Merge branch 'main' into fix/link-popup-short-selection

Author: makhnatkin

.github/dependabot.yml

@@ -40,6 +40,8 @@ updates:
       - dependency-name: "*"
         update-types:
           - "version-update:semver-major"
+      - dependency-name: "@diplodoc/*"
+      - dependency-name: "@gravity-ui/*"
 
   # npm — demo
   - package-ecosystem: npm
@@ -52,10 +54,16 @@ updates:
         patterns:
           - "@storybook/*"
           - "storybook"
+      playwright:
+        patterns:
+          - "@playwright/*"
+          - "playwright"
     ignore:
       - dependency-name: "*"
         update-types:
           - "version-update:semver-major"
+      - dependency-name: "@diplodoc/*"
+      - dependency-name: "@gravity-ui/*"
 
   # npm — packages/*
   - package-ecosystem: npm
@@ -78,6 +86,8 @@ updates:
       - dependency-name: "*"
         update-types:
           - "version-update:semver-major"
+      - dependency-name: "@diplodoc/*"
+      - dependency-name: "@gravity-ui/*"
 
   # npm — infra/*
   - package-ecosystem: npm

.github/workflows/publish.yml

@@ -15,6 +15,7 @@ on:
         options:
           - 'packages/editor'
           - 'packages/latex-extension'
+          - 'packages/page-constructor-extension'
       tag:
         description: 'Publish with tag'
         required: true

.release-please/config.json

@@ -4,6 +4,7 @@
   "bump-minor-pre-major": true,
   "bump-patch-for-minor-pre-major": true,
   "separate-pull-requests": true,
+  "bootstrap-sha": "0aaeb738572e33accc35a39caf646bcb1724b834",
   "changelog-sections": [
     {"type": "feat", "section": "Features", "hidden": false},
     {"type": "fix", "section": "Bug Fixes", "hidden": false},
@@ -12,6 +13,7 @@
   ],
   "packages": {
     "packages/editor": {},
-    "packages/latex-extension": {}
+    "packages/latex-extension": {},
+    "packages/page-constructor-extension": {}
   }
 }

.release-please/manifest.json

@@ -1,4 +1,5 @@
 {
-  "packages/editor": "15.38.1",
-  "packages/latex-extension": "0.1.0"
+  "packages/editor": "15.40.0",
+  "packages/latex-extension": "0.1.0",
+  "packages/page-constructor-extension": "0.1.0"
 }

demo/.storybook/main.ts

@@ -50,6 +50,17 @@ const config: StorybookConfig = {
             process: require.resolve('process/browser'),
         };
 
+        config.ignoreWarnings ||= [];
+        config.ignoreWarnings.push(/\.js\.map$/);
+        config.module ||= {};
+        config.module.rules ||= [];
+        config.module.rules.push({
+            test: /\.(js|css)\.map$/,
+            include: /node_modules/,
+            type: 'asset/resource' as const,
+            generator: {emit: false},
+        });
+
         config.watchOptions ||= {};
         config.watchOptions.ignored = /node_modules([\\]+|\/)+(?!@gravity-ui\/markdown-editor)/;
 

demo/package.json

@@ -26,12 +26,15 @@
     "@diplodoc/html-extension": "catalog:peer-diplodoc",
     "@diplodoc/latex-extension": "catalog:peer-diplodoc",
     "@diplodoc/mermaid-extension": "catalog:peer-diplodoc",
+    "@diplodoc/page-constructor-extension": "catalog:peer-diplodoc",
     "@diplodoc/quote-link-extension": "catalog:peer-diplodoc",
     "@diplodoc/tabs-extension": "catalog:peer-diplodoc",
     "@diplodoc/transform": "catalog:peer-diplodoc",
     "@gravity-ui/components": "catalog:peer-gravity",
     "@gravity-ui/markdown-editor": "workspace:*",
     "@gravity-ui/markdown-editor-latex-extension": "workspace:*",
+    "@gravity-ui/markdown-editor-page-constructor-extension": "workspace:*",
+    "@gravity-ui/page-constructor": "catalog:peer-gravity",
     "@gravity-ui/uikit": "catalog:peer-gravity",
     "markdown-it": "catalog:peers"
   },

demo/src/components/Playground.tsx

@@ -32,6 +32,8 @@ import {
     wLatexBlockItemData,
     wLatexInlineItemData,
 } from '@gravity-ui/markdown-editor-latex-extension/configs';
+import {YfmPageConstructorExtension} from '@gravity-ui/markdown-editor-page-constructor-extension';
+import {wYfmPageConstructorItemData} from '@gravity-ui/markdown-editor-page-constructor-extension/configs';
 import {Button, DropdownMenu} from '@gravity-ui/uikit';
 
 import {getPlugins} from '../defaults/md-plugins';
