Content Model: Adjust selection for link to select a word

packages/roosterjs-content-model/lib/publicApi/link/adjustLinkSelection.ts

@@ -1,8 +1,10 @@
 import { adjustSegmentSelection } from '../../modelApi/selection/adjustSegmentSelection';
+import { adjustWordSelection } from '../../modelApi/selection/adjustWordSelection';
 import { areSameFormats } from '../../domToModel/utils/areSameFormats';
 import { formatWithContentModel } from '../utils/formatWithContentModel';
 import { getSelectedSegments } from '../../modelApi/selection/collectSelections';
 import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor';
+import { setSelection } from '../../modelApi/selection/setSelection';
 
 /**
  * Adjust selection to make sure select a hyperlink if any, or a word if original selection is collapsed
@@ -15,14 +17,22 @@ export default function adjustLinkSelection(
     let url: string | null = null;
 
     formatWithContentModel(editor, 'adjustLinkSelection', model => {
-        const changed = adjustSegmentSelection(
+        let changed = adjustSegmentSelection(
             model,
             target => !!target.isSelected && !!target.link,
             (target, ref) => !!target.link && areSameFormats(target.link.format, ref.link!.format)
         );
-        const segments = getSelectedSegments(model, false /*includingFormatHolder*/);
+        let segments = getSelectedSegments(model, false /*includingFormatHolder*/);
+        const firstSegment = segments[0];
 
-        // TODO: expand selection to a word if selection is collapsed
+        if (segments.length == 1 && firstSegment.segmentType == 'SelectionMarker') {
+            segments = adjustWordSelection(model, firstSegment);
+
+            if (segments.length > 1) {
+                changed = true;
+                setSelection(model, segments[0], segments[segments.length - 1]);
+            }
+        }
 
         text = segments.map(x => (x.segmentType == 'Text' ? x.text : '')).join('');
         url = segments[0]?.link?.format.href || null;

packages/roosterjs-content-model/test/publicApi/link/adjustLinkSelectionTest.ts

@@ -300,4 +300,54 @@ describe('adjustLinkSelection', () => {
             'http://test.com'
         );
     });
+
+    it('Doc without link, expand for word', () => {
+        const doc = createContentModelDocument();
+        const para = createParagraph();
+        const text0 = createText('test0 te');
+        const marker = createSelectionMarker();
+        const text1 = createText('st1 test2');
+
+        para.segments.push(text0, marker, text1);
+        doc.blocks.push(para);
+
+        runTest(
+            doc,
+            {
+                blockGroupType: 'Document',
+                blocks: [
+                    {
+                        blockType: 'Paragraph',
+                        format: {},
+                        segments: [
+                            {
+                                segmentType: 'Text',
+                                format: {},
+                                text: 'test0 ',
+                            },
+                            {
+                                segmentType: 'Text',
+                                format: {},
+                                text: 'te',
+                                isSelected: true,
+                            },
+                            {
+                                segmentType: 'Text',
+                                format: {},
+                                text: 'st1',
+                                isSelected: true,
+                            },
+                            {
+                                segmentType: 'Text',
+                                format: {},
+                                text: ' test2',
+                            },
+                        ],
+                    },
+                ],
+            },
+            'test1',
+            null
+        );
+    });
 });