@gravity-ui/markdown-editor 13.1.1 → 13.2.0

package/README.md

@@ -1,6 +1,6 @@
 # @gravity-ui/markdown-editor · [![npm package](https://img.shields.io/npm/v/@gravity-ui/markdown-editor)](https://www.npmjs.com/package/@gravity-ui/markdown-editor) [![CI](https://img.shields.io/github/actions/workflow/status/gravity-ui/markdown-editor/ci.yml?branch=main&label=CI)](https://github.com/gravity-ui/markdown-editor/actions/workflows/ci.yml?query=branch:main) [![Release](https://img.shields.io/github/actions/workflow/status/gravity-ui/markdown-editor/release.yml?branch=main&label=Release)](https://github.com/gravity-ui/markdown-editor/actions/workflows/release.yml?query=branch:main) [![storybook](https://img.shields.io/badge/Storybook-deployed-ff4685)](https://preview.gravity-ui.com/md-editor/)
 
-## Markdown wysiwyg and markup editor 
+## Markdown wysiwyg and markup editor
 
 MarkdownEditor is a powerful tool for working with Markdown, which combines WYSIWYG and Markup modes. This means that you can create and edit content in a convenient visual mode, as well as have full control over the markup.
 
@@ -69,5 +69,5 @@ Don't forget to call `configure()` from [UIKit](https://github.com/gravity-ui/ui
 To start the dev storybook
 
 ```shell
-npm run dev
+npm start
 ```

package/build/cjs/core/markdown/MarkdownSerializer.js

@@ -299,7 +299,7 @@ class MarkdownSerializerState {
         node.forEach((child, _, i) => {
             if (i && isTight)
                 this.flushClose(1);
-            this.wrapBlock(delim, firstDelim(i), node, () => this.render(child, node, i));
+            this.wrapBlock(delim, firstDelim(i, child), node, () => this.render(child, node, i));
         });
         this.inTightList = prevTight;
     }

package/build/cjs/extensions/behavior/SelectionContext/tooltip.d.ts

@@ -2,10 +2,12 @@ import { PopupProps } from '@gravity-ui/uikit';
 import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { ActionStorage } from '../../../core';
