feat: merge master

Author: Полеводин Дмитрий Игоревич (4094029)

.github/workflows/release.yml

@@ -18,3 +18,9 @@ jobs:
           node-version: 18
           default-branch: ${{ github.ref_name != 'main' && github.ref_name || null }}
           npm-dist-tag: ${{ github.ref_name != 'main' && 'untagged' || 'latest' }}
+          changelog-types: >
+            [{"type":"feat","section":"Features","hidden":false},
+             {"type":"fix","section":"Bug Fixes","hidden":false},
+             {"type":"refactor","section":"Refactoring","hidden":false},
+             {"type":"perf","section":"Performance Improvements","hidden":false}]
+

.storybook/main.ts

@@ -38,6 +38,8 @@ const config: StorybookConfig = {
             config.resolve.alias[alias] = resolve(baseUrl, paths[alias][0])
         }
 
+        config.resolve.alias['demo/*'] = resolve(__dirname, '..', 'demo/*');
+
         return config;
     },
 };

CHANGELOG.md

@@ -1,5 +1,78 @@
 # Changelog
 
+## [15.11.1](https://github.com/gravity-ui/markdown-editor/compare/v15.11.0...v15.11.1) (2025-05-13)
+
+
+### Bug Fixes
+
+* don't paste url as image if shift pressed ([#750](https://github.com/gravity-ui/markdown-editor/issues/750)) ([1dd30c8](https://github.com/gravity-ui/markdown-editor/commit/1dd30c8cc4dabfc650f399f922259a710bf0f2aa))
+* **markup:** fixed paste handling in markup mode ([7ae1d59](https://github.com/gravity-ui/markdown-editor/commit/7ae1d59710b93cd559c7903992c691cac484610a))
+* **styles:** added spacing rules to prevent jumps when editing lists ([#751](https://github.com/gravity-ui/markdown-editor/issues/751)) ([9059b84](https://github.com/gravity-ui/markdown-editor/commit/9059b84c25e558a77bcc2cdd06a528f5dfdedf47))
+
+## [15.11.0](https://github.com/gravity-ui/markdown-editor/compare/v15.10.1...v15.11.0) (2025-04-29)
+
+
+### Features
+
+* **bundle:** added customization of display of the settings block ([#740](https://github.com/gravity-ui/markdown-editor/issues/740)) ([6e863a3](https://github.com/gravity-ui/markdown-editor/commit/6e863a350f5ad1cf6f7801e600afd4fd3930eeba))
+* **Gpt:** changed hotkey to open gpt popup ([#741](https://github.com/gravity-ui/markdown-editor/issues/741)) ([ccdf761](https://github.com/gravity-ui/markdown-editor/commit/ccdf76102488db57f51c8f1cca8e67f84f563007))
+
+
+### Bug Fixes
+
+* **Lists:** fixed toolbar button activation for sink list item ([#744](https://github.com/gravity-ui/markdown-editor/issues/744)) ([f556e08](https://github.com/gravity-ui/markdown-editor/commit/f556e08df79c1bbadb43c70e53e533c68cc0f589))
+
+## [15.10.1](https://github.com/gravity-ui/markdown-editor/compare/v15.10.0...v15.10.1) (2025-04-25)
+
+
+### Bug Fixes
+
+* **markup:** fix pasting image urls to link lines ([#738](https://github.com/gravity-ui/markdown-editor/issues/738)) ([2dfba92](https://github.com/gravity-ui/markdown-editor/commit/2dfba92d97884c0d2506ec2d558cb91e7b7a301d))
+
+## [15.10.0](https://github.com/gravity-ui/markdown-editor/compare/v15.9.0...v15.10.0) (2025-04-24)
+
+
+### Features
+
+* **markup:** allow to disable search panel ([#736](https://github.com/gravity-ui/markdown-editor/issues/736)) ([1ecb513](https://github.com/gravity-ui/markdown-editor/commit/1ecb5137e4170d7eab7a4d433721ef21b76272a4))
+
+## [15.9.0](https://github.com/gravity-ui/markdown-editor/compare/v15.8.1...v15.9.0) (2025-04-23)
+
+
+### Features
+
+* **SelectionContext:** allow to change popup placement behavior ([#732](https://github.com/gravity-ui/markdown-editor/issues/732)) ([52e72e7](https://github.com/gravity-ui/markdown-editor/commit/52e72e74c2b3f90f8bfc0f28155383da1573d1ec))
+
+
+### Bug Fixes
+
+* resolved log func via named import to avoid default mismatch ([#733](https://github.com/gravity-ui/markdown-editor/issues/733)) ([13906ed](https://github.com/gravity-ui/markdown-editor/commit/13906edfeb639ef6ffbe06bc4c77c58981127f28))
+
+## [15.8.1](https://github.com/gravity-ui/markdown-editor/compare/v15.8.0...v15.8.1) (2025-04-18)
+
+
+### Bug Fixes
+
+* **gpt:** fix gpt markup action for preset ([#727](https://github.com/gravity-ui/markdown-editor/issues/727)) ([9221b3a](https://github.com/gravity-ui/markdown-editor/commit/9221b3a5d9efb6c336f58cae5bfe620e61d87ab4))
+
+## [15.8.0](https://github.com/gravity-ui/markdown-editor/compare/v15.7.0...v15.8.0) (2025-04-17)
+
+
+### Features
+
+* **image:** move selection to the image title on toolbar item click ([#725](https://github.com/gravity-ui/markdown-editor/issues/725)) ([68096df](https://github.com/gravity-ui/markdown-editor/commit/68096df110a5d232290a35d30b31c4d99766d5e7))
+
+
+### Bug Fixes
+
+* **markup:** fix pasting image urls to link lines ([#721](https://github.com/gravity-ui/markdown-editor/issues/721)) ([2fddf0a](https://github.com/gravity-ui/markdown-editor/commit/2fddf0a80d43a53630f2228b78ba89ec335c916c))
+* **QuoteLink:** move clipboard button style to the plugin styles ([#724](https://github.com/gravity-ui/markdown-editor/issues/724)) ([8b65ebd](https://github.com/gravity-ui/markdown-editor/commit/8b65ebd426945de60e986874c8241921c0adf252))
+
+
+### Refactoring
+
+* **bundle:** move editor content to additional component ([#722](https://github.com/gravity-ui/markdown-editor/issues/722)) ([2b94fd3](https://github.com/gravity-ui/markdown-editor/commit/2b94fd36c4a9717252fb8dae790dc0c5574fa4a4))
+  
 ## [15.7.0](https://github.com/gravity-ui/markdown-editor/compare/v15.6.1...v15.7.0) (2025-04-15)
 
 

demo/components/Playground.tsx

@@ -5,6 +5,7 @@ import {defaultOptions} from '@diplodoc/transform/lib/sanitize';
 import {Button, DropdownMenu} from '@gravity-ui/uikit';
 
 import type {ToolbarActionData} from 'src/bundle/Editor';
+import type {SettingItems} from 'src/bundle/settings';
 import type {Extension} from 'src/cm/state';
 import {FoldingHeading} from 'src/extensions/additional/FoldingHeading';
 import {Math} from 'src/extensions/additional/Math';
@@ -57,7 +58,7 @@ const wCommandMenuConfig = wysiwygToolbarConfigs.wCommandMenuConfig.concat(
 export type PlaygroundProps = {
     initial?: MarkupString;
     allowHTML?: boolean;
-    settingsVisible?: boolean;
+    settingsVisible?: boolean | SettingItems[];
     initialEditor?: MarkdownEditorMode;
     preserveEmptyRows?: boolean;
     breaks?: boolean;
@@ -67,6 +68,7 @@ export type PlaygroundProps = {
     sanitizeHtml?: boolean;
     prepareRawMarkup?: boolean;
     splitModeOrientation?: 'horizontal' | 'vertical' | false;
+    searchPanel?: boolean;
     stickyToolbar?: boolean;
     initialSplitModeEnabled?: boolean;
     renderPreviewDefined?: boolean;
@@ -80,6 +82,7 @@ export type PlaygroundProps = {
     directiveSyntax?: DirectiveSyntaxValue;
     disabledHTMLBlockModes?: EmbeddingMode[];
     disableMarkdownItAttrs?: boolean;
+    markupParseHtmlOnPaste?: boolean;
 } & Pick<UseMarkdownEditorProps, 'experimental' | 'wysiwygConfig'> &
     Pick<
         MarkdownEditorViewProps,
@@ -114,6 +117,7 @@ export const Playground = memo<PlaygroundProps>((props) => {
         sanitizeHtml,
         prepareRawMarkup,
         splitModeOrientation,
+        searchPanel,
         stickyToolbar,
         renderPreviewDefined,
         height,
@@ -130,6 +134,7 @@ export const Playground = memo<PlaygroundProps>((props) => {
         directiveSyntax,
         disabledHTMLBlockModes,
         disableMarkdownItAttrs,
+        markupParseHtmlOnPaste,
     } = props;
     const [editorMode, setEditorMode] = useState<MarkdownEditorMode>(initialEditor ?? 'wysiwyg');
     const [mdRaw, setMdRaw] = useState<MarkupString>(initial || '');
@@ -225,18 +230,20 @@ export const Playground = memo<PlaygroundProps>((props) => {
                 uploadFile: fileUploadHandler,
             },
             experimental: {
-                ...experimental,
                 directiveSyntax,
                 preserveEmptyRows,
                 prepareRawMarkup: prepareRawMarkup
                     ? (value) => '**prepare raw markup**\n\n' + value
                     : undefined,
+                ...experimental,
             },
             markupConfig: {
+                parseHtmlOnPaste: true,
                 extensions: markupConfigExtensions,
                 parseInsertedUrlAsImage,
                 renderPreview,
                 splitMode: splitModeOrientation,
+                searchPanel,
             },
         },
         [
@@ -245,6 +252,7 @@ export const Playground = memo<PlaygroundProps>((props) => {
             linkifyTlds,
             breaks,
             splitModeOrientation,
+            searchPanel,
             renderPreviewDefined,
             renderPreview,
             experimental?.needToSetDimensionsForUploadedImages,
@@ -253,8 +261,10 @@ export const Playground = memo<PlaygroundProps>((props) => {
             experimental?.needToSetDimensionsForUploadedImages,
             experimental?.beforeEditorModeChange,
             experimental?.prepareRawMarkup,
+            experimental?.preserveEmptyRows,
             directiveSyntax,
             disableMarkdownItAttrs,
+            markupParseHtmlOnPaste,
         ],
     );
 

demo/components/PlaygroundMini.tsx

@@ -15,6 +15,7 @@ export type PlaygroundMiniProps = Pick<
     | 'sanitizeHtml'
     | 'prepareRawMarkup'
     | 'splitModeOrientation'
+    | 'searchPanel'
     | 'stickyToolbar'
     | 'initialSplitModeEnabled'
     | 'renderPreviewDefined'

demo/defaults/args.ts

@@ -12,6 +12,7 @@ export const args: Meta<PlaygroundMiniProps>['args'] = {
     sanitizeHtml: false,
     prepareRawMarkup: false,
     splitModeOrientation: 'horizontal',
+    searchPanel: true,
     stickyToolbar: true,
     initialSplitModeEnabled: false,
     renderPreviewDefined: true,

demo/defaults/content.ts

@@ -276,3 +276,29 @@ And ##monospace## can be **##com##**##bined\\*##
 ---
 
 `.trim();
+
+export const loremIpsum = `
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse enim nisl, tincidunt sit amet auctor vitae, ullamcorper non urna. In feugiat sagittis risus, sit amet accumsan nisi consequat sit amet. Aenean a molestie tellus, vitae volutpat ante. Integer sagittis, turpis a blandit consequat, risus sem consequat ex, at elementum odio diam id nibh. Nam nec neque enim. Integer a risus mattis, lacinia ante nec, commodo eros. Cras erat erat, finibus vitae blandit ut, pulvinar sed quam. Vivamus porta, ipsum non pharetra porttitor, enim felis vestibulum nunc, eget tincidunt erat turpis nec risus. Fusce mollis neque ac porttitor mattis. Aliquam ultrices sagittis bibendum. Praesent a nisi eleifend metus congue fermentum.
+
+Sed egestas enim ac massa varius mattis. Donec scelerisque maximus ultricies. Sed a laoreet dui, at porta enim. Maecenas accumsan a neque et luctus. Nullam venenatis nunc velit, sit amet egestas nisl elementum eu. Sed lobortis volutpat est eu facilisis. Aenean vitae tortor ac massa sagittis tristique at et leo. Nullam faucibus nulla eu vehicula pharetra. Nullam molestie interdum ligula eu malesuada. Pellentesque mauris nunc, volutpat sit amet pretium in, malesuada eu turpis.
+
+Vivamus quis eros aliquet, aliquet odio eget, sollicitudin ligula. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed vitae justo felis. Proin quis enim leo. Aenean mattis placerat sem, eu suscipit leo venenatis vitae. Proin finibus augue gravida, rhoncus velit sed, ornare ipsum. Mauris pharetra justo quis risus cursus malesuada. In sed ante eget odio elementum viverra et ac libero. Nullam ultrices massa sit amet turpis convallis vehicula. Aenean lobortis magna quis metus aliquet iaculis. Nullam congue, odio vitae blandit placerat, purus velit condimentum nulla, ut placerat metus risus non turpis. Quisque justo neque, posuere id accumsan efficitur, fringilla non ex. Sed metus mauris, blandit eu imperdiet vitae, volutpat sit amet lectus. Proin molestie elit justo, nec fermentum arcu interdum et.
+
+Nam euismod semper diam at efficitur. Maecenas porta velit posuere dui interdum, nec consequat ligula varius. Ut at ultricies ante, sit amet sollicitudin lectus. Praesent iaculis quam sed augue faucibus dapibus. Vestibulum non ipsum eu nibh suscipit pulvinar quis sed augue. Duis rhoncus, mi nec ullamcorper consectetur, urna magna hendrerit quam, id interdum purus arcu in risus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Maecenas gravida magna eget vulputate faucibus. Quisque posuere, velit a maximus fermentum, ex sapien semper erat, sed tincidunt arcu enim ut felis. Vestibulum tempor, ante sit amet laoreet vehicula, nunc eros congue dui, quis imperdiet est leo in leo. Curabitur condimentum sapien nisi, sed volutpat odio euismod condimentum. Etiam velit sapien, finibus bibendum erat nec, feugiat pellentesque quam. Suspendisse cursus nulla ut leo sagittis viverra.
+
+Quisque blandit rutrum nibh sit amet vehicula. Mauris nec interdum leo. Donec suscipit turpis semper pellentesque faucibus. Vestibulum vitae rhoncus tortor. Suspendisse vehicula nisi ac diam mollis, nec pellentesque risus auctor. Suspendisse sit amet turpis ut elit gravida hendrerit nec ornare erat. Nullam eu risus eget est tincidunt luctus sit amet in nisi. Curabitur tellus dolor, accumsan sed maximus nec, lacinia eu neque. Curabitur facilisis a augue semper laoreet. Pellentesque ac faucibus ipsum, a sagittis turpis. Sed eleifend libero ac urna porttitor, vitae finibus velit laoreet. In viverra eros quis iaculis porta.
+
+Praesent viverra velit eu felis facilisis, eu commodo justo volutpat. Nullam eget hendrerit nibh. Vestibulum dui purus, hendrerit sit amet eros in, lacinia laoreet quam. Cras dui mauris, dictum ac ultricies eu, dignissim sit amet metus. Curabitur molestie ante lectus, eget volutpat urna efficitur non. Vivamus lacinia, ligula vitae ornare maximus, dolor odio volutpat velit, sit amet finibus nunc nunc nec augue. Morbi scelerisque tortor at metus ultricies vehicula.
+
+Fusce elementum finibus quam, at tincidunt ipsum egestas eget. Aenean nec ipsum orci. Maecenas quis vehicula purus. Proin tellus magna, euismod eu neque quis, elementum elementum risus. Aenean nibh arcu, bibendum non lacus ac, dapibus pharetra urna. Nunc ut posuere dolor, ac ornare lorem. Nullam varius fringilla sapien ut dapibus. Praesent feugiat dolor nulla, sed commodo orci sagittis eget. Maecenas elementum eros sed magna cursus, quis scelerisque est posuere.
+
+Aliquam aliquam, justo quis ultrices venenatis, eros mi posuere mauris, quis venenatis justo urna sed nisl. Quisque aliquam tincidunt ligula. Proin at tortor eget velit consequat dignissim. Suspendisse metus augue, ultricies sed varius ac, interdum at diam. Mauris laoreet interdum sapien a sagittis. Vivamus dignissim felis a ante porttitor consectetur. Fusce sodales magna et velit cursus dictum. Praesent sodales elit nec lectus porta lobortis. Sed eget metus ut mi ultrices mollis quis eget ante. Vestibulum viverra, magna non euismod mollis, magna lacus egestas ante, posuere faucibus risus diam eu dui. Maecenas maximus lorem orci, sit amet dignissim sem feugiat ac. Morbi tempus purus eu pellentesque bibendum.
+
+Suspendisse dui lorem, fringilla sed arcu quis, aliquet finibus dolor. Sed fringilla aliquet enim nec tempor. Vivamus lectus leo, elementum et risus quis, porta cursus enim. Vivamus ac maximus justo, ac vestibulum risus. Donec ut nunc neque. Mauris in felis vulputate, tincidunt erat in, ullamcorper lorem. Aliquam eu lectus lectus. Nullam eget consectetur leo. Proin venenatis dolor sed magna scelerisque, vulputate imperdiet ante dictum. Etiam ac rhoncus arcu, a dignissim tellus. Donec viverra odio eget lacinia sodales.
+
+Vivamus sed tellus at metus cursus imperdiet. Duis quis turpis elit. Quisque turpis magna, scelerisque in leo id, eleifend porttitor erat. Pellentesque fringilla vel felis eget congue. Pellentesque blandit sem nunc, eu vulputate sem pharetra ac. Ut sed dignissim lectus. Quisque nec nisi ut leo feugiat posuere. Mauris elit sapien, bibendum nec dolor id, pharetra ullamcorper augue. Vivamus et lacus efficitur, fermentum magna id, fermentum neque. Donec aliquet vehicula dapibus. Aenean efficitur nunc eu libero accumsan, sed dignissim neque convallis. Donec eleifend, nisl vel elementum bibendum, eros metus ultricies elit, sodales pharetra magna mauris in est. Donec imperdiet sapien in nibh placerat ultrices id eget quam. Fusce dapibus arcu fringilla dui bibendum, ut rutrum lectus dictum. Pellentesque at elit quam. In id neque in lectus dapibus congue et a tellus.
+
+Donec vitae turpis lacus. Morbi imperdiet ipsum sed consectetur maximus. Quisque sodales ligula lacus, et pulvinar elit efficitur at. Pellentesque augue lorem, ullamcorper sed iaculis nec, blandit ac nunc. Cras purus justo, malesuada nec feugiat vitae, egestas cursus ipsum. Pellentesque in massa fermentum, fermentum lacus ut, rhoncus velit. Phasellus sodales bibendum tellus vel bibendum. Ut convallis libero leo, eu pulvinar lorem tincidunt eget. Vivamus fringilla ipsum quis lacus consectetur ornare.
+
+`.trim();

demo/stories/experiments/hide-some-settings/HideSomeSettings.stories.tsx

@@ -0,0 +1,13 @@
+import type {StoryObj} from '@storybook/react';
+
+import {HideSomeSettingsDemo as component} from './HideSomeSettings';
+
+export const Story: StoryObj<typeof component> = {
+    args: {settingsVisilbe: ['toolbar']},
+};
+Story.storyName = 'Hide some settings';
+
+export default {
+    title: 'Experiments / HideSomeSettings',
+    component,
+};

demo/stories/experiments/hide-some-settings/HideSomeSettings.tsx

@@ -0,0 +1,56 @@
+import {memo, useCallback} from 'react';
+
+import type {SettingItems} from 'src/bundle/settings';
+import {MarkdownEditorView, type RenderPreview, useMarkdownEditor} from 'src/index';
+
+import {PlaygroundLayout} from '../../../components/PlaygroundLayout';
+import {SplitModePreview} from '../../../components/SplitModePreview';
+import {plugins} from '../../../defaults/md-plugins';
+
+type HideSomeSettingsDemoProps = {
+    settingsVisilbe: SettingItems[];
+};
+
+export const HideSomeSettingsDemo = memo<HideSomeSettingsDemoProps>((props) => {
+    const {settingsVisilbe} = props;
+
+    const renderPreview = useCallback<RenderPreview>(
+        ({getValue, md}) => (
+            <SplitModePreview
+                getValue={getValue}
+                allowHTML={md.html}
+                linkify={md.linkify}
+                linkifyTlds={md.linkifyTlds}
+                breaks={md.breaks}
+                needToSanitizeHtml
+                plugins={plugins}
+            />
+        ),
+        [],
+    );
+
+    const editor = useMarkdownEditor(
+        {
+            initial: {markup: ''},
+            markupConfig: {renderPreview},
+        },
+        [],
+    );
+
+    return (
+        <PlaygroundLayout
+            editor={editor}
+            view={({className}) => (
+                <MarkdownEditorView
+                    autofocus
+                    stickyToolbar
+                    settingsVisible={settingsVisilbe}
+                    editor={editor}
+                    className={className}
+                />
+            )}
+        />
+    );
+});
+
+HideSomeSettingsDemo.displayName = 'HideSomeSettingsDemo';