@skbkontur/markdown 2.6.3 → 2.7.0-alpha.0

package/src/Markdown/MarkdownHelpItems.js

@@ -1,13 +1,3 @@
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var _a, _b;
 import React from 'react';
 import { MarkdownSymbolWrapper } from './Markdown.styled';
 import { MarkdownFormat } from './MarkdownFormat';
@@ -19,10 +9,10 @@ import { List } from '../MarkdownIcons/List';
 import { I } from '../MarkdownIcons/MarkdownIcons.styled';
 import { NumberedList } from '../MarkdownIcons/NumberedList';
 import { Table } from '../MarkdownIcons/Table';
-var newLinesRegexp = /([\n\r]+)/g;
-var spacesMatchRegexp = /\s/gm;
-var spacesSplitRegexp = /(\s+)/;
-export var eventKeyCodeToMarkdownFormat = {
+const newLinesRegexp = /([\n\r]+)/g;
+const spacesMatchRegexp = /\s/gm;
+const spacesSplitRegexp = /(\s+)/;
+export const eventKeyCodeToMarkdownFormat = {
     Digit2: MarkdownFormat.h2,
     Digit3: MarkdownFormat.h3,
     Digit4: MarkdownFormat.h4,
@@ -36,46 +26,46 @@ export var eventKeyCodeToMarkdownFormat = {
     KeyC: MarkdownFormat.codeBlock,
     KeyQ: MarkdownFormat.quote,
 };
-export var markdownFormatToShortKeyLong = (_a = {},
-    _a[MarkdownFormat.h2] = '2',
-    _a[MarkdownFormat.h3] = '3',
-    _a[MarkdownFormat.h4] = '4',
-    _a[MarkdownFormat.crossed] = 'S',
-    _a[MarkdownFormat.list] = 'P',
-    _a[MarkdownFormat.checkedList] = 'D',
-    _a[MarkdownFormat.numberedList] = 'O',
-    _a[MarkdownFormat.codeBlock] = 'C',
-    _a[MarkdownFormat.quote] = 'Q',
-    _a);
-export var markdownFormatToShortKeyShort = (_b = {},
-    _b[MarkdownFormat.bold] = 'B',
-    _b[MarkdownFormat.italic] = 'I',
-    _b[MarkdownFormat.ref] = 'K',
-    _b);
+export const markdownFormatToShortKeyLong = {
+    [MarkdownFormat.h2]: '2',
+    [MarkdownFormat.h3]: '3',
+    [MarkdownFormat.h4]: '4',
+    [MarkdownFormat.crossed]: 'S',
+    [MarkdownFormat.list]: 'P',
+    [MarkdownFormat.checkedList]: 'D',
+    [MarkdownFormat.numberedList]: 'O',
+    [MarkdownFormat.codeBlock]: 'C',
+    [MarkdownFormat.quote]: 'Q',
+};
+export const markdownFormatToShortKeyShort = {
+    [MarkdownFormat.bold]: 'B',
+    [MarkdownFormat.italic]: 'I',
+    [MarkdownFormat.ref]: 'K',
+};
 function reverseString(text) {
     return text.split('').reverse().join('');
 }
 export function checkSpaceSymbol(text, checkedLength) {
-    var latestSymbolPos = text.length - 1;
-    var latestSymbol = text.charAt(latestSymbolPos);
+    const latestSymbolPos = text.length - 1;
+    const latestSymbol = text.charAt(latestSymbolPos);
     if (latestSymbol.match(spacesMatchRegexp) && checkedLength) {
-        var substringText = reverseString(text).split(spacesSplitRegexp);
-        var spaces = substringText[1];
-        var remainingText = substringText.slice(2);
-        var textWithoutSpaces = remainingText.join('');
-        var reversed = reverseString(textWithoutSpaces);
+        const substringText = reverseString(text).split(spacesSplitRegexp);
+        const spaces = substringText[1];
+        const remainingText = substringText.slice(2);
+        const textWithoutSpaces = remainingText.join('');
+        const reversed = reverseString(textWithoutSpaces);
         return { value: reversed, spaces: reverseString(spaces) };
     }
     return { value: text, spaces: '' };
 }
-export var markdownHelpHeaders = [
+export const markdownHelpHeaders = [
     {
         format: MarkdownFormat.h2,
         tid: MarkdownTids.HeadingH2,
         node: (React.createElement(React.Fragment, null,
             React.createElement(MarkdownSymbolWrapper, null, "##"),
             " \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A 2")),
-        wrapContent: function (content) { return "## ".concat(content); },
+        wrapContent: (content) => `## ${content}`,
         text: 'Заголовок 2',
     },
     {
@@ -84,7 +74,7 @@ export var markdownHelpHeaders = [
         node: (React.createElement(React.Fragment, null,
             React.createElement(MarkdownSymbolWrapper, null, "###"),
             " \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A 3")),
-        wrapContent: function (content) { return "### ".concat(content); },
+        wrapContent: (content) => `### ${content}`,
         text: 'Заголовок 3',
     },
     {
@@ -93,11 +83,11 @@ export var markdownHelpHeaders = [
         node: (React.createElement(React.Fragment, null,
             React.createElement(MarkdownSymbolWrapper, null, "####"),
             " \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A 4")),
-        wrapContent: function (content) { return "#### ".concat(content); },
+        wrapContent: (content) => `#### ${content}`,
         text: 'Заголовок 4',
     },
 ];
-export var markdownHelpText = [
+export const markdownHelpText = [
     {
         format: MarkdownFormat.bold,
         tid: MarkdownTids.Bold,
@@ -106,7 +96,7 @@ export var markdownHelpText = [
             "\u0416\u0438\u0440\u043D\u044B\u0439",
             React.createElement(MarkdownSymbolWrapper, null, "**"))),
         icon: React.createElement("strong", null, "B"),
-        wrapContent: function (content) { return "**".concat(content, "**"); },
+        wrapContent: (content) => `**${content}**`,
         text: 'Жирный',
         checkLength: 2,
     },
@@ -118,7 +108,7 @@ export var markdownHelpText = [
             "\u041A\u0443\u0440\u0441\u0438\u0432",
             React.createElement(MarkdownSymbolWrapper, null, "*"))),
         icon: React.createElement(I, null, "I"),
-        wrapContent: function (content) { return "*".concat(content, "*"); },
+        wrapContent: (content) => `*${content}*`,
         text: 'Курсив',
         checkLength: 1,
     },
@@ -132,7 +122,7 @@ export var markdownHelpText = [
         icon: (React.createElement("span", { style: {
                 textDecoration: 'line-through',
             } }, "S")),
-        wrapContent: function (content) { return "~~".concat(content, "~~"); },
+        wrapContent: (content) => `~~${content}~~`,
         text: 'Зачеркнутый',
         checkLength: 2,
     },
@@ -147,12 +137,12 @@ export var markdownHelpText = [
             "\u0421\u0441\u044B\u043B\u043A\u0430",
             React.createElement(MarkdownSymbolWrapper, null, ")"))),
         icon: React.createElement(AttachLink, null),
-        wrapContent: function (content) { return "[".concat(content, "]()"); },
+        wrapContent: (content) => `[${content}]()`,
         text: 'Ссылка',
         checkLength: 1,
     },
 ];
-export var markdownHelpLists = [
+export const markdownHelpLists = [
     {
         format: MarkdownFormat.list,
         tid: MarkdownTids.List,
@@ -160,7 +150,7 @@ export var markdownHelpLists = [
             React.createElement(MarkdownSymbolWrapper, null, "*"),
             " \u0421\u043F\u0438\u0441\u043E\u043A")),
         icon: React.createElement(List, null),
-        wrapContent: function (content) { return getList(content, '*'); },
+        wrapContent: (content) => getList(content, '*'),
         text: 'Список',
     },
     {
@@ -170,7 +160,7 @@ export var markdownHelpLists = [
             React.createElement(MarkdownSymbolWrapper, null, "* [x]"),
             " \u0421\u043F\u0438\u0441\u043E\u043A - \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u043E")),
         icon: React.createElement(CheckedList, null),
-        wrapContent: function (content) { return getList(content, '* [x]'); },
+        wrapContent: (content) => getList(content, '* [x]'),
         text: 'Список - выполнено',
     },
     {
@@ -180,11 +170,11 @@ export var markdownHelpLists = [
             React.createElement(MarkdownSymbolWrapper, null, "1. "),
             " \u0421\u043F\u0438\u0441\u043E\u043A - \u043D\u0443\u043C\u0435\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439")),
         icon: React.createElement(NumberedList, null),
-        wrapContent: function (content) { return getList(content, 1); },
+        wrapContent: (content) => getList(content, 1),
         text: 'Список - нумерованный',
     },
 ];
