@gravity-ui/markdown-editor 13.14.0 → 13.15.0

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

@@ -63,6 +63,8 @@ export declare type MarkupConfig = {
      * See more https://codemirror.net/docs/ref/#state.EditorState.languageDataAt
      */
     languageData?: YfmLangOptions['languageData'];
+    /** Config for @codemirror/autocomplete https://codemirror.net/docs/ref/#autocomplete.autocompletion%5Econfig */
+    autocompletion?: CreateCodemirrorParams['autocompletion'];
 };
 export declare type EscapeConfig = {
     commonEscape?: RegExp;

package/build/cjs/bundle/Editor.js

@@ -165,6 +165,7 @@ class EditorImpl extends event_emitter_1.SafeEventEmitter {
                 disabledExtensions: tslib_1.__classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").disabledExtensions,
                 keymaps: tslib_1.__classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").keymaps,
                 yfmLangOptions: { languageData: tslib_1.__classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").languageData },
+                autocompletion: tslib_1.__classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").autocompletion,
                 receiver: this,
             })), "f");
         }

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

@@ -23,12 +23,20 @@ const YfmHeadingSpecs = (builder, opts) => {
                 defining: true,
                 selectable: true,
                 parseDOM: [
-                    { tag: 'h1', getAttrs: (0, utils_1.getNodeAttrs)(1) },
-                    { tag: 'h2', getAttrs: (0, utils_1.getNodeAttrs)(2) },
-                    { tag: 'h3', getAttrs: (0, utils_1.getNodeAttrs)(3) },
-                    { tag: 'h4', getAttrs: (0, utils_1.getNodeAttrs)(4) },
-                    { tag: 'h5', getAttrs: (0, utils_1.getNodeAttrs)(5) },
-                    { tag: 'h6', getAttrs: (0, utils_1.getNodeAttrs)(6) },
+                    { tag: 'h1', getAttrs: (0, utils_1.getNodeAttrs)(1), priority: 100, consuming: true },
+                    { tag: 'h2', getAttrs: (0, utils_1.getNodeAttrs)(2), priority: 100, consuming: true },
+                    { tag: 'h3', getAttrs: (0, utils_1.getNodeAttrs)(3), priority: 100, consuming: true },
+                    { tag: 'h4', getAttrs: (0, utils_1.getNodeAttrs)(4), priority: 100, consuming: true },
+                    { tag: 'h5', getAttrs: (0, utils_1.getNodeAttrs)(5), priority: 100, consuming: true },
+                    { tag: 'h6', getAttrs: (0, utils_1.getNodeAttrs)(6), priority: 100, consuming: true },
+                    {
+                        // ignore anchor link inside headings
+                        tag: 'a.yfm-anchor',
+                        context: `${const_1.headingNodeName}/`,
+                        skip: true,
+                        ignore: true,
+                        priority: 1000,
+                    },
                 ],
                 toDOM(node) {
                     const id = node.attrs[const_1.YfmHeadingAttr.Id];

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

@@ -1,12 +1,9 @@
-import { BaseTarget, StylesObject } from '@diplodoc/html-extension/plugin';
+import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
 import type { ExtensionNodeSpec } from '../../../../core';
 export { yfmHtmlBlockNodeName } from './const';
-export declare type YfmHtmlBlockSpecsOptions = {
+export interface YfmHtmlBlockSpecsOptions extends Omit<PluginOptions, 'runtimeJsPath' | 'containerClasses' | 'bundle'> {
     nodeView?: ExtensionNodeSpec['view'];
-    sanitize?: (dirtyHtml: string) => string;
-    styles?: string | StylesObject;
-    baseTarget?: BaseTarget;
-};
+}
 export declare const YfmHtmlBlockSpecs: import("../../../../core").ExtensionWithOptions<YfmHtmlBlockSpecsOptions> & {
     readonly NodeName: "yfm_html_block";
     readonly NodeAttrs: typeof import("./const").YfmHtmlBlockAttrs;

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

@@ -1,14 +1,10 @@
-import { BaseTarget, StylesObject } from '@diplodoc/html-extension/plugin';
+import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
 import type { IHTMLIFrameElementConfig } from '@diplodoc/html-extension/runtime';
 import { Action, ExtensionAuto } from '../../../core';
 import { YfmHtmlBlockAction } from './YfmHtmlBlockSpecs/const';
-export declare type YfmHtmlBlockOptions = {
+export interface YfmHtmlBlockOptions extends Omit<PluginOptions, 'runtimeJsPath' | 'containerClasses' | 'bundle'> {
     useConfig?: () => IHTMLIFrameElementConfig | undefined;
-    sanitize?: (dirtyHtml: string) => string;
-    styles?: string | StylesObject;
-    baseTarget?: BaseTarget;
-    head?: string;
-};
+}
 export declare const YfmHtmlBlock: ExtensionAuto<YfmHtmlBlockOptions>;
 declare global {
     namespace WysiwygEditor {

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

@@ -1,3 +1,4 @@
+import { autocompletion } from '@codemirror/autocomplete';
 import type { Extension, StateCommand } from '@codemirror/state';
 import { EditorView, EditorViewConfig, KeyBinding } from '@codemirror/view';
 import { EventMap } from '../../bundle/Editor';
@@ -6,6 +7,7 @@ import { Receiver } from '../../utils';
 import { FileUploadHandler } from './files-upload-facet';
 import { type YfmLangOptions } from './yfm';
 export type { YfmLangOptions };
+declare type Autocompletion = Parameters<typeof autocompletion>[0];
 export declare type CreateCodemirrorParams = {
     doc: EditorViewConfig['doc'];
     placeholderText: string;
@@ -24,6 +26,7 @@ export declare type CreateCodemirrorParams = {
     keymaps?: readonly KeyBinding[];
     receiver?: Receiver<EventMap>;
     yfmLangOptions?: YfmLangOptions;
+    autocompletion?: Autocompletion;
 };
 export declare function createCodemirror(params: CreateCodemirrorParams): EditorView;
 export declare function withLogger(action: string, command: StateCommand): StateCommand;

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

@@ -16,7 +16,7 @@ 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, } = 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)];
     if (!disabledExtensions.history) {
         extensions.push((0, commands_1.history)());
@@ -58,7 +58,7 @@ function createCodemirror(params) {
         ...commands_1.defaultKeymap,
         ...(disabledExtensions.history ? [] : commands_1.historyKeymap),
         ...keymaps,
-    ]), (0, autocomplete_1.autocompletion)(), (0, yfm_1.yfmLang)(yfmLangOptions), react_facet_1.ReactRendererFacet.of(reactRenderer), pairing_chars_1.PairingCharactersExtension, view_1.EditorView.lineWrapping, view_1.EditorView.contentAttributes.of({ spellcheck: 'true' }), view_1.EditorView.domEventHandlers({
+    ]), (0, autocomplete_1.autocompletion)(autocompletionConfig), (0, yfm_1.yfmLang)(yfmLangOptions), react_facet_1.ReactRendererFacet.of(reactRenderer), pairing_chars_1.PairingCharactersExtension, view_1.EditorView.lineWrapping, view_1.EditorView.contentAttributes.of({ spellcheck: 'true' }), view_1.EditorView.domEventHandlers({
         scroll(event) {
             onScroll(event);
         },

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.14.0' !== 'undefined' ? '13.14.0' : 'unknown';
+exports.VERSION = typeof '13.15.0' !== 'undefined' ? '13.15.0' : 'unknown';

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

@@ -63,6 +63,8 @@ export declare type MarkupConfig = {
      * See more https://codemirror.net/docs/ref/#state.EditorState.languageDataAt
      */
     languageData?: YfmLangOptions['languageData'];
+    /** Config for @codemirror/autocomplete https://codemirror.net/docs/ref/#autocomplete.autocompletion%5Econfig */
+    autocompletion?: CreateCodemirrorParams['autocompletion'];
 };
 export declare type EscapeConfig = {
     commonEscape?: RegExp;

package/build/esm/bundle/Editor.js

@@ -162,6 +162,7 @@ export class EditorImpl extends SafeEventEmitter {
                 disabledExtensions: __classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").disabledExtensions,
                 keymaps: __classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").keymaps,
                 yfmLangOptions: { languageData: __classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").languageData },
+                autocompletion: __classPrivateFieldGet(this, _EditorImpl_markupConfig, "f").autocompletion,
                 receiver: this,
             })), "f");
         }

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

@@ -19,12 +19,20 @@ export const YfmHeadingSpecs = (builder, opts) => {
                 defining: true,
                 selectable: true,
                 parseDOM: [
-                    { tag: 'h1', getAttrs: getNodeAttrs(1) },
-                    { tag: 'h2', getAttrs: getNodeAttrs(2) },
-                    { tag: 'h3', getAttrs: getNodeAttrs(3) },
-                    { tag: 'h4', getAttrs: getNodeAttrs(4) },
-                    { tag: 'h5', getAttrs: getNodeAttrs(5) },
-                    { tag: 'h6', getAttrs: getNodeAttrs(6) },
+                    { tag: 'h1', getAttrs: getNodeAttrs(1), priority: 100, consuming: true },
+                    { tag: 'h2', getAttrs: getNodeAttrs(2), priority: 100, consuming: true },
+                    { tag: 'h3', getAttrs: getNodeAttrs(3), priority: 100, consuming: true },
+                    { tag: 'h4', getAttrs: getNodeAttrs(4), priority: 100, consuming: true },
+                    { tag: 'h5', getAttrs: getNodeAttrs(5), priority: 100, consuming: true },
+                    { tag: 'h6', getAttrs: getNodeAttrs(6), priority: 100, consuming: true },
+                    {
+                        // ignore anchor link inside headings
+                        tag: 'a.yfm-anchor',
+                        context: `${headingNodeName}/`,
+                        skip: true,
+                        ignore: true,
+                        priority: 1000,
+                    },
                 ],
                 toDOM(node) {
                     const id = node.attrs[YfmHeadingAttr.Id];

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

@@ -1,12 +1,9 @@
-import { BaseTarget, StylesObject } from '@diplodoc/html-extension/plugin';
+import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
 import type { ExtensionNodeSpec } from '../../../../core';
 export { yfmHtmlBlockNodeName } from './const';
-export declare type YfmHtmlBlockSpecsOptions = {
+export interface YfmHtmlBlockSpecsOptions extends Omit<PluginOptions, 'runtimeJsPath' | 'containerClasses' | 'bundle'> {
     nodeView?: ExtensionNodeSpec['view'];
-    sanitize?: (dirtyHtml: string) => string;
-    styles?: string | StylesObject;
-    baseTarget?: BaseTarget;
-};
+}
 export declare const YfmHtmlBlockSpecs: import("../../../../core").ExtensionWithOptions<YfmHtmlBlockSpecsOptions> & {
     readonly NodeName: "yfm_html_block";
     readonly NodeAttrs: typeof import("./const").YfmHtmlBlockAttrs;

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

@@ -1,14 +1,10 @@
-import { BaseTarget, StylesObject } from '@diplodoc/html-extension/plugin';
+import { PluginOptions } from '@diplodoc/html-extension/plugin/transform';
 import type { IHTMLIFrameElementConfig } from '@diplodoc/html-extension/runtime';
 import { Action, ExtensionAuto } from '../../../core';
 import { YfmHtmlBlockAction } from './YfmHtmlBlockSpecs/const';
-export declare type YfmHtmlBlockOptions = {
+export interface YfmHtmlBlockOptions extends Omit<PluginOptions, 'runtimeJsPath' | 'containerClasses' | 'bundle'> {
     useConfig?: () => IHTMLIFrameElementConfig | undefined;
-    sanitize?: (dirtyHtml: string) => string;
-    styles?: string | StylesObject;
-    baseTarget?: BaseTarget;
-    head?: string;
-};
+}
 export declare const YfmHtmlBlock: ExtensionAuto<YfmHtmlBlockOptions>;
 declare global {
     namespace WysiwygEditor {

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

@@ -1,3 +1,4 @@
+import { autocompletion } from '@codemirror/autocomplete';
 import type { Extension, StateCommand } from '@codemirror/state';
 import { EditorView, EditorViewConfig, KeyBinding } from '@codemirror/view';
 import { EventMap } from '../../bundle/Editor';
@@ -6,6 +7,7 @@ import { Receiver } from '../../utils';
 import { FileUploadHandler } from './files-upload-facet';
 import { type YfmLangOptions } from './yfm';
 export type { YfmLangOptions };
+declare type Autocompletion = Parameters<typeof autocompletion>[0];
 export declare type CreateCodemirrorParams = {
     doc: EditorViewConfig['doc'];
     placeholderText: string;
@@ -24,6 +26,7 @@ export declare type CreateCodemirrorParams = {
     keymaps?: readonly KeyBinding[];
     receiver?: Receiver<EventMap>;
     yfmLangOptions?: YfmLangOptions;
+    autocompletion?: Autocompletion;
 };
 export declare function createCodemirror(params: CreateCodemirrorParams): EditorView;
 export declare function withLogger(action: string, command: StateCommand): StateCommand;

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

@@ -13,7 +13,7 @@ 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, } = params;
+    const { doc, placeholderText, reactRenderer, onCancel, onScroll, onSubmit, onChange, onDocChange, extensions: extraExtensions, disabledExtensions = {}, keymaps = [], receiver, yfmLangOptions, autocompletion: autocompletionConfig, } = params;
     const extensions = [gravityTheme, placeholder(placeholderText)];
     if (!disabledExtensions.history) {
         extensions.push(history());
@@ -55,7 +55,7 @@ export function createCodemirror(params) {
         ...defaultKeymap,
         ...(disabledExtensions.history ? [] : historyKeymap),
         ...keymaps,
-    ]), autocompletion(), yfmLang(yfmLangOptions), ReactRendererFacet.of(reactRenderer), PairingCharactersExtension, EditorView.lineWrapping, EditorView.contentAttributes.of({ spellcheck: 'true' }), EditorView.domEventHandlers({
+    ]), autocompletion(autocompletionConfig), yfmLang(yfmLangOptions), ReactRendererFacet.of(reactRenderer), PairingCharactersExtension, EditorView.lineWrapping, EditorView.contentAttributes.of({ spellcheck: 'true' }), EditorView.domEventHandlers({
         scroll(event) {
             onScroll(event);
         },

package/build/esm/version.js

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

package/package.json

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