@gravity-ui/markdown-editor 13.20.0 → 13.21.0

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

@@ -1,2 +1,6 @@
+import { newlineInCode } from 'prosemirror-commands';
 import type { Command } from 'prosemirror-state';
+import type { ExtensionDeps } from '../../../core';
+export { newlineInCode };
 export declare const resetCodeblock: Command;
+export declare const setCodeBlockType: ({ serializer }: ExtensionDeps) => Command;

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

@@ -1,15 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetCodeblock = void 0;
+exports.setCodeBlockType = exports.resetCodeblock = exports.newlineInCode = void 0;
+const prosemirror_commands_1 = require("prosemirror-commands");
+Object.defineProperty(exports, "newlineInCode", { enumerable: true, get: function () { return prosemirror_commands_1.newlineInCode; } });
 const BaseSchema_1 = require("../../base/BaseSchema");
 const const_1 = require("./const");
 const resetCodeblock = (state, dispatch, view) => {
     const { selection } = state;
     if (selection.empty &&
-        selection.$from.parent.type === (0, const_1.cbType)(state.schema) &&
+        selection.$from.parent.type === (0, const_1.codeBlockType)(state.schema) &&
         (view === null || view === void 0 ? void 0 : view.endOfTextblock('backward', state))) {
         return (0, BaseSchema_1.toParagraph)(state, dispatch, view);
     }
     return false;
 };
 exports.resetCodeblock = resetCodeblock;
+const setCodeBlockType = ({ serializer }) => (state, dispatch) => {
+    const nodeType = (0, const_1.codeBlockType)(state.schema);
+    if (!(0, prosemirror_commands_1.setBlockType)(nodeType)(state))
+        return false;
+    if (dispatch) {
+        const markup = serializer.serialize(state.selection.content().content);
+        dispatch(state.tr.replaceSelectionWith(nodeType.createAndFill({}, markup ? state.schema.text(markup) : null)));
+    }
+    return true;
+};
+exports.setCodeBlockType = setCodeBlockType;

package/build/cjs/extensions/markdown/CodeBlock/const.d.ts

@@ -1,4 +1,6 @@
+import { codeBlockType } from './CodeBlockSpecs';
 export { codeBlockNodeName, codeBlockLangAttr, CodeBlockNodeAttr as CodeBlockAttr, } from './CodeBlockSpecs';
 export declare const cbAction = "toCodeBlock";
 /** @deprecated Use `codeBlockType` instead */
 export declare const cbType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
+export { codeBlockType };

package/build/cjs/extensions/markdown/CodeBlock/const.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cbType = exports.cbAction = exports.CodeBlockAttr = exports.codeBlockLangAttr = exports.codeBlockNodeName = void 0;
+exports.codeBlockType = exports.cbType = exports.cbAction = exports.CodeBlockAttr = exports.codeBlockLangAttr = exports.codeBlockNodeName = void 0;
 const CodeBlockSpecs_1 = require("./CodeBlockSpecs");
+Object.defineProperty(exports, "codeBlockType", { enumerable: true, get: function () { return CodeBlockSpecs_1.codeBlockType; } });
 var CodeBlockSpecs_2 = require("./CodeBlockSpecs");
 Object.defineProperty(exports, "codeBlockNodeName", { enumerable: true, get: function () { return CodeBlockSpecs_2.codeBlockNodeName; } });
 Object.defineProperty(exports, "codeBlockLangAttr", { enumerable: true, get: function () { return CodeBlockSpecs_2.codeBlockLangAttr; } });

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

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodeBlock = exports.codeBlockType = exports.codeBlockLangAttr = exports.CodeBlockNodeAttr = exports.codeBlockNodeName = exports.resetCodeblock = void 0;
-const prosemirror_commands_1 = require("prosemirror-commands");
-const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const lodash_1 = require("../../../lodash");
 const inputrules_1 = require("../../../utils/inputrules");