@@ -54,6 +56,7 @@ const wCommandMenuConfig = wysiwygToolbarConfigs.wCommandMenuConfig.concat(
     wLatexInlineItemData,
     wLatexBlockItemData,
     wysiwygToolbarConfigs.wMermaidItemData,
+    wYfmPageConstructorItemData,
     wysiwygToolbarConfigs.wYfmHtmlBlockItemData,
 );
 
@@ -211,6 +214,16 @@ export const Playground = memo<PlaygroundProps>((props) => {
                             },
                             theme: {dark: 'dark', light: 'forest'},
                         })
+                        .use(YfmPageConstructorExtension, {
+                            autoSave: {
+                                enabled:
+                                    storyAdditionalControls?.yfmPageConstructorAutoSaveEnabled ??
+                                    true,
+                                delay:
+                                    storyAdditionalControls?.yfmPageConstructorAutoSaveDelay ??
+                                    1000,
+                            },
+                        })
                         .use(FoldingHeading)
                         .use(YfmHtmlBlock, {
                             useConfig: useYfmHtmlBlockStyles,

demo/src/components/SplitModePreview.tsx

@@ -11,18 +11,26 @@ import {
     withMermaid,
 } from '@gravity-ui/markdown-editor/view/hocs/withMermaid/index.js';
 import {withYfmHtmlBlock} from '@gravity-ui/markdown-editor/view/hocs/withYfmHtml/index.js';
+import {withYfmPageConstructor} from '@gravity-ui/markdown-editor-page-constructor-extension/view';
 import {useThemeValue} from '@gravity-ui/uikit';
 import type MarkdownIt from 'markdown-it';
 
-import {LATEX_RUNTIME, MERMAID_RUNTIME, YFM_HTML_BLOCK_RUNTIME} from '../defaults/md-plugins';
+import {
+    LATEX_RUNTIME,
+    MERMAID_RUNTIME,
+    PAGE_CONSTRUCTOR_RUNTIME,
+    YFM_HTML_BLOCK_RUNTIME,
+} from '../defaults/md-plugins';
 import useYfmHtmlBlockStyles from '../hooks/useYfmHtmlBlockStyles';
 
 const ML_ATTR = 'data-ml';
 const mermaidConfig: MermaidConfig = {theme: 'forest'};
 
 const Preview = withMermaid({runtime: MERMAID_RUNTIME})(
     withLatex({runtime: LATEX_RUNTIME})(
-        withYfmHtmlBlock({runtime: YFM_HTML_BLOCK_RUNTIME})(YfmStaticView),
+        withYfmPageConstructor({runtime: PAGE_CONSTRUCTOR_RUNTIME})(
+            withYfmHtmlBlock({runtime: YFM_HTML_BLOCK_RUNTIME})(YfmStaticView),
+        ),
     ),
 );
 

demo/src/defaults/md-plugins.ts

@@ -5,6 +5,7 @@ import '@diplodoc/folding-headings-extension/runtime';
 import {transform as yfmHtmlBlock} from '@diplodoc/html-extension';
 import {transform as latex} from '@diplodoc/latex-extension';
 import {transform as mermaid} from '@diplodoc/mermaid-extension';
+import {transform as yfmPageConstructor} from '@diplodoc/page-constructor-extension';
 import {transform as yfmTabs} from '@diplodoc/tabs-extension';
 import anchors from '@diplodoc/transform/lib/plugins/anchors';
 import checkbox from '@diplodoc/transform/lib/plugins/checkbox';
@@ -30,6 +31,7 @@ import type {PluginWithParams} from 'markdown-it/lib';
 export const LATEX_RUNTIME = 'extension:latex';
 export const MERMAID_RUNTIME = 'extension:mermaid';
 export const YFM_HTML_BLOCK_RUNTIME = 'extension:yfm-html-block';
+export const PAGE_CONSTRUCTOR_RUNTIME = 'extension:page-constructor';
 
 type GetPluginsOptions = {
     directiveSyntax?: RenderPreviewParams['directiveSyntax'];
@@ -88,6 +90,7 @@ export function getPlugins({
         latex({bundle: false, validate: false, runtime: LATEX_RUNTIME}),
         mark,
         mermaid({bundle: false, runtime: MERMAID_RUNTIME}),
+        yfmPageConstructor({bundle: false, runtime: PAGE_CONSTRUCTOR_RUNTIME}),
         sub,
         yfmHtmlBlock({
             bundle: false,

demo/src/stories/yfm/YFM.stories.tsx

@@ -87,3 +87,14 @@ export const MermaidDiagram: Story = {
         },
     },
 };
+
+export const YfmPageConstructor: Story = {
+    name: 'YFM Page Constructor',
+    args: {
+        initial: markup.yfmPageConstructor,
+        storyAdditionalControls: {
+            yfmPageConstructorAutoSaveEnabled: true,
+            yfmPageConstructorAutoSaveDelay: 500,
+        },
+    },
+};