-export var markdownHelpOther = [
+export const markdownHelpOther = [
     {
         format: MarkdownFormat.codeBlock,
         tid: MarkdownTids.CodeBlock,
@@ -193,7 +183,7 @@ export var markdownHelpOther = [
             "\u0411\u043B\u043E\u043A \u043A\u043E\u0434\u0430",
             React.createElement(MarkdownSymbolWrapper, null, "`"))),
         icon: React.createElement("span", null, '</>'),
-        wrapContent: function (content) { return "`".concat(content, "`"); },
+        wrapContent: (content) => `\`${content}\``,
         text: 'Блок кода',
         checkLength: 1,
     },
@@ -206,7 +196,7 @@ export var markdownHelpOther = [
                 " "),
             " \u0426\u0438\u0442\u0430\u0442\u0430")),
         icon: '>',
-        wrapContent: function (content) { return "> ".concat(content); },
+        wrapContent: (content) => `> ${content}`,
         text: 'Цитата',
     },
     {
@@ -214,11 +204,14 @@ export var markdownHelpOther = [
         tid: MarkdownTids.Table,
         node: 'Таблица',
         icon: React.createElement(Table, null),
-        wrapContent: function () { return "| \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A | \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A |\n| ------ | ------ |\n| \u042F\u0447\u0435\u0439\u043A\u0430 | \u042F\u0447\u0435\u0439\u043A\u0430 |\n| \u042F\u0447\u0435\u0439\u043A\u0430 | \u042F\u0447\u0435\u0439\u043A\u0430 |"; },
+        wrapContent: () => `| Заголовок | Заголовок |
+| ------ | ------ |
+| Ячейка | Ячейка |
+| Ячейка | Ячейка |`,
         text: 'Таблица',
     },
 ];
