@gravity-ui/markdown-editor 13.18.1 → 13.19.0

package/README.md

@@ -1,4 +1,4 @@
-![Markdown Editor](https://github.com/user-attachments/assets/40be2902-a683-4167-bd8d-ffd8bff26e69)
+![Markdown Editor](https://github.com/user-attachments/assets/0b4e5f65-54cf-475f-9c68-557a4e9edb46)
 
 # @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/)
 

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

@@ -57,6 +57,8 @@ export declare type MarkupConfig = {
     disabledExtensions?: CreateCodemirrorParams['disabledExtensions'];
     /** Additional keymaps for codemirror instance */
     keymaps?: CreateCodemirrorParams['keymaps'];
+    /** Overrides the default placeholder content. */
+    placeholder?: CreateCodemirrorParams['placeholder'];
     /**
      * Additional language data for markdown language in codemirror.
      * Can be used to configure additional autocompletions and others.

package/build/cjs/bundle/Editor.js

@@ -150,10 +150,11 @@ class EditorImpl extends event_emitter_1.SafeEventEmitter {
         return tslib_1.__classPrivateFieldGet(this, _EditorImpl_wysiwygEditor, "f");
     }
     get markupEditor() {
+        var _a;
         if (!tslib_1.__classPrivateFieldGet(this, _EditorImpl_markupEditor, "f")) {
             tslib_1.__classPrivateFieldSet(this, _EditorImpl_markupEditor, new editor_1.Editor((0, codemirror_1.createCodemirror)({
                 doc: tslib_1.__classPrivateFieldGet(this, _EditorImpl_markup, "f"),
-                placeholderText: (0, bundle_1.i18n)('markup_placeholder'),
+                placeholder: (_a = tslib_1.__classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").placeholder) !== null && _a !== void 0 ? _a : (0, bundle_1.i18n)('markup_placeholder'),
                 onCancel: () => this.emit('cancel', null),
                 onSubmit: () => this.emit('submit', null),
                 onChange: () => this.emit('rerender-toolbar', null),

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

@@ -195,15 +195,19 @@ class MarkdownSerializerState {
         let trailing = '';
         const progress = (node, _, index) => {
             let marks = node ? node.marks : [];
-            // Remove marks from breaks (hard_break or soft_break) that are the last node inside
+            // Remove marks from breaks (hard_break or soft_break) that are the edge node inside
             // that mark to prevent parser edge cases with new lines just
-            // before closing marks.
+            // before closing or after opening marks.
             if (node && node.type.spec.isBreak) {
                 marks = marks.filter(m => {
+                    if (index === 0)
+                        return false;
                     if (index + 1 == parent.childCount)
                         return false;
+                    const prev = parent.child(index - 1);
                     const next = parent.child(index + 1);
-                    return m.isInSet(next.marks) && (!next.isText || /\S/.test(next.text));
+                    return ((m.isInSet(prev.marks) && (!prev.isText || /\S/.test(prev.text))) &&
+                        (m.isInSet(next.marks) && (!next.isText || /\S/.test(next.text))));
                 });
             }
             let leading = trailing;

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

@@ -1,5 +1,4 @@
 import type { NodeType } from 'prosemirror-model';
 import type { Command } from 'prosemirror-state';
 export declare function toList(listType: NodeType): Command;
-export declare const liftIfCursorIsAtBeginningOfItem: Command;
 export declare const joinPrevList: Command;

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

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinPrevList = exports.liftIfCursorIsAtBeginningOfItem = exports.toList = void 0;
+exports.joinPrevList = exports.toList = void 0;
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const join_1 = require("../../../commands/join");
-const selection_1 = require("../../../utils/selection");
 const utils_1 = require("./utils");
 function toList(listType) {
     return (state, dispatch) => {
@@ -18,18 +17,6 @@ function toList(listType) {
     };
 }
 exports.toList = toList;
-const liftIfCursorIsAtBeginningOfItem = (state, dispatch) => {
-    const $cursor = (0, selection_1.get$CursorAtBlockStart)(state.selection);
-    if (!$cursor)
-        return false;
-    const { schema } = state;
-    const parentBlock = $cursor.node($cursor.depth - 1);
-    if (parentBlock.firstChild === $cursor.parent && (0, utils_1.isListItemNode)(parentBlock)) {
-        return (0, prosemirror_schema_list_1.liftListItem)((0, utils_1.liType)(schema))(state, dispatch);
-    }
-    return false;
-};
-exports.liftIfCursorIsAtBeginningOfItem = liftIfCursorIsAtBeginningOfItem;
 exports.joinPrevList = (0, join_1.joinPreviousBlock)({
     checkPrevNode: utils_1.isListNode,
     skipNode: utils_1.isListOrItemNode,

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
 const ListsSpecs_1 = require("./ListsSpecs");
@@ -29,7 +28,7 @@ const Lists = (builder, opts) => {
     }, builder.Priority.High);
     builder.addKeymap(({ schema }) => ({
         Enter: (0, prosemirror_schema_list_1.splitListItem)((0, ListsSpecs_1.liType)(schema)),
-        Backspace: (0, prosemirror_commands_1.chainCommands)(commands_1.liftIfCursorIsAtBeginningOfItem, commands_1.joinPrevList),
+        Backspace: commands_1.joinPrevList,
     }), builder.Priority.Low);
     builder.use(inputrules_1.ListsInputRulesExtension, { bulletListInputRule: opts === null || opts === void 0 ? void 0 : opts.ulInputRules });
     builder.addPlugin(MergeListsPlugin_1.mergeListsPlugin);

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

@@ -21,11 +21,15 @@ const mergeListsPlugin = () => new prosemirror_state_1.Plugin({
 });
 exports.mergeListsPlugin = mergeListsPlugin;
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    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);
+    const posAfterMap = {};
+    for (const item of nodes) {
+        const posBefore = item.pos;
+        const posAfter = posBefore + item.node.nodeSize;
+        posAfterMap[posAfter] = item.node;
+        const nodeBefore = posAfterMap[posBefore];
+        if ((nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === item.node.type) {
+            tr.join(tr.mapping.map(posBefore));
+            posAfterMap[posBefore] = undefined;
         }
     }
 }

package/build/cjs/extensions/yfm/YfmTable/YfmTableSpecs/serializer.js

@@ -67,10 +67,23 @@ exports.serializerTokens = {
             state.ensureNewLine();
         });
     },
-    [const_1.YfmTableNode.Row]: (_state, node) => {
-        throw new Error(`Should not serialize ${node.type.name} node via serialize-token`);
+    [const_1.YfmTableNode.Row]: (state, node) => {
+        console.warn(`Should not serialize ${node.type.name} node via serialize-token`);
+        state.write('||');
+        state.ensureNewLine();
+        state.write('\n');
+        state.renderContent(node);
+        state.write('||');
+        state.ensureNewLine();
     },
-    [const_1.YfmTableNode.Cell]: (_state, node) => {
-        throw new Error(`Should not serialize ${node.type.name} node via serialize-token`);
+    [const_1.YfmTableNode.Cell]: (state, node, parent) => {
+        console.warn(`Should not serialize ${node.type.name} node via serialize-token`);
+        state.renderContent(node);
+        const isLastCellInRow = parent.lastChild === node;
+        if (!isLastCellInRow) {
+            state.write('|');
+            state.ensureNewLine();
+            state.write('\n');
+        }
     },
 };

package/build/cjs/markup/codemirror/create.d.ts

@@ -1,6 +1,6 @@
 import { autocompletion } from '@codemirror/autocomplete';
 import type { Extension, StateCommand } from '@codemirror/state';
-import { EditorView, EditorViewConfig, KeyBinding } from '@codemirror/view';
+import { EditorView, EditorViewConfig, KeyBinding, placeholder } from '@codemirror/view';
 import { EventMap } from '../../bundle/Editor';
 import { ReactRenderStorage } from '../../extensions';
 import { Receiver } from '../../utils';
@@ -10,7 +10,7 @@ export type { YfmLangOptions };
 declare type Autocompletion = Parameters<typeof autocompletion>[0];
 export declare type CreateCodemirrorParams = {
     doc: EditorViewConfig['doc'];
-    placeholderText: string;
+    placeholder: Parameters<typeof placeholder>[0];
     onCancel: () => void;
     onSubmit: () => void;
     onChange: () => void;

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

@@ -16,8 +16,8 @@ const react_facet_1 = require("./react-facet");
 const plugin_1 = require("./search-plugin/plugin");
 const yfm_1 = require("./yfm");
 function createCodemirror(params) {
-    const { doc, placeholderText, reactRenderer, onCancel, onScroll, onSubmit, onChange, onDocChange, extensions: extraExtensions, disabledExtensions = {}, keymaps = [], receiver, yfmLangOptions, autocompletion: autocompletionConfig, } = params;
-    const extensions = [gravity_1.gravityTheme, (0, view_1.placeholder)(placeholderText)];
+    const { doc, reactRenderer, onCancel, onScroll, onSubmit, onChange, onDocChange, disabledExtensions = {}, keymaps = [], receiver, yfmLangOptions, extensions: extraExtensions, placeholder: placeholderContent, autocompletion: autocompletionConfig, } = params;
+    const extensions = [gravity_1.gravityTheme, (0, view_1.placeholder)(placeholderContent)];
     if (!disabledExtensions.history) {
         extensions.push((0, commands_1.history)());
     }

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.18.1' !== 'undefined' ? '13.18.1' : 'unknown';
+exports.VERSION = typeof '13.19.0' !== 'undefined' ? '13.19.0' : 'unknown';

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

@@ -57,6 +57,8 @@ export declare type MarkupConfig = {
     disabledExtensions?: CreateCodemirrorParams['disabledExtensions'];
     /** Additional keymaps for codemirror instance */
     keymaps?: CreateCodemirrorParams['keymaps'];
+    /** Overrides the default placeholder content. */
+    placeholder?: CreateCodemirrorParams['placeholder'];
     /**
      * Additional language data for markdown language in codemirror.
      * Can be used to configure additional autocompletions and others.

package/build/esm/bundle/Editor.js

@@ -147,10 +147,11 @@ export class EditorImpl extends SafeEventEmitter {
         return __classPrivateFieldGet(this, _EditorImpl_wysiwygEditor, "f");
     }
     get markupEditor() {
+        var _a;
         if (!__classPrivateFieldGet(this, _EditorImpl_markupEditor, "f")) {
             __classPrivateFieldSet(this, _EditorImpl_markupEditor, new MarkupEditor(createCodemirror({
                 doc: __classPrivateFieldGet(this, _EditorImpl_markup, "f"),
-                placeholderText: i18n('markup_placeholder'),
+                placeholder: (_a = __classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").placeholder) !== null && _a !== void 0 ? _a : i18n('markup_placeholder'),
                 onCancel: () => this.emit('cancel', null),
                 onSubmit: () => this.emit('submit', null),
                 onChange: () => this.emit('rerender-toolbar', null),

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

@@ -191,15 +191,19 @@ export class MarkdownSerializerState {
         let trailing = '';
         const progress = (node, _, index) => {
             let marks = node ? node.marks : [];
-            // Remove marks from breaks (hard_break or soft_break) that are the last node inside
+            // Remove marks from breaks (hard_break or soft_break) that are the edge node inside
             // that mark to prevent parser edge cases with new lines just
-            // before closing marks.
+            // before closing or after opening marks.
             if (node && node.type.spec.isBreak) {
                 marks = marks.filter(m => {
+                    if (index === 0)
+                        return false;
                     if (index + 1 == parent.childCount)
                         return false;
+                    const prev = parent.child(index - 1);
                     const next = parent.child(index + 1);
-                    return m.isInSet(next.marks) && (!next.isText || /\S/.test(next.text));
+                    return ((m.isInSet(prev.marks) && (!prev.isText || /\S/.test(prev.text))) &&
+                        (m.isInSet(next.marks) && (!next.isText || /\S/.test(next.text))));
                 });
             }
             let leading = trailing;

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

@@ -1,5 +1,4 @@
 import type { NodeType } from 'prosemirror-model';
 import type { Command } from 'prosemirror-state';
 export declare function toList(listType: NodeType): Command;
-export declare const liftIfCursorIsAtBeginningOfItem: Command;
 export declare const joinPrevList: Command;

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

@@ -1,7 +1,6 @@
-import { liftListItem, wrapInList } from 'prosemirror-schema-list';
+import { wrapInList } from 'prosemirror-schema-list';
 import { joinPreviousBlock } from '../../../commands/join';
-import { get$CursorAtBlockStart } from '../../../utils/selection';
-import { findAnyParentList, isListItemNode, isListNode, isListOrItemNode, liType } from './utils';
+import { findAnyParentList, isListNode, isListOrItemNode } from './utils';
 export function toList(listType) {
     return (state, dispatch) => {
         const parentList = findAnyParentList(state.schema)(state.selection);
@@ -14,17 +13,6 @@ export function toList(listType) {
         return wrapInList(listType)(state, dispatch);
     };
 }
-export const liftIfCursorIsAtBeginningOfItem = (state, dispatch) => {
-    const $cursor = get$CursorAtBlockStart(state.selection);
-    if (!$cursor)
-        return false;
-    const { schema } = state;
-    const parentBlock = $cursor.node($cursor.depth - 1);
-    if (parentBlock.firstChild === $cursor.parent && isListItemNode(parentBlock)) {
-        return liftListItem(liType(schema))(state, dispatch);
-    }
-    return false;
-};
 export const joinPrevList = joinPreviousBlock({
     checkPrevNode: isListNode,
     skipNode: isListOrItemNode,

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

@@ -1,9 +1,8 @@
-import { chainCommands } from 'prosemirror-commands';
 import { liftListItem, sinkListItem, splitListItem } from 'prosemirror-schema-list';
 import { withLogAction } from '../../../utils/keymap';
 import { ListsSpecs, blType, liType, olType } from './ListsSpecs';
 import { actions } from './actions';
-import { joinPrevList, liftIfCursorIsAtBeginningOfItem, toList } from './commands';
+import { joinPrevList, toList } from './commands';
 import { ListAction } from './const';
 import { ListsInputRulesExtension } from './inputrules';
 import { mergeListsPlugin } from './plugins/MergeListsPlugin';
@@ -21,7 +20,7 @@ export const Lists = (builder, opts) => {
     }, builder.Priority.High);
     builder.addKeymap(({ schema }) => ({
         Enter: splitListItem(liType(schema)),
-        Backspace: chainCommands(liftIfCursorIsAtBeginningOfItem, joinPrevList),
+        Backspace: joinPrevList,
     }), builder.Priority.Low);
     builder.use(ListsInputRulesExtension, { bulletListInputRule: opts === null || opts === void 0 ? void 0 : opts.ulInputRules });
     builder.addPlugin(mergeListsPlugin);

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

@@ -17,11 +17,15 @@ export const mergeListsPlugin = () => new Plugin({
     },
 });
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    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);
+    const posAfterMap = {};
+    for (const item of nodes) {
+        const posBefore = item.pos;
+        const posAfter = posBefore + item.node.nodeSize;
+        posAfterMap[posAfter] = item.node;
+        const nodeBefore = posAfterMap[posBefore];
+        if ((nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === item.node.type) {
+            tr.join(tr.mapping.map(posBefore));
+            posAfterMap[posBefore] = undefined;
         }
     }
 }

package/build/esm/extensions/yfm/YfmTable/YfmTableSpecs/serializer.js

@@ -63,10 +63,23 @@ export const serializerTokens = {
             state.ensureNewLine();
         });
     },
-    [YfmTableNode.Row]: (_state, node) => {
-        throw new Error(`Should not serialize ${node.type.name} node via serialize-token`);
+    [YfmTableNode.Row]: (state, node) => {
+        console.warn(`Should not serialize ${node.type.name} node via serialize-token`);
+        state.write('||');
+        state.ensureNewLine();
+        state.write('\n');
+        state.renderContent(node);
+        state.write('||');
+        state.ensureNewLine();
     },
-    [YfmTableNode.Cell]: (_state, node) => {
-        throw new Error(`Should not serialize ${node.type.name} node via serialize-token`);
+    [YfmTableNode.Cell]: (state, node, parent) => {
+        console.warn(`Should not serialize ${node.type.name} node via serialize-token`);
+        state.renderContent(node);
+        const isLastCellInRow = parent.lastChild === node;
+        if (!isLastCellInRow) {
+            state.write('|');
+            state.ensureNewLine();
+            state.write('\n');
+        }
     },
 };

package/build/esm/markup/codemirror/create.d.ts

@@ -1,6 +1,6 @@
 import { autocompletion } from '@codemirror/autocomplete';
 import type { Extension, StateCommand } from '@codemirror/state';
-import { EditorView, EditorViewConfig, KeyBinding } from '@codemirror/view';
+import { EditorView, EditorViewConfig, KeyBinding, placeholder } from '@codemirror/view';
 import { EventMap } from '../../bundle/Editor';
 import { ReactRenderStorage } from '../../extensions';
 import { Receiver } from '../../utils';
@@ -10,7 +10,7 @@ export type { YfmLangOptions };
 declare type Autocompletion = Parameters<typeof autocompletion>[0];
 export declare type CreateCodemirrorParams = {
     doc: EditorViewConfig['doc'];
-    placeholderText: string;
+    placeholder: Parameters<typeof placeholder>[0];
     onCancel: () => void;
     onSubmit: () => void;
     onChange: () => void;

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

@@ -13,8 +13,8 @@ import { ReactRendererFacet } from './react-facet';
 import { SearchPanelPlugin } from './search-plugin/plugin';
 import { yfmLang } from './yfm';
 export function createCodemirror(params) {
-    const { doc, placeholderText, reactRenderer, onCancel, onScroll, onSubmit, onChange, onDocChange, extensions: extraExtensions, disabledExtensions = {}, keymaps = [], receiver, yfmLangOptions, autocompletion: autocompletionConfig, } = params;
-    const extensions = [gravityTheme, placeholder(placeholderText)];
+    const { doc, reactRenderer, onCancel, onScroll, onSubmit, onChange, onDocChange, disabledExtensions = {}, keymaps = [], receiver, yfmLangOptions, extensions: extraExtensions, placeholder: placeholderContent, autocompletion: autocompletionConfig, } = params;
+    const extensions = [gravityTheme, placeholder(placeholderContent)];
     if (!disabledExtensions.history) {
         extensions.push(history());
     }

package/build/esm/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/markdown-editor",
-  "version": "13.18.1",
+  "version": "13.19.0",
   "description": "Markdown wysiwyg and markup editor",
   "license": "MIT",
   "repository": {