@gravity-ui/markdown-editor 13.21.4 → 13.23.0

package/README.md

@@ -52,13 +52,13 @@ function Editor({onSubmit}) {
 }
 ```
 Read more:
-- [How to connect the editor in the Create React App](docs/how-to-add-editor-with-create-react-app.md)
-- [How to add preview for markup mode](docs/how-to-add-preview.md)
-- [How to add HTML extension](docs/how-to-connect-html-extension.md)
-- [How to add Latex extension](docs/how-to-connect-latex-extension.md)
-- [How to add Mermaid extension](docs/how-to-connect-mermaid-extension.md)
-- [How to write extension](docs/how-to-create-extension.md)
-- [How to add GPT extension](docs/how-to-connect-gpt-extensions.md)
+- [How to connect the editor in the Create React App](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-add-editor-with-create-react-app.md)
+- [How to add preview for markup mode](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-add-preview.md)
+- [How to add HTML extension](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-connect-html-extension.md)
+- [How to add Latex extension](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-connect-latex-extension.md)
+- [How to add Mermaid extension](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-connect-mermaid-extension.md)
+- [How to write extension](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-create-extension.md)
+- [How to add GPT extension](https://github.com/gravity-ui/markdown-editor/blob/main/docs/how-to-connect-gpt-extensions.md)
 
 
 ### i18n

package/build/cjs/bundle/MarkdownEditorView.d.ts

@@ -2,8 +2,7 @@ import React from 'react';
 import type { ToasterPublicMethods } from '@gravity-ui/uikit';
 import { ClassNameProps } from '../classname';
 import type { Editor } from './Editor';
-import { MToolbarData, MToolbarItemData } from './config/markup';
-import { WToolbarData, WToolbarItemData } from './config/wysiwyg';
+import { MToolbarData, MToolbarItemData, WToolbarData, WToolbarItemData } from './config';
 export declare const cnEditorComponent: import("@bem-react/classname").ClassNameFormatter;
 export declare type MarkdownEditorViewProps = ClassNameProps & {
     editor?: Editor;

package/build/cjs/bundle/MarkdownEditorView.js

@@ -8,16 +8,13 @@ const react_use_1 = require("react-use");
 const classname_1 = require("../classname");
 const bundle_1 = require("../i18n/bundle");
 const logger_1 = require("../logger");
-const hooks_1 = require("../react-utils/hooks");
-const toaster_1 = require("../react-utils/toaster");
-const useSticky_1 = require("../react-utils/useSticky");
-const platform_1 = require("../utils/platform");
+const react_utils_1 = require("../react-utils");
+const utils_1 = require("../utils");
 const HorizontalDrag_1 = require("./HorizontalDrag");
 const MarkupEditorView_1 = require("./MarkupEditorView");
 const SplitModeView_1 = require("./SplitModeView");
 const WysiwygEditorView_1 = require("./WysiwygEditorView");
-const markup_1 = require("./config/markup");
-const wysiwyg_1 = require("./config/wysiwyg");
+const config_1 = require("./config");
 const context_1 = require("./context");
 const settings_1 = require("./settings");
 const sticky_1 = require("./sticky");
@@ -31,12 +28,12 @@ exports.MarkdownEditorView = react_1.default.forwardRef((props, ref) => {
     (0, react_1.useEffect)(() => {
         setIsMounted(true);
     }, []);
-    const [showPreview, , unsetShowPreview, toggleShowPreview] = (0, hooks_1.useBooleanState)(false);
+    const [showPreview, , unsetShowPreview, toggleShowPreview] = (0, react_utils_1.useBooleanState)(false);
     const context = (0, context_1.useMarkdownEditorContext)();
     const editor = ((_a = props.editor) !== null && _a !== void 0 ? _a : context);
     if (!editor)
         throw new Error('[MarkdownEditorView]: an instance of the editor must be passed through the props or context');
-    const { autofocus, className, settingsVisible = true, markupToolbarConfig = markup_1.mToolbarConfigByPreset[editor.preset], wysiwygToolbarConfig = wysiwyg_1.wToolbarConfigByPreset[editor.preset], markupHiddenActionsConfig = markup_1.mHiddenDataByPreset[editor.preset], wysiwygHiddenActionsConfig = wysiwyg_1.wHiddenDataByPreset[editor.preset], toaster, stickyToolbar, } = props;
+    const { autofocus, className, settingsVisible = true, markupToolbarConfig = config_1.mToolbarConfigByPreset[editor.preset], wysiwygToolbarConfig = config_1.wToolbarConfigByPreset[editor.preset], markupHiddenActionsConfig = config_1.mHiddenDataByPreset[editor.preset], wysiwygHiddenActionsConfig = config_1.wHiddenDataByPreset[editor.preset], toaster, stickyToolbar, } = props;
     const rerender = (0, react_use_1.useUpdate)();
     react_1.default.useLayoutEffect(() => {
         editor.on('rerender', rerender);
@@ -66,6 +63,12 @@ exports.MarkdownEditorView = react_1.default.forwardRef((props, ref) => {
     (0, react_use_1.useKey)((e) => canRenderPreview && isPreviewKeyDown(e), () => onShowPreviewChange(!showPreview), { event: 'keydown' }, [showPreview, editorMode, onShowPreviewChange, canRenderPreview]);
     const editorWrapperRef = (0, react_1.useRef)(null);
     const splitModeViewWrapperRef = (0, react_1.useRef)(null);
+    (0, react_1.useEffect)(() => {
+        if (showPreview) {
+            divRef.current.focus();
+        }
+    }, [divRef, showPreview]);
+    (0, react_use_1.useKey)((e) => showPreview && isWrapperFocused(divRef) && isSubmitKeyDown(e), () => editor.emit('submit', null), { event: 'keydown' }, [showPreview]);
     const settings = (0, react_1.useMemo)(() => (react_1.default.createElement(Settings, { mode: editorMode, onModeChange: onModeChange, toolbarVisibility: editor.toolbarVisible && !showPreview, onToolbarVisibilityChange: onToolbarVisibilityChange, onSplitModeChange: onSplitModeChange, splitModeEnabled: editor.splitModeEnabled, splitMode: editor.splitMode, stickyToolbar: stickyToolbar, onShowPreviewChange: onShowPreviewChange, showPreview: showPreview, renderPreviewButton: canRenderPreview })), [
         canRenderPreview,
         stickyToolbar,
@@ -98,11 +101,11 @@ exports.MarkdownEditorView = react_1.default.forwardRef((props, ref) => {
             });
             return null;
         } },
-        react_1.default.createElement(toaster_1.ToasterContext.Provider, { value: toaster },
+        react_1.default.createElement(react_utils_1.ToasterContext.Provider, { value: toaster },
             react_1.default.createElement("div", { ref: divRef, className: b({
                     settings: settingsVisible,
                     split: markupSplitMode && editor.splitMode,
-                }, [className]) },
+                }, [className]), role: "button", tabIndex: 0 },
                 react_1.default.createElement("div", { className: b('editor-wrapper'), ref: editorWrapperRef }, showPreview ? (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement("div", { className: b('preview-wrapper') }, (_b = editor.renderPreview) === null || _b === void 0 ? void 0 : _b.call(editor, {
                         getValue: editor.getValue,
@@ -120,7 +123,7 @@ exports.MarkdownEditorView.displayName = 'MarkdownEditorView';
 const MarkupSearchAnchor = ({ mode }) => (react_1.default.createElement(react_1.default.Fragment, null, mode === 'markup' && react_1.default.createElement("div", { className: "g-md-search-anchor" })));
 function Settings(props) {
     const wrapperRef = (0, react_1.useRef)(null);
-    const isSticky = (0, useSticky_1.useSticky)(wrapperRef) && props.toolbarVisibility && props.stickyToolbar;
+    const isSticky = (0, react_utils_1.useSticky)(wrapperRef) && props.toolbarVisibility && props.stickyToolbar;
     return (react_1.default.createElement("div", { className: b('settings-wrapper') },
         react_1.default.createElement("div", { ref: wrapperRef, className: sticky_1.stickyCn.settings({
                 withToolbar: props.toolbarVisibility,
@@ -130,6 +133,13 @@ function Settings(props) {
             react_1.default.createElement(MarkupSearchAnchor, Object.assign({}, props)))));
 }
 function isPreviewKeyDown(e) {
-    const modKey = (0, platform_1.isMac)() ? e.metaKey : e.ctrlKey;
+    const modKey = (0, utils_1.isMac)() ? e.metaKey : e.ctrlKey;
     return modKey && e.shiftKey && e.code === 'KeyP';
 }
+function isWrapperFocused(divRef) {
+    return document.activeElement === divRef.current;
+}
+function isSubmitKeyDown(e) {
+    const modKey = (0, utils_1.isMac)() ? e.metaKey : e.ctrlKey;
+    return modKey && e.code === 'Enter';
+}

package/build/cjs/bundle/config/index.d.ts

@@ -1 +1,2 @@
 export * from './wysiwyg';
+export * from './markup';

package/build/cjs/bundle/config/index.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./wysiwyg"), exports);
+tslib_1.__exportStar(require("./markup"), exports);

package/build/cjs/extensions/markdown/Lists/ListsSpecs/const.d.ts

@@ -5,10 +5,19 @@ export declare enum ListNode {
 }
 export declare enum ListsAttr {
     Tight = "tight",
-    /** used in bullet list only */
+    /** @deprecated Use `ListsAttr.Markup` instead */
     Bullet = "bullet",
     /** used in ordered list only */
     Order = "order",
-    /** used in list item only */
     Markup = "markup"
 }
+export declare const Markup: {
+    bullet: {
+        values: string[];
+        default: string;
+    };
+    ordered: {
+        values: string[];
+        default: string;
+    };
+};

package/build/cjs/extensions/markdown/Lists/ListsSpecs/const.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListsAttr = exports.ListNode = void 0;
+exports.Markup = exports.ListsAttr = exports.ListNode = void 0;
 var ListNode;
 (function (ListNode) {
     ListNode["ListItem"] = "list_item";
@@ -10,10 +10,19 @@ var ListNode;
 var ListsAttr;
 (function (ListsAttr) {
     ListsAttr["Tight"] = "tight";
-    /** used in bullet list only */
+    /** @deprecated Use `ListsAttr.Markup` instead */
     ListsAttr["Bullet"] = "bullet";
     /** used in ordered list only */
     ListsAttr["Order"] = "order";
-    /** used in list item only */
     ListsAttr["Markup"] = "markup";
 })(ListsAttr = exports.ListsAttr || (exports.ListsAttr = {}));
+exports.Markup = {
+    bullet: {
+        values: ['-', '+', '*'],
+        default: '*',
+    },
+    ordered: {
+        values: ['.', ')'],
+        default: '.',
+    },
+};

package/build/cjs/extensions/markdown/Lists/ListsSpecs/parser.js

@@ -14,6 +14,7 @@ exports.parserTokens = {
         getAttrs: (token, tokens, i) => ({
             [const_1.ListsAttr.Tight]: listIsTight(tokens, i),
             [const_1.ListsAttr.Bullet]: token.markup,
+            [const_1.ListsAttr.Markup]: token.markup,
         }),
     },
     [const_1.ListNode.OrderedList]: {
@@ -22,6 +23,7 @@ exports.parserTokens = {
         getAttrs: (token, tokens, i) => ({
             [const_1.ListsAttr.Order]: Number(token.attrGet('start')) || 1,
             [const_1.ListsAttr.Tight]: listIsTight(tokens, i),
+            [const_1.ListsAttr.Markup]: token.markup,
         }),
     },
 };

package/build/cjs/extensions/markdown/Lists/ListsSpecs/schema.js

@@ -4,7 +4,10 @@ exports.schemaSpecs = void 0;
 const const_1 = require("./const");
 exports.schemaSpecs = {
     [const_1.ListNode.ListItem]: {
-        attrs: { [const_1.ListsAttr.Tight]: { default: false }, [const_1.ListsAttr.Markup]: { default: null } },
+        attrs: {
+            [const_1.ListsAttr.Tight]: { default: false },
+            [const_1.ListsAttr.Markup]: { default: null },
+        },
         content: '(paragraph|block)+',
         defining: true,
         parseDOM: [{ tag: 'li' }],
@@ -19,7 +22,11 @@ exports.schemaSpecs = {
     [const_1.ListNode.BulletList]: {
         content: `${const_1.ListNode.ListItem}+`,
         group: 'block',
-        attrs: { [const_1.ListsAttr.Tight]: { default: false }, [const_1.ListsAttr.Bullet]: { default: '*' } },
+        attrs: {
+            [const_1.ListsAttr.Tight]: { default: false },
+            [const_1.ListsAttr.Bullet]: { default: const_1.Markup.bullet.default },
+            [const_1.ListsAttr.Markup]: { default: const_1.Markup.bullet.default },
+        },
         parseDOM: [
             {
                 tag: 'ul',
@@ -36,7 +43,11 @@ exports.schemaSpecs = {
         complex: 'root',
     },
     [const_1.ListNode.OrderedList]: {
-        attrs: { [const_1.ListsAttr.Order]: { default: 1 }, [const_1.ListsAttr.Tight]: { default: false } },
+        attrs: {
+            [const_1.ListsAttr.Order]: { default: 1 },
+            [const_1.ListsAttr.Tight]: { default: false },
+            [const_1.ListsAttr.Markup]: { default: const_1.Markup.ordered.default },
+        },
         content: `${const_1.ListNode.ListItem}+`,
         group: 'block',
         parseDOM: [

package/build/cjs/extensions/markdown/Lists/ListsSpecs/serializer.js

@@ -7,15 +7,28 @@ exports.serializerTokens = {
         state.renderContent(node);
     },
     [const_1.ListNode.BulletList]: (state, node) => {
-        state.renderList(node, '  ', (_i, li) => (li.attrs[const_1.ListsAttr.Markup] || node.attrs[const_1.ListsAttr.Bullet] || '*') + ' ');
+        state.renderList(node, '  ', (_i, li) => {
+            const markup = getMarkup({ item: li, list: node, type: 'bullet' });
+            return markup + ' ';
+        });
     },
     [const_1.ListNode.OrderedList]: (state, node) => {
         const start = node.attrs[const_1.ListsAttr.Order] || 1;
         const maxW = String(start + node.childCount - 1).length;
         const space = state.repeat(' ', maxW + 2);
-        state.renderList(node, space, (i) => {
+        state.renderList(node, space, (i, li) => {
             const nStr = String(start + i);
-            return state.repeat(' ', maxW - nStr.length) + nStr + '. ';
+            const markup = getMarkup({ item: li, list: node, type: 'ordered' });
+            return state.repeat(' ', maxW - nStr.length) + nStr + markup + ' ';
         });
     },
 };
+function getMarkup({ item, list, type, }) {
+    const defs = const_1.Markup[type];
+    let value = item.attrs[const_1.ListsAttr.Markup];
+    if (!defs.values.includes(value))
+        value = list.attrs[const_1.ListsAttr.Markup];
+    if (!defs.values.includes(value))
+        value = defs.default;
+    return value;
+}

package/build/cjs/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockSpecs/index.d.ts

@@ -1,4 +1,4 @@
-import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
+import { PluginOptions } from '@diplodoc/html-extension/plugin';
 import type { ExtensionNodeSpec } from '../../../../core';
 export { yfmHtmlBlockNodeName } from './const';
 export interface YfmHtmlBlockSpecsOptions extends Omit<PluginOptions, 'runtimeJsPath' | 'containerClasses' | 'bundle' | 'embeddingMode'> {

package/build/cjs/extensions/yfm/YfmHtmlBlock/index.d.ts

@@ -1,4 +1,4 @@
-import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
+import { PluginOptions } from '@diplodoc/html-extension/plugin';
 import type { IHTMLIFrameElementConfig } from '@diplodoc/html-extension/runtime';
 import { Action, ExtensionAuto } from '../../../core';
 import { YfmHtmlBlockAction } from './YfmHtmlBlockSpecs/const';

package/build/cjs/i18n/menubar/index.d.ts

@@ -1,4 +1,4 @@
-export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "strike" | "underline" | "mark" | "quote" | "colorify" | "mono" | "text" | "html" | "cut" | "table" | "image" | "code_inline" | "heading" | "note" | "file" | "codeblock" | "checkbox" | "emoji" | "list" | "tabs" | "math" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "gpt" | "undo" | "redo" | "math_inline" | "math_block" | "colorify__color_blue" | "colorify__color_default" | "colorify__color_gray" | "colorify__color_green" | "colorify__color_orange" | "colorify__color_red" | "colorify__color_violet" | "colorify__color_yellow" | "colorify__group_text" | "folding-heading" | "folding-heading_hint" | "hrule" | "list__action_lift" | "list__action_sink" | "list_action_disabled" | "mermaid" | "more_action" | "olist" | "ulist", S extends string>(key: G | (string extends S ? S : never), params?: {
+export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "strike" | "underline" | "mark" | "quote" | "colorify" | "mono" | "text" | "html" | "cut" | "table" | "image" | "code_inline" | "list" | "heading" | "note" | "file" | "codeblock" | "checkbox" | "emoji" | "tabs" | "math" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "gpt" | "undo" | "redo" | "math_inline" | "math_block" | "colorify__color_blue" | "colorify__color_default" | "colorify__color_gray" | "colorify__color_green" | "colorify__color_orange" | "colorify__color_red" | "colorify__color_violet" | "colorify__color_yellow" | "colorify__group_text" | "folding-heading" | "folding-heading_hint" | "hrule" | "list__action_lift" | "list__action_sink" | "list_action_disabled" | "mermaid" | "more_action" | "olist" | "ulist", S extends string>(key: G | (string extends S ? S : never), params?: {
     [key: string]: any;
 } | undefined) => S extends G ? {
     bold: string;

package/build/cjs/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 /** During build process, the current version will be injected here */
-exports.VERSION = typeof '13.21.4' !== 'undefined' ? '13.21.4' : 'unknown';
+exports.VERSION = typeof '13.23.0' !== 'undefined' ? '13.23.0' : 'unknown';

package/build/cjs/view/hocs/withYfmHtml/types.d.ts

@@ -1,3 +1,3 @@
-import type { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
+import type { PluginOptions } from '@diplodoc/html-extension/plugin';
 export type { TransformMeta } from '../../types';
 export declare type PluginRuntime = PluginOptions['runtimeJsPath'];

package/build/esm/bundle/MarkdownEditorView.d.ts

@@ -2,8 +2,7 @@ import React from 'react';
 import type { ToasterPublicMethods } from '@gravity-ui/uikit';
 import { ClassNameProps } from '../classname';
 import type { Editor } from './Editor';
-import { MToolbarData, MToolbarItemData } from './config/markup';
-import { WToolbarData, WToolbarItemData } from './config/wysiwyg';
+import { MToolbarData, MToolbarItemData, WToolbarData, WToolbarItemData } from './config';
 import '../styles/styles.css';
 import './MarkdownEditorView.css';
 export declare const cnEditorComponent: import("@bem-react/classname").ClassNameFormatter;

package/build/esm/bundle/MarkdownEditorView.js

@@ -4,16 +4,13 @@ import { useEnsuredForwardedRef, useKey, useUpdate } from 'react-use';
 import { cn } from '../classname';
 import { i18n } from '../i18n/bundle';
 import { logger } from '../logger';
-import { useBooleanState } from '../react-utils/hooks';
-import { ToasterContext } from '../react-utils/toaster';
-import { useSticky } from '../react-utils/useSticky';
-import { isMac } from '../utils/platform';
+import { ToasterContext, useBooleanState, useSticky } from '../react-utils';
+import { isMac } from '../utils';
 import { HorizontalDrag } from './HorizontalDrag';
 import { MarkupEditorView } from './MarkupEditorView';
 import { SplitModeView } from './SplitModeView';
 import { WysiwygEditorView } from './WysiwygEditorView';
-import { mHiddenDataByPreset, mToolbarConfigByPreset, } from './config/markup';
-import { wHiddenDataByPreset, wToolbarConfigByPreset, } from './config/wysiwyg';
+import { mHiddenDataByPreset, mToolbarConfigByPreset, wHiddenDataByPreset, wToolbarConfigByPreset, } from './config';
 import { useMarkdownEditorContext } from './context';
 import { EditorSettings } from './settings';
 import { stickyCn } from './sticky';
@@ -63,6 +60,12 @@ export const MarkdownEditorView = React.forwardRef((props, ref) => {
     useKey((e) => canRenderPreview && isPreviewKeyDown(e), () => onShowPreviewChange(!showPreview), { event: 'keydown' }, [showPreview, editorMode, onShowPreviewChange, canRenderPreview]);
     const editorWrapperRef = useRef(null);
     const splitModeViewWrapperRef = useRef(null);
+    useEffect(() => {
+        if (showPreview) {
+            divRef.current.focus();
+        }
+    }, [divRef, showPreview]);
+    useKey((e) => showPreview && isWrapperFocused(divRef) && isSubmitKeyDown(e), () => editor.emit('submit', null), { event: 'keydown' }, [showPreview]);
     const settings = useMemo(() => (React.createElement(Settings, { mode: editorMode, onModeChange: onModeChange, toolbarVisibility: editor.toolbarVisible && !showPreview, onToolbarVisibilityChange: onToolbarVisibilityChange, onSplitModeChange: onSplitModeChange, splitModeEnabled: editor.splitModeEnabled, splitMode: editor.splitMode, stickyToolbar: stickyToolbar, onShowPreviewChange: onShowPreviewChange, showPreview: showPreview, renderPreviewButton: canRenderPreview })), [
         canRenderPreview,
         stickyToolbar,
@@ -99,7 +102,7 @@ export const MarkdownEditorView = React.forwardRef((props, ref) => {
             React.createElement("div", { ref: divRef, className: b({
                     settings: settingsVisible,
                     split: markupSplitMode && editor.splitMode,
-                }, [className]) },
+                }, [className]), role: "button", tabIndex: 0 },
                 React.createElement("div", { className: b('editor-wrapper'), ref: editorWrapperRef }, showPreview ? (React.createElement(React.Fragment, null,
                     React.createElement("div", { className: b('preview-wrapper') }, (_b = editor.renderPreview) === null || _b === void 0 ? void 0 : _b.call(editor, {
                         getValue: editor.getValue,
@@ -130,3 +133,10 @@ function isPreviewKeyDown(e) {
     const modKey = isMac() ? e.metaKey : e.ctrlKey;
     return modKey && e.shiftKey && e.code === 'KeyP';
 }
+function isWrapperFocused(divRef) {
+    return document.activeElement === divRef.current;
+}
+function isSubmitKeyDown(e) {
+    const modKey = isMac() ? e.metaKey : e.ctrlKey;
+    return modKey && e.code === 'Enter';
+}

package/build/esm/bundle/config/index.d.ts

@@ -1 +1,2 @@
 export * from './wysiwyg';
+export * from './markup';

package/build/esm/bundle/config/index.js

@@ -1 +1,2 @@
 export * from './wysiwyg';
+export * from './markup';

package/build/esm/extensions/markdown/Lists/ListsSpecs/const.d.ts

@@ -5,10 +5,19 @@ export declare enum ListNode {
 }
 export declare enum ListsAttr {
     Tight = "tight",
-    /** used in bullet list only */
+    /** @deprecated Use `ListsAttr.Markup` instead */
     Bullet = "bullet",
     /** used in ordered list only */
     Order = "order",
-    /** used in list item only */
     Markup = "markup"
 }
+export declare const Markup: {
+    bullet: {
+        values: string[];
+        default: string;
+    };
+    ordered: {
+        values: string[];
+        default: string;
+    };
+};

package/build/esm/extensions/markdown/Lists/ListsSpecs/const.js

@@ -7,10 +7,19 @@ export var ListNode;
 export var ListsAttr;
 (function (ListsAttr) {
     ListsAttr["Tight"] = "tight";
-    /** used in bullet list only */
+    /** @deprecated Use `ListsAttr.Markup` instead */
     ListsAttr["Bullet"] = "bullet";
     /** used in ordered list only */
     ListsAttr["Order"] = "order";
-    /** used in list item only */
     ListsAttr["Markup"] = "markup";
 })(ListsAttr || (ListsAttr = {}));
+export const Markup = {
+    bullet: {
+        values: ['-', '+', '*'],
+        default: '*',
+    },
+    ordered: {
+        values: ['.', ')'],
+        default: '.',
+    },
+};

package/build/esm/extensions/markdown/Lists/ListsSpecs/parser.js

@@ -11,6 +11,7 @@ export const parserTokens = {
         getAttrs: (token, tokens, i) => ({
             [ListsAttr.Tight]: listIsTight(tokens, i),
             [ListsAttr.Bullet]: token.markup,
+            [ListsAttr.Markup]: token.markup,
         }),
     },
     [ListNode.OrderedList]: {
@@ -19,6 +20,7 @@ export const parserTokens = {
         getAttrs: (token, tokens, i) => ({
             [ListsAttr.Order]: Number(token.attrGet('start')) || 1,
             [ListsAttr.Tight]: listIsTight(tokens, i),
+            [ListsAttr.Markup]: token.markup,
         }),
     },
 };

package/build/esm/extensions/markdown/Lists/ListsSpecs/schema.js

@@ -1,7 +1,10 @@
-import { ListNode, ListsAttr } from './const';
+import { ListNode, ListsAttr, Markup } from './const';
 export const schemaSpecs = {
     [ListNode.ListItem]: {
-        attrs: { [ListsAttr.Tight]: { default: false }, [ListsAttr.Markup]: { default: null } },
+        attrs: {
+            [ListsAttr.Tight]: { default: false },
+            [ListsAttr.Markup]: { default: null },
+        },
         content: '(paragraph|block)+',
         defining: true,
         parseDOM: [{ tag: 'li' }],
@@ -16,7 +19,11 @@ export const schemaSpecs = {
     [ListNode.BulletList]: {
         content: `${ListNode.ListItem}+`,
         group: 'block',
-        attrs: { [ListsAttr.Tight]: { default: false }, [ListsAttr.Bullet]: { default: '*' } },
+        attrs: {
+            [ListsAttr.Tight]: { default: false },
+            [ListsAttr.Bullet]: { default: Markup.bullet.default },
+            [ListsAttr.Markup]: { default: Markup.bullet.default },
+        },
         parseDOM: [
             {
                 tag: 'ul',
@@ -33,7 +40,11 @@ export const schemaSpecs = {
         complex: 'root',
     },
     [ListNode.OrderedList]: {
-        attrs: { [ListsAttr.Order]: { default: 1 }, [ListsAttr.Tight]: { default: false } },
+        attrs: {
+            [ListsAttr.Order]: { default: 1 },
+            [ListsAttr.Tight]: { default: false },
+            [ListsAttr.Markup]: { default: Markup.ordered.default },
+        },
         content: `${ListNode.ListItem}+`,
         group: 'block',
         parseDOM: [

package/build/esm/extensions/markdown/Lists/ListsSpecs/serializer.js

@@ -1,18 +1,31 @@
-import { ListNode, ListsAttr } from './const';
+import { ListNode, ListsAttr, Markup } from './const';
 export const serializerTokens = {
     [ListNode.ListItem]: (state, node) => {
         state.renderContent(node);
     },
     [ListNode.BulletList]: (state, node) => {
-        state.renderList(node, '  ', (_i, li) => (li.attrs[ListsAttr.Markup] || node.attrs[ListsAttr.Bullet] || '*') + ' ');
+        state.renderList(node, '  ', (_i, li) => {
+            const markup = getMarkup({ item: li, list: node, type: 'bullet' });
+            return markup + ' ';
+        });
     },
     [ListNode.OrderedList]: (state, node) => {
         const start = node.attrs[ListsAttr.Order] || 1;
         const maxW = String(start + node.childCount - 1).length;
         const space = state.repeat(' ', maxW + 2);
-        state.renderList(node, space, (i) => {
+        state.renderList(node, space, (i, li) => {
             const nStr = String(start + i);
-            return state.repeat(' ', maxW - nStr.length) + nStr + '. ';
+            const markup = getMarkup({ item: li, list: node, type: 'ordered' });
+            return state.repeat(' ', maxW - nStr.length) + nStr + markup + ' ';
         });
     },
 };
+function getMarkup({ item, list, type, }) {
+    const defs = Markup[type];
+    let value = item.attrs[ListsAttr.Markup];
+    if (!defs.values.includes(value))
+        value = list.attrs[ListsAttr.Markup];
+    if (!defs.values.includes(value))
+        value = defs.default;
+    return value;
+}

package/build/esm/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockSpecs/index.d.ts

@@ -1,4 +1,4 @@
-import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
+import { PluginOptions } from '@diplodoc/html-extension/plugin';
 import type { ExtensionNodeSpec } from '../../../../core';
 export { yfmHtmlBlockNodeName } from './const';
 export interface YfmHtmlBlockSpecsOptions extends Omit<PluginOptions, 'runtimeJsPath' | 'containerClasses' | 'bundle' | 'embeddingMode'> {

package/build/esm/extensions/yfm/YfmHtmlBlock/index.d.ts

@@ -1,4 +1,4 @@
-import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
+import { PluginOptions } from '@diplodoc/html-extension/plugin';
 import type { IHTMLIFrameElementConfig } from '@diplodoc/html-extension/runtime';
 import { Action, ExtensionAuto } from '../../../core';
 import { YfmHtmlBlockAction } from './YfmHtmlBlockSpecs/const';

package/build/esm/i18n/menubar/index.d.ts

@@ -1,4 +1,4 @@
-export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "strike" | "underline" | "mark" | "quote" | "colorify" | "mono" | "text" | "html" | "cut" | "table" | "image" | "code_inline" | "heading" | "note" | "file" | "codeblock" | "checkbox" | "emoji" | "list" | "tabs" | "math" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "gpt" | "undo" | "redo" | "math_inline" | "math_block" | "colorify__color_blue" | "colorify__color_default" | "colorify__color_gray" | "colorify__color_green" | "colorify__color_orange" | "colorify__color_red" | "colorify__color_violet" | "colorify__color_yellow" | "colorify__group_text" | "folding-heading" | "folding-heading_hint" | "hrule" | "list__action_lift" | "list__action_sink" | "list_action_disabled" | "mermaid" | "more_action" | "olist" | "ulist", S extends string>(key: G | (string extends S ? S : never), params?: {
+export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "strike" | "underline" | "mark" | "quote" | "colorify" | "mono" | "text" | "html" | "cut" | "table" | "image" | "code_inline" | "list" | "heading" | "note" | "file" | "codeblock" | "checkbox" | "emoji" | "tabs" | "math" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "gpt" | "undo" | "redo" | "math_inline" | "math_block" | "colorify__color_blue" | "colorify__color_default" | "colorify__color_gray" | "colorify__color_green" | "colorify__color_orange" | "colorify__color_red" | "colorify__color_violet" | "colorify__color_yellow" | "colorify__group_text" | "folding-heading" | "folding-heading_hint" | "hrule" | "list__action_lift" | "list__action_sink" | "list_action_disabled" | "mermaid" | "more_action" | "olist" | "ulist", S extends string>(key: G | (string extends S ? S : never), params?: {
     [key: string]: any;
 } | undefined) => S extends G ? {
     bold: string;

package/build/esm/version.js

@@ -1,2 +1,2 @@
 /** During build process, the current version will be injected here */
-export const VERSION = typeof '13.21.4' !== 'undefined' ? '13.21.4' : 'unknown';
+export const VERSION = typeof '13.23.0' !== 'undefined' ? '13.23.0' : 'unknown';

package/build/esm/view/hocs/withYfmHtml/types.d.ts

@@ -1,3 +1,3 @@
-import type { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
+import type { PluginOptions } from '@diplodoc/html-extension/plugin';
 export type { TransformMeta } from '../../types';
 export declare type PluginRuntime = PluginOptions['runtimeJsPath'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/markdown-editor",
-  "version": "13.21.4",
+  "version": "13.23.0",
   "description": "Markdown wysiwyg and markup editor",
   "license": "MIT",
   "repository": {
@@ -201,7 +201,7 @@
   },
   "devDependencies": {
     "@diplodoc/folding-headings-extension": "0.1.0",
-    "@diplodoc/html-extension": "2.1.0",
+    "@diplodoc/html-extension": "2.3.2",
     "@diplodoc/latex-extension": "1.0.3",
     "@diplodoc/mermaid-extension": "1.2.1",
     "@diplodoc/transform": "4.22.0",
@@ -276,7 +276,7 @@
   },
   "peerDependencies": {
     "@diplodoc/folding-headings-extension": "^0.1.0",
-    "@diplodoc/html-extension": "2.1.0",
+    "@diplodoc/html-extension": "2.3.2",
     "@diplodoc/latex-extension": "^1.0.3",
     "@diplodoc/mermaid-extension": "^1.0.0",
     "@diplodoc/transform": ">=4.5.0 <4.19.0",