fix review

Author: kseniya57

src/extensions/additional/QuoteLink/PlaceholderWidget/descriptor.tsx

@@ -83,8 +83,8 @@ export class QuoteLinkWidgetDescriptor extends ReactWidgetDescriptor {
                 currentNodeWithPos.pos + currentNodeWithPos.node.nodeSize,
                 quoteLinkType(this.#view.state.schema).create(
                     {
-                        [QuoteLinkAttr.Href]: url,
-                        [QuoteLinkAttr.Content]: text,
+                        [QuoteLinkAttr.Cite]: url,
+                        [QuoteLinkAttr.DataContent]: text,
                     },
                     content,
                 ),

src/extensions/additional/QuoteLink/QuoteLink.test.ts

@@ -19,7 +19,7 @@ const {
     extensions: (builder) =>
         builder
             .use(BaseSchemaSpecs, {})
-            .use(YfmConfigsSpecs, {attrs: {allowedAttributes: ['data-quotelink']}})
+            .use(YfmConfigsSpecs, {attrs: {allowedAttributes: ['data-quotelink', 'data-content']}})
             .use(BlockquoteSpecs)
             .use(QuoteLinkSpecs),
 }).buildDeps();
@@ -29,8 +29,8 @@ const {doc, p, quoteLink} = builders<'doc' | 'p' | 'quoteLink'>(schema, {
     p: {nodeType: BaseNode.Paragraph},
     quoteLink: {
         nodeType: quoteLinkNodeName,
-        [QuoteLinkAttr.Href]: 'https://ya.ru',
-        [QuoteLinkAttr.Content]: 'Quote link',
+        [QuoteLinkAttr.Cite]: 'https://ya.ru',
+        [QuoteLinkAttr.DataContent]: 'Quote link',
     },
 });
 