-import { ToolbarGroupItemData } from '../../../toolbar';
-export declare type ContextGroupItemData = ToolbarGroupItemData<ActionStorage> & {
+import { ToolbarButtonPopupData, ToolbarGroupItemData, ToolbarSingleItemData } from '../../../toolbar';
+export declare type ContextGroupItemData = (ToolbarGroupItemData<ActionStorage> & {
     condition?: (state: EditorState) => void;
-};
+}) | ((ToolbarSingleItemData<ActionStorage> | ToolbarButtonPopupData<ActionStorage>) & {
+    condition?: 'enabled';
+});
 export declare type ContextGroupData = ContextGroupItemData[];
 export declare type ContextConfig = ContextGroupData[];
 export declare class TooltipView {

package/build/cjs/extensions/behavior/SelectionContext/tooltip.js

@@ -54,7 +54,16 @@ class TooltipView {
     getFilteredConfig() {
         return this.baseProps.show
             ? this.menuConfig
-                .map((groupData) => groupData.filter(({ condition }) => (0, lodash_1.isFunction)(condition) ? condition(this.view.state) : true))
+                .map((groupData) => groupData.filter((item) => {
+                const { condition } = item;
+                if (condition === 'enabled') {
+                    return item.isEnable(this.actions);
+                }
+                if ((0, lodash_1.isFunction)(condition)) {
+                    return condition(this.view.state);
+                }
+                return true;
+            }))
                 .filter((groupData) => Boolean(groupData.length))
             : [];
     }

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

@@ -3,3 +3,12 @@ export declare enum ListNode {
     BulletList = "bullet_list",
     OrderedList = "ordered_list"
 }
+export declare enum ListsAttr {
+    Tight = "tight",
+    /** used in bullet list only */
+    Bullet = "bullet",
+    /** used in ordered list only */
+    Order = "order",
+    /** used in list item only */
+    Markup = "markup"
+}

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

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListNode = void 0;
+exports.ListsAttr = exports.ListNode = void 0;
 var ListNode;
 (function (ListNode) {
     ListNode["ListItem"] = "list_item";
     ListNode["BulletList"] = "bullet_list";
     ListNode["OrderedList"] = "ordered_list";
 })(ListNode = exports.ListNode || (exports.ListNode = {}));
+var ListsAttr;
+(function (ListsAttr) {
+    ListsAttr["Tight"] = "tight";
+    /** used in bullet list only */
+    ListsAttr["Bullet"] = "bullet";
+    /** used in ordered list only */
+    ListsAttr["Order"] = "order";
+    /** used in list item only */
+    ListsAttr["Markup"] = "markup";
+})(ListsAttr = exports.ListsAttr || (exports.ListsAttr = {}));

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

@@ -1,5 +1,5 @@
 import type { ExtensionAuto } from '../../../../core';
-export { ListNode } from './const';
+export { ListsAttr, ListNode } from './const';
 export declare const liType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const blType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const olType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListsSpecs = exports.olType = exports.blType = exports.liType = exports.ListNode = void 0;
+exports.ListsSpecs = exports.olType = exports.blType = exports.liType = exports.ListNode = exports.ListsAttr = void 0;
 const schema_1 = require("../../../../utils/schema");
 const const_1 = require("./const");
 const parser_1 = require("./parser");
 const schema_2 = require("./schema");
 const serializer_1 = require("./serializer");
 var const_2 = require("./const");
+Object.defineProperty(exports, "ListsAttr", { enumerable: true, get: function () { return const_2.ListsAttr; } });
 Object.defineProperty(exports, "ListNode", { enumerable: true, get: function () { return const_2.ListNode; } });
 exports.liType = (0, schema_1.nodeTypeFactory)(const_1.ListNode.ListItem);
 exports.blType = (0, schema_1.nodeTypeFactory)(const_1.ListNode.BulletList);

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

@@ -3,18 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parserTokens = void 0;
 const const_1 = require("./const");
 exports.parserTokens = {
-    [const_1.ListNode.ListItem]: { name: const_1.ListNode.ListItem, type: 'block' },
+    [const_1.ListNode.ListItem]: {
+        name: const_1.ListNode.ListItem,
+        type: 'block',
+        getAttrs: (token) => ({ [const_1.ListsAttr.Markup]: token.markup }),
+    },
     [const_1.ListNode.BulletList]: {
         name: const_1.ListNode.BulletList,
         type: 'block',
-        getAttrs: (_, tokens, i) => ({ tight: listIsTight(tokens, i) }),
+        getAttrs: (token, tokens, i) => ({
+            [const_1.ListsAttr.Tight]: listIsTight(tokens, i),
+            [const_1.ListsAttr.Bullet]: token.markup,
+        }),
     },
     [const_1.ListNode.OrderedList]: {
         name: const_1.ListNode.OrderedList,
         type: 'block',
-        getAttrs: (tok, tokens, i) => ({
-            order: Number(tok.attrGet('start')) || 1,
-            tight: listIsTight(tokens, i),
+        getAttrs: (token, tokens, i) => ({
+            [const_1.ListsAttr.Order]: Number(token.attrGet('start')) || 1,
+            [const_1.ListsAttr.Tight]: listIsTight(tokens, i),
         }),
     },
 };

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

@@ -4,7 +4,7 @@ exports.schemaSpecs = void 0;
 const const_1 = require("./const");
 exports.schemaSpecs = {
     [const_1.ListNode.ListItem]: {
-        attrs: { tight: { default: false } },
+        attrs: { [const_1.ListsAttr.Tight]: { default: false }, [const_1.ListsAttr.Markup]: { default: null } },
         content: '(paragraph|block)+',
         defining: true,
         parseDOM: [{ tag: 'li' }],
@@ -19,22 +19,24 @@ exports.schemaSpecs = {
     [const_1.ListNode.BulletList]: {
         content: `${const_1.ListNode.ListItem}+`,
         group: 'block',
-        attrs: { tight: { default: false } },
+        attrs: { [const_1.ListsAttr.Tight]: { default: false }, [const_1.ListsAttr.Bullet]: { default: '*' } },
         parseDOM: [
             {
                 tag: 'ul',
-                getAttrs: (dom) => ({ tight: dom.hasAttribute('data-tight') }),
+                getAttrs: (dom) => ({
+                    [const_1.ListsAttr.Tight]: dom.hasAttribute('data-tight'),
+                }),
             },
         ],
         toDOM(node) {
-            return ['ul', { 'data-tight': node.attrs.tight ? 'true' : null }, 0];
+            return ['ul', { 'data-tight': node.attrs[const_1.ListsAttr.Tight] ? 'true' : null }, 0];
         },
         selectable: false,
         allowSelection: false,
         complex: 'root',
     },
     [const_1.ListNode.OrderedList]: {
-        attrs: { order: { default: 1 }, tight: { default: false } },
+        attrs: { [const_1.ListsAttr.Order]: { default: 1 }, [const_1.ListsAttr.Tight]: { default: false } },
         content: `${const_1.ListNode.ListItem}+`,
         group: 'block',
         parseDOM: [
@@ -42,10 +44,10 @@ exports.schemaSpecs = {
                 tag: 'ol',
                 getAttrs(dom) {
                     return {
-                        order: dom.hasAttribute('start')
+                        [const_1.ListsAttr.Order]: dom.hasAttribute('start')
                             ? Number(dom.getAttribute('start'))
                             : 1,
-                        tight: dom.hasAttribute('data-tight'),
+                        [const_1.ListsAttr.Tight]: dom.hasAttribute('data-tight'),
                     };
                 },
             },
@@ -54,8 +56,8 @@ exports.schemaSpecs = {
             return [
                 'ol',
                 {
-                    start: node.attrs.order === 1 ? null : node.attrs.order,
-                    'data-tight': node.attrs.tight ? 'true' : null,
+                    start: node.attrs[const_1.ListsAttr.Order] === 1 ? null : node.attrs[const_1.ListsAttr.Order],
+                    'data-tight': node.attrs[const_1.ListsAttr.Tight] ? 'true' : null,
                 },
                 0,
             ];

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

@@ -7,10 +7,10 @@ exports.serializerTokens = {
         state.renderContent(node);
     },
     [const_1.ListNode.BulletList]: (state, node) => {
-        state.renderList(node, '  ', () => (node.attrs.bullet || '*') + ' ');
+        state.renderList(node, '  ', (_i, li) => (li.attrs[const_1.ListsAttr.Markup] || node.attrs[const_1.ListsAttr.Bullet] || '*') + ' ');
     },
     [const_1.ListNode.OrderedList]: (state, node) => {
-        const start = node.attrs.order || 1;
+        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) => {

package/build/cjs/extensions/markdown/Lists/index.d.ts

@@ -1,7 +1,7 @@
 import type { Action, ExtensionAuto } from '../../../core';
 import { ListAction } from './const';
 import { ListsInputRulesOptions } from './inputrules';
-export { ListNode, blType, liType, olType } from './ListsSpecs';
+export { ListNode, ListsAttr, blType, liType, olType } from './ListsSpecs';
 export declare type ListsOptions = {
     ulKey?: string | null;
     olKey?: string | null;

package/build/cjs/extensions/markdown/Lists/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lists = exports.olType = exports.liType = exports.blType = exports.ListNode = void 0;
+exports.Lists = exports.olType = exports.liType = exports.blType = exports.ListsAttr = exports.ListNode = void 0;
 const prosemirror_commands_1 = require("prosemirror-commands");
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const keymap_1 = require("../../../utils/keymap");
@@ -12,6 +12,7 @@ const inputrules_1 = require("./inputrules");
 const MergeListsPlugin_1 = require("./plugins/MergeListsPlugin");
 var ListsSpecs_2 = require("./ListsSpecs");
 Object.defineProperty(exports, "ListNode", { enumerable: true, get: function () { return ListsSpecs_2.ListNode; } });
+Object.defineProperty(exports, "ListsAttr", { enumerable: true, get: function () { return ListsSpecs_2.ListsAttr; } });
 Object.defineProperty(exports, "blType", { enumerable: true, get: function () { return ListsSpecs_2.blType; } });
 Object.defineProperty(exports, "liType", { enumerable: true, get: function () { return ListsSpecs_2.liType; } });
 Object.defineProperty(exports, "olType", { enumerable: true, get: function () { return ListsSpecs_2.olType; } });

package/build/cjs/extensions/markdown/Lists/inputrules.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulletListRule = exports.orderedListRule = exports.ListsInputRulesExtension = void 0;
 const inputrules_1 = require("../../../utils/inputrules");
+const ListsSpecs_1 = require("./ListsSpecs");
 const utils_1 = require("./utils");
 const ListsInputRulesExtension = (builder, options) => {
     builder.addInputRules(({ schema }) => {
@@ -20,7 +21,7 @@ exports.ListsInputRulesExtension = ListsInputRulesExtension;
  * followed by a dot at the start of a textblock into an ordered list.
  */
 function orderedListRule(nodeType) {
-    return (0, inputrules_1.wrappingInputRule)(/^(\d+)\.\s$/, nodeType, (match) => ({ order: Number(match[1]) }), (match, node) => node.childCount + node.attrs.order === Number(match[1]));
+    return (0, inputrules_1.wrappingInputRule)(/^(\d+)\.\s$/, nodeType, (match) => ({ [ListsSpecs_1.ListsAttr.Order]: Number(match[1]) }), (match, node) => node.childCount + node.attrs[ListsSpecs_1.ListsAttr.Order] === Number(match[1]));
 }
 exports.orderedListRule = orderedListRule;
 /**
@@ -39,6 +40,6 @@ function bulletListRule(nodeType, config) {
     if (bullets.length === 0)
         return null;
     const regexp = new RegExp(`^\\s*([${bullets.join('')}])\\s$`); // same as /^\s*([-+*])\s$/
-    return (0, inputrules_1.wrappingInputRule)(regexp, nodeType);
+    return (0, inputrules_1.wrappingInputRule)(regexp, nodeType, (match) => ({ [ListsSpecs_1.ListsAttr.Bullet]: match[1] }));
 }
 exports.bulletListRule = bulletListRule;

package/build/cjs/extensions/markdown/Lists/plugins/MergeListsPlugin.js

@@ -21,11 +21,10 @@ const mergeListsPlugin = () => new prosemirror_state_1.Plugin({
 });
 exports.mergeListsPlugin = mergeListsPlugin;
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    for (let i = 0; i < nodes.length - 1; i++) {
-        const current = nodes[i];
-        const next = nodes[i + 1];
-        if (current.node.type === next.node.type &&
-            current.pos + current.node.nodeSize === next.pos) {
+    for (let i = nodes.length - 1; i > 0; i--) {
+        const prev = nodes[i - 1];
+        const next = nodes[i];
+        if (prev.node.type === next.node.type && prev.pos + prev.node.nodeSize === next.pos) {
             tr.join(next.pos);
         }
     }

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.d.ts

@@ -4,4 +4,5 @@ export declare const YfmHeadingAttr: {
     readonly Level: "level";
     readonly Id: "id";
     readonly DataLine: "data-line";
+    readonly Folding: "folding";
 };

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.js

@@ -9,4 +9,5 @@ exports.YfmHeadingAttr = {
     Level: HeadingSpecs_1.headingLevelAttr,
     Id: 'id',
     DataLine: 'data-line',
+    Folding: 'folding',
 };

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/index.js

@@ -16,6 +16,7 @@ const YfmHeadingSpecs = (builder, opts) => {
                     [const_1.YfmHeadingAttr.Id]: { default: '' },
                     [const_1.YfmHeadingAttr.Level]: { default: 1 },
                     [const_1.YfmHeadingAttr.DataLine]: { default: null },
+                    [const_1.YfmHeadingAttr.Folding]: { default: false },
                 },
                 content: '(text | inline)*',
                 group: 'block',
@@ -32,11 +33,13 @@ const YfmHeadingSpecs = (builder, opts) => {
                 toDOM(node) {
                     const id = node.attrs[const_1.YfmHeadingAttr.Id];
                     const lineNumber = node.attrs[const_1.YfmHeadingAttr.DataLine];
+                    const folding = node.attrs[const_1.YfmHeadingAttr.Folding];
                     return [
                         'h' + node.attrs[const_1.YfmHeadingAttr.Level],
                         {
                             id: id || null,
                             [const_1.YfmHeadingAttr.DataLine]: lineNumber,
+                            [`data-${const_1.YfmHeadingAttr.Folding}`]: folding ? '' : null,
                         },
                         0,
                         // [
@@ -61,6 +64,7 @@ const YfmHeadingSpecs = (builder, opts) => {
                     name: const_1.headingNodeName,
                     type: 'block',
                     getAttrs: (token) => {
+                        var _a;
                         if (token.type.endsWith('_close'))
                             return {};
                         const attrs = Object.fromEntries(token.attrs || []);
@@ -70,12 +74,14 @@ const YfmHeadingSpecs = (builder, opts) => {
                         //     attrs[YfmHeadingAttr.Id] = slugify(tokens[index + 1].content);
                         // }
                         // attrs have id only if it explicitly specified manually
-                        return Object.assign({ [const_1.YfmHeadingAttr.Level]: Number(token.tag.slice(1)) }, attrs);
+                        return Object.assign({ [const_1.YfmHeadingAttr.Level]: Number(token.tag.slice(1)), [const_1.YfmHeadingAttr.Folding]: (_a = token.meta) === null || _a === void 0 ? void 0 : _a.folding }, attrs);
                     },
                 },
             },
             toMd: (state, node) => {
-                state.write(state.repeat('#', node.attrs[const_1.YfmHeadingAttr.Level]) + ' ');
+                const folding = node.attrs[const_1.YfmHeadingAttr.Folding];
+                const level = node.attrs[const_1.YfmHeadingAttr.Level];
+                state.write(state.repeat('#', level) + (folding ? '+' : '') + ' ');
                 state.renderInline(node);
                 const anchor = node.attrs[const_1.YfmHeadingAttr.Id];
                 if (anchor /*&& anchor !== node.firstChild?.textContent*/) {

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/utils.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "headingRule", { enumerable: true, get: function
 const getNodeAttrs = (level) => (node) => ({
     [const_1.YfmHeadingAttr.Level]: level,
     [const_1.YfmHeadingAttr.Id]: node.getAttribute('id') || '',
+    [const_1.YfmHeadingAttr.Folding]: node.hasAttribute(`data-${const_1.YfmHeadingAttr.Folding}`),
 });
 exports.getNodeAttrs = getNodeAttrs;
 // export const slugify = (str: string) =>

package/build/cjs/extensions/yfm/YfmHeading/commands.js

@@ -9,15 +9,17 @@ const const_1 = require("./const");
 var commands_1 = require("../../markdown/Heading/commands");
 Object.defineProperty(exports, "resetHeading", { enumerable: true, get: function () { return commands_1.resetHeading; } });
 const toHeading = (level) => (state, dispatch, view) => {
+    const attrs = {};
     const parentHeading = (0, prosemirror_utils_1.findParentNodeOfType)((0, utils_1.hType)(state.schema))(state.selection);
-    if (parentHeading && parentHeading.node.attrs[const_1.headingLevelAttr] === level) {
-        return (0, base_1.toParagraph)(state, dispatch, view);
+    if (parentHeading) {
+        if (parentHeading.node.attrs[const_1.headingLevelAttr] === level) {
+            return (0, base_1.toParagraph)(state, dispatch, view);
+        }
+        Object.assign(attrs, parentHeading.node.attrs);
     }
     // const text = state.selection.$head.parent.textContent;
-    const attrs = {
-        // [YfmHeadingAttr.Id]: slugify(text),
-        [const_1.YfmHeadingAttr.Level]: level,
-    };
+    // attrs[YfmHeadingAttr.Id] = slugify(text);
+    attrs[const_1.YfmHeadingAttr.Level] = level;
     return (0, prosemirror_commands_1.setBlockType)((0, utils_1.hType)(state.schema), attrs)(state, dispatch);
 };
 exports.toHeading = toHeading;

package/build/cjs/markup/codemirror/gravity.js

@@ -33,4 +33,28 @@ exports.gravityTheme = view_1.EditorView.baseTheme({
     '&.cm-focused .cm-selectionBackground, &.cm-focused ::selection': {
         background: 'var(--g-color-base-misc-medium)',
     },
+    '.cm-tooltip.cm-tooltip-autocomplete': {
+        padding: '4px 0',
+        lineHeight: '24px',
+        color: 'var(--g-color-text-primary)',
+        fontFamily: 'var(--g-font-family-monospace)',
+        fontSize: 'var(--g-text-body-1-font-size)',
+        backgroundColor: 'var(--g-color-base-float)',
+        border: '1px solid var(--g-color-line-generic-solid)',
+        borderRadius: '4px',
+        '& > ul': {
+            '& > completion-section': {
+                color: 'var(--g-color-text-hint)',
+                fontWeight: 'var(--g-text-accent-font-weight)',
+                borderBottom: '1px solid var(--g-color-line-generic)',
+            },
+            '& > li:hover': {
+                backgroundColor: 'var(--g-color-base-simple-hover)',
+            },
+            '& > li[aria-selected]': {
+                backgroundColor: 'var(--g-color-base-selection)',
+                color: 'revert',
+            },
+        },
+    },
 });

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.1.1' !== 'undefined' ? '13.1.1' : 'unknown';
+exports.VERSION = typeof '13.2.0' !== 'undefined' ? '13.2.0' : 'unknown';

package/build/esm/core/markdown/MarkdownSerializer.js

@@ -295,7 +295,7 @@ export class MarkdownSerializerState {
         node.forEach((child, _, i) => {
             if (i && isTight)
                 this.flushClose(1);
-            this.wrapBlock(delim, firstDelim(i), node, () => this.render(child, node, i));
+            this.wrapBlock(delim, firstDelim(i, child), node, () => this.render(child, node, i));
         });
         this.inTightList = prevTight;
     }

package/build/esm/extensions/behavior/SelectionContext/tooltip.d.ts

@@ -2,10 +2,12 @@ import { PopupProps } from '@gravity-ui/uikit';
 import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { ActionStorage } from '../../../core';
-import { ToolbarGroupItemData } from '../../../toolbar';
-export declare type ContextGroupItemData = ToolbarGroupItemData<ActionStorage> & {
+import { ToolbarButtonPopupData, ToolbarGroupItemData, ToolbarSingleItemData } from '../../../toolbar';
+export declare type ContextGroupItemData = (ToolbarGroupItemData<ActionStorage> & {
     condition?: (state: EditorState) => void;
-};
+}) | ((ToolbarSingleItemData<ActionStorage> | ToolbarButtonPopupData<ActionStorage>) & {
+    condition?: 'enabled';
+});
 export declare type ContextGroupData = ContextGroupItemData[];
 export declare type ContextConfig = ContextGroupData[];
 export declare class TooltipView {

package/build/esm/extensions/behavior/SelectionContext/tooltip.js

@@ -5,7 +5,7 @@ import { Popup } from '@gravity-ui/uikit';
 import { isFunction } from '../../../lodash';
 import { logger } from '../../../logger';
 import { ErrorLoggerBoundary } from '../../../react-utils/ErrorBoundary';
-import { Toolbar } from '../../../toolbar';
+import { Toolbar, } from '../../../toolbar';
 import { getReactRendererFromState } from '../ReactRenderer';
 const SelectionTooltip = (_a) => {
     var { show, poppupProps } = _a, toolbarProps = __rest(_a, ["show", "poppupProps"]);
@@ -51,7 +51,16 @@ export class TooltipView {
     getFilteredConfig() {
         return this.baseProps.show
             ? this.menuConfig
-                .map((groupData) => groupData.filter(({ condition }) => isFunction(condition) ? condition(this.view.state) : true))
+                .map((groupData) => groupData.filter((item) => {
+                const { condition } = item;
+                if (condition === 'enabled') {
+                    return item.isEnable(this.actions);
+                }
+                if (isFunction(condition)) {
+                    return condition(this.view.state);
+                }
+                return true;
+            }))
                 .filter((groupData) => Boolean(groupData.length))
             : [];
     }

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

@@ -3,3 +3,12 @@ export declare enum ListNode {
     BulletList = "bullet_list",
     OrderedList = "ordered_list"
 }
+export declare enum ListsAttr {
+    Tight = "tight",
+    /** used in bullet list only */
+    Bullet = "bullet",
+    /** used in ordered list only */
+    Order = "order",
+    /** used in list item only */
+    Markup = "markup"
+}

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

@@ -4,3 +4,13 @@ export var ListNode;
     ListNode["BulletList"] = "bullet_list";
     ListNode["OrderedList"] = "ordered_list";
 })(ListNode || (ListNode = {}));
+export var ListsAttr;
+(function (ListsAttr) {
+    ListsAttr["Tight"] = "tight";
+    /** used in bullet list only */
+    ListsAttr["Bullet"] = "bullet";
+    /** used in ordered list only */
+    ListsAttr["Order"] = "order";
+    /** used in list item only */
+    ListsAttr["Markup"] = "markup";
+})(ListsAttr || (ListsAttr = {}));

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

@@ -1,5 +1,5 @@
 import type { ExtensionAuto } from '../../../../core';
-export { ListNode } from './const';
+export { ListsAttr, ListNode } from './const';
 export declare const liType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const blType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const olType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;

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

@@ -3,7 +3,7 @@ import { ListNode } from './const';
 import { parserTokens } from './parser';
 import { schemaSpecs } from './schema';
 import { serializerTokens } from './serializer';
-export { ListNode } from './const';
+export { ListsAttr, ListNode } from './const';
 export const liType = nodeTypeFactory(ListNode.ListItem);
 export const blType = nodeTypeFactory(ListNode.BulletList);
 export const olType = nodeTypeFactory(ListNode.OrderedList);

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

@@ -1,17 +1,24 @@
-import { ListNode } from './const';
+import { ListNode, ListsAttr } from './const';
 export const parserTokens = {
-    [ListNode.ListItem]: { name: ListNode.ListItem, type: 'block' },
+    [ListNode.ListItem]: {
+        name: ListNode.ListItem,
+        type: 'block',
+        getAttrs: (token) => ({ [ListsAttr.Markup]: token.markup }),
+    },
     [ListNode.BulletList]: {
         name: ListNode.BulletList,
         type: 'block',
-        getAttrs: (_, tokens, i) => ({ tight: listIsTight(tokens, i) }),
+        getAttrs: (token, tokens, i) => ({
+            [ListsAttr.Tight]: listIsTight(tokens, i),
+            [ListsAttr.Bullet]: token.markup,
+        }),
     },
     [ListNode.OrderedList]: {
         name: ListNode.OrderedList,
         type: 'block',
-        getAttrs: (tok, tokens, i) => ({
-            order: Number(tok.attrGet('start')) || 1,
-            tight: listIsTight(tokens, i),
+        getAttrs: (token, tokens, i) => ({
+            [ListsAttr.Order]: Number(token.attrGet('start')) || 1,
+            [ListsAttr.Tight]: listIsTight(tokens, i),
         }),
     },
 };

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

@@ -1,7 +1,7 @@
-import { ListNode } from './const';
+import { ListNode, ListsAttr } from './const';
 export const schemaSpecs = {
     [ListNode.ListItem]: {
-        attrs: { tight: { default: false } },
+        attrs: { [ListsAttr.Tight]: { default: false }, [ListsAttr.Markup]: { default: null } },
         content: '(paragraph|block)+',
         defining: true,
         parseDOM: [{ tag: 'li' }],
@@ -16,22 +16,24 @@ export const schemaSpecs = {
     [ListNode.BulletList]: {
         content: `${ListNode.ListItem}+`,
         group: 'block',
-        attrs: { tight: { default: false } },
+        attrs: { [ListsAttr.Tight]: { default: false }, [ListsAttr.Bullet]: { default: '*' } },
         parseDOM: [
             {
                 tag: 'ul',
-                getAttrs: (dom) => ({ tight: dom.hasAttribute('data-tight') }),
+                getAttrs: (dom) => ({
+                    [ListsAttr.Tight]: dom.hasAttribute('data-tight'),
+                }),
             },
         ],
         toDOM(node) {
-            return ['ul', { 'data-tight': node.attrs.tight ? 'true' : null }, 0];
+            return ['ul', { 'data-tight': node.attrs[ListsAttr.Tight] ? 'true' : null }, 0];
         },
         selectable: false,
         allowSelection: false,
         complex: 'root',
     },
     [ListNode.OrderedList]: {
-        attrs: { order: { default: 1 }, tight: { default: false } },
+        attrs: { [ListsAttr.Order]: { default: 1 }, [ListsAttr.Tight]: { default: false } },
         content: `${ListNode.ListItem}+`,
         group: 'block',
         parseDOM: [
@@ -39,10 +41,10 @@ export const schemaSpecs = {
                 tag: 'ol',
                 getAttrs(dom) {
                     return {
-                        order: dom.hasAttribute('start')
+                        [ListsAttr.Order]: dom.hasAttribute('start')
                             ? Number(dom.getAttribute('start'))
                             : 1,
-                        tight: dom.hasAttribute('data-tight'),
+                        [ListsAttr.Tight]: dom.hasAttribute('data-tight'),
                     };
                 },
             },
@@ -51,8 +53,8 @@ export const schemaSpecs = {
             return [
                 'ol',
                 {
-                    start: node.attrs.order === 1 ? null : node.attrs.order,
-                    'data-tight': node.attrs.tight ? 'true' : null,
+                    start: node.attrs[ListsAttr.Order] === 1 ? null : node.attrs[ListsAttr.Order],
+                    'data-tight': node.attrs[ListsAttr.Tight] ? 'true' : null,
                 },
                 0,
             ];

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

@@ -1,13 +1,13 @@
-import { ListNode } from './const';
+import { ListNode, ListsAttr } from './const';
 export const serializerTokens = {
     [ListNode.ListItem]: (state, node) => {
         state.renderContent(node);
     },
     [ListNode.BulletList]: (state, node) => {
-        state.renderList(node, '  ', () => (node.attrs.bullet || '*') + ' ');
+        state.renderList(node, '  ', (_i, li) => (li.attrs[ListsAttr.Markup] || node.attrs[ListsAttr.Bullet] || '*') + ' ');
     },
     [ListNode.OrderedList]: (state, node) => {
-        const start = node.attrs.order || 1;
+        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) => {

package/build/esm/extensions/markdown/Lists/index.d.ts

@@ -1,7 +1,7 @@
 import type { Action, ExtensionAuto } from '../../../core';
 import { ListAction } from './const';
 import { ListsInputRulesOptions } from './inputrules';
-export { ListNode, blType, liType, olType } from './ListsSpecs';
+export { ListNode, ListsAttr, blType, liType, olType } from './ListsSpecs';
 export declare type ListsOptions = {
     ulKey?: string | null;
     olKey?: string | null;

package/build/esm/extensions/markdown/Lists/index.js

@@ -7,7 +7,7 @@ import { joinPrevList, liftIfCursorIsAtBeginningOfItem, toList } from './command
 import { ListAction } from './const';
 import { ListsInputRulesExtension } from './inputrules';
 import { mergeListsPlugin } from './plugins/MergeListsPlugin';
-export { ListNode, blType, liType, olType } from './ListsSpecs';
+export { ListNode, ListsAttr, blType, liType, olType } from './ListsSpecs';
 export const Lists = (builder, opts) => {
     builder.use(ListsSpecs);
     builder.addKeymap(({ schema }) => {

package/build/esm/extensions/markdown/Lists/inputrules.js

@@ -1,4 +1,5 @@
 import { wrappingInputRule } from '../../../utils/inputrules';
+import { ListsAttr } from './ListsSpecs';
 import { blType, olType } from './utils';
 export const ListsInputRulesExtension = (builder, options) => {
     builder.addInputRules(({ schema }) => {
@@ -16,7 +17,7 @@ export const ListsInputRulesExtension = (builder, options) => {
  * followed by a dot at the start of a textblock into an ordered list.
  */
 export function orderedListRule(nodeType) {
-    return wrappingInputRule(/^(\d+)\.\s$/, nodeType, (match) => ({ order: Number(match[1]) }), (match, node) => node.childCount + node.attrs.order === Number(match[1]));
+    return wrappingInputRule(/^(\d+)\.\s$/, nodeType, (match) => ({ [ListsAttr.Order]: Number(match[1]) }), (match, node) => node.childCount + node.attrs[ListsAttr.Order] === Number(match[1]));
 }
 /**
  * Given a list node type, returns an input rule that turns a bullet
@@ -34,5 +35,5 @@ export function bulletListRule(nodeType, config) {
     if (bullets.length === 0)
         return null;
     const regexp = new RegExp(`^\\s*([${bullets.join('')}])\\s$`); // same as /^\s*([-+*])\s$/
-    return wrappingInputRule(regexp, nodeType);
+    return wrappingInputRule(regexp, nodeType, (match) => ({ [ListsAttr.Bullet]: match[1] }));
 }

package/build/esm/extensions/markdown/Lists/plugins/MergeListsPlugin.js

@@ -17,11 +17,10 @@ export const mergeListsPlugin = () => new Plugin({
     },
 });
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    for (let i = 0; i < nodes.length - 1; i++) {
-        const current = nodes[i];
-        const next = nodes[i + 1];
-        if (current.node.type === next.node.type &&
-            current.pos + current.node.nodeSize === next.pos) {
+    for (let i = nodes.length - 1; i > 0; i--) {
+        const prev = nodes[i - 1];
+        const next = nodes[i];
+        if (prev.node.type === next.node.type && prev.pos + prev.node.nodeSize === next.pos) {
             tr.join(next.pos);
         }
     }

package/build/esm/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.d.ts

@@ -4,4 +4,5 @@ export declare const YfmHeadingAttr: {
     readonly Level: "level";
     readonly Id: "id";
     readonly DataLine: "data-line";
+    readonly Folding: "folding";
 };

package/build/esm/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.js

@@ -4,4 +4,5 @@ export const YfmHeadingAttr = {
     Level: headingLevelAttr,
     Id: 'id',
     DataLine: 'data-line',
+    Folding: 'folding',
 };

package/build/esm/extensions/yfm/YfmHeading/YfmHeadingSpecs/index.js

@@ -12,6 +12,7 @@ export const YfmHeadingSpecs = (builder, opts) => {
                     [YfmHeadingAttr.Id]: { default: '' },
                     [YfmHeadingAttr.Level]: { default: 1 },
                     [YfmHeadingAttr.DataLine]: { default: null },
+                    [YfmHeadingAttr.Folding]: { default: false },
                 },
                 content: '(text | inline)*',
                 group: 'block',
@@ -28,11 +29,13 @@ export const YfmHeadingSpecs = (builder, opts) => {
                 toDOM(node) {
                     const id = node.attrs[YfmHeadingAttr.Id];
                     const lineNumber = node.attrs[YfmHeadingAttr.DataLine];
+                    const folding = node.attrs[YfmHeadingAttr.Folding];
                     return [
                         'h' + node.attrs[YfmHeadingAttr.Level],
                         {
                             id: id || null,
                             [YfmHeadingAttr.DataLine]: lineNumber,
+                            [`data-${YfmHeadingAttr.Folding}`]: folding ? '' : null,
                         },
                         0,
                         // [
@@ -57,6 +60,7 @@ export const YfmHeadingSpecs = (builder, opts) => {
                     name: headingNodeName,
                     type: 'block',
                     getAttrs: (token) => {
+                        var _a;
                         if (token.type.endsWith('_close'))
                             return {};
                         const attrs = Object.fromEntries(token.attrs || []);
@@ -66,12 +70,14 @@ export const YfmHeadingSpecs = (builder, opts) => {
                         //     attrs[YfmHeadingAttr.Id] = slugify(tokens[index + 1].content);
                         // }
                         // attrs have id only if it explicitly specified manually
-                        return Object.assign({ [YfmHeadingAttr.Level]: Number(token.tag.slice(1)) }, attrs);
+                        return Object.assign({ [YfmHeadingAttr.Level]: Number(token.tag.slice(1)), [YfmHeadingAttr.Folding]: (_a = token.meta) === null || _a === void 0 ? void 0 : _a.folding }, attrs);
                     },
                 },
             },
             toMd: (state, node) => {
-                state.write(state.repeat('#', node.attrs[YfmHeadingAttr.Level]) + ' ');
+                const folding = node.attrs[YfmHeadingAttr.Folding];
+                const level = node.attrs[YfmHeadingAttr.Level];
+                state.write(state.repeat('#', level) + (folding ? '+' : '') + ' ');
                 state.renderInline(node);
                 const anchor = node.attrs[YfmHeadingAttr.Id];
                 if (anchor /*&& anchor !== node.firstChild?.textContent*/) {

package/build/esm/extensions/yfm/YfmHeading/YfmHeadingSpecs/utils.js

@@ -4,6 +4,7 @@ export { hType, hasParentHeading, headingRule } from '../../../markdown/Heading/
 export const getNodeAttrs = (level) => (node) => ({
     [YfmHeadingAttr.Level]: level,
     [YfmHeadingAttr.Id]: node.getAttribute('id') || '',
+    [YfmHeadingAttr.Folding]: node.hasAttribute(`data-${YfmHeadingAttr.Folding}`),
 });
 // export const slugify = (str: string) =>
 //     // same config as in yfm-transform

package/build/esm/extensions/yfm/YfmHeading/commands.js

@@ -5,14 +5,16 @@ import { hType } from './YfmHeadingSpecs/utils';
 import { YfmHeadingAttr, headingLevelAttr } from './const';
 export { resetHeading } from '../../markdown/Heading/commands';
 export const toHeading = (level) => (state, dispatch, view) => {
+    const attrs = {};
     const parentHeading = findParentNodeOfType(hType(state.schema))(state.selection);
-    if (parentHeading && parentHeading.node.attrs[headingLevelAttr] === level) {
-        return toParagraph(state, dispatch, view);
+    if (parentHeading) {
+        if (parentHeading.node.attrs[headingLevelAttr] === level) {
+            return toParagraph(state, dispatch, view);
+        }
+        Object.assign(attrs, parentHeading.node.attrs);
     }
     // const text = state.selection.$head.parent.textContent;
-    const attrs = {
-        // [YfmHeadingAttr.Id]: slugify(text),
-        [YfmHeadingAttr.Level]: level,
-    };
+    // attrs[YfmHeadingAttr.Id] = slugify(text);
+    attrs[YfmHeadingAttr.Level] = level;
     return setBlockType(hType(state.schema), attrs)(state, dispatch);
 };

package/build/esm/markup/codemirror/gravity.js

@@ -30,4 +30,28 @@ export const gravityTheme = EditorView.baseTheme({
     '&.cm-focused .cm-selectionBackground, &.cm-focused ::selection': {
         background: 'var(--g-color-base-misc-medium)',
     },
+    '.cm-tooltip.cm-tooltip-autocomplete': {
+        padding: '4px 0',
+        lineHeight: '24px',
+        color: 'var(--g-color-text-primary)',
+        fontFamily: 'var(--g-font-family-monospace)',
+        fontSize: 'var(--g-text-body-1-font-size)',
+        backgroundColor: 'var(--g-color-base-float)',
+        border: '1px solid var(--g-color-line-generic-solid)',
+        borderRadius: '4px',
+        '& > ul': {
+            '& > completion-section': {
+                color: 'var(--g-color-text-hint)',
+                fontWeight: 'var(--g-text-accent-font-weight)',
+                borderBottom: '1px solid var(--g-color-line-generic)',
+            },
+            '& > li:hover': {
+                backgroundColor: 'var(--g-color-base-simple-hover)',
+            },
+            '& > li[aria-selected]': {
+                backgroundColor: 'var(--g-color-base-selection)',
+                color: 'revert',
+            },
+        },
+    },
 });

package/build/esm/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/markdown-editor",
-  "version": "13.1.1",
+  "version": "13.2.0",
   "description": "Markdown wysiwyg and markup editor",
   "license": "MIT",
   "repository": {
@@ -16,7 +16,6 @@
   ],
   "scripts": {
     "start": "npm run storybook:start",
-    "dev": "npm run storybook:start",
     "clean": "gulp clean",
     "build": "gulp",
     "typecheck": "tsc -p tsconfig.json --noEmit",