Merge pull request #2100 from microsoft/u/juliaroldi/link-on-images

Fix link underline on images
microsoft · Sep 26, 2023 · 368e88e · 368e88e
2 parents 897d4d2 + c5dbf33
commit 368e88e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/packages-content-model/roosterjs-content-model-editor/lib/publicApi/link/insertLink.ts b/packages-content-model/roosterjs-content-model-editor/lib/publicApi/link/insertLink.ts
@@ -43,16 +43,7 @@ export default function insertLink(
     let url = (checkXss(link) || '').trim();
     if (url) {
         const linkData = matchLink(url);
-        const link: ContentModelLink = {
-            dataset: {},
-            format: {
-                href: linkData ? linkData.normalizedUrl : applyLinkPrefix(url),
-                anchorTitle,
-                target,
-                underline: true,
-            },
-        };
-
+        const linkUrl = linkData ? linkData.normalizedUrl : applyLinkPrefix(url);
         const links: ContentModelLink[] = [];
         let anchorNode: Node | undefined;
 
@@ -71,8 +62,13 @@ export default function insertLink(
                     originalText == text
                 ) {
                     segments.forEach(x => {
+                        const link = createLink(
+                            linkUrl,
+                            anchorTitle,
+                            target,
+                            x.segmentType == 'Text'
+                        );
                         addLink(x, link);
-
                         if (x.link) {
                             links.push(x.link);
                         }
@@ -86,6 +82,7 @@ export default function insertLink(
                         ...(getPendingFormat(editor) || {}),
                     });
                     const doc = createContentModelDocument();
+                    const link = createLink(linkUrl, anchorTitle, target);
 
                     addLink(segment, link);
                     addSegment(doc, segment);
@@ -114,6 +111,23 @@ export default function insertLink(
     }
 }
 
+const createLink = (
+    url: string,
+    anchorTitle?: string,
+    target?: string,
+    underline: boolean = true
+): ContentModelLink => {
+    return {
+        dataset: {},
+        format: {
+            href: url,
+            anchorTitle,
+            target,
+            underline: underline,
+        },
+    };
+};
+
 // TODO: This is copied from original code. We may need to integrate this logic into matchLink() later.
 function applyLinkPrefix(url: string): string {
     if (!url) {

diff --git a/packages-content-model/roosterjs-content-model-editor/test/publicApi/link/insertLinkTest.ts b/packages-content-model/roosterjs-content-model-editor/test/publicApi/link/insertLinkTest.ts
@@ -230,7 +230,10 @@ describe('insertLink', () => {
                                 format: {},
                                 src: 'test',
                                 dataset: {},
-                                link,
+                                link: {
+                                    dataset: link.dataset,
+                                    format: { ...link.format, underline: false },
+                                },
                                 isSelected: true,
                             },
                             {