@@ -24,28 +22,19 @@ const CodeBlock = (builder, opts) => {
     builder.use(CodeBlockSpecs_1.CodeBlockSpecs, opts);
     builder.addKeymap((deps) => {
         const { codeBlockKey } = opts;
-        const bindings = { Enter: prosemirror_commands_1.newlineInCode, Backspace: commands_1.resetCodeblock };
+        const bindings = { Enter: commands_1.newlineInCode, Backspace: commands_1.resetCodeblock };
         if (codeBlockKey) {
-            bindings[codeBlockKey] = (0, keymap_1.withLogAction)('code_block', (0, prosemirror_commands_1.setBlockType)((0, const_1.cbType)(deps.schema)));
+            bindings[codeBlockKey] = (0, keymap_1.withLogAction)('code_block', (0, commands_1.setCodeBlockType)(deps));
         }
         return bindings;
     });
-    builder.addInputRules(({ schema }) => ({ rules: [codeBlockRule((0, const_1.cbType)(schema))] }));
-    builder.addAction(const_1.cbAction, ({ schema, serializer }) => {
-        const cb = (0, const_1.cbType)(schema);
-        const cmd = (state, dispatch) => {
-            if (!(0, prosemirror_commands_1.setBlockType)(cb)(state))
-                return false;
-            if (dispatch) {
-                const markup = serializer.serialize(prosemirror_model_1.Fragment.from(state.selection.content().content));
-                dispatch(state.tr.replaceSelectionWith(cb.createAndFill({}, markup ? state.schema.text(markup) : null)));
-            }
-            return true;
-        };
+    builder.addInputRules(({ schema }) => ({ rules: [codeBlockRule((0, const_1.codeBlockType)(schema))] }));
+    builder.addAction(const_1.cbAction, (deps) => {
+        const cb = (0, const_1.codeBlockType)(deps.schema);
         return {
             isActive: (state) => (0, prosemirror_utils_1.hasParentNodeOfType)(cb)(state.selection),
-            isEnable: cmd,
-            run: cmd,
+            isEnable: (0, commands_1.setCodeBlockType)(deps),
+            run: (0, commands_1.setCodeBlockType)(deps),
         };
     });
     builder.addPlugin(codeBlockPastePlugin_1.codeBlockPastePlugin, builder.Priority.High);

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

@@ -54,6 +54,10 @@ function createCodemirror(params) {
             },
         },
         { key: 'Tab', preventDefault: true, run: commands_1.insertTab },
+        {
+            key: 'Enter',
+            shift: commands_1.insertNewlineKeepIndent,
+        },
         commands_1.indentWithTab,
         ...commands_1.defaultKeymap,
         ...(disabledExtensions.history ? [] : commands_1.historyKeymap),

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.20.0' !== 'undefined' ? '13.20.0' : 'unknown';
+exports.VERSION = typeof '13.21.0' !== 'undefined' ? '13.21.0' : 'unknown';

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

@@ -1,2 +1,6 @@
+import { newlineInCode } from 'prosemirror-commands';
 import type { Command } from 'prosemirror-state';
+import type { ExtensionDeps } from '../../../core';
+export { newlineInCode };
 export declare const resetCodeblock: Command;
+export declare const setCodeBlockType: ({ serializer }: ExtensionDeps) => Command;

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

@@ -1,11 +1,23 @@
+import { newlineInCode, setBlockType } from 'prosemirror-commands';
 import { toParagraph } from '../../base/BaseSchema';
-import { cbType } from './const';
+import { codeBlockType } from './const';
+export { newlineInCode };
 export const resetCodeblock = (state, dispatch, view) => {
     const { selection } = state;
     if (selection.empty &&
-        selection.$from.parent.type === cbType(state.schema) &&
+        selection.$from.parent.type === codeBlockType(state.schema) &&
         (view === null || view === void 0 ? void 0 : view.endOfTextblock('backward', state))) {
         return toParagraph(state, dispatch, view);
     }
     return false;
 };
+export const setCodeBlockType = ({ serializer }) => (state, dispatch) => {
+    const nodeType = codeBlockType(state.schema);
+    if (!setBlockType(nodeType)(state))
+        return false;
+    if (dispatch) {
+        const markup = serializer.serialize(state.selection.content().content);
+        dispatch(state.tr.replaceSelectionWith(nodeType.createAndFill({}, markup ? state.schema.text(markup) : null)));
+    }
+    return true;
+};

package/build/esm/extensions/markdown/CodeBlock/const.d.ts

@@ -1,4 +1,6 @@
+import { codeBlockType } from './CodeBlockSpecs';
 export { codeBlockNodeName, codeBlockLangAttr, CodeBlockNodeAttr as CodeBlockAttr, } from './CodeBlockSpecs';
 export declare const cbAction = "toCodeBlock";
 /** @deprecated Use `codeBlockType` instead */
 export declare const cbType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
+export { codeBlockType };

package/build/esm/extensions/markdown/CodeBlock/const.js

@@ -3,3 +3,4 @@ export { codeBlockNodeName, codeBlockLangAttr, CodeBlockNodeAttr as CodeBlockAtt
 export const cbAction = 'toCodeBlock';
 /** @deprecated Use `codeBlockType` instead */
 export const cbType = codeBlockType;
+export { codeBlockType };

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

@@ -1,13 +1,11 @@
-import { newlineInCode, setBlockType } from 'prosemirror-commands';
-import { Fragment } from 'prosemirror-model';
 import { hasParentNodeOfType } from 'prosemirror-utils';
 import { isFunction } from '../../../lodash';
 import { textblockTypeInputRule } from '../../../utils/inputrules';
 import { withLogAction } from '../../../utils/keymap';
 import { CodeBlockHighlight } from './CodeBlockHighlight/CodeBlockHighlight';
 import { CodeBlockSpecs } from './CodeBlockSpecs';
-import { resetCodeblock } from './commands';
-import { cbAction, cbType } from './const';
+import { newlineInCode, resetCodeblock, setCodeBlockType } from './commands';
+import { cbAction, codeBlockType } from './const';
 import { codeBlockPastePlugin } from './plugins/codeBlockPastePlugin';
 export { resetCodeblock } from './commands';
 export { codeBlockNodeName, CodeBlockNodeAttr, codeBlockLangAttr, codeBlockType, } from './CodeBlockSpecs';
@@ -18,26 +16,17 @@ export const CodeBlock = (builder, opts) => {
         const { codeBlockKey } = opts;
         const bindings = { Enter: newlineInCode, Backspace: resetCodeblock };
         if (codeBlockKey) {
-            bindings[codeBlockKey] = withLogAction('code_block', setBlockType(cbType(deps.schema)));
+            bindings[codeBlockKey] = withLogAction('code_block', setCodeBlockType(deps));
         }
         return bindings;
     });
-    builder.addInputRules(({ schema }) => ({ rules: [codeBlockRule(cbType(schema))] }));
-    builder.addAction(cbAction, ({ schema, serializer }) => {
-        const cb = cbType(schema);
-        const cmd = (state, dispatch) => {
-            if (!setBlockType(cb)(state))
-                return false;
-            if (dispatch) {
-                const markup = serializer.serialize(Fragment.from(state.selection.content().content));
-                dispatch(state.tr.replaceSelectionWith(cb.createAndFill({}, markup ? state.schema.text(markup) : null)));
-            }
-            return true;
-        };
+    builder.addInputRules(({ schema }) => ({ rules: [codeBlockRule(codeBlockType(schema))] }));
+    builder.addAction(cbAction, (deps) => {
+        const cb = codeBlockType(deps.schema);
         return {
             isActive: (state) => hasParentNodeOfType(cb)(state.selection),
-            isEnable: cmd,
-            run: cmd,
+            isEnable: setCodeBlockType(deps),
+            run: setCodeBlockType(deps),
         };
     });
     builder.addPlugin(codeBlockPastePlugin, builder.Priority.High);

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

@@ -1,5 +1,5 @@
 import { autocompletion } from '@codemirror/autocomplete';
-import { defaultKeymap, history, historyKeymap, indentWithTab, insertTab, } from '@codemirror/commands';
+import { defaultKeymap, history, historyKeymap, indentWithTab, insertNewlineKeepIndent, insertTab, } from '@codemirror/commands';
 import { syntaxHighlighting } from '@codemirror/language';
 import { EditorView, keymap, placeholder } from '@codemirror/view';
 import { ActionName } from '../../bundle/config/action-names';
@@ -51,6 +51,10 @@ export function createCodemirror(params) {
             },
         },
         { key: 'Tab', preventDefault: true, run: insertTab },
+        {
+            key: 'Enter',
+            shift: insertNewlineKeepIndent,
+        },
         indentWithTab,
         ...defaultKeymap,
         ...(disabledExtensions.history ? [] : historyKeymap),

package/build/esm/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/markdown-editor",
-  "version": "13.20.0",
+  "version": "13.21.0",
   "description": "Markdown wysiwyg and markup editor",
   "license": "MIT",
   "repository": {
@@ -165,7 +165,7 @@
     "@codemirror/language": "6.10.1",
     "@codemirror/search": "6.5.6",
     "@codemirror/state": "6.4.1",
-    "@codemirror/view": "6.26.3",
+    "@codemirror/view": "6.28.0",
     "@gravity-ui/i18n": "^1.1.0",
     "@gravity-ui/icons": "^2.10.0",
     "@lezer/highlight": "1.2.0",