@payloadcms/richtext-lexical 3.0.0-beta.127 → 3.0.0-beta.129

package/dist/features/blocks/client/index.js

@@ -26,15 +26,17 @@ export const BlocksFeatureClient = createClientFeature(({
           key: 'block-' + blockSlug,
           keywords: ['block', 'blocks', blockSlug],
           label: ({
+            featureClientSchemaMap,
             i18n,
-            richTextComponentMap
+            schemaPath
           }) => {
-            if (!richTextComponentMap) {
+            if (!featureClientSchemaMap) {
               return blockSlug;
             }
-            const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_blocks`;
-            const blocksField = richTextComponentMap.get(componentMapRenderedBlockPath)?.[0];
-            const clientBlock = blocksField.blocks.find(_block => _block.slug === blockSlug);
+            const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_blocks.${blockSlug}`;
+            const clientSchemaMap = featureClientSchemaMap['blocks'];
+            const blocksField = clientSchemaMap[componentMapRenderedBlockPath][0];
+            const clientBlock = blocksField.blocks[0];
             const blockDisplayName = clientBlock?.labels?.singular ? getTranslation(clientBlock.labels.singular, i18n) : clientBlock?.slug;
             return blockDisplayName;
           },
@@ -61,15 +63,14 @@ export const BlocksFeatureClient = createClientFeature(({
           key: 'inlineBlocks-' + inlineBlockSlug,
           keywords: ['inlineBlock', 'inline block', inlineBlockSlug],
           label: ({
+            featureClientSchemaMap,
             i18n,
-            richTextComponentMap
+            schemaPath
           }) => {
-            if (!richTextComponentMap) {
-              return inlineBlockSlug;
-            }
-            const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`;
-            const blocksField = richTextComponentMap.get(componentMapRenderedBlockPath)?.[0];
-            const clientBlock = blocksField.blocks.find(_block => _block.slug === inlineBlockSlug);
+            const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.${inlineBlockSlug}`;
+            const clientSchemaMap = featureClientSchemaMap['blocks'];
+            const blocksField = clientSchemaMap[componentMapRenderedBlockPath][0];
+            const clientBlock = blocksField.blocks[0];
             const blockDisplayName = clientBlock?.labels?.singular ? getTranslation(clientBlock.labels.singular, i18n) : clientBlock?.slug;
             return blockDisplayName;
           },
@@ -103,15 +104,14 @@ export const BlocksFeatureClient = createClientFeature(({
           isActive: undefined,
           key: 'block-' + blockSlug,
           label: ({
+            featureClientSchemaMap,
             i18n,
-            richTextComponentMap
+            schemaPath
           }) => {
-            if (!richTextComponentMap) {
-              return blockSlug;
-            }
-            const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_blocks`;
-            const blocksField = richTextComponentMap.get(componentMapRenderedBlockPath)?.[0];
-            const clientBlock = blocksField.blocks.find(_block => _block.slug === blockSlug);
+            const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_blocks.${blockSlug}`;
+            const clientSchemaMap = featureClientSchemaMap['blocks'];
+            const blocksField = clientSchemaMap[componentMapRenderedBlockPath][0];
+            const clientBlock = blocksField.blocks[0];
             const blockDisplayName = clientBlock?.labels?.singular ? getTranslation(clientBlock.labels.singular, i18n) : clientBlock?.slug;
             return blockDisplayName;
           },
@@ -137,15 +137,17 @@ export const BlocksFeatureClient = createClientFeature(({
           isActive: undefined,
           key: 'inlineBlock-' + inlineBlockSlug,
           label: ({
+            featureClientSchemaMap,
             i18n,
-            richTextComponentMap
+            schemaPath
           }) => {
-            if (!richTextComponentMap) {
+            if (!featureClientSchemaMap) {
               return inlineBlockSlug;
             }
-            const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`;
-            const blocksField = richTextComponentMap.get(componentMapRenderedBlockPath)?.[0];
-            const clientBlock = blocksField.blocks.find(_block => _block.slug === inlineBlockSlug);
+            const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.${inlineBlockSlug}`;
+            const clientSchemaMap = featureClientSchemaMap['blocks'];
+            const blocksField = clientSchemaMap[componentMapRenderedBlockPath][0];
+            const clientBlock = blocksField.blocks[0];
             const blockDisplayName = clientBlock?.labels?.singular ? getTranslation(clientBlock.labels.singular, i18n) : clientBlock?.slug;
             return blockDisplayName;
           },

package/dist/features/blocks/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getTranslation","BlockIcon","InlineBlocksIcon","createClientFeature","BlockNode","InlineBlockNode","INSERT_BLOCK_COMMAND","OPEN_INLINE_BLOCK_DRAWER_COMMAND","BlocksPlugin","BlocksFeatureClient","props","nodes","plugins","Component","position","sanitizedClientFeatureProps","slashMenu","groups","clientBlockSlugs","length","items","map","blockSlug","Icon","key","keywords","label","i18n","richTextComponentMap","componentMapRenderedBlockPath","blocksField","get","clientBlock","blocks","find","_block","slug","blockDisplayName","labels","singular","onSelect","editor","dispatchCommand","blockName","blockType","t","clientInlineBlockSlugs","inlineBlockSlug","fields","filter","Boolean","toolbarFixed","type","ChildComponent","index","isActive","undefined","order"],"sources":["../../../../src/features/blocks/client/index.tsx"],"sourcesContent":["'use client'\n\nimport type { BlocksFieldClient } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport type { SlashMenuItem } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js'\nimport type { ToolbarGroup, ToolbarGroupItem } from '../../toolbars/types.js'\n\nimport { BlockIcon } from '../../../lexical/ui/icons/Block/index.js'\nimport { InlineBlocksIcon } from '../../../lexical/ui/icons/InlineBlocks/index.js'\nimport { createClientFeature } from '../../../utilities/createClientFeature.js'\nimport { BlockNode } from './nodes/BlocksNode.js'\nimport { InlineBlockNode } from './nodes/InlineBlocksNode.js'\nimport { INSERT_BLOCK_COMMAND, OPEN_INLINE_BLOCK_DRAWER_COMMAND } from './plugin/commands.js'\nimport { BlocksPlugin } from './plugin/index.js'\n\nexport type BlocksFeatureClientProps = {\n  clientBlockSlugs: string[]\n  clientInlineBlockSlugs: string[]\n}\n// @ts-expect-error - TODO: fix this\nexport const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>(({ props }) => ({\n  nodes: [BlockNode, InlineBlockNode],\n  plugins: [\n    {\n      Component: BlocksPlugin,\n      position: 'normal',\n    },\n  ],\n  sanitizedClientFeatureProps: props,\n  slashMenu: {\n    groups: [\n      props.clientBlockSlugs?.length\n        ? {\n            items: props.clientBlockSlugs.map((blockSlug) => {\n              return {\n                Icon: BlockIcon,\n                key: 'block-' + blockSlug,\n                keywords: ['block', 'blocks', blockSlug],\n                label: ({ i18n, richTextComponentMap }) => {\n                  if (!richTextComponentMap) {\n                    return blockSlug\n                  }\n\n                  const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_blocks`\n                  const blocksField: BlocksFieldClient = richTextComponentMap.get(\n                    componentMapRenderedBlockPath,\n                  )?.[0]\n\n                  const clientBlock = blocksField.blocks.find((_block) => _block.slug === blockSlug)\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                    blockName: '',\n                    blockType: blockSlug,\n                  })\n                },\n              } as SlashMenuItem\n            }),\n            key: 'blocks',\n            label: ({ i18n }) => {\n              return i18n.t('lexical:blocks:label')\n            },\n          }\n        : null,\n      props.clientInlineBlockSlugs?.length\n        ? {\n            items: props.clientInlineBlockSlugs.map((inlineBlockSlug) => {\n              return {\n                Icon: InlineBlocksIcon,\n                key: 'inlineBlocks-' + inlineBlockSlug,\n                keywords: ['inlineBlock', 'inline block', inlineBlockSlug],\n                label: ({ i18n, richTextComponentMap }) => {\n                  if (!richTextComponentMap) {\n                    return inlineBlockSlug\n                  }\n\n                  const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`\n\n                  const blocksField: BlocksFieldClient = richTextComponentMap.get(\n                    componentMapRenderedBlockPath,\n                  )?.[0]\n\n                  const clientBlock = blocksField.blocks.find(\n                    (_block) => _block.slug === inlineBlockSlug,\n                  )\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                    fields: {\n                      blockName: '',\n                      blockType: inlineBlockSlug,\n                    },\n                  })\n                },\n              } as SlashMenuItem\n            }),\n            key: 'inlineBlocks',\n            label: ({ i18n }) => {\n              return i18n.t('lexical:blocks:inlineBlocks:label')\n            },\n          }\n        : null,\n    ].filter(Boolean),\n  },\n  toolbarFixed: {\n    groups: [\n      props.clientBlockSlugs?.length\n        ? {\n            type: 'dropdown',\n            ChildComponent: BlockIcon,\n            items: props.clientBlockSlugs.map((blockSlug, index) => {\n              return {\n                ChildComponent: BlockIcon,\n                isActive: undefined, // At this point, we would be inside a sub-richtext-editor. And at this point this will be run against the focused sub-editor, not the parent editor which has the actual block. Thus, no point in running this\n                key: 'block-' + blockSlug,\n                label: ({ i18n, richTextComponentMap }) => {\n                  if (!richTextComponentMap) {\n                    return blockSlug\n                  }\n                  const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_blocks`\n                  const blocksField: BlocksFieldClient = richTextComponentMap.get(\n                    componentMapRenderedBlockPath,\n                  )?.[0]\n\n                  const clientBlock = blocksField.blocks.find((_block) => _block.slug === blockSlug)\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                    blockName: '',\n                    blockType: blockSlug,\n                  })\n                },\n                order: index,\n              } as ToolbarGroupItem\n            }),\n            key: 'blocks',\n            order: 20,\n          }\n        : null,\n      props.clientInlineBlockSlugs?.length\n        ? {\n            type: 'dropdown',\n            ChildComponent: InlineBlocksIcon,\n            items: props.clientInlineBlockSlugs.map((inlineBlockSlug, index) => {\n              return {\n                ChildComponent: InlineBlocksIcon,\n                isActive: undefined,\n                key: 'inlineBlock-' + inlineBlockSlug,\n                label: ({ i18n, richTextComponentMap }) => {\n                  if (!richTextComponentMap) {\n                    return inlineBlockSlug\n                  }\n\n                  const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`\n                  const blocksField: BlocksFieldClient = richTextComponentMap.get(\n                    componentMapRenderedBlockPath,\n                  )?.[0]\n\n                  const clientBlock = blocksField.blocks.find(\n                    (_block) => _block.slug === inlineBlockSlug,\n                  )\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                    fields: {\n                      blockType: inlineBlockSlug,\n                    },\n                  })\n                },\n                order: index,\n              } as ToolbarGroupItem\n            }),\n            key: 'inlineBlocks',\n            order: 25,\n          }\n        : null,\n    ].filter(Boolean) as ToolbarGroup[],\n  },\n}))\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getTranslation","BlockIcon","InlineBlocksIcon","createClientFeature","BlockNode","InlineBlockNode","INSERT_BLOCK_COMMAND","OPEN_INLINE_BLOCK_DRAWER_COMMAND","BlocksPlugin","BlocksFeatureClient","props","nodes","plugins","Component","position","sanitizedClientFeatureProps","slashMenu","groups","clientBlockSlugs","length","items","map","blockSlug","Icon","key","keywords","label","featureClientSchemaMap","i18n","schemaPath","componentMapRenderedBlockPath","clientSchemaMap","blocksField","clientBlock","blocks","blockDisplayName","labels","singular","slug","onSelect","editor","dispatchCommand","blockName","blockType","t","clientInlineBlockSlugs","inlineBlockSlug","fields","filter","Boolean","toolbarFixed","type","ChildComponent","index","isActive","undefined","order"],"sources":["../../../../src/features/blocks/client/index.tsx"],"sourcesContent":["'use client'\n\nimport type { BlocksFieldClient } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport type { SlashMenuItem } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js'\nimport type { ToolbarGroup, ToolbarGroupItem } from '../../toolbars/types.js'\n\nimport { BlockIcon } from '../../../lexical/ui/icons/Block/index.js'\nimport { InlineBlocksIcon } from '../../../lexical/ui/icons/InlineBlocks/index.js'\nimport { createClientFeature } from '../../../utilities/createClientFeature.js'\nimport { BlockNode } from './nodes/BlocksNode.js'\nimport { InlineBlockNode } from './nodes/InlineBlocksNode.js'\nimport { INSERT_BLOCK_COMMAND, OPEN_INLINE_BLOCK_DRAWER_COMMAND } from './plugin/commands.js'\nimport { BlocksPlugin } from './plugin/index.js'\n\nexport type BlocksFeatureClientProps = {\n  clientBlockSlugs: string[]\n  clientInlineBlockSlugs: string[]\n}\n// @ts-expect-error - TODO: fix this\nexport const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>(({ props }) => ({\n  nodes: [BlockNode, InlineBlockNode],\n  plugins: [\n    {\n      Component: BlocksPlugin,\n      position: 'normal',\n    },\n  ],\n  sanitizedClientFeatureProps: props,\n  slashMenu: {\n    groups: [\n      props.clientBlockSlugs?.length\n        ? {\n            items: props.clientBlockSlugs.map((blockSlug) => {\n              return {\n                Icon: BlockIcon,\n                key: 'block-' + blockSlug,\n                keywords: ['block', 'blocks', blockSlug],\n                label: ({ featureClientSchemaMap, i18n, schemaPath }) => {\n                  if (!featureClientSchemaMap) {\n                    return blockSlug\n                  }\n\n                  const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_blocks.${blockSlug}`\n                  const clientSchemaMap = featureClientSchemaMap['blocks']\n\n                  const blocksField: BlocksFieldClient = clientSchemaMap[\n                    componentMapRenderedBlockPath\n                  ][0] as BlocksFieldClient\n\n                  const clientBlock = blocksField.blocks[0]\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                    blockName: '',\n                    blockType: blockSlug,\n                  })\n                },\n              } as SlashMenuItem\n            }),\n            key: 'blocks',\n            label: ({ i18n }) => {\n              return i18n.t('lexical:blocks:label')\n            },\n          }\n        : null,\n      props.clientInlineBlockSlugs?.length\n        ? {\n            items: props.clientInlineBlockSlugs.map((inlineBlockSlug) => {\n              return {\n                Icon: InlineBlocksIcon,\n                key: 'inlineBlocks-' + inlineBlockSlug,\n                keywords: ['inlineBlock', 'inline block', inlineBlockSlug],\n                label: ({ featureClientSchemaMap, i18n, schemaPath }) => {\n                  const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.${inlineBlockSlug}`\n                  const clientSchemaMap = featureClientSchemaMap['blocks']\n\n                  const blocksField: BlocksFieldClient = clientSchemaMap[\n                    componentMapRenderedBlockPath\n                  ][0] as BlocksFieldClient\n\n                  const clientBlock = blocksField.blocks[0]\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                    fields: {\n                      blockName: '',\n                      blockType: inlineBlockSlug,\n                    },\n                  })\n                },\n              } as SlashMenuItem\n            }),\n            key: 'inlineBlocks',\n            label: ({ i18n }) => {\n              return i18n.t('lexical:blocks:inlineBlocks:label')\n            },\n          }\n        : null,\n    ].filter(Boolean),\n  },\n  toolbarFixed: {\n    groups: [\n      props.clientBlockSlugs?.length\n        ? {\n            type: 'dropdown',\n            ChildComponent: BlockIcon,\n            items: props.clientBlockSlugs.map((blockSlug, index) => {\n              return {\n                ChildComponent: BlockIcon,\n                isActive: undefined, // At this point, we would be inside a sub-richtext-editor. And at this point this will be run against the focused sub-editor, not the parent editor which has the actual block. Thus, no point in running this\n                key: 'block-' + blockSlug,\n                label: ({ featureClientSchemaMap, i18n, schemaPath }) => {\n                  const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_blocks.${blockSlug}`\n                  const clientSchemaMap = featureClientSchemaMap['blocks']\n\n                  const blocksField: BlocksFieldClient = clientSchemaMap[\n                    componentMapRenderedBlockPath\n                  ][0] as BlocksFieldClient\n\n                  const clientBlock = blocksField.blocks[0]\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                    blockName: '',\n                    blockType: blockSlug,\n                  })\n                },\n                order: index,\n              } as ToolbarGroupItem\n            }),\n            key: 'blocks',\n            order: 20,\n          }\n        : null,\n      props.clientInlineBlockSlugs?.length\n        ? {\n            type: 'dropdown',\n            ChildComponent: InlineBlocksIcon,\n            items: props.clientInlineBlockSlugs.map((inlineBlockSlug, index) => {\n              return {\n                ChildComponent: InlineBlocksIcon,\n                isActive: undefined,\n                key: 'inlineBlock-' + inlineBlockSlug,\n                label: ({ featureClientSchemaMap, i18n, schemaPath }) => {\n                  if (!featureClientSchemaMap) {\n                    return inlineBlockSlug\n                  }\n\n                  const componentMapRenderedBlockPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.${inlineBlockSlug}`\n                  const clientSchemaMap = featureClientSchemaMap['blocks']\n\n                  const blocksField: BlocksFieldClient = clientSchemaMap[\n                    componentMapRenderedBlockPath\n                  ][0] as BlocksFieldClient\n\n                  const clientBlock = blocksField.blocks[0]\n\n                  const blockDisplayName = clientBlock?.labels?.singular\n                    ? getTranslation(clientBlock.labels.singular, i18n)\n                    : clientBlock?.slug\n\n                  return blockDisplayName\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                    fields: {\n                      blockType: inlineBlockSlug,\n                    },\n                  })\n                },\n                order: index,\n              } as ToolbarGroupItem\n            }),\n            key: 'inlineBlocks',\n            order: 25,\n          }\n        : null,\n    ].filter(Boolean) as ToolbarGroup[],\n  },\n}))\n"],"mappings":"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","ignoreList":[]}

package/dist/features/blocks/client/plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/blocks/client/plugin/index.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAC1F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAa3D,MAAM,MAAM,kBAAkB,GAAG,qBAAqB,CAAA;AAEtD,eAAO,MAAM,YAAY,EAAE,eAAe,CAAC,wBAAwB,CAmKlE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/blocks/client/plugin/index.tsx"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAC1F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAa3D,MAAM,MAAM,kBAAkB,GAAG,qBAAqB,CAAA;AAEtD,eAAO,MAAM,YAAY,EAAE,eAAe,CAAC,wBAAwB,CA8JlE,CAAA"}

package/dist/features/blocks/client/plugin/index.js

@@ -5,7 +5,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js';
 import { $insertNodeToNearestRoot, $wrapNodeInElement, mergeRegister } from '@lexical/utils';
 import { getTranslation } from '@payloadcms/translations';
-import { formatDrawerSlug, useEditDepth, useFieldProps, useTranslation } from '@payloadcms/ui';
+import { formatDrawerSlug, useEditDepth, useTranslation } from '@payloadcms/ui';
 import { $createParagraphNode, $getNodeByKey, $getPreviousSelection, $getSelection, $insertNodes, $isParagraphNode, $isRangeSelection, $isRootOrShadowRoot, COMMAND_PRIORITY_EDITOR } from 'lexical';
 import React, { useEffect, useState } from 'react';
 import { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider.js';
@@ -15,7 +15,7 @@ import { $createBlockNode, BlockNode } from '../nodes/BlocksNode.js';
 import { $createInlineBlockNode, $isInlineBlockNode } from '../nodes/InlineBlocksNode.js';
 import { INSERT_BLOCK_COMMAND, INSERT_INLINE_BLOCK_COMMAND, OPEN_INLINE_BLOCK_DRAWER_COMMAND } from './commands.js';
 export const BlocksPlugin = () => {
-  const $ = _c(21);
+  const $ = _c(27);
   const [editor] = useLexicalComposerContext();
   const [blockFields, setBlockFields] = useState(null);
   const [blockType, setBlockType] = useState("");
@@ -25,35 +25,33 @@ export const BlocksPlugin = () => {
     t
   } = useTranslation();
   const {
+    fieldProps: t0
+  } = useEditorConfigContext();
+  const {
+    featureClientSchemaMap,
     schemaPath
-  } = useFieldProps();
+  } = t0;
   const {
     uuid
   } = useEditorConfigContext();
   const editDepth = useEditDepth();
-  const t0 = `lexical-inlineBlocks-create-` + uuid;
-  let t1;
-  if ($[0] !== t0 || $[1] !== editDepth) {
-    t1 = formatDrawerSlug({
-      slug: t0,
+  const t1 = `lexical-inlineBlocks-create-` + uuid;
+  let t2;
+  if ($[0] !== t1 || $[1] !== editDepth) {
+    t2 = formatDrawerSlug({
+      slug: t1,
       depth: editDepth
     });
-    $[0] = t0;
+    $[0] = t1;
     $[1] = editDepth;
-    $[2] = t1;
+    $[2] = t2;
   } else {
-    t1 = $[2];
+    t2 = $[2];
   }
-  const drawerSlug = t1;
+  const drawerSlug = t2;
   const {
     toggleDrawer
-  } = useLexicalDrawer(drawerSlug);
-  const {
-    field: t2
-  } = useEditorConfigContext();
-  const {
-    richTextComponentMap
-  } = t2;
+  } = useLexicalDrawer(drawerSlug, true);
   let t3;
   let t4;
   if ($[3] !== editor || $[4] !== targetNodeKey || $[5] !== toggleDrawer) {
@@ -133,65 +131,75 @@ export const BlocksPlugin = () => {
   if (!blockFields) {
     return null;
   }
-  const schemaFieldsPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.lexical_inline_blocks.${blockFields?.blockType}`;
-  const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`;
+  const schemaFieldsPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.${blockFields?.blockType}`;
+  const clientSchemaMap = featureClientSchemaMap.blocks;
+  const blocksField = clientSchemaMap[schemaFieldsPath][0];
+  const clientBlock = blocksField.blocks[0];
+  if (!blocksField) {
+    return null;
+  }
   let t5;
-  let t6;
-  if ($[8] !== richTextComponentMap || $[9] !== blockFields || $[10] !== i18n || $[11] !== t || $[12] !== blockType || $[13] !== editor || $[14] !== drawerSlug || $[15] !== schemaFieldsPath) {
-    t6 = Symbol.for("react.early_return_sentinel");
-    bb0: {
-      const blocksField = richTextComponentMap?.has(componentMapRenderedBlockPath) ? richTextComponentMap.get(componentMapRenderedBlockPath)[0] : null;
-      const clientBlock = blocksField ? blocksField.blocks.find(block => block.slug === blockFields?.blockType) : null;
-      if (!blocksField) {
-        t6 = null;
-        break bb0;
-      }
-      const blockDisplayName = clientBlock?.labels?.singular ? getTranslation(clientBlock?.labels?.singular, i18n) : clientBlock?.slug;
-      let t7;
-      if ($[18] !== blockType || $[19] !== editor) {
-        t7 = (_fields, data) => {
-          if (!data) {
-            return;
-          }
-          data.blockType = blockType;
-          editor.dispatchCommand(INSERT_INLINE_BLOCK_COMMAND, data);
-        };
-        $[18] = blockType;
-        $[19] = editor;
-        $[20] = t7;
-      } else {
-        t7 = $[20];
-      }
-      t5 = _jsx(FieldsDrawer, {
-        data: blockFields,
-        drawerSlug,
-        drawerTitle: t(`lexical:blocks:inlineBlocks:${blockFields?.id ? "edit" : "create"}`, {
-          label: blockDisplayName ?? t("lexical:blocks:inlineBlocks:label")
-        }),
-        featureKey: "blocks",
-        fieldMapOverride: clientBlock?.fields,
-        handleDrawerSubmit: t7,
-        schemaFieldsPathOverride: schemaFieldsPath,
-        schemaPathSuffix: blockFields?.blockType
-      });
-    }
-    $[8] = richTextComponentMap;
-    $[9] = blockFields;
-    $[10] = i18n;
-    $[11] = t;
-    $[12] = blockType;
-    $[13] = editor;
-    $[14] = drawerSlug;
-    $[15] = schemaFieldsPath;
-    $[16] = t5;
-    $[17] = t6;
+  if ($[8] !== clientBlock || $[9] !== i18n) {
+    t5 = clientBlock?.labels?.singular ? getTranslation(clientBlock?.labels?.singular, i18n) : clientBlock?.slug;
+    $[8] = clientBlock;
+    $[9] = i18n;
+    $[10] = t5;
+  } else {
+    t5 = $[10];
+  }
+  const blockDisplayName = t5;
+  const t6 = `lexical:blocks:inlineBlocks:${blockFields?.id ? "edit" : "create"}`;
+  let t7;
+  if ($[11] !== blockDisplayName || $[12] !== t) {
+    t7 = blockDisplayName ?? t("lexical:blocks:inlineBlocks:label");
+    $[11] = blockDisplayName;
+    $[12] = t;
+    $[13] = t7;
   } else {
-    t5 = $[16];
-    t6 = $[17];
+    t7 = $[13];
   }
-  if (t6 !== Symbol.for("react.early_return_sentinel")) {
-    return t6;
+  let t8;
+  if ($[14] !== t7 || $[15] !== t || $[16] !== t6 || $[17] !== clientBlock?.fields || $[18] !== blockType || $[19] !== editor || $[20] !== blockFields || $[21] !== drawerSlug || $[22] !== schemaPath) {
+    let t9;
+    if ($[24] !== blockType || $[25] !== editor) {
+      t9 = (_fields, data) => {
+        if (!data) {
+          return;
+        }
+        data.blockType = blockType;
+        editor.dispatchCommand(INSERT_INLINE_BLOCK_COMMAND, data);
+      };
+      $[24] = blockType;
+      $[25] = editor;
+      $[26] = t9;
+    } else {
+      t9 = $[26];
+    }
+    t8 = _jsx(FieldsDrawer, {
+      data: blockFields,
+      drawerSlug,
+      drawerTitle: t(t6, {
+        label: t7
+      }),
+      featureKey: "blocks",
+      fieldMapOverride: clientBlock?.fields,
+      handleDrawerSubmit: t9,
+      schemaPath,
+      schemaPathSuffix: `lexical_inline_blocks.${blockFields?.blockType}.fields`
+    });
+    $[14] = t7;
+    $[15] = t;
+    $[16] = t6;
+    $[17] = clientBlock?.fields;
+    $[18] = blockType;
+    $[19] = editor;
+    $[20] = blockFields;
+    $[21] = drawerSlug;
+    $[22] = schemaPath;
+    $[23] = t8;
+  } else {
+    t8 = $[23];
   }
-  return t5;
+  return t8;
 };
 //# sourceMappingURL=index.js.map

package/dist/features/blocks/client/plugin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","useLexicalComposerContext","$insertNodeToNearestRoot","$wrapNodeInElement","mergeRegister","getTranslation","formatDrawerSlug","useEditDepth","useFieldProps","useTranslation","$createParagraphNode","$getNodeByKey","$getPreviousSelection","$getSelection","$insertNodes","$isParagraphNode","$isRangeSelection","$isRootOrShadowRoot","COMMAND_PRIORITY_EDITOR","React","useEffect","useState","useEditorConfigContext","FieldsDrawer","useLexicalDrawer","$createBlockNode","BlockNode","$createInlineBlockNode","$isInlineBlockNode","INSERT_BLOCK_COMMAND","INSERT_INLINE_BLOCK_COMMAND","OPEN_INLINE_BLOCK_DRAWER_COMMAND","BlocksPlugin","$","editor","blockFields","setBlockFields","blockType","setBlockType","targetNodeKey","setTargetNodeKey","i18n","t","schemaPath","uuid","editDepth","t0","t1","slug","depth","drawerSlug","toggleDrawer","field","t2","richTextComponentMap","t3","t4","hasNodes","Error","registerCommand","payload","update","selection","blockNode","focus","focusNode","getNode","getTextContentSize","getParentOrThrow","getChildren","filter","node","length","remove","fields","node_0","setFields","inlineBlockNode","selectEnd","t5","fields_0","nodeKey","rangeSelection","getEditorState","read","selection_0","schemaFieldsPath","componentMapRenderedBlockPath","t6","Symbol","for","bb0","blocksField","has","get","clientBlock","blocks","find","block","blockDisplayName","labels","singular","t7","_fields","data","dispatchCommand","_jsx","drawerTitle","id","label","featureKey","fieldMapOverride","handleDrawerSubmit","schemaFieldsPathOverride","schemaPathSuffix"],"sources":["../../../../../src/features/blocks/client/plugin/index.tsx"],"sourcesContent":["'use client'\n\nimport type { BlocksFieldClient } from 'payload'\n\nimport { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'\nimport { $insertNodeToNearestRoot, $wrapNodeInElement, mergeRegister } from '@lexical/utils'\nimport { getTranslation } from '@payloadcms/translations'\nimport {\n  formatDrawerSlug,\n  useEditDepth,\n  useFieldProps,\n  useModal,\n  useTranslation,\n} from '@payloadcms/ui'\nimport {\n  $createParagraphNode,\n  $getNodeByKey,\n  $getPreviousSelection,\n  $getSelection,\n  $insertNodes,\n  $isParagraphNode,\n  $isRangeSelection,\n  $isRootOrShadowRoot,\n  COMMAND_PRIORITY_EDITOR,\n  type RangeSelection,\n} from 'lexical'\nimport React, { useEffect, useState } from 'react'\n\nimport type { PluginComponent } from '../../../typesClient.js'\nimport type { BlockFields, BlockFieldsOptionalID } from '../../server/nodes/BlocksNode.js'\nimport type { BlocksFeatureClientProps } from '../index.js'\n\nimport { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider.js'\nimport { FieldsDrawer } from '../../../../utilities/fieldsDrawer/Drawer.js'\nimport { useLexicalDrawer } from '../../../../utilities/fieldsDrawer/useLexicalDrawer.js'\nimport { $createBlockNode, BlockNode } from '../nodes/BlocksNode.js'\nimport { $createInlineBlockNode, $isInlineBlockNode } from '../nodes/InlineBlocksNode.js'\nimport {\n  INSERT_BLOCK_COMMAND,\n  INSERT_INLINE_BLOCK_COMMAND,\n  OPEN_INLINE_BLOCK_DRAWER_COMMAND,\n} from './commands.js'\n\nexport type InsertBlockPayload = BlockFieldsOptionalID\n\nexport const BlocksPlugin: PluginComponent<BlocksFeatureClientProps> = () => {\n  const [editor] = useLexicalComposerContext()\n  const [blockFields, setBlockFields] = useState<BlockFields | null>(null)\n  const [blockType, setBlockType] = useState<string>('' as any)\n  const [targetNodeKey, setTargetNodeKey] = useState<null | string>(null)\n  const { i18n, t } = useTranslation<string, any>()\n  const { schemaPath } = useFieldProps()\n  const { uuid } = useEditorConfigContext()\n  const editDepth = useEditDepth()\n\n  const drawerSlug = formatDrawerSlug({\n    slug: `lexical-inlineBlocks-create-` + uuid,\n    depth: editDepth,\n  })\n\n  const { toggleDrawer } = useLexicalDrawer(drawerSlug)\n\n  const {\n    field: { richTextComponentMap },\n  } = useEditorConfigContext()\n\n  useEffect(() => {\n    if (!editor.hasNodes([BlockNode])) {\n      throw new Error('BlocksPlugin: BlocksNode not registered on editor')\n    }\n\n    return mergeRegister(\n      editor.registerCommand<InsertBlockPayload>(\n        INSERT_BLOCK_COMMAND,\n        (payload: InsertBlockPayload) => {\n          editor.update(() => {\n            const selection = $getSelection() || $getPreviousSelection()\n\n            if ($isRangeSelection(selection)) {\n              const blockNode = $createBlockNode(payload)\n              // Insert blocks node BEFORE potentially removing focusNode, as $insertNodeToNearestRoot errors if the focusNode doesn't exist\n              $insertNodeToNearestRoot(blockNode)\n\n              const { focus } = selection\n              const focusNode = focus.getNode()\n\n              // First, delete currently selected node if it's an empty paragraph and if there are sufficient\n              // paragraph nodes (more than 1) left in the parent node, so that we don't \"trap\" the user\n              if (\n                $isParagraphNode(focusNode) &&\n                focusNode.getTextContentSize() === 0 &&\n                focusNode\n                  .getParentOrThrow()\n                  .getChildren()\n                  .filter((node) => $isParagraphNode(node)).length > 1\n              ) {\n                focusNode.remove()\n              }\n            }\n          })\n\n          return true\n        },\n        COMMAND_PRIORITY_EDITOR,\n      ),\n      editor.registerCommand(\n        INSERT_INLINE_BLOCK_COMMAND,\n        (fields) => {\n          if (targetNodeKey) {\n            const node = $getNodeByKey(targetNodeKey)\n\n            if (!node || !$isInlineBlockNode(node)) {\n              return false\n            }\n\n            node.setFields(fields as BlockFields)\n\n            setTargetNodeKey(null)\n            return true\n          }\n\n          const inlineBlockNode = $createInlineBlockNode(fields as BlockFields)\n          $insertNodes([inlineBlockNode])\n          if ($isRootOrShadowRoot(inlineBlockNode.getParentOrThrow())) {\n            $wrapNodeInElement(inlineBlockNode, $createParagraphNode).selectEnd()\n          }\n\n          return true\n        },\n        COMMAND_PRIORITY_EDITOR,\n      ),\n      editor.registerCommand(\n        OPEN_INLINE_BLOCK_DRAWER_COMMAND,\n        ({ fields, nodeKey }) => {\n          setBlockFields((fields as BlockFields) ?? null)\n          setTargetNodeKey(nodeKey ?? null)\n          setBlockType(fields?.blockType ?? ('' as any))\n\n          if (nodeKey) {\n            toggleDrawer()\n            return true\n          }\n\n          let rangeSelection: null | RangeSelection = null\n\n          editor.getEditorState().read(() => {\n            const selection = $getSelection()\n            if ($isRangeSelection(selection)) {\n              rangeSelection = selection\n            }\n          })\n\n          if (rangeSelection) {\n            //setLastSelection(rangeSelection)\n            toggleDrawer()\n          }\n          return true\n        },\n        COMMAND_PRIORITY_EDITOR,\n      ),\n    )\n  }, [editor, targetNodeKey, toggleDrawer])\n\n  if (!blockFields) {\n    return null\n  }\n\n  const schemaFieldsPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.lexical_inline_blocks.${blockFields?.blockType}`\n\n  const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`\n  const blocksField: BlocksFieldClient = richTextComponentMap?.has(componentMapRenderedBlockPath)\n    ? richTextComponentMap.get(componentMapRenderedBlockPath)[0]\n    : null\n\n  const clientBlock = blocksField\n    ? blocksField.blocks.find((block) => block.slug === blockFields?.blockType)\n    : null\n\n  if (!blocksField) {\n    return null\n  }\n\n  const blockDisplayName = clientBlock?.labels?.singular\n    ? getTranslation(clientBlock?.labels?.singular, i18n)\n    : clientBlock?.slug\n\n  return (\n    <FieldsDrawer\n      data={blockFields}\n      drawerSlug={drawerSlug}\n      drawerTitle={t(`lexical:blocks:inlineBlocks:${blockFields?.id ? 'edit' : 'create'}`, {\n        label: blockDisplayName ?? t('lexical:blocks:inlineBlocks:label'),\n      })}\n      featureKey=\"blocks\"\n      fieldMapOverride={clientBlock?.fields}\n      handleDrawerSubmit={(_fields, data) => {\n        if (!data) {\n          return\n        }\n\n        data.blockType = blockType\n\n        editor.dispatchCommand(INSERT_INLINE_BLOCK_COMMAND, data)\n      }}\n      schemaFieldsPathOverride={schemaFieldsPath}\n      schemaPathSuffix={blockFields?.blockType}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","useLexicalComposerContext","$insertNodeToNearestRoot","$wrapNodeInElement","mergeRegister","getTranslation","formatDrawerSlug","useEditDepth","useTranslation","$createParagraphNode","$getNodeByKey","$getPreviousSelection","$getSelection","$insertNodes","$isParagraphNode","$isRangeSelection","$isRootOrShadowRoot","COMMAND_PRIORITY_EDITOR","React","useEffect","useState","useEditorConfigContext","FieldsDrawer","useLexicalDrawer","$createBlockNode","BlockNode","$createInlineBlockNode","$isInlineBlockNode","INSERT_BLOCK_COMMAND","INSERT_INLINE_BLOCK_COMMAND","OPEN_INLINE_BLOCK_DRAWER_COMMAND","BlocksPlugin","$","editor","blockFields","setBlockFields","blockType","setBlockType","targetNodeKey","setTargetNodeKey","i18n","t","fieldProps","t0","featureClientSchemaMap","schemaPath","uuid","editDepth","t1","t2","slug","depth","drawerSlug","toggleDrawer","t3","t4","hasNodes","Error","registerCommand","payload","update","selection","blockNode","focus","focusNode","getNode","getTextContentSize","getParentOrThrow","getChildren","filter","node","length","remove","fields","node_0","setFields","inlineBlockNode","selectEnd","t5","fields_0","nodeKey","rangeSelection","getEditorState","read","selection_0","schemaFieldsPath","clientSchemaMap","blocks","blocksField","clientBlock","labels","singular","blockDisplayName","t6","id","t7","t8","t9","_fields","data","dispatchCommand","_jsx","drawerTitle","label","featureKey","fieldMapOverride","handleDrawerSubmit","schemaPathSuffix"],"sources":["../../../../../src/features/blocks/client/plugin/index.tsx"],"sourcesContent":["'use client'\n\nimport type { BlocksFieldClient } from 'payload'\n\nimport { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'\nimport { $insertNodeToNearestRoot, $wrapNodeInElement, mergeRegister } from '@lexical/utils'\nimport { getTranslation } from '@payloadcms/translations'\nimport { formatDrawerSlug, useEditDepth, useTranslation } from '@payloadcms/ui'\nimport {\n  $createParagraphNode,\n  $getNodeByKey,\n  $getPreviousSelection,\n  $getSelection,\n  $insertNodes,\n  $isParagraphNode,\n  $isRangeSelection,\n  $isRootOrShadowRoot,\n  COMMAND_PRIORITY_EDITOR,\n  type RangeSelection,\n} from 'lexical'\nimport React, { useEffect, useState } from 'react'\n\nimport type { PluginComponent } from '../../../typesClient.js'\nimport type { BlockFields, BlockFieldsOptionalID } from '../../server/nodes/BlocksNode.js'\nimport type { BlocksFeatureClientProps } from '../index.js'\n\nimport { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider.js'\nimport { FieldsDrawer } from '../../../../utilities/fieldsDrawer/Drawer.js'\nimport { useLexicalDrawer } from '../../../../utilities/fieldsDrawer/useLexicalDrawer.js'\nimport { $createBlockNode, BlockNode } from '../nodes/BlocksNode.js'\nimport { $createInlineBlockNode, $isInlineBlockNode } from '../nodes/InlineBlocksNode.js'\nimport {\n  INSERT_BLOCK_COMMAND,\n  INSERT_INLINE_BLOCK_COMMAND,\n  OPEN_INLINE_BLOCK_DRAWER_COMMAND,\n} from './commands.js'\n\nexport type InsertBlockPayload = BlockFieldsOptionalID\n\nexport const BlocksPlugin: PluginComponent<BlocksFeatureClientProps> = () => {\n  const [editor] = useLexicalComposerContext()\n  const [blockFields, setBlockFields] = useState<BlockFields | null>(null)\n  const [blockType, setBlockType] = useState<string>('' as any)\n  const [targetNodeKey, setTargetNodeKey] = useState<null | string>(null)\n  const { i18n, t } = useTranslation<string, any>()\n  const {\n    fieldProps: { featureClientSchemaMap, schemaPath },\n  } = useEditorConfigContext()\n  const { uuid } = useEditorConfigContext()\n  const editDepth = useEditDepth()\n\n  const drawerSlug = formatDrawerSlug({\n    slug: `lexical-inlineBlocks-create-` + uuid,\n    depth: editDepth,\n  })\n\n  const { toggleDrawer } = useLexicalDrawer(drawerSlug, true)\n\n  useEffect(() => {\n    if (!editor.hasNodes([BlockNode])) {\n      throw new Error('BlocksPlugin: BlocksNode not registered on editor')\n    }\n\n    return mergeRegister(\n      editor.registerCommand<InsertBlockPayload>(\n        INSERT_BLOCK_COMMAND,\n        (payload: InsertBlockPayload) => {\n          editor.update(() => {\n            const selection = $getSelection() || $getPreviousSelection()\n\n            if ($isRangeSelection(selection)) {\n              const blockNode = $createBlockNode(payload)\n              // Insert blocks node BEFORE potentially removing focusNode, as $insertNodeToNearestRoot errors if the focusNode doesn't exist\n              $insertNodeToNearestRoot(blockNode)\n\n              const { focus } = selection\n              const focusNode = focus.getNode()\n\n              // First, delete currently selected node if it's an empty paragraph and if there are sufficient\n              // paragraph nodes (more than 1) left in the parent node, so that we don't \"trap\" the user\n              if (\n                $isParagraphNode(focusNode) &&\n                focusNode.getTextContentSize() === 0 &&\n                focusNode\n                  .getParentOrThrow()\n                  .getChildren()\n                  .filter((node) => $isParagraphNode(node)).length > 1\n              ) {\n                focusNode.remove()\n              }\n            }\n          })\n\n          return true\n        },\n        COMMAND_PRIORITY_EDITOR,\n      ),\n      editor.registerCommand(\n        INSERT_INLINE_BLOCK_COMMAND,\n        (fields) => {\n          if (targetNodeKey) {\n            const node = $getNodeByKey(targetNodeKey)\n\n            if (!node || !$isInlineBlockNode(node)) {\n              return false\n            }\n\n            node.setFields(fields as BlockFields)\n\n            setTargetNodeKey(null)\n            return true\n          }\n\n          const inlineBlockNode = $createInlineBlockNode(fields as BlockFields)\n          $insertNodes([inlineBlockNode])\n          if ($isRootOrShadowRoot(inlineBlockNode.getParentOrThrow())) {\n            $wrapNodeInElement(inlineBlockNode, $createParagraphNode).selectEnd()\n          }\n\n          return true\n        },\n        COMMAND_PRIORITY_EDITOR,\n      ),\n      editor.registerCommand(\n        OPEN_INLINE_BLOCK_DRAWER_COMMAND,\n        ({ fields, nodeKey }) => {\n          setBlockFields((fields as BlockFields) ?? null)\n          setTargetNodeKey(nodeKey ?? null)\n          setBlockType(fields?.blockType ?? ('' as any))\n\n          if (nodeKey) {\n            toggleDrawer()\n            return true\n          }\n\n          let rangeSelection: null | RangeSelection = null\n\n          editor.getEditorState().read(() => {\n            const selection = $getSelection()\n            if ($isRangeSelection(selection)) {\n              rangeSelection = selection\n            }\n          })\n\n          if (rangeSelection) {\n            //setLastSelection(rangeSelection)\n            toggleDrawer()\n          }\n          return true\n        },\n        COMMAND_PRIORITY_EDITOR,\n      ),\n    )\n  }, [editor, targetNodeKey, toggleDrawer])\n\n  if (!blockFields) {\n    return null\n  }\n\n  const schemaFieldsPath = `${schemaPath}.lexical_internal_feature.blocks.lexical_inline_blocks.${blockFields?.blockType}`\n\n  const clientSchemaMap = featureClientSchemaMap['blocks']\n\n  const blocksField: BlocksFieldClient = clientSchemaMap[schemaFieldsPath][0] as BlocksFieldClient\n\n  const clientBlock = blocksField.blocks[0]\n\n  if (!blocksField) {\n    return null\n  }\n\n  const blockDisplayName = clientBlock?.labels?.singular\n    ? getTranslation(clientBlock?.labels?.singular, i18n)\n    : clientBlock?.slug\n\n  return (\n    <FieldsDrawer\n      data={blockFields}\n      drawerSlug={drawerSlug}\n      drawerTitle={t(`lexical:blocks:inlineBlocks:${blockFields?.id ? 'edit' : 'create'}`, {\n        label: blockDisplayName ?? t('lexical:blocks:inlineBlocks:label'),\n      })}\n      featureKey=\"blocks\"\n      fieldMapOverride={clientBlock?.fields}\n      handleDrawerSubmit={(_fields, data) => {\n        if (!data) {\n          return\n        }\n\n        data.blockType = blockType\n\n        editor.dispatchCommand(INSERT_INLINE_BLOCK_COMMAND, data)\n      }}\n      schemaPath={schemaPath}\n      schemaPathSuffix={`lexical_inline_blocks.${blockFields?.blockType}.fields`}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/features/blocks/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA8B,MAAM,SAAS,CAAA;AAIhE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAUlE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,KAAK,EAAE,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,aAAa,gIA4KxB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA8C,MAAM,SAAS,CAAA;AAIhF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAUlE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,KAAK,EAAE,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,aAAa,gIAmLxB,CAAA"}

package/dist/features/blocks/server/index.js

@@ -84,19 +84,29 @@ export const BlocksFeature = createServerFeature({
         */
         const schemaMap = new Map();
         if (props?.blocks?.length) {
-          schemaMap.set('lexical_blocks', [{
-            name: 'lexical_blocks',
-            type: 'blocks',
-            blocks: props.blocks
-          }]);
+          for (const block of props.blocks) {
+            schemaMap.set(`lexical_blocks.${block.slug}.fields`, {
+              fields: block.fields
+            });
+            schemaMap.set(`lexical_blocks.${block.slug}`, {
+              name: `lexical_blocks_${block.slug}`,
+              type: 'blocks',
+              blocks: [block]
+            });
+          }
         }
         if (props?.inlineBlocks?.length) {
           // To generate block schemaMap which generates things like the componentMap for admin.Label
-          schemaMap.set('lexical_inline_blocks', [{
-            name: 'lexical_inline_blocks',
-            type: 'blocks',
-            blocks: props.inlineBlocks
-          }]);
+          for (const block of props.inlineBlocks) {
+            schemaMap.set(`lexical_inline_blocks.${block.slug}.fields`, {
+              fields: block.fields
+            });
+            schemaMap.set(`lexical_inline_blocks.${block.slug}`, {
+              name: `lexical_inline_blocks_${block.slug}`,
+              type: 'blocks',
+              blocks: [block]
+            });
+          }
         }
         return schemaMap;
       },

package/dist/features/blocks/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["fieldsToJSONSchema","sanitizeFields","createServerFeature","createNode","blockPopulationPromiseHOC","i18n","ServerBlockNode","ServerInlineBlockNode","blockValidationHOC","BlocksFeature","feature","config","_config","isRoot","parentIsLocalized","props","clientProps","clientBlockSlugs","clientInlineBlockSlugs","validRelationships","collections","map","c","slug","sanitized","fields","name","type","blocks","inlineBlocks","requireFieldLevelRichTextEditor","block","ClientFeature","clientFeatureProps","generatedTypes","modifyOutputSchema","collectionIDFieldTypes","currentSchema","field","interfaceNameDefinitions","length","push","generateSchemaMap","schemaMap","Map","set","nodes","getSubFields","node","blockType","find","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"sources":["../../../../src/features/blocks/server/index.ts"],"sourcesContent":["import type { Block, BlocksField, Config, Field } from 'payload'\n\nimport { fieldsToJSONSchema, sanitizeFields } from 'payload'\n\nimport type { BlocksFeatureClientProps } from '../client/index.js'\n\nimport { createServerFeature } from '../../../utilities/createServerFeature.js'\nimport { createNode } from '../../typeUtilities.js'\nimport { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { ServerBlockNode } from './nodes/BlocksNode.js'\nimport { ServerInlineBlockNode } from './nodes/InlineBlocksNode.js'\nimport { blockValidationHOC } from './validate.js'\n\nexport type BlocksFeatureProps = {\n  blocks?: Block[]\n  inlineBlocks?: Block[]\n}\n\nexport const BlocksFeature = createServerFeature<\n  BlocksFeatureProps,\n  BlocksFeatureProps,\n  BlocksFeatureClientProps\n>({\n  feature: async ({ config: _config, isRoot, parentIsLocalized, props }) => {\n    // Build clientProps\n    const clientProps: BlocksFeatureClientProps = {\n      clientBlockSlugs: [],\n      clientInlineBlockSlugs: [],\n    }\n    const validRelationships = _config.collections.map((c) => c.slug) || []\n\n    const sanitized = await sanitizeFields({\n      config: _config as unknown as Config,\n      fields: [\n        {\n          name: 'lexical_blocks',\n          type: 'blocks',\n          blocks: props.blocks ?? [],\n        },\n        {\n          name: 'lexical_inline_blocks',\n          type: 'blocks',\n          blocks: props.inlineBlocks ?? [],\n        },\n      ],\n      parentIsLocalized,\n      requireFieldLevelRichTextEditor: isRoot,\n      validRelationships,\n    })\n\n    props.blocks = (sanitized[0] as BlocksField).blocks\n    props.inlineBlocks = (sanitized[1] as BlocksField).blocks\n\n    clientProps.clientBlockSlugs = props.blocks.map((block) => block.slug)\n    clientProps.clientInlineBlockSlugs = props.inlineBlocks.map((block) => block.slug)\n\n    return {\n      ClientFeature: '@payloadcms/richtext-lexical/client#BlocksFeatureClient',\n      clientFeatureProps: clientProps,\n      generatedTypes: {\n        modifyOutputSchema: ({\n          collectionIDFieldTypes,\n          config,\n          currentSchema,\n          field,\n          interfaceNameDefinitions,\n        }) => {\n          if (!props?.blocks?.length && !props?.inlineBlocks?.length) {\n            return currentSchema\n          }\n\n          const fields: BlocksField[] = []\n\n          if (props?.blocks?.length) {\n            fields.push({\n              name: field?.name + '_lexical_blocks',\n              type: 'blocks',\n              blocks: props.blocks,\n            })\n          }\n          if (props?.inlineBlocks?.length) {\n            fields.push({\n              name: field?.name + '_lexical_inline_blocks',\n              type: 'blocks',\n              blocks: props.inlineBlocks,\n            })\n          }\n\n          if (fields.length) {\n            // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.\n            // we don't actually use the JSON Schema itself in the generated types yet.\n            fieldsToJSONSchema(collectionIDFieldTypes, fields, interfaceNameDefinitions, config)\n          }\n\n          return currentSchema\n        },\n      },\n      generateSchemaMap: ({ props }) => {\n        /**\n         * Add sub-fields to the schemaMap. E.g. if you have an array field as part of the block, and it runs addRow, it will request these\n         * sub-fields from the component map. Thus, we need to put them in the component map here.\n         */\n        const schemaMap = new Map<string, Field[]>()\n\n        if (props?.blocks?.length) {\n          schemaMap.set('lexical_blocks', [\n            {\n              name: 'lexical_blocks',\n              type: 'blocks',\n              blocks: props.blocks,\n            },\n          ])\n        }\n\n        if (props?.inlineBlocks?.length) {\n          // To generate block schemaMap which generates things like the componentMap for admin.Label\n          schemaMap.set('lexical_inline_blocks', [\n            {\n              name: 'lexical_inline_blocks',\n              type: 'blocks',\n              blocks: props.inlineBlocks,\n            },\n          ])\n        }\n\n        return schemaMap\n      },\n      i18n,\n      nodes: [\n        createNode({\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (props?.blocks?.length) {\n                return [\n                  {\n                    name: 'lexical_blocks',\n                    type: 'blocks',\n                    blocks: props.blocks,\n                  },\n                ]\n              }\n              return []\n            }\n\n            const blockType = node.fields.blockType\n\n            const block = props.blocks?.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(props.blocks)],\n          node: ServerBlockNode,\n          validations: [blockValidationHOC(props.blocks)],\n        }),\n        createNode({\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (props?.inlineBlocks?.length) {\n                return [\n                  {\n                    name: 'lexical_inline_blocks',\n                    type: 'blocks',\n                    blocks: props.inlineBlocks,\n                  },\n                ]\n              }\n              return []\n            }\n\n            const blockType = node.fields.blockType\n\n            const block = props.inlineBlocks?.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(props.inlineBlocks)],\n          node: ServerInlineBlockNode,\n          validations: [blockValidationHOC(props.inlineBlocks)],\n        }),\n      ],\n      sanitizedServerFeatureProps: props,\n    }\n  },\n  key: 'blocks',\n})\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["fieldsToJSONSchema","sanitizeFields","createServerFeature","createNode","blockPopulationPromiseHOC","i18n","ServerBlockNode","ServerInlineBlockNode","blockValidationHOC","BlocksFeature","feature","config","_config","isRoot","parentIsLocalized","props","clientProps","clientBlockSlugs","clientInlineBlockSlugs","validRelationships","collections","map","c","slug","sanitized","fields","name","type","blocks","inlineBlocks","requireFieldLevelRichTextEditor","block","ClientFeature","clientFeatureProps","generatedTypes","modifyOutputSchema","collectionIDFieldTypes","currentSchema","field","interfaceNameDefinitions","length","push","generateSchemaMap","schemaMap","Map","set","nodes","getSubFields","node","blockType","find","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"sources":["../../../../src/features/blocks/server/index.ts"],"sourcesContent":["import type { Block, BlocksField, Config, Field, FieldSchemaMap } from 'payload'\n\nimport { fieldsToJSONSchema, sanitizeFields } from 'payload'\n\nimport type { BlocksFeatureClientProps } from '../client/index.js'\n\nimport { createServerFeature } from '../../../utilities/createServerFeature.js'\nimport { createNode } from '../../typeUtilities.js'\nimport { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { ServerBlockNode } from './nodes/BlocksNode.js'\nimport { ServerInlineBlockNode } from './nodes/InlineBlocksNode.js'\nimport { blockValidationHOC } from './validate.js'\n\nexport type BlocksFeatureProps = {\n  blocks?: Block[]\n  inlineBlocks?: Block[]\n}\n\nexport const BlocksFeature = createServerFeature<\n  BlocksFeatureProps,\n  BlocksFeatureProps,\n  BlocksFeatureClientProps\n>({\n  feature: async ({ config: _config, isRoot, parentIsLocalized, props }) => {\n    // Build clientProps\n    const clientProps: BlocksFeatureClientProps = {\n      clientBlockSlugs: [],\n      clientInlineBlockSlugs: [],\n    }\n    const validRelationships = _config.collections.map((c) => c.slug) || []\n\n    const sanitized = await sanitizeFields({\n      config: _config as unknown as Config,\n      fields: [\n        {\n          name: 'lexical_blocks',\n          type: 'blocks',\n          blocks: props.blocks ?? [],\n        },\n        {\n          name: 'lexical_inline_blocks',\n          type: 'blocks',\n          blocks: props.inlineBlocks ?? [],\n        },\n      ],\n      parentIsLocalized,\n      requireFieldLevelRichTextEditor: isRoot,\n      validRelationships,\n    })\n\n    props.blocks = (sanitized[0] as BlocksField).blocks\n    props.inlineBlocks = (sanitized[1] as BlocksField).blocks\n\n    clientProps.clientBlockSlugs = props.blocks.map((block) => block.slug)\n    clientProps.clientInlineBlockSlugs = props.inlineBlocks.map((block) => block.slug)\n\n    return {\n      ClientFeature: '@payloadcms/richtext-lexical/client#BlocksFeatureClient',\n      clientFeatureProps: clientProps,\n      generatedTypes: {\n        modifyOutputSchema: ({\n          collectionIDFieldTypes,\n          config,\n          currentSchema,\n          field,\n          interfaceNameDefinitions,\n        }) => {\n          if (!props?.blocks?.length && !props?.inlineBlocks?.length) {\n            return currentSchema\n          }\n\n          const fields: BlocksField[] = []\n\n          if (props?.blocks?.length) {\n            fields.push({\n              name: field?.name + '_lexical_blocks',\n              type: 'blocks',\n              blocks: props.blocks,\n            })\n          }\n          if (props?.inlineBlocks?.length) {\n            fields.push({\n              name: field?.name + '_lexical_inline_blocks',\n              type: 'blocks',\n              blocks: props.inlineBlocks,\n            })\n          }\n\n          if (fields.length) {\n            // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.\n            // we don't actually use the JSON Schema itself in the generated types yet.\n            fieldsToJSONSchema(collectionIDFieldTypes, fields, interfaceNameDefinitions, config)\n          }\n\n          return currentSchema\n        },\n      },\n      generateSchemaMap: ({ props }) => {\n        /**\n         * Add sub-fields to the schemaMap. E.g. if you have an array field as part of the block, and it runs addRow, it will request these\n         * sub-fields from the component map. Thus, we need to put them in the component map here.\n         */\n        const schemaMap: FieldSchemaMap = new Map()\n\n        if (props?.blocks?.length) {\n          for (const block of props.blocks) {\n            schemaMap.set(`lexical_blocks.${block.slug}.fields`, {\n              fields: block.fields,\n            })\n            schemaMap.set(`lexical_blocks.${block.slug}`, {\n              name: `lexical_blocks_${block.slug}`,\n              type: 'blocks',\n              blocks: [block],\n            })\n          }\n        }\n\n        if (props?.inlineBlocks?.length) {\n          // To generate block schemaMap which generates things like the componentMap for admin.Label\n          for (const block of props.inlineBlocks) {\n            schemaMap.set(`lexical_inline_blocks.${block.slug}.fields`, {\n              fields: block.fields,\n            })\n\n            schemaMap.set(`lexical_inline_blocks.${block.slug}`, {\n              name: `lexical_inline_blocks_${block.slug}`,\n              type: 'blocks',\n              blocks: [block],\n            })\n          }\n        }\n\n        return schemaMap\n      },\n      i18n,\n      nodes: [\n        createNode({\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (props?.blocks?.length) {\n                return [\n                  {\n                    name: 'lexical_blocks',\n                    type: 'blocks',\n                    blocks: props.blocks,\n                  },\n                ]\n              }\n              return []\n            }\n\n            const blockType = node.fields.blockType\n\n            const block = props.blocks?.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(props.blocks)],\n          node: ServerBlockNode,\n          validations: [blockValidationHOC(props.blocks)],\n        }),\n        createNode({\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (props?.inlineBlocks?.length) {\n                return [\n                  {\n                    name: 'lexical_inline_blocks',\n                    type: 'blocks',\n                    blocks: props.inlineBlocks,\n                  },\n                ]\n              }\n              return []\n            }\n\n            const blockType = node.fields.blockType\n\n            const block = props.inlineBlocks?.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(props.inlineBlocks)],\n          node: ServerInlineBlockNode,\n          validations: [blockValidationHOC(props.inlineBlocks)],\n        }),\n      ],\n      sanitizedServerFeatureProps: props,\n    }\n  },\n  key: 'blocks',\n})\n"],"mappings":"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","ignoreList":[]}

package/dist/features/blocks/server/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAA;AACpF,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE7E,eAAO,MAAM,kBAAkB,WACrB,KAAK,EAAE,KACd,cAAc,CAAC,mBAAmB,GAAG,yBAAyB,CA4ChE,CAAA"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAA;AACpF,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE7E,eAAO,MAAM,kBAAkB,WACrB,KAAK,EAAE,KACd,cAAc,CAAC,mBAAmB,GAAG,yBAAyB,CA+ChE,CAAA"}

package/dist/features/blocks/server/validate.js

@@ -1,4 +1,4 @@
-import { buildStateFromSchema } from '@payloadcms/ui/forms/buildStateFromSchema';
+import { fieldSchemasToFormState } from '@payloadcms/ui/forms/fieldSchemasToFormState';
 export const blockValidationHOC = blocks => {
   return async ({
     node,
@@ -21,17 +21,20 @@ export const blockValidationHOC = blocks => {
       return 'Block not found';
     }
     /**
-    * Run buildStateFromSchema as that properly validates block and block sub-fields
+    * Run fieldSchemasToFormState as that properly validates block and block sub-fields
     */
-    const result = await buildStateFromSchema({
+    const result = await fieldSchemasToFormState({
       id,
       collectionSlug,
       data: blockFieldData,
-      fieldSchema: block.fields,
+      fields: block.fields,
+      fieldSchemaMap: undefined,
       operation: operation === 'create' || operation === 'update' ? operation : 'update',
+      permissions: {},
       preferences,
+      renderAllFields: false,
       req,
-      siblingData: blockFieldData
+      schemaPath: ''
     });
     let errorPaths = [];
     for (const fieldKey in result) {

package/dist/features/blocks/server/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","names":["buildStateFromSchema","blockValidationHOC","blocks","node","validation","blockFieldData","fields","options","id","collectionSlug","operation","preferences","req","block","find","slug","blockType","result","data","fieldSchema","siblingData","errorPaths","fieldKey","concat","length","join"],"sources":["../../../../src/features/blocks/server/validate.ts"],"sourcesContent":["import type { Block } from 'payload'\n\nimport { buildStateFromSchema } from '@payloadcms/ui/forms/buildStateFromSchema'\n\nimport type { NodeValidation } from '../../typesServer.js'\nimport type { SerializedInlineBlockNode } from '../client/nodes/InlineBlocksNode.js'\nimport type { BlockFields, SerializedBlockNode } from './nodes/BlocksNode.js'\n\nexport const blockValidationHOC = (\n  blocks: Block[],\n): NodeValidation<SerializedBlockNode | SerializedInlineBlockNode> => {\n  return async ({ node, validation }) => {\n    const blockFieldData = node.fields ?? ({} as BlockFields)\n\n    const {\n      options: { id, collectionSlug, operation, preferences, req },\n    } = validation\n\n    // find block\n    const block = blocks.find((block) => block.slug === blockFieldData.blockType)\n\n    // validate block\n    if (!block) {\n      return 'Block not found'\n    }\n\n    /**\n     * Run buildStateFromSchema as that properly validates block and block sub-fields\n     */\n\n    const result = await buildStateFromSchema({\n      id,\n      collectionSlug,\n      data: blockFieldData,\n      fieldSchema: block.fields,\n      operation: operation === 'create' || operation === 'update' ? operation : 'update',\n      preferences,\n      req,\n      siblingData: blockFieldData,\n    })\n\n    let errorPaths: string[] = []\n    for (const fieldKey in result) {\n      if (result[fieldKey].errorPaths) {\n        errorPaths = errorPaths.concat(result[fieldKey].errorPaths)\n      }\n    }\n\n    if (errorPaths.length) {\n      return 'The following fields are invalid: ' + errorPaths.join(', ')\n    }\n\n    return true\n  }\n}\n"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ;AAMrC,OAAO,MAAMC,kBAAA,GACXC,MAAA;EAEA,OAAO,OAAO;IAAEC,IAAI;IAAEC;EAAU,CAAE;IAChC,MAAMC,cAAA,GAAiBF,IAAA,CAAKG,MAAM,IAAK,CAAC;IAExC,MAAM;MACJC,OAAA,EAAS;QAAEC,EAAE;QAAEC,cAAc;QAAEC,SAAS;QAAEC,WAAW;QAAEC;MAAG;IAAE,CAC7D,GAAGR,UAAA;IAEJ;IACA,MAAMS,KAAA,GAAQX,MAAA,CAAOY,IAAI,CAAED,KAAA,IAAUA,KAAA,CAAME,IAAI,KAAKV,cAAA,CAAeW,SAAS;IAE5E;IACA,IAAI,CAACH,KAAA,EAAO;MACV,OAAO;IACT;IAEA;;;IAIA,MAAMI,MAAA,GAAS,MAAMjB,oBAAA,CAAqB;MACxCQ,EAAA;MACAC,cAAA;MACAS,IAAA,EAAMb,cAAA;MACNc,WAAA,EAAaN,KAAA,CAAMP,MAAM;MACzBI,SAAA,EAAWA,SAAA,KAAc,YAAYA,SAAA,KAAc,WAAWA,SAAA,GAAY;MAC1EC,WAAA;MACAC,GAAA;MACAQ,WAAA,EAAaf;IACf;IAEA,IAAIgB,UAAA,GAAuB,EAAE;IAC7B,KAAK,MAAMC,QAAA,IAAYL,MAAA,EAAQ;MAC7B,IAAIA,MAAM,CAACK,QAAA,CAAS,CAACD,UAAU,EAAE;QAC/BA,UAAA,GAAaA,UAAA,CAAWE,MAAM,CAACN,MAAM,CAACK,QAAA,CAAS,CAACD,UAAU;MAC5D;IACF;IAEA,IAAIA,UAAA,CAAWG,MAAM,EAAE;MACrB,OAAO,uCAAuCH,UAAA,CAAWI,IAAI,CAAC;IAChE;IAEA,OAAO;EACT;AACF","ignoreList":[]}
+{"version":3,"file":"validate.js","names":["fieldSchemasToFormState","blockValidationHOC","blocks","node","validation","blockFieldData","fields","options","id","collectionSlug","operation","preferences","req","block","find","slug","blockType","result","data","fieldSchemaMap","undefined","permissions","renderAllFields","schemaPath","errorPaths","fieldKey","concat","length","join"],"sources":["../../../../src/features/blocks/server/validate.ts"],"sourcesContent":["import type { Block } from 'payload'\n\nimport { fieldSchemasToFormState } from '@payloadcms/ui/forms/fieldSchemasToFormState'\n\nimport type { NodeValidation } from '../../typesServer.js'\nimport type { SerializedInlineBlockNode } from '../client/nodes/InlineBlocksNode.js'\nimport type { BlockFields, SerializedBlockNode } from './nodes/BlocksNode.js'\n\nexport const blockValidationHOC = (\n  blocks: Block[],\n): NodeValidation<SerializedBlockNode | SerializedInlineBlockNode> => {\n  return async ({ node, validation }) => {\n    const blockFieldData = node.fields ?? ({} as BlockFields)\n\n    const {\n      options: { id, collectionSlug, operation, preferences, req },\n    } = validation\n\n    // find block\n    const block = blocks.find((block) => block.slug === blockFieldData.blockType)\n\n    // validate block\n    if (!block) {\n      return 'Block not found'\n    }\n\n    /**\n     * Run fieldSchemasToFormState as that properly validates block and block sub-fields\n     */\n\n    const result = await fieldSchemasToFormState({\n      id,\n      collectionSlug,\n      data: blockFieldData,\n      fields: block.fields,\n      fieldSchemaMap: undefined,\n      operation: operation === 'create' || operation === 'update' ? operation : 'update',\n      permissions: {},\n      preferences,\n      renderAllFields: false,\n      req,\n      schemaPath: '',\n    })\n\n    let errorPaths: string[] = []\n    for (const fieldKey in result) {\n      if (result[fieldKey].errorPaths) {\n        errorPaths = errorPaths.concat(result[fieldKey].errorPaths)\n      }\n    }\n\n    if (errorPaths.length) {\n      return 'The following fields are invalid: ' + errorPaths.join(', ')\n    }\n\n    return true\n  }\n}\n"],"mappings":"AAEA,SAASA,uBAAuB,QAAQ;AAMxC,OAAO,MAAMC,kBAAA,GACXC,MAAA;EAEA,OAAO,OAAO;IAAEC,IAAI;IAAEC;EAAU,CAAE;IAChC,MAAMC,cAAA,GAAiBF,IAAA,CAAKG,MAAM,IAAK,CAAC;IAExC,MAAM;MACJC,OAAA,EAAS;QAAEC,EAAE;QAAEC,cAAc;QAAEC,SAAS;QAAEC,WAAW;QAAEC;MAAG;IAAE,CAC7D,GAAGR,UAAA;IAEJ;IACA,MAAMS,KAAA,GAAQX,MAAA,CAAOY,IAAI,CAAED,KAAA,IAAUA,KAAA,CAAME,IAAI,KAAKV,cAAA,CAAeW,SAAS;IAE5E;IACA,IAAI,CAACH,KAAA,EAAO;MACV,OAAO;IACT;IAEA;;;IAIA,MAAMI,MAAA,GAAS,MAAMjB,uBAAA,CAAwB;MAC3CQ,EAAA;MACAC,cAAA;MACAS,IAAA,EAAMb,cAAA;MACNC,MAAA,EAAQO,KAAA,CAAMP,MAAM;MACpBa,cAAA,EAAgBC,SAAA;MAChBV,SAAA,EAAWA,SAAA,KAAc,YAAYA,SAAA,KAAc,WAAWA,SAAA,GAAY;MAC1EW,WAAA,EAAa,CAAC;MACdV,WAAA;MACAW,eAAA,EAAiB;MACjBV,GAAA;MACAW,UAAA,EAAY;IACd;IAEA,IAAIC,UAAA,GAAuB,EAAE;IAC7B,KAAK,MAAMC,QAAA,IAAYR,MAAA,EAAQ;MAC7B,IAAIA,MAAM,CAACQ,QAAA,CAAS,CAACD,UAAU,EAAE;QAC/BA,UAAA,GAAaA,UAAA,CAAWE,MAAM,CAACT,MAAM,CAACQ,QAAA,CAAS,CAACD,UAAU;MAC5D;IACF;IAEA,IAAIA,UAAA,CAAWG,MAAM,EAAE;MACrB,OAAO,uCAAuCH,UAAA,CAAWI,IAAI,CAAC;IAChE;IAEA,OAAO;EACT;AACF","ignoreList":[]}