-export var markdownHelpFiles = function (fileApiUrl) {
+export const markdownHelpFiles = (fileApiUrl) => {
     if (!fileApiUrl)
         return [];
     return [
@@ -227,7 +220,7 @@ export var markdownHelpFiles = function (fileApiUrl) {
             tid: MarkdownTids.AttachFile,
             node: '',
             icon: React.createElement("span", null),
-            wrapContent: function (file) { return "![img](".concat(fileApiUrl).concat(file.id, ")"); },
+            wrapContent: file => `![img](${fileApiUrl}${file.id})`,
             text: 'Картинка',
         },
         {
@@ -235,23 +228,28 @@ export var markdownHelpFiles = function (fileApiUrl) {
             tid: MarkdownTids.AttachFile,
             node: '',
             icon: React.createElement(AttachPaperclip, null),
-            wrapContent: function (file) { return "[".concat(file.caption, "](").concat(fileApiUrl).concat(file.id, ")"); },
+            wrapContent: file => `[${file.caption}](${fileApiUrl}${file.id})`,
             text: 'Файл',
         },
     ];
 };
-export var markdownHelpItems = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], markdownHelpHeaders, true), markdownHelpText, true), markdownHelpLists, true), markdownHelpOther, true);
+export const markdownHelpItems = [
+    ...markdownHelpHeaders,
+    ...markdownHelpText,
+    ...markdownHelpLists,
+    ...markdownHelpOther,
+];
 function getList(value, symbol) {
-    var splitValueWithNewLines = value.split(newLinesRegexp);
-    var numberList = [];
+    const splitValueWithNewLines = value.split(newLinesRegexp);
+    const numberList = [];
     return splitValueWithNewLines
-        .map(function (v, idx) {
+        .map((v, idx) => {
         if (!newLinesRegexp.test(v)) {
             if (typeof symbol === 'number') {
                 numberList.push(idx);
-                return "".concat(numberList.length, ". ").concat(v);
+                return `${numberList.length}. ${v}`;
             }
-            return "".concat(symbol, " ").concat(v);
+            return `${symbol} ${v}`;
         }
         return v;
     })

package/src/Markdown/MarkdownHelpers/EmptyPreview.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { EmptyPreviewArrow } from '../../MarkdownIcons/EmptyPrviewArrow';
 import { EmptyPreviewContainer, EmptyPreviewIconWrapper, EmptyPreviewText } from '../Markdown.styled';
-export var EmptyPreview = function () {
+export const EmptyPreview = () => {
     return (React.createElement(EmptyPreviewContainer, null,
         React.createElement(EmptyPreviewText, null, "\u041D\u0430\u0447\u043D\u0438 \u0432\u0432\u043E\u0434\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442 \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435 "),
         React.createElement(EmptyPreviewIconWrapper, null,

package/src/Markdown/MarkdownHelpers/MarkdownFormatButton.js

@@ -2,16 +2,15 @@ import { Hint } from '@skbkontur/react-ui';
 import React from 'react';
 import { MarkdownCombination } from '../../MarkdownCombination/MarkdownCombination';
 import { MarkdownButtonContentWrapper, MarkdownButtonIcon, MarkdownButtonWrapper, VisuallyHidden, } from '../Markdown.styled';
-export var MarkdownFormatButton = function (_a) {
-    var dataTid = _a.dataTid, icon = _a.icon, hintText = _a.hintText, onClick = _a.onClick, format = _a.format, disabled = _a.disabled, text = _a.text, href = _a.href, showActionHint = _a.showActionHint, showHintWhenDisabled = _a.showHintWhenDisabled, showShortKey = _a.showShortKey, showText = _a.showText, hintPos = _a.hintPos;
-    var button = (React.createElement(MarkdownButtonWrapper, { borderless: true, disabled: disabled, "data-tid": dataTid, onClick: onClick },
+export const MarkdownFormatButton = ({ dataTid, icon, hintText, onClick, format, disabled, text, href, showActionHint, showHintWhenDisabled, showShortKey, showText, hintPos, }) => {
+    const button = (React.createElement(MarkdownButtonWrapper, { borderless: true, disabled: disabled, "data-tid": dataTid, onClick: onClick },
         React.createElement(MarkdownButtonContentWrapper, null,
             !!icon && React.createElement(MarkdownButtonIcon, null, icon),
             showText ? text : React.createElement(VisuallyHidden, null, text))));
-    var content = href ? (React.createElement("a", { href: href, tabIndex: -1, target: "_blank", rel: "noopener noreferrer nofollow" }, button)) : (button);
+    const content = href ? (React.createElement("a", { href: href, tabIndex: -1, target: "_blank", rel: "noopener noreferrer nofollow" }, button)) : (button);
     if (!showActionHint && !showShortKey)
         return content;
-    var actualHintText = showActionHint && hintText;
-    var hintComponent = format ? (React.createElement(MarkdownCombination, { format: format, text: actualHintText, showShortKey: showShortKey })) : (actualHintText);
-    return (React.createElement(Hint, { manual: !showHintWhenDisabled && disabled, text: hintComponent, pos: hintPos !== null && hintPos !== void 0 ? hintPos : 'top center', maxWidth: 360 }, content));
+    const actualHintText = showActionHint && hintText;
+    const hintComponent = format ? (React.createElement(MarkdownCombination, { format: format, text: actualHintText, showShortKey: showShortKey })) : (actualHintText);
+    return (React.createElement(Hint, { manual: !showHintWhenDisabled && disabled, text: hintComponent, pos: hintPos ?? 'top center', maxWidth: 360 }, content));
 };

package/src/Markdown/MarkdownHelpers/constants.js

@@ -1,2 +1,2 @@
-export var MENU_ITEM_HOVERED_STATE_DATA_ATTRIBUTE = '[data-visual-state-hover]';
-export var EMPTY_AVATAR = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7Zg/aBNRHMebXEv+CFKxSusgBAcXRdDJWnA4qAVdRMzgIogScCldmj8dQighoRgh/hnataCSSXRyCA7BQS0OdVGHgrGCOqQiUmNiEr+v960Ycum9dy9m8gPH789d775573fv/a4D/9HEQ6tFLpcL1Gq1Cx6Px9dsNj/CvonFYu9hW7zENdoCk8mk1+/3ZyBmlqktWq3WOkwB+TzElq2sOq4Ezs/PHzIMY9br9U5CyBhEDCHttc52UMU1sXg8nmeshEErTTabnYCwEo5xhMMQNwi70w8dxDVTpmkaxWLxKXPSKI1gPp/3bW5uvsMDDzIlDUaxhR9lRqNRJZHdpsWWarV6xo04Af7OgxcoxVAaJYF4wEm6bplYWFgYpS+FkkAwRusKMYqNRuMEQymUBKKG6Gmxl1YK1SneoKvDD1oppAVieREvxx4r0mIUi/tu+o6ojOAKSugyfdfgHrcCgcBdho5ICSwUCmJB32dF+ojdh64jUgLD4XADN/3GUBuMYoWuI9JTjJu+oNsLpO+lIvA2jHb7BDawFi7Td0RaIPbQR1hmpjDVaaaUECWC4zrEjc/NzX1m2hHldmtxcXGoUqmsY0T3MyUFxN1Hy3WJoTTSI7hNJBKpw6j2dk3sQjfpK6EsUBAMBnMwL63IGYzeDZTICkMlXAmcnp7+iVo6iwe/ZaoruOYe2rQ4Q2W0vknE9gcBr1GP3bau0tramrm0tCTKwhWuRnAb8TEEcV8Y2rGqI06gJZD8orVjp3NSaAlkd9y1v8P0H0bnIj6qXOOqBkW7hI7kKtwEDqcGdBVlkAyFQo/Fns6cNNICIWoEy4uJUTmH4zweuounpMDfiA/5Bzie4D4lsRJsnXBgR4GizcJbeBHuNTzgNEQpf0d34TuOh9g67yQSiedWyp6uAjOZzDGYZYg6amX+DfjhBb/fH5mZmfnKVBu2AtPp9BHDMJ7BlW7NdYDIV1jMT6VSqSpTf7B9i7Fvio6lL+IEmKXjPp/vCsM2OgSyvTetqH9gUCbpttEhsFwuH1B9Q3uEba13CKzX6yN0+wrqcJhuG3Y1qPTl30NqtG10CEQtBOn2FZSV7Zdeh0Asnq62vx7wibYNuynuxf9flEENfqD7FwMDvwH9BxCkLLaB+AAAAABJRU5ErkJggg==';
+export const MENU_ITEM_HOVERED_STATE_DATA_ATTRIBUTE = '[data-visual-state-hover]';
+export const EMPTY_AVATAR = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7Zg/aBNRHMebXEv+CFKxSusgBAcXRdDJWnA4qAVdRMzgIogScCldmj8dQighoRgh/hnataCSSXRyCA7BQS0OdVGHgrGCOqQiUmNiEr+v960Ycum9dy9m8gPH789d775573fv/a4D/9HEQ6tFLpcL1Gq1Cx6Px9dsNj/CvonFYu9hW7zENdoCk8mk1+/3ZyBmlqktWq3WOkwB+TzElq2sOq4Ezs/PHzIMY9br9U5CyBhEDCHttc52UMU1sXg8nmeshEErTTabnYCwEo5xhMMQNwi70w8dxDVTpmkaxWLxKXPSKI1gPp/3bW5uvsMDDzIlDUaxhR9lRqNRJZHdpsWWarV6xo04Af7OgxcoxVAaJYF4wEm6bplYWFgYpS+FkkAwRusKMYqNRuMEQymUBKKG6Gmxl1YK1SneoKvDD1oppAVieREvxx4r0mIUi/tu+o6ojOAKSugyfdfgHrcCgcBdho5ICSwUCmJB32dF+ojdh64jUgLD4XADN/3GUBuMYoWuI9JTjJu+oNsLpO+lIvA2jHb7BDawFi7Td0RaIPbQR1hmpjDVaaaUECWC4zrEjc/NzX1m2hHldmtxcXGoUqmsY0T3MyUFxN1Hy3WJoTTSI7hNJBKpw6j2dk3sQjfpK6EsUBAMBnMwL63IGYzeDZTICkMlXAmcnp7+iVo6iwe/ZaoruOYe2rQ4Q2W0vknE9gcBr1GP3bau0tramrm0tCTKwhWuRnAb8TEEcV8Y2rGqI06gJZD8orVjp3NSaAlkd9y1v8P0H0bnIj6qXOOqBkW7hI7kKtwEDqcGdBVlkAyFQo/Fns6cNNICIWoEy4uJUTmH4zweuounpMDfiA/5Bzie4D4lsRJsnXBgR4GizcJbeBHuNTzgNEQpf0d34TuOh9g67yQSiedWyp6uAjOZzDGYZYg6amX+DfjhBb/fH5mZmfnKVBu2AtPp9BHDMJ7BlW7NdYDIV1jMT6VSqSpTf7B9i7Fvio6lL+IEmKXjPp/vCsM2OgSyvTetqH9gUCbpttEhsFwuH1B9Q3uEba13CKzX6yN0+wrqcJhuG3Y1qPTl30NqtG10CEQtBOn2FZSV7Zdeh0Asnq62vx7wibYNuynuxf9flEENfqD7FwMDvwH9BxCkLLaB+AAAAABJRU5ErkJggg==';

package/src/Markdown/MarkdownHelpers/markdownHelpers.d.ts

@@ -2,6 +2,7 @@ import { Textarea } from '@skbkontur/react-ui';
 import { KeyboardEvent as ReactKeyboardEvent, RefObject } from 'react';
 import { MarkdownFormat } from '../MarkdownFormat';
 import { Nullable, RefItem } from '../types';
+export { handleMarkdownListEnter } from './markdownListEnterHelpers';
 export declare function setMarkdown(textareaNode: HTMLTextAreaElement, text: string, format: MarkdownFormat, selectionStart: number, selectionEnd?: number | null): void;
 export declare function setMarkdownFiles(file: RefItem, textarea: Textarea, format: MarkdownFormat, cursorPosition?: number | null, fileApiUrl?: string): void;
 export declare function setMarkdownPastedHtml(text: string, textareaNode: HTMLTextAreaElement): void;

package/src/Markdown/MarkdownHelpers/markdownHelpers.js

@@ -1,94 +1,97 @@
 import { useEffect } from 'react';
+import { handleMarkdownListEnter } from './markdownListEnterHelpers';
 import { getPastedHtml } from './markdownTextareaHelpers';
 import { useFileLogic } from '../Files/Files.logic';
 import { MarkdownFormat } from '../MarkdownFormat';
 import { checkSpaceSymbol, eventKeyCodeToMarkdownFormat, markdownFormatToShortKeyLong, markdownHelpFiles, markdownHelpItems, } from '../MarkdownHelpItems';
-var italic = MarkdownFormat.italic, bold = MarkdownFormat.bold, crossed = MarkdownFormat.crossed, codeBlock = MarkdownFormat.codeBlock, ref = MarkdownFormat.ref, file = MarkdownFormat.file, image = MarkdownFormat.image;
-var betweenTextFormats = [italic, bold, crossed, codeBlock, file, image];
-var specialFormats = [ref];
+import { onInsertText } from '../utils/onInsertText';
+const { italic, bold, crossed, codeBlock, ref, file, image } = MarkdownFormat;
+const betweenTextFormats = [italic, bold, crossed, codeBlock, file, image];
+const specialFormats = [ref];
+export { handleMarkdownListEnter } from './markdownListEnterHelpers';
 export function setMarkdown(textareaNode, text, format, selectionStart, selectionEnd) {
-    var _a;
-    var markdownHelpItem = markdownHelpItems.find(function (item) { return item.format === format; });
+    const markdownHelpItem = markdownHelpItems.find(item => item.format === format);
     if (markdownHelpItem) {
-        var prevCommentPart = text.substring(selectionStart, selectionEnd !== null && selectionEnd !== void 0 ? selectionEnd : undefined);
-        var _b = checkSpaceSymbol(prevCommentPart, markdownHelpItem.checkLength), value = _b.value, spaces = _b.spaces;
-        var nextCommentPart = markdownHelpItem.wrapContent(value) + spaces;
-        document.execCommand('insertText', false, nextCommentPart);
-        setTextareaCursor(format, prevCommentPart.length, nextCommentPart.length, textareaNode, (selectionEnd !== null && selectionEnd !== void 0 ? selectionEnd : 0) +
-            ((markdownHelpItem === null || markdownHelpItem === void 0 ? void 0 : markdownHelpItem.format) === MarkdownFormat.ref ? 0 : (_a = markdownHelpItem === null || markdownHelpItem === void 0 ? void 0 : markdownHelpItem.checkLength) !== null && _a !== void 0 ? _a : 0) -
+        const prevCommentPart = text.substring(selectionStart, selectionEnd ?? undefined);
+        const { value, spaces } = checkSpaceSymbol(prevCommentPart, markdownHelpItem.checkLength);
+        const nextCommentPart = markdownHelpItem.wrapContent(value) + spaces;
+        onInsertText(nextCommentPart);
+        setTextareaCursor(format, prevCommentPart.length, nextCommentPart.length, textareaNode, (selectionEnd ?? 0) +
+            (markdownHelpItem?.format === MarkdownFormat.ref ? 0 : markdownHelpItem?.checkLength ?? 0) -
             spaces.length);
     }
 }
 export function setMarkdownFiles(file, textarea, format, cursorPosition, fileApiUrl) {
-    var _a, _b;
-    var markdownHelpItem = markdownHelpFiles(fileApiUrl).find(function (item) { return item.format === format; });
+    const markdownHelpItem = markdownHelpFiles(fileApiUrl).find(item => item.format === format);
     if (markdownHelpItem) {
-        var textareaNode = textarea.node;
-        var currentCursorPosition = (_a = cursorPosition !== null && cursorPosition !== void 0 ? cursorPosition : textareaNode.selectionStart) !== null && _a !== void 0 ? _a : (_b = textareaNode === null || textareaNode === void 0 ? void 0 : textareaNode.value) === null || _b === void 0 ? void 0 : _b.length;
-        var nextCommentPart = markdownHelpItem.wrapContent(file);
-        var newCursorPosition = currentCursorPosition + nextCommentPart.length;
+        const textareaNode = textarea.node;
+        const currentCursorPosition = cursorPosition ?? textareaNode.selectionStart ?? textareaNode?.value?.length;
+        const nextCommentPart = markdownHelpItem.wrapContent(file);
+        const newCursorPosition = currentCursorPosition + nextCommentPart.length;
         textareaNode.selectionStart = currentCursorPosition;
         textareaNode.focus();
-        document.execCommand('insertText', false, nextCommentPart);
+        onInsertText(nextCommentPart);
         textareaNode.selectionStart = newCursorPosition;
         textareaNode.selectionEnd = newCursorPosition;
     }
 }
 export function setMarkdownPastedHtml(text, textareaNode) {
-    var _a, _b;
-    var selectionStart = textareaNode.selectionStart;
-    var currentCursorPosition = (_b = selectionStart !== null && selectionStart !== void 0 ? selectionStart : (_a = textareaNode === null || textareaNode === void 0 ? void 0 : textareaNode.value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
-    var newCursorPosition = currentCursorPosition + text.length;
+    const selectionStart = textareaNode.selectionStart;
+    const currentCursorPosition = selectionStart ?? textareaNode?.value?.length ?? 0;
+    const newCursorPosition = currentCursorPosition + text.length;
     textareaNode.selectionStart = currentCursorPosition;
     textareaNode.focus();
-    document.execCommand('insertText', false, text);
+    onInsertText(text);
     textareaNode.selectionStart = newCursorPosition;
     textareaNode.selectionEnd = newCursorPosition;
 }
 export function setTextareaCursor(format, prevCommentPartLength, nextCommentPartLength, textareaNode, selectionEnd) {
     if (betweenTextFormats.includes(format)) {
-        var formatCenterPosition = (nextCommentPartLength - prevCommentPartLength) / 2;
+        const formatCenterPosition = (nextCommentPartLength - prevCommentPartLength) / 2;
         textareaNode.selectionStart = selectionEnd + formatCenterPosition;
         textareaNode.selectionEnd = selectionEnd + formatCenterPosition;
     }
     if (specialFormats.includes(format)) {
-        var nextCommentCursorPosition = nextCommentPartLength - 1;
+        const nextCommentCursorPosition = nextCommentPartLength - 1;
         textareaNode.selectionStart = selectionEnd - prevCommentPartLength + nextCommentCursorPosition;
         textareaNode.selectionEnd = selectionEnd - prevCommentPartLength + nextCommentCursorPosition;
     }
 }
 export function createMarkdownHelpKeyDownHandler(text, ref, callback) {
-    return function (event) {
-        if (!(ref === null || ref === void 0 ? void 0 : ref.current))
+    return (event) => {
+        if (!ref?.current)
             return;
-        var textareaNode = ref.current.node;
-        var format = eventKeyCodeToMarkdownFormat[event.code];
-        var isLong = markdownFormatToShortKeyLong[format];
+        const textareaNode = ref.current.node;
+        const format = eventKeyCodeToMarkdownFormat[event.code];
+        const isLong = markdownFormatToShortKeyLong[format];
         if ((event.metaKey || event.ctrlKey) && (isLong ? event.shiftKey : true) && format) {
-            var markdownHelpItem = markdownHelpItems.find(function (item) { return item.format === format; });
+            const markdownHelpItem = markdownHelpItems.find(item => item.format === format);
             if (markdownHelpItem && textareaNode) {
                 event.stopPropagation();
                 event.preventDefault();
-                var _a = [textareaNode.selectionStart, textareaNode.selectionEnd], start = _a[0], end = _a[1];
-                var prevCommentPart = text.substring(start, end);
-                var nextCommentPart = markdownHelpItem.wrapContent(prevCommentPart);
-                document.execCommand('insertText', false, nextCommentPart);
+                const [start, end] = [textareaNode.selectionStart, textareaNode.selectionEnd];
+                const prevCommentPart = text.substring(start, end);
+                const nextCommentPart = markdownHelpItem.wrapContent(prevCommentPart);
+                onInsertText(nextCommentPart);
                 setTextareaCursor(format, prevCommentPart.length, nextCommentPart.length, textareaNode, end);
             }
         }
-        callback && callback(event);
+        handleMarkdownListEnter(event, textareaNode);
+        callback?.(event);
     };
 }
-export var usePasteFromClipboard = function (textarea, uploadFileApi, downloadFileApi, fileApiUrl) {
-    var uploadFile = useFileLogic(uploadFileApi, downloadFileApi, fileApiUrl, textarea).uploadFile;
-    var textareaNode = textarea === null || textarea === void 0 ? void 0 : textarea.node;
-    useEffect(function () {
+export const usePasteFromClipboard = (textarea, uploadFileApi, downloadFileApi, fileApiUrl) => {
+    const { uploadFile } = useFileLogic(uploadFileApi, downloadFileApi, fileApiUrl, textarea);
+    const textareaNode = textarea?.node;
+    useEffect(() => {
         if (downloadFileApi && uploadFileApi) {
-            var handlePaste_1 = function (event) {
-                var _a, _b, _c, _d;
-                var files = (_a = event === null || event === void 0 ? void 0 : event.clipboardData) === null || _a === void 0 ? void 0 : _a.files;
-                var html = (_d = (_c = (_b = event === null || event === void 0 ? void 0 : event.clipboardData) === null || _b === void 0 ? void 0 : _b.getData('text/html')) === null || _c === void 0 ? void 0 : _c.replace("<meta charset='utf-8'>", '')) === null || _d === void 0 ? void 0 : _d.replace("<meta charset=\"utf-8\">", '');
-                if (files === null || files === void 0 ? void 0 : files.length) {
+            const handlePaste = (event) => {
+                const files = event?.clipboardData?.files;
+                const html = event?.clipboardData
+                    ?.getData('text/html')
+                    ?.replace(`<meta charset='utf-8'>`, '')
+                    ?.replace(`<meta charset="utf-8">`, '');
+                if (files?.length) {
                     event.preventDefault();
                     void uploadFile(files[0]);
                     return;
@@ -99,9 +102,9 @@ export var usePasteFromClipboard = function (textarea, uploadFileApi, downloadFi
                 }
             };
             if (textareaNode) {
-                textareaNode.addEventListener('paste', handlePaste_1);
+                textareaNode.addEventListener('paste', handlePaste);
             }
-            return function () { return textareaNode === null || textareaNode === void 0 ? void 0 : textareaNode.removeEventListener('paste', handlePaste_1); };
+            return () => textareaNode?.removeEventListener('paste', handlePaste);
         }
     }, [downloadFileApi, textareaNode, uploadFile, uploadFileApi]);
 };

package/src/Markdown/MarkdownHelpers/markdownListEnterHelpers.d.ts

@@ -0,0 +1,2 @@
+import { KeyboardEvent as ReactKeyboardEvent } from 'react';
+export declare function handleMarkdownListEnter(event: ReactKeyboardEvent<HTMLTextAreaElement>, textareaNode: HTMLTextAreaElement): boolean | void;

package/src/Markdown/MarkdownHelpers/markdownListEnterHelpers.js

@@ -0,0 +1,45 @@
+import { onInsertText } from '../utils/onInsertText';
+const listItemRegExp = /^(?<spacesBeforeMarker> *)(?:(?<orderedListNumber>\d+)(?<orderedListDelimiter>[.)])|(?<unorderedListMarker>[*+-])(?: +(?<checkboxListMarker>\[[ xX]]))?)(?: +(?<text>.*)|$)$/;
+export function handleMarkdownListEnter(event, textareaNode) {
+    const { selectionStart, selectionEnd, value } = textareaNode;
+    const isOnlyDownEnter = event.key === 'Enter' && !event.shiftKey && !event.altKey && !event.metaKey && !event.ctrlKey;
+    if (!isOnlyDownEnter || selectionStart !== selectionEnd)
+        return;
+    /*
+     * Находим начало текущей строки:
+     * ищем последний перенос строки перед курсором
+     * и берём позицию сразу после него
+     */
+    const currentLineStartIndex = value.lastIndexOf('\n', selectionStart - 1) + 1;
+    /* Находим конец текущей строки */
+    const currentLineEndIndex = getCurrentLineEndIndex(value, selectionStart);
+    const currentLineText = value.slice(currentLineStartIndex, currentLineEndIndex);
+    const listLineMatch = currentLineText.match(listItemRegExp);
+    if (!listLineMatch?.groups)
+        return;
+    const { spacesBeforeMarker, orderedListNumber, orderedListDelimiter, unorderedListMarker, checkboxListMarker, text, } = listLineMatch.groups;
+    event.stopPropagation();
+    event.preventDefault();
+    if (!text?.trim()) {
+        textareaNode.setSelectionRange(currentLineStartIndex, currentLineEndIndex);
+        return document.execCommand('delete');
+    }
+    if (orderedListNumber && orderedListDelimiter)
+        return onInsertText(`\n${spacesBeforeMarker}${Number(orderedListNumber) + 1}${orderedListDelimiter} `);
+    if (checkboxListMarker)
+        return onInsertText(`\n${spacesBeforeMarker}${unorderedListMarker} ${checkboxListMarker} `);
+    if (unorderedListMarker)
+        return onInsertText(`\n${spacesBeforeMarker}${unorderedListMarker} `);
+}
+function getCurrentLineEndIndex(text, cursorPosition) {
+    /* Ищем ближайший перенос строки после курсора */
+    const currentLineEndIndex = text.indexOf('\n', cursorPosition);
+    /*
+     * Если переноса строки после курсора нет,
+     * значит текущая строка последняя
+     * и заканчивается в конце всего текста
+     */
+    if (currentLineEndIndex === -1)
+        return text.length;
+    return currentLineEndIndex;
+}

package/src/Markdown/MarkdownHelpers/markdownMentionHelpers.js

@@ -1,11 +1,11 @@
 import { useEffect } from 'react';
 import { EMPTY_AVATAR, MENU_ITEM_HOVERED_STATE_DATA_ATTRIBUTE } from './constants';
 import { getTextareaTokens } from './markdownTextareaHelpers';
-var ArrowsVertical = ['ArrowUp', 'ArrowDown'];
+const ArrowsVertical = ['ArrowUp', 'ArrowDown'];
 export function mentionActions(event, setToken) {
-    var _a = event.currentTarget, value = _a.value, selectionStart = _a.selectionStart;
-    var tokens = getTextareaTokens(value);
-    var mention = tokens.find(function (t) { return selectionStart >= t.positions[0] && selectionStart <= t.positions[1] && t.value.startsWith('@'); });
+    const { value, selectionStart } = event.currentTarget;
+    const tokens = getTextareaTokens(value);
+    const mention = tokens.find(t => selectionStart >= t.positions[0] && selectionStart <= t.positions[1] && t.value.startsWith('@'));
     if (mention) {
         setToken(mention);
     }
@@ -13,10 +13,10 @@ export function mentionActions(event, setToken) {
         setToken(undefined);
     }
 }
-export var useMenuKeyListener = function (onSelectUser, menuRef) {
-    useEffect(function () {
-        var keyListener = function (event) {
-            if (menuRef === null || menuRef === void 0 ? void 0 : menuRef.current) {
+export const useMenuKeyListener = (onSelectUser, menuRef) => {
+    useEffect(() => {
+        const keyListener = (event) => {
+            if (menuRef?.current) {
                 if (ArrowsVertical.includes(event.key)) {
                     if (event.key === 'ArrowUp') {
                         menuRef.current.up();
@@ -26,7 +26,7 @@ export var useMenuKeyListener = function (onSelectUser, menuRef) {
                     }
                 }
                 if (event.key === 'Enter') {
-                    var hoveredElement = document.querySelector(MENU_ITEM_HOVERED_STATE_DATA_ATTRIBUTE);
+                    const hoveredElement = document.querySelector(MENU_ITEM_HOVERED_STATE_DATA_ATTRIBUTE);
                     if (hoveredElement) {
                         onSelectUser(Number(hoveredElement.id || 0));
                     }
@@ -34,12 +34,12 @@ export var useMenuKeyListener = function (onSelectUser, menuRef) {
             }
         };
         window.addEventListener('keydown', keyListener);
-        return function () { return window.removeEventListener('keydown', keyListener); };
+        return () => window.removeEventListener('keydown', keyListener);
     }, [menuRef, onSelectUser]);
 };
-export var getMentionValue = function (mention) { var _a, _b; return (_b = (_a = mention === null || mention === void 0 ? void 0 : mention.value) === null || _a === void 0 ? void 0 : _a.replace('@', '')) !== null && _b !== void 0 ? _b : ''; };
+export const getMentionValue = (mention) => mention?.value?.replace('@', '') ?? '';
 export function getAvatarUrl(sid) {
     if (!sid)
         return EMPTY_AVATAR;
-    return "https://staff.skbkontur.ru/api/avatar/".concat(sid, "?size=s}");
+    return `https://staff.skbkontur.ru/api/avatar/${sid}?size=s}`;
 }