remove getLinkSegment

microsoft · Apr 4, 2024 · c1b2a9d · c1b2a9d
1 parent b1b398e
commit c1b2a9d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 220 deletions.
diff --git a/packages/roosterjs-content-model-plugins/lib/autoFormat/link/createLink.ts b/packages/roosterjs-content-model-plugins/lib/autoFormat/link/createLink.ts
@@ -1,17 +1,18 @@
 import { addLink } from 'roosterjs-content-model-dom';
-import { getLinkSegment } from './getLinkSegment';
-import type { IEditor } from 'roosterjs-content-model-types';
+import { formatTextSegmentBeforeSelectionMarker } from '../../pluginUtils/formatTextSegmentBeforeSelectionMarker';
+import { matchLink } from 'roosterjs-content-model-api';
+import type { IEditor, LinkData } from 'roosterjs-content-model-types';
 
 /**
  * @internal
  */
 export function createLink(editor: IEditor) {
-    editor.formatContentModel(model => {
-        const link = getLinkSegment(model);
-        if (link && !link.link) {
-            addLink(link, {
+    formatTextSegmentBeforeSelectionMarker(editor, (_model, linkSegment, _paragraph) => {
+        let linkData: LinkData | null = null;
+        if (!linkSegment.link && (linkData = matchLink(linkSegment.text))) {
+            addLink(linkSegment, {
                 format: {
-                    href: link.text,
+                    href: linkData.normalizedUrl,
                     underline: true,
                 },
                 dataset: {},

diff --git a/packages/roosterjs-content-model-plugins/lib/autoFormat/link/getLinkSegment.ts b/packages/roosterjs-content-model-plugins/lib/autoFormat/link/getLinkSegment.ts
diff --git a/packages/roosterjs-content-model-plugins/lib/autoFormat/link/unlink.ts b/packages/roosterjs-content-model-plugins/lib/autoFormat/link/unlink.ts
@@ -1,18 +1,18 @@
-import { getLinkSegment } from './getLinkSegment';
+import { formatTextSegmentBeforeSelectionMarker } from '../../pluginUtils/formatTextSegmentBeforeSelectionMarker';
+
 import type { IEditor } from 'roosterjs-content-model-types';
 
 /**
  * @internal
  */
 export function unlink(editor: IEditor, rawEvent: KeyboardEvent) {
-    editor.formatContentModel(model => {
-        const link = getLinkSegment(model);
-        if (link?.link) {
-            link.link = undefined;
+    formatTextSegmentBeforeSelectionMarker(editor, (_model, linkSegment, _paragraph) => {
+        if (linkSegment?.link) {
+            linkSegment.link = undefined;
             rawEvent.preventDefault();
+
             return true;
         }
-
         return false;
     });
 }
diff --git a/packages/roosterjs-content-model-plugins/test/autoFormat/link/createLinkTest.ts b/packages/roosterjs-content-model-plugins/test/autoFormat/link/createLinkTest.ts
@@ -110,7 +110,7 @@ describe('createLink', () => {
                             format: {},
                             link: {
                                 format: {
-                                    href: 'www.bing.com',
+                                    href: 'http://www.bing.com',
                                     underline: true,
                                 },
                                 dataset: {},

diff --git a/packages/roosterjs-content-model-plugins/test/autoFormat/link/getLinkSegmentTest.ts b/packages/roosterjs-content-model-plugins/test/autoFormat/link/getLinkSegmentTest.ts