@skbkontur/markdown 2.7.0-alpha.1 → 2.7.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/markdown",
-  "version": "2.7.0-alpha.1",
+  "version": "2.7.0-alpha.5",
   "packageManager": "yarn@4.13.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -67,7 +67,7 @@
     "@storybook/react": "8.2.8",
     "@storybook/react-vite": "8.2.8",
     "@storybook/test-runner": "0.19.1",
-    "@swc/core": "1.3.50",
+    "@swc/core": "1.15.11",
     "@swc/jest": "0.2.26",
     "@swc/plugin-styled-components": "5.0.0",
     "@types/jest": "29.5.0",
@@ -121,4 +121,4 @@
   "resolutions": {
     "@types/react": "18.0.28"
   }
-}
+}

package/src/Markdown/MarkdownHelpers/markdownListEnterHelpers.js

@@ -1,4 +1,20 @@
 import { onInsertText } from '../utils/onInsertText';
+/**
+ * RegExp для парсинга markdown-like list item.
+ *
+ * Поддерживает:
+ * - unordered lists: "- item", "* item", "+ item";
+ * - ordered lists: "1. item", "1) item";
+ * - checkbox items: "- [ ] item", "- [x] item done", "- [X] item done".
+ *
+ * Группы:
+ * - spacesBeforeMarker: отступы перед маркером списка;
+ * - orderedListNumber: номер ordered-list элемента;
+ * - orderedListDelimiter: разделитель ordered-list: "." или ")";
+ * - unorderedListMarker: маркер unordered-list: "*", "-" или "+";
+ * - checkboxListMarker: checkbox-маркер: "[ ]", "[x]" или "[X]";
+ * - text: текст элемента списка, может быть пустым.
+ */
 const listItemRegExp = /^(?<spacesBeforeMarker> *)(?:(?<orderedListNumber>\d+)(?<orderedListDelimiter>[.)])|(?<unorderedListMarker>[*+-])(?: +(?<checkboxListMarker>\[[ xX]]))?)(?: +(?<text>.*)|$)$/;
 export function handleMarkdownListEnter(event, textareaNode) {
     const { selectionStart, selectionEnd, value } = textareaNode;
@@ -20,6 +36,7 @@ export function handleMarkdownListEnter(event, textareaNode) {
     const { spacesBeforeMarker, orderedListNumber, orderedListDelimiter, unorderedListMarker, checkboxListMarker, text, } = listLineMatch.groups;
     event.stopPropagation();
     event.preventDefault();
+    /* Если пункт списка пустой, удаляем маркер и завершаем список */
     if (!text?.trim()) {
         textareaNode.setSelectionRange(currentLineStartIndex, currentLineEndIndex);
         return document.execCommand('delete');
@@ -27,11 +44,11 @@ export function handleMarkdownListEnter(event, textareaNode) {
     if (orderedListNumber && orderedListDelimiter) {
         const nextOrderedListNumber = Number(orderedListNumber) + 1;
         const newLine = `\n${spacesBeforeMarker}${nextOrderedListNumber}${orderedListDelimiter} `;
-        const renumberedRestLines = getRestLinesWithRenumberedList(value, currentLineEndIndex, spacesBeforeMarker, orderedListDelimiter, nextOrderedListNumber + 1);
-        if (renumberedRestLines) {
+        const { isChanged, listEndIndex, renumberedList } = getRenumberedListLines(value, currentLineEndIndex, spacesBeforeMarker, orderedListDelimiter, nextOrderedListNumber + 1);
+        if (isChanged) {
             const currentLineTextAfterCursor = value.slice(selectionStart, currentLineEndIndex);
-            textareaNode.setSelectionRange(selectionStart, value.length);
-            onInsertText(`${newLine}${currentLineTextAfterCursor}${renumberedRestLines}`);
+            textareaNode.setSelectionRange(selectionStart, listEndIndex);
+            onInsertText(`${newLine}${currentLineTextAfterCursor}${renumberedList}`);
             const cursorPosition = selectionStart + newLine.length;
             return textareaNode.setSelectionRange(cursorPosition, cursorPosition);
         }
@@ -54,18 +71,32 @@ function getCurrentLineEndIndex(text, cursorPosition) {
         return text.length;
     return currentLineEndIndex;
 }
-function getRestLinesWithRenumberedList(value, currentLineEndIndex, spacesBeforeMarker, orderedListDelimiter, nextOrderedListNumber) {
-    const lines = value.slice(currentLineEndIndex).split('\n');
+function getRenumberedListLines(value, currentLineEndIndex, spacesBeforeMarker, orderedListDelimiter, nextOrderedListNumber) {
+    let nextLineStartIndex = currentLineEndIndex + 1;
     let currentOrderedListNumber = nextOrderedListNumber;
-    for (let i = 1; i < lines.length; i += 1) {
-        const listLineMatch = lines[i].match(listItemRegExp);
+    let isChanged = false;
+    let renumberedList = '';
+    let listEndIndex = currentLineEndIndex;
+    while (nextLineStartIndex < value.length) {
+        const nextLineEndIndex = getCurrentLineEndIndex(value, nextLineStartIndex);
+        const line = value.slice(nextLineStartIndex, nextLineEndIndex);
+        const listLineMatch = line.match(listItemRegExp);
         const groups = listLineMatch?.groups;
         if (!groups?.orderedListNumber ||
             groups.spacesBeforeMarker !== spacesBeforeMarker ||
             groups.orderedListDelimiter !== orderedListDelimiter)
             break;
-        lines[i] = lines[i].replace(`${spacesBeforeMarker}${groups.orderedListNumber}${orderedListDelimiter}`, `${spacesBeforeMarker}${currentOrderedListNumber}${orderedListDelimiter}`);
+        const renumberedLine = line.replace(`${spacesBeforeMarker}${groups.orderedListNumber}${orderedListDelimiter}`, `${spacesBeforeMarker}${currentOrderedListNumber}${orderedListDelimiter}`);
+        if (renumberedLine !== line)
+            isChanged = true;
+        renumberedList += `\n${renumberedLine}`;
+        listEndIndex = nextLineEndIndex;
+        nextLineStartIndex = nextLineEndIndex + 1;
         currentOrderedListNumber += 1;
     }
-    return lines.join('\n');
+    return {
+        isChanged,
+        listEndIndex,
+        renumberedList,
+    };
 }