@@ -51,7 +51,7 @@ describe('QuoteLink extension', () => {
         parseDOM(
             schema,
             dd`<div>
-                    <blockquote class="yfm-quote-link" href="https://ya.ru" content="Quote link">
+                    <blockquote class="yfm-quote-link" cite="https://ya.ru" data-content="Quote link">
                         <p>quote link text</p>
                     </blockquote>
             </div>`,

src/extensions/additional/QuoteLink/QuoteLinkSpecs/index.ts

@@ -11,8 +11,8 @@ export const quoteLinkType = nodeTypeFactory(quoteLinkNodeName);
 export const isQuoteLinkNode = (node: Node) => node.type.name === quoteLinkNodeName;
 
 export enum QuoteLinkAttr {
-    Href = 'href',
-    Content = 'content',
+    Cite = 'cite',
+    DataContent = 'data-content',
 }
 
 export const QuoteLinkSpecs: ExtensionAuto = (builder) => {
@@ -30,8 +30,8 @@ export const QuoteLinkSpecs: ExtensionAuto = (builder) => {
             spec: {
                 attrs: {
                     class: {default: 'yfm-quote-link'},
-                    [QuoteLinkAttr.Href]: {default: ''},
-                    [QuoteLinkAttr.Content]: {default: ''},
+                    [QuoteLinkAttr.Cite]: {default: ''},
+                    [QuoteLinkAttr.DataContent]: {default: ''},
                 },
                 content: 'block+',
                 group: 'block',
@@ -41,8 +41,12 @@ export const QuoteLinkSpecs: ExtensionAuto = (builder) => {
                         tag: '.yfm-quote-link',
                         getAttrs(dom) {
                             return {
-                                href: (dom as Element).getAttribute(QuoteLinkAttr.Href),
-                                content: (dom as Element).getAttribute(QuoteLinkAttr.Content),
+                                [QuoteLinkAttr.Cite]: (dom as Element).getAttribute(
+                                    QuoteLinkAttr.Cite,
+                                ),
+                                [QuoteLinkAttr.DataContent]: (dom as Element).getAttribute(
+                                    QuoteLinkAttr.DataContent,
+                                ),
                             };
                         },
                         priority: builder.Priority.VeryHigh,
@@ -58,15 +62,17 @@ export const QuoteLinkSpecs: ExtensionAuto = (builder) => {
                     name: quoteLinkNodeName,
                     type: 'block',
                     getAttrs: (tok) => ({
-                        href: tok.attrGet('href'),
-                        content: tok.attrGet('content') || null,
+                        [QuoteLinkAttr.Cite]: tok.attrGet('cite'),
+                        [QuoteLinkAttr.DataContent]: tok.attrGet('data-content') || null,
                     }),
                 },
             },
             toMd: (state, node) => {
                 state.wrapBlock(
                     '> ',
-                    `> [${node.attrs.content}](${node.attrs.href}){data-quotelink=true}\n>\n`,
+                    `> [${node.attrs[QuoteLinkAttr.DataContent]}](${
+                        node.attrs[QuoteLinkAttr.Cite]
+                    }){data-quotelink=true}\n>\n`,
                     node,
                     () => state.renderContent(node),
                 );

src/extensions/additional/QuoteLink/QuoteLinkSpecs/md/moveLinkToQuoteAttributes.ts

@@ -1,5 +1,9 @@
 import type {PluginSimple} from 'markdown-it';
 
+import {matchLinkAtInlineStart} from 'src/extensions/additional/QuoteLink/QuoteLinkSpecs/md/utils';
+
+import {QuoteLinkAttr} from '..';
+
 export const moveLinkToQuoteAttributes: PluginSimple = (md) => {
     md.core.ruler.push('move-link-to-quote-attributes', (state) => {
         const {tokens} = state;
@@ -9,17 +13,31 @@ export const moveLinkToQuoteAttributes: PluginSimple = (md) => {
         while (i < tokens.length) {
             const token = tokens[i];
             if (token.type === 'yfm_quote-link_open') {
-                const linkToken = tokens[i + 2]?.children?.[0];
-                if (linkToken && linkToken.type === 'link_open') {
-                    token.attrSet('href', linkToken.attrGet('href') ?? '');
-                }
+                const inlineToken = tokens[i + 2];
+                const linkMatch = matchLinkAtInlineStart(inlineToken);
 
-                const linkTextToken = tokens[i + 2]?.children?.[1];
-                if (linkTextToken?.content) {
-                    token.attrSet('content', linkTextToken.content);
-                }
+                if (
+                    linkMatch?.openToken.attrIndex('data-quotelink') !== -1 &&
+                    linkMatch?.closeTokenIndex
+                ) {
+                    token.attrSet(QuoteLinkAttr.Cite, linkMatch?.openToken.attrGet('href') ?? '');
+                    const content = inlineToken.children
+                        ?.slice(1, linkMatch.closeTokenIndex)
+                        .reduce((result, item) => result + item.content, '')
+                        .trim();
+                    if (content) {
+                        token.attrSet(QuoteLinkAttr.DataContent, content);
+                    }
 
-                tokens.splice(i + 1, 3);
+                    if (linkMatch.closeTokenIndex === (inlineToken.children?.length ?? 0) - 1) {
+                        tokens.splice(i + 1, 3);
+                    } else {
+                        inlineToken.children?.splice(0, linkMatch.closeTokenIndex + 1);
+                        if (inlineToken.children?.every((childToken) => !childToken.content)) {
+                            tokens.splice(i + 1, 3);
+                        }
+                    }
+                }
             }
 
             i++;

src/extensions/additional/QuoteLink/QuoteLinkSpecs/md/utils.ts

@@ -0,0 +1,25 @@
+import type Token from 'markdown-it/lib/token';
+
+export function matchLinkAtInlineStart(inlineToken: Token) {
+    if (inlineToken.type !== 'inline' || !inlineToken.children?.length) {
+        return null;
+    }
+
+    const {children: tokens} = inlineToken;
+    if (tokens[0].type !== 'link_open') {
+        return null;
+    }
+
+    for (let i = 0; i < tokens.length; i++) {
+        const token = tokens[i];
+        if (token.type === 'link_close') {
+            return {
+                openToken: tokens[0],
+                closeToken: token,
+                closeTokenIndex: i,
+            };
+        }
+    }
+
+    return null;
+}