@payloadcms/richtext-lexical 3.0.0-canary.3bd3027 → 3.0.0-canary.483db21

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

@@ -0,0 +1,133 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React, { useCallback, useEffect, useRef } from 'react';
+const baseClass = 'inline-block';
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
+import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection';
+import { mergeRegister } from '@lexical/utils';
+import { getTranslation } from '@payloadcms/translations';
+import { Button, useTranslation } from '@payloadcms/ui';
+import { $getNodeByKey, $getSelection, $isNodeSelection, CLICK_COMMAND, COMMAND_PRIORITY_LOW, KEY_BACKSPACE_COMMAND, KEY_DELETE_COMMAND } from 'lexical';
+import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider.js';
+import { $isInlineBlockNode } from '../nodes/InlineBlocksNode.js';
+import { OPEN_INLINE_BLOCK_DRAWER_COMMAND } from '../plugin/commands.js';
+export const InlineBlockComponent = (props)=>{
+    const { formData, nodeKey } = props;
+    const [editor] = useLexicalComposerContext();
+    const { i18n, t } = useTranslation();
+    const { editorConfig, field } = useEditorConfigContext();
+    const inlineBlockElemElemRef = useRef(null);
+    const [isSelected, setSelected, clearSelection] = useLexicalNodeSelection(nodeKey);
+    const reducedBlock = editorConfig?.resolvedFeatureMap?.get('blocks')?.sanitizedClientFeatureProps?.reducedInlineBlocks?.find((block)=>block.slug === formData?.blockType);
+    const removeInlineBlock = useCallback(()=>{
+        editor.update(()=>{
+            $getNodeByKey(nodeKey).remove();
+        });
+    }, [
+        editor,
+        nodeKey
+    ]);
+    const $onDelete = useCallback((event)=>{
+        if (isSelected && $isNodeSelection($getSelection())) {
+            event.preventDefault();
+            const node = $getNodeByKey(nodeKey);
+            if ($isInlineBlockNode(node)) {
+                node.remove();
+                return true;
+            }
+        }
+        return false;
+    }, [
+        isSelected,
+        nodeKey
+    ]);
+    const onClick = useCallback((payload)=>{
+        const event = payload;
+        // Check if inlineBlockElemElemRef.target or anything WITHIN inlineBlockElemElemRef.target was clicked
+        if (event.target === inlineBlockElemElemRef.current || inlineBlockElemElemRef.current?.contains(event.target)) {
+            if (event.shiftKey) {
+                setSelected(!isSelected);
+            } else {
+                if (!isSelected) {
+                    clearSelection();
+                    setSelected(true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }, [
+        isSelected,
+        setSelected,
+        clearSelection
+    ]);
+    useEffect(()=>{
+        return mergeRegister(editor.registerCommand(CLICK_COMMAND, onClick, COMMAND_PRIORITY_LOW), editor.registerCommand(KEY_DELETE_COMMAND, $onDelete, COMMAND_PRIORITY_LOW), editor.registerCommand(KEY_BACKSPACE_COMMAND, $onDelete, COMMAND_PRIORITY_LOW));
+    }, [
+        clearSelection,
+        editor,
+        isSelected,
+        nodeKey,
+        $onDelete,
+        setSelected,
+        onClick
+    ]);
+    const LabelComponent = reducedBlock?.LabelComponent;
+    const blockDisplayName = reducedBlock.labels.singular ? getTranslation(reducedBlock.labels.singular, i18n) : reducedBlock.slug;
+    return /*#__PURE__*/ _jsxs("div", {
+        className: [
+            baseClass,
+            baseClass + '-' + formData.blockType,
+            isSelected && `${baseClass}--selected`
+        ].filter(Boolean).join(' '),
+        ref: inlineBlockElemElemRef,
+        children: [
+            LabelComponent ? /*#__PURE__*/ _jsx(LabelComponent, {
+                blockKind: 'lexicalInlineBlock',
+                formData: formData
+            }) : /*#__PURE__*/ _jsx("div", {
+                children: getTranslation(reducedBlock.labels.singular, i18n)
+            }),
+            editor.isEditable() && /*#__PURE__*/ _jsxs("div", {
+                className: `${baseClass}__actions`,
+                children: [
+                    /*#__PURE__*/ _jsx(Button, {
+                        buttonStyle: "icon-label",
+                        className: `${baseClass}__editButton`,
+                        disabled: field?.readOnly,
+                        el: "div",
+                        icon: "edit",
+                        onClick: ()=>{
+                            editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {
+                                fields: formData,
+                                nodeKey
+                            });
+                        },
+                        round: true,
+                        size: "small",
+                        tooltip: t('lexical:blocks:inlineBlocks:edit', {
+                            label: blockDisplayName
+                        })
+                    }),
+                    /*#__PURE__*/ _jsx(Button, {
+                        buttonStyle: "icon-label",
+                        className: `${baseClass}__removeButton`,
+                        disabled: field?.readOnly,
+                        icon: "x",
+                        onClick: (e)=>{
+                            e.preventDefault();
+                            removeInlineBlock();
+                        },
+                        round: true,
+                        size: "small",
+                        tooltip: t('lexical:blocks:inlineBlocks:remove', {
+                            label: blockDisplayName
+                        })
+                    })
+                ]
+            })
+        ]
+    });
+};
+
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/features/blocks/componentInline/index.tsx"],"sourcesContent":["'use client'\n\nimport React, { useCallback, useEffect, useRef } from 'react'\nconst baseClass = 'inline-block'\n\nimport { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'\nimport { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection'\nimport { mergeRegister } from '@lexical/utils'\nimport { getTranslation } from '@payloadcms/translations'\nimport { Button, useTranslation } from '@payloadcms/ui'\nimport {\n  $getNodeByKey,\n  $getSelection,\n  $isNodeSelection,\n  CLICK_COMMAND,\n  COMMAND_PRIORITY_LOW,\n  KEY_BACKSPACE_COMMAND,\n  KEY_DELETE_COMMAND,\n} from 'lexical'\n\nimport type { ClientComponentProps } from '../../typesClient.js'\nimport type { BlocksFeatureClientProps, ClientBlock } from '../feature.client.js'\nimport type { InlineBlockFields } from '../nodes/InlineBlocksNode.js'\n\nimport { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider.js'\nimport { $isInlineBlockNode } from '../nodes/InlineBlocksNode.js'\nimport { OPEN_INLINE_BLOCK_DRAWER_COMMAND } from '../plugin/commands.js'\nimport './index.scss'\n\ntype Props = {\n  readonly formData: InlineBlockFields\n  readonly nodeKey?: string\n}\n\nexport const InlineBlockComponent: React.FC<Props> = (props) => {\n  const { formData, nodeKey } = props\n  const [editor] = useLexicalComposerContext()\n  const { i18n, t } = useTranslation<object, string>()\n  const { editorConfig, field } = useEditorConfigContext()\n  const inlineBlockElemElemRef = useRef<HTMLDivElement | null>(null)\n  const [isSelected, setSelected, clearSelection] = useLexicalNodeSelection(nodeKey)\n\n  const reducedBlock: ClientBlock = (\n    editorConfig?.resolvedFeatureMap?.get('blocks')\n      ?.sanitizedClientFeatureProps as ClientComponentProps<BlocksFeatureClientProps>\n  )?.reducedInlineBlocks?.find((block) => block.slug === formData?.blockType)\n\n  const removeInlineBlock = useCallback(() => {\n    editor.update(() => {\n      $getNodeByKey(nodeKey).remove()\n    })\n  }, [editor, nodeKey])\n\n  const $onDelete = useCallback(\n    (event: KeyboardEvent) => {\n      if (isSelected && $isNodeSelection($getSelection())) {\n        event.preventDefault()\n        const node = $getNodeByKey(nodeKey)\n        if ($isInlineBlockNode(node)) {\n          node.remove()\n          return true\n        }\n      }\n      return false\n    },\n    [isSelected, nodeKey],\n  )\n  const onClick = useCallback(\n    (payload: MouseEvent) => {\n      const event = payload\n      // Check if inlineBlockElemElemRef.target or anything WITHIN inlineBlockElemElemRef.target was clicked\n      if (\n        event.target === inlineBlockElemElemRef.current ||\n        inlineBlockElemElemRef.current?.contains(event.target as Node)\n      ) {\n        if (event.shiftKey) {\n          setSelected(!isSelected)\n        } else {\n          if (!isSelected) {\n            clearSelection()\n            setSelected(true)\n          }\n        }\n        return true\n      }\n\n      return false\n    },\n    [isSelected, setSelected, clearSelection],\n  )\n\n  useEffect(() => {\n    return mergeRegister(\n      editor.registerCommand<MouseEvent>(CLICK_COMMAND, onClick, COMMAND_PRIORITY_LOW),\n\n      editor.registerCommand(KEY_DELETE_COMMAND, $onDelete, COMMAND_PRIORITY_LOW),\n      editor.registerCommand(KEY_BACKSPACE_COMMAND, $onDelete, COMMAND_PRIORITY_LOW),\n    )\n  }, [clearSelection, editor, isSelected, nodeKey, $onDelete, setSelected, onClick])\n\n  const LabelComponent = reducedBlock?.LabelComponent\n\n  const blockDisplayName = reducedBlock.labels.singular\n    ? getTranslation(reducedBlock.labels.singular, i18n)\n    : reducedBlock.slug\n\n  return (\n    <div\n      className={[\n        baseClass,\n        baseClass + '-' + formData.blockType,\n        isSelected && `${baseClass}--selected`,\n      ]\n        .filter(Boolean)\n        .join(' ')}\n      ref={inlineBlockElemElemRef}\n    >\n      {LabelComponent ? (\n        <LabelComponent blockKind={'lexicalInlineBlock'} formData={formData} />\n      ) : (\n        <div>{getTranslation(reducedBlock.labels.singular, i18n)}</div>\n      )}\n      {editor.isEditable() && (\n        <div className={`${baseClass}__actions`}>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__editButton`}\n            disabled={field?.readOnly}\n            el=\"div\"\n            icon=\"edit\"\n            onClick={() => {\n              editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                fields: formData,\n                nodeKey,\n              })\n            }}\n            round\n            size=\"small\"\n            tooltip={t('lexical:blocks:inlineBlocks:edit', { label: blockDisplayName })}\n          />\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__removeButton`}\n            disabled={field?.readOnly}\n            icon=\"x\"\n            onClick={(e) => {\n              e.preventDefault()\n              removeInlineBlock()\n            }}\n            round\n            size=\"small\"\n            tooltip={t('lexical:blocks:inlineBlocks:remove', { label: blockDisplayName })}\n          />\n        </div>\n      )}\n    </div>\n  )\n}\n"],"names":["React","useCallback","useEffect","useRef","baseClass","useLexicalComposerContext","useLexicalNodeSelection","mergeRegister","getTranslation","Button","useTranslation","$getNodeByKey","$getSelection","$isNodeSelection","CLICK_COMMAND","COMMAND_PRIORITY_LOW","KEY_BACKSPACE_COMMAND","KEY_DELETE_COMMAND","useEditorConfigContext","$isInlineBlockNode","OPEN_INLINE_BLOCK_DRAWER_COMMAND","InlineBlockComponent","props","formData","nodeKey","editor","i18n","t","editorConfig","field","inlineBlockElemElemRef","isSelected","setSelected","clearSelection","reducedBlock","resolvedFeatureMap","get","sanitizedClientFeatureProps","reducedInlineBlocks","find","block","slug","blockType","removeInlineBlock","update","remove","$onDelete","event","preventDefault","node","onClick","payload","target","current","contains","shiftKey","registerCommand","LabelComponent","blockDisplayName","labels","singular","div","className","filter","Boolean","join","ref","blockKind","isEditable","buttonStyle","disabled","readOnly","el","icon","dispatchCommand","fields","round","size","tooltip","label","e"],"mappings":"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"}

package/dist/features/blocks/feature.client.d.ts

@@ -1,6 +1,10 @@
-import type { ReducedBlock } from '@payloadcms/ui/utilities/buildComponentMap';
+import type { Block, ReducedBlock } from 'payload';
+export type ClientBlock = {
+    LabelComponent?: Block['admin']['components']['Label'];
+} & ReducedBlock;
 export type BlocksFeatureClientProps = {
-    reducedBlocks: ReducedBlock[];
+    reducedBlocks: ClientBlock[];
+    reducedInlineBlocks: ClientBlock[];
 };
 export declare const BlocksFeatureClient: import("react").FC<{
     featureKey: string;

package/dist/features/blocks/feature.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature.client.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/feature.client.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAU9E,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,YAAY,EAAE,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,mBAAmB;;;6BAwE7B,CAAA"}
+{"version":3,"file":"feature.client.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/feature.client.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAclD,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAA;CACvD,GAAG,YAAY,CAAA;AAEhB,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,WAAW,EAAE,CAAA;IAC5B,mBAAmB,EAAE,WAAW,EAAE,CAAA;CACnC,CAAA;AAED,eAAO,MAAM,mBAAmB;;;6BAyI7B,CAAA"}

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

@@ -1,13 +1,16 @@
 'use client';
 import { getTranslation } from '@payloadcms/translations';
 import { BlockIcon } from '../../lexical/ui/icons/Block/index.js';
+import { InlineBlocksIcon } from '../../lexical/ui/icons/InlineBlocks/index.js';
 import { createClientFeature } from '../../utilities/createClientFeature.js';
 import { BlockNode } from './nodes/BlocksNode.js';
-import { INSERT_BLOCK_COMMAND } from './plugin/commands.js';
+import { InlineBlockNode } from './nodes/InlineBlocksNode.js';
+import { INSERT_BLOCK_COMMAND, OPEN_INLINE_BLOCK_DRAWER_COMMAND } from './plugin/commands.js';
 import { BlocksPlugin } from './plugin/index.js';
 export const BlocksFeatureClient = createClientFeature(({ props })=>({
         nodes: [
-            BlockNode
+            BlockNode,
+            InlineBlockNode
         ],
         plugins: [
             {
@@ -18,7 +21,7 @@ export const BlocksFeatureClient = createClientFeature(({ props })=>({
         sanitizedClientFeatureProps: props,
         slashMenu: {
             groups: [
-                {
+                props.reducedBlocks?.length ? {
                     items: props.reducedBlocks.map((block)=>{
                         return {
                             Icon: BlockIcon,
@@ -47,12 +50,44 @@ export const BlocksFeatureClient = createClientFeature(({ props })=>({
                     label: ({ i18n })=>{
                         return i18n.t('lexical:blocks:label');
                     }
-                }
-            ]
+                } : null,
+                props.reducedInlineBlocks?.length ? {
+                    items: props.reducedInlineBlocks.map((inlineBlock)=>{
+                        return {
+                            Icon: InlineBlocksIcon,
+                            key: 'inlineBlocks-' + inlineBlock.slug,
+                            keywords: [
+                                'inlineBlock',
+                                'inline block',
+                                inlineBlock.slug
+                            ],
+                            label: ({ i18n })=>{
+                                if (!inlineBlock.labels.singular) {
+                                    return inlineBlock.slug;
+                                }
+                                return getTranslation(inlineBlock.labels.singular, i18n);
+                            },
+                            onSelect: ({ editor })=>{
+                                editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {
+                                    fields: {
+                                        id: null,
+                                        blockName: '',
+                                        blockType: inlineBlock.slug
+                                    }
+                                });
+                            }
+                        };
+                    }),
+                    key: 'inlineBlocks',
+                    label: ({ i18n })=>{
+                        return i18n.t('lexical:blocks:inlineBlocks:label');
+                    }
+                } : null
+            ].filter(Boolean)
         },
         toolbarFixed: {
             groups: [
-                {
+                props.reducedBlocks?.length ? {
                     type: 'dropdown',
                     ChildComponent: BlockIcon,
                     items: props.reducedBlocks.map((block, index)=>{
@@ -78,8 +113,35 @@ export const BlocksFeatureClient = createClientFeature(({ props })=>({
                     }),
                     key: 'blocks',
                     order: 20
-                }
-            ]
+                } : null,
+                props.reducedInlineBlocks?.length ? {
+                    type: 'dropdown',
+                    ChildComponent: InlineBlocksIcon,
+                    items: props.reducedInlineBlocks.map((inlineBlock, index)=>{
+                        return {
+                            ChildComponent: InlineBlocksIcon,
+                            isActive: undefined,
+                            key: 'inlineBlock-' + inlineBlock.slug,
+                            label: ({ i18n })=>{
+                                if (!inlineBlock.labels.singular) {
+                                    return inlineBlock.slug;
+                                }
+                                return getTranslation(inlineBlock.labels.singular, i18n);
+                            },
+                            onSelect: ({ editor })=>{
+                                editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {
+                                    fields: {
+                                        blockType: inlineBlock.slug
+                                    }
+                                });
+                            },
+                            order: index
+                        };
+                    }),
+                    key: 'inlineBlocks',
+                    order: 25
+                } : null
+            ].filter(Boolean)
         }
     }));
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/features/blocks/feature.client.tsx"],"sourcesContent":["'use client'\n\nimport type { ReducedBlock } from '@payloadcms/ui/utilities/buildComponentMap'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport { BlockIcon } from '../../lexical/ui/icons/Block/index.js'\nimport { createClientFeature } from '../../utilities/createClientFeature.js'\nimport { BlockNode } from './nodes/BlocksNode.js'\nimport { INSERT_BLOCK_COMMAND } from './plugin/commands.js'\nimport { BlocksPlugin } from './plugin/index.js'\n\nexport type BlocksFeatureClientProps = {\n  reducedBlocks: ReducedBlock[]\n}\n\nexport const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>(({ props }) => ({\n  nodes: [BlockNode],\n  plugins: [\n    {\n      Component: BlocksPlugin,\n      position: 'normal',\n    },\n  ],\n  sanitizedClientFeatureProps: props,\n  slashMenu: {\n    groups: [\n      {\n        items: props.reducedBlocks.map((block) => {\n          return {\n            Icon: BlockIcon,\n            key: 'block-' + block.slug,\n            keywords: ['block', 'blocks', block.slug],\n            label: ({ i18n }) => {\n              if (!block.labels.singular) {\n                return block.slug\n              }\n\n              return getTranslation(block.labels.singular, i18n)\n            },\n            onSelect: ({ editor }) => {\n              editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                id: null,\n                blockName: '',\n                blockType: block.slug,\n              })\n            },\n          }\n        }),\n        key: 'blocks',\n        label: ({ i18n }) => {\n          return i18n.t('lexical:blocks:label')\n        },\n      },\n    ],\n  },\n  toolbarFixed: {\n    groups: [\n      {\n        type: 'dropdown',\n        ChildComponent: BlockIcon,\n        items: props.reducedBlocks.map((block, 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-' + block.slug,\n            label: ({ i18n }) => {\n              if (!block.labels.singular) {\n                return block.slug\n              }\n\n              return getTranslation(block.labels.singular, i18n)\n            },\n            onSelect: ({ editor }) => {\n              editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                id: null,\n                blockName: '',\n                blockType: block.slug,\n              })\n            },\n            order: index,\n          }\n        }),\n        key: 'blocks',\n        order: 20,\n      },\n    ],\n  },\n}))\n"],"names":["getTranslation","BlockIcon","createClientFeature","BlockNode","INSERT_BLOCK_COMMAND","BlocksPlugin","BlocksFeatureClient","props","nodes","plugins","Component","position","sanitizedClientFeatureProps","slashMenu","groups","items","reducedBlocks","map","block","Icon","key","slug","keywords","label","i18n","labels","singular","onSelect","editor","dispatchCommand","id","blockName","blockType","t","toolbarFixed","type","ChildComponent","index","isActive","undefined","order"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;AAIA,SAASA,cAAc,QAAQ,2BAA0B;AAEzD,SAASC,SAAS,QAAQ,wCAAuC;AACjE,SAASC,mBAAmB,QAAQ,yCAAwC;AAC5E,SAASC,SAAS,QAAQ,wBAAuB;AACjD,SAASC,oBAAoB,QAAQ,uBAAsB;AAC3D,SAASC,YAAY,QAAQ,oBAAmB;AAMhD,OAAO,MAAMC,sBAAsBJ,oBAA8C,CAAC,EAAEK,KAAK,EAAE,GAAM,CAAA;QAC/FC,OAAO;YAACL;SAAU;QAClBM,SAAS;YACP;gBACEC,WAAWL;gBACXM,UAAU;YACZ;SACD;QACDC,6BAA6BL;QAC7BM,WAAW;YACTC,QAAQ;gBACN;oBACEC,OAAOR,MAAMS,aAAa,CAACC,GAAG,CAAC,CAACC;wBAC9B,OAAO;4BACLC,MAAMlB;4BACNmB,KAAK,WAAWF,MAAMG,IAAI;4BAC1BC,UAAU;gCAAC;gCAAS;gCAAUJ,MAAMG,IAAI;6BAAC;4BACzCE,OAAO,CAAC,EAAEC,IAAI,EAAE;gCACd,IAAI,CAACN,MAAMO,MAAM,CAACC,QAAQ,EAAE;oCAC1B,OAAOR,MAAMG,IAAI;gCACnB;gCAEA,OAAOrB,eAAekB,MAAMO,MAAM,CAACC,QAAQ,EAAEF;4BAC/C;4BACAG,UAAU,CAAC,EAAEC,MAAM,EAAE;gCACnBA,OAAOC,eAAe,CAACzB,sBAAsB;oCAC3C0B,IAAI;oCACJC,WAAW;oCACXC,WAAWd,MAAMG,IAAI;gCACvB;4BACF;wBACF;oBACF;oBACAD,KAAK;oBACLG,OAAO,CAAC,EAAEC,IAAI,EAAE;wBACd,OAAOA,KAAKS,CAAC,CAAC;oBAChB;gBACF;aACD;QACH;QACAC,cAAc;YACZpB,QAAQ;gBACN;oBACEqB,MAAM;oBACNC,gBAAgBnC;oBAChBc,OAAOR,MAAMS,aAAa,CAACC,GAAG,CAAC,CAACC,OAAOmB;wBACrC,OAAO;4BACLD,gBAAgBnC;4BAChBqC,UAAUC;4BACVnB,KAAK,WAAWF,MAAMG,IAAI;4BAC1BE,OAAO,CAAC,EAAEC,IAAI,EAAE;gCACd,IAAI,CAACN,MAAMO,MAAM,CAACC,QAAQ,EAAE;oCAC1B,OAAOR,MAAMG,IAAI;gCACnB;gCAEA,OAAOrB,eAAekB,MAAMO,MAAM,CAACC,QAAQ,EAAEF;4BAC/C;4BACAG,UAAU,CAAC,EAAEC,MAAM,EAAE;gCACnBA,OAAOC,eAAe,CAACzB,sBAAsB;oCAC3C0B,IAAI;oCACJC,WAAW;oCACXC,WAAWd,MAAMG,IAAI;gCACvB;4BACF;4BACAmB,OAAOH;wBACT;oBACF;oBACAjB,KAAK;oBACLoB,OAAO;gBACT;aACD;QACH;IACF,CAAA,GAAG"}
+{"version":3,"sources":["../../../src/features/blocks/feature.client.tsx"],"sourcesContent":["'use client'\n\nimport type { Block, ReducedBlock } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport type { ToolbarGroup } 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 ClientBlock = {\n  LabelComponent?: Block['admin']['components']['Label']\n} & ReducedBlock\n\nexport type BlocksFeatureClientProps = {\n  reducedBlocks: ClientBlock[]\n  reducedInlineBlocks: ClientBlock[]\n}\n\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.reducedBlocks?.length\n        ? {\n            items: props.reducedBlocks.map((block) => {\n              return {\n                Icon: BlockIcon,\n                key: 'block-' + block.slug,\n                keywords: ['block', 'blocks', block.slug],\n                label: ({ i18n }) => {\n                  if (!block.labels.singular) {\n                    return block.slug\n                  }\n\n                  return getTranslation(block.labels.singular, i18n)\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                    id: null,\n                    blockName: '',\n                    blockType: block.slug,\n                  })\n                },\n              }\n            }),\n            key: 'blocks',\n            label: ({ i18n }) => {\n              return i18n.t('lexical:blocks:label')\n            },\n          }\n        : null,\n      props.reducedInlineBlocks?.length\n        ? {\n            items: props.reducedInlineBlocks.map((inlineBlock) => {\n              return {\n                Icon: InlineBlocksIcon,\n                key: 'inlineBlocks-' + inlineBlock.slug,\n                keywords: ['inlineBlock', 'inline block', inlineBlock.slug],\n                label: ({ i18n }) => {\n                  if (!inlineBlock.labels.singular) {\n                    return inlineBlock.slug\n                  }\n\n                  return getTranslation(inlineBlock.labels.singular, i18n)\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                    fields: {\n                      id: null,\n                      blockName: '',\n                      blockType: inlineBlock.slug,\n                    },\n                  })\n                },\n              }\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.reducedBlocks?.length\n        ? {\n            type: 'dropdown',\n            ChildComponent: BlockIcon,\n            items: props.reducedBlocks.map((block, 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-' + block.slug,\n                label: ({ i18n }) => {\n                  if (!block.labels.singular) {\n                    return block.slug\n                  }\n\n                  return getTranslation(block.labels.singular, i18n)\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(INSERT_BLOCK_COMMAND, {\n                    id: null,\n                    blockName: '',\n                    blockType: block.slug,\n                  })\n                },\n                order: index,\n              }\n            }),\n            key: 'blocks',\n            order: 20,\n          }\n        : null,\n      props.reducedInlineBlocks?.length\n        ? {\n            type: 'dropdown',\n            ChildComponent: InlineBlocksIcon,\n            items: props.reducedInlineBlocks.map((inlineBlock, index) => {\n              return {\n                ChildComponent: InlineBlocksIcon,\n                isActive: undefined,\n                key: 'inlineBlock-' + inlineBlock.slug,\n                label: ({ i18n }) => {\n                  if (!inlineBlock.labels.singular) {\n                    return inlineBlock.slug\n                  }\n\n                  return getTranslation(inlineBlock.labels.singular, i18n)\n                },\n                onSelect: ({ editor }) => {\n                  editor.dispatchCommand(OPEN_INLINE_BLOCK_DRAWER_COMMAND, {\n                    fields: {\n                      blockType: inlineBlock.slug,\n                    },\n                  })\n                },\n                order: index,\n              }\n            }),\n            key: 'inlineBlocks',\n            order: 25,\n          }\n        : null,\n    ].filter(Boolean) as ToolbarGroup[],\n  },\n}))\n"],"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","reducedBlocks","length","items","map","block","Icon","key","slug","keywords","label","i18n","labels","singular","onSelect","editor","dispatchCommand","id","blockName","blockType","t","reducedInlineBlocks","inlineBlock","fields","filter","Boolean","toolbarFixed","type","ChildComponent","index","isActive","undefined","order"],"mappings":"AAAA;AAIA,SAASA,cAAc,QAAQ,2BAA0B;AAIzD,SAASC,SAAS,QAAQ,wCAAuC;AACjE,SAASC,gBAAgB,QAAQ,+CAA8C;AAC/E,SAASC,mBAAmB,QAAQ,yCAAwC;AAC5E,SAASC,SAAS,QAAQ,wBAAuB;AACjD,SAASC,eAAe,QAAQ,8BAA6B;AAC7D,SAASC,oBAAoB,EAAEC,gCAAgC,QAAQ,uBAAsB;AAC7F,SAASC,YAAY,QAAQ,oBAAmB;AAWhD,OAAO,MAAMC,sBAAsBN,oBAA8C,CAAC,EAAEO,KAAK,EAAE,GAAM,CAAA;QAC/FC,OAAO;YAACP;YAAWC;SAAgB;QACnCO,SAAS;YACP;gBACEC,WAAWL;gBACXM,UAAU;YACZ;SACD;QACDC,6BAA6BL;QAC7BM,WAAW;YACTC,QAAQ;gBACNP,MAAMQ,aAAa,EAAEC,SACjB;oBACEC,OAAOV,MAAMQ,aAAa,CAACG,GAAG,CAAC,CAACC;wBAC9B,OAAO;4BACLC,MAAMtB;4BACNuB,KAAK,WAAWF,MAAMG,IAAI;4BAC1BC,UAAU;gCAAC;gCAAS;gCAAUJ,MAAMG,IAAI;6BAAC;4BACzCE,OAAO,CAAC,EAAEC,IAAI,EAAE;gCACd,IAAI,CAACN,MAAMO,MAAM,CAACC,QAAQ,EAAE;oCAC1B,OAAOR,MAAMG,IAAI;gCACnB;gCAEA,OAAOzB,eAAesB,MAAMO,MAAM,CAACC,QAAQ,EAAEF;4BAC/C;4BACAG,UAAU,CAAC,EAAEC,MAAM,EAAE;gCACnBA,OAAOC,eAAe,CAAC3B,sBAAsB;oCAC3C4B,IAAI;oCACJC,WAAW;oCACXC,WAAWd,MAAMG,IAAI;gCACvB;4BACF;wBACF;oBACF;oBACAD,KAAK;oBACLG,OAAO,CAAC,EAAEC,IAAI,EAAE;wBACd,OAAOA,KAAKS,CAAC,CAAC;oBAChB;gBACF,IACA;gBACJ3B,MAAM4B,mBAAmB,EAAEnB,SACvB;oBACEC,OAAOV,MAAM4B,mBAAmB,CAACjB,GAAG,CAAC,CAACkB;wBACpC,OAAO;4BACLhB,MAAMrB;4BACNsB,KAAK,kBAAkBe,YAAYd,IAAI;4BACvCC,UAAU;gCAAC;gCAAe;gCAAgBa,YAAYd,IAAI;6BAAC;4BAC3DE,OAAO,CAAC,EAAEC,IAAI,EAAE;gCACd,IAAI,CAACW,YAAYV,MAAM,CAACC,QAAQ,EAAE;oCAChC,OAAOS,YAAYd,IAAI;gCACzB;gCAEA,OAAOzB,eAAeuC,YAAYV,MAAM,CAACC,QAAQ,EAAEF;4BACrD;4BACAG,UAAU,CAAC,EAAEC,MAAM,EAAE;gCACnBA,OAAOC,eAAe,CAAC1B,kCAAkC;oCACvDiC,QAAQ;wCACNN,IAAI;wCACJC,WAAW;wCACXC,WAAWG,YAAYd,IAAI;oCAC7B;gCACF;4BACF;wBACF;oBACF;oBACAD,KAAK;oBACLG,OAAO,CAAC,EAAEC,IAAI,EAAE;wBACd,OAAOA,KAAKS,CAAC,CAAC;oBAChB;gBACF,IACA;aACL,CAACI,MAAM,CAACC;QACX;QACAC,cAAc;YACZ1B,QAAQ;gBACNP,MAAMQ,aAAa,EAAEC,SACjB;oBACEyB,MAAM;oBACNC,gBAAgB5C;oBAChBmB,OAAOV,MAAMQ,aAAa,CAACG,GAAG,CAAC,CAACC,OAAOwB;wBACrC,OAAO;4BACLD,gBAAgB5C;4BAChB8C,UAAUC;4BACVxB,KAAK,WAAWF,MAAMG,IAAI;4BAC1BE,OAAO,CAAC,EAAEC,IAAI,EAAE;gCACd,IAAI,CAACN,MAAMO,MAAM,CAACC,QAAQ,EAAE;oCAC1B,OAAOR,MAAMG,IAAI;gCACnB;gCAEA,OAAOzB,eAAesB,MAAMO,MAAM,CAACC,QAAQ,EAAEF;4BAC/C;4BACAG,UAAU,CAAC,EAAEC,MAAM,EAAE;gCACnBA,OAAOC,eAAe,CAAC3B,sBAAsB;oCAC3C4B,IAAI;oCACJC,WAAW;oCACXC,WAAWd,MAAMG,IAAI;gCACvB;4BACF;4BACAwB,OAAOH;wBACT;oBACF;oBACAtB,KAAK;oBACLyB,OAAO;gBACT,IACA;gBACJvC,MAAM4B,mBAAmB,EAAEnB,SACvB;oBACEyB,MAAM;oBACNC,gBAAgB3C;oBAChBkB,OAAOV,MAAM4B,mBAAmB,CAACjB,GAAG,CAAC,CAACkB,aAAaO;wBACjD,OAAO;4BACLD,gBAAgB3C;4BAChB6C,UAAUC;4BACVxB,KAAK,iBAAiBe,YAAYd,IAAI;4BACtCE,OAAO,CAAC,EAAEC,IAAI,EAAE;gCACd,IAAI,CAACW,YAAYV,MAAM,CAACC,QAAQ,EAAE;oCAChC,OAAOS,YAAYd,IAAI;gCACzB;gCAEA,OAAOzB,eAAeuC,YAAYV,MAAM,CAACC,QAAQ,EAAEF;4BACrD;4BACAG,UAAU,CAAC,EAAEC,MAAM,EAAE;gCACnBA,OAAOC,eAAe,CAAC1B,kCAAkC;oCACvDiC,QAAQ;wCACNJ,WAAWG,YAAYd,IAAI;oCAC7B;gCACF;4BACF;4BACAwB,OAAOH;wBACT;oBACF;oBACAtB,KAAK;oBACLyB,OAAO;gBACT,IACA;aACL,CAACR,MAAM,CAACC;QACX;IACF,CAAA,GAAG"}

package/dist/features/blocks/feature.server.d.ts

@@ -1,7 +1,8 @@
 import type { Block } from 'payload';
 import type { BlocksFeatureClientProps } from './feature.client.js';
 export type BlocksFeatureProps = {
-    blocks: Block[];
+    blocks?: Block[];
+    inlineBlocks?: Block[];
 };
-export declare const BlocksFeature: import("../types.js").FeatureProviderProviderServer<BlocksFeatureProps, BlocksFeatureProps, BlocksFeatureClientProps>;
+export declare const BlocksFeature: import("../typesServer.js").FeatureProviderProviderServer<BlocksFeatureProps, BlocksFeatureProps, BlocksFeatureClientProps>;
 //# sourceMappingURL=feature.server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"feature.server.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/feature.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA6B,MAAM,SAAS,CAAA;AAK/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAWnE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,KAAK,EAAE,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,aAAa,uHAiHxB,CAAA"}
+{"version":3,"file":"feature.server.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/feature.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA6B,MAAM,SAAS,CAAA;AAI/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAYnE,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,6HAoKxB,CAAA"}

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

@@ -1,4 +1,3 @@
-import { traverseFields } from '@payloadcms/ui/utilities/buildFieldSchemaMap/traverseFields';
 import { baseBlockFields, fieldsToJSONSchema, formatLabels, sanitizeFields } from 'payload';
 // eslint-disable-next-line payload/no-imports-from-exports-dir
 import { BlocksFeatureClient } from '../../exports/client/index.js';
@@ -7,72 +6,111 @@ import { createNode } from '../typeUtilities.js';
 import { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js';
 import { i18n } from './i18n.js';
 import { BlockNode } from './nodes/BlocksNode.js';
+import { InlineBlockNode } from './nodes/InlineBlocksNode.js';
 import { blockValidationHOC } from './validate.js';
 export const BlocksFeature = createServerFeature({
     feature: async ({ config: _config, isRoot, props })=>{
-        if (props?.blocks?.length) {
+        if (props?.blocks?.length || props?.inlineBlocks?.length) {
             const validRelationships = _config.collections.map((c)=>c.slug) || [];
-            for (const block of props.blocks){
-                block.fields = block.fields.concat(baseBlockFields);
-                block.labels = !block.labels ? formatLabels(block.slug) : block.labels;
-                block.fields = await sanitizeFields({
-                    config: _config,
-                    fields: block.fields,
-                    requireFieldLevelRichTextEditor: isRoot,
-                    validRelationships
-                });
+            if (props?.blocks?.length) {
+                for (const block of props.blocks){
+                    block.fields = block.fields.concat(baseBlockFields);
+                    block.labels = !block.labels ? formatLabels(block.slug) : block.labels;
+                    block.fields = await sanitizeFields({
+                        config: _config,
+                        fields: block.fields,
+                        requireFieldLevelRichTextEditor: isRoot,
+                        validRelationships
+                    });
+                }
+            }
+            if (props?.inlineBlocks?.length) {
+                for (const block of props.inlineBlocks){
+                    block.fields = block.fields.concat(baseBlockFields);
+                    block.labels = !block.labels ? formatLabels(block.slug) : block.labels;
+                    block.fields = await sanitizeFields({
+                        config: _config,
+                        fields: block.fields,
+                        requireFieldLevelRichTextEditor: isRoot,
+                        validRelationships
+                    });
+                }
             }
         }
         // Build clientProps
         const clientProps = {
-            reducedBlocks: []
+            reducedBlocks: [],
+            reducedInlineBlocks: []
         };
-        for (const block of props.blocks){
-            clientProps.reducedBlocks.push({
-                slug: block.slug,
-                fieldMap: [],
-                imageAltText: block.imageAltText,
-                imageURL: block.imageURL,
-                labels: block.labels
-            });
+        if (props?.blocks?.length) {
+            for (const block of props.blocks){
+                clientProps.reducedBlocks.push({
+                    slug: block.slug,
+                    LabelComponent: block?.admin?.components?.Label,
+                    fieldMap: [],
+                    imageAltText: block.imageAltText,
+                    imageURL: block.imageURL,
+                    labels: block.labels
+                });
+            }
+        }
+        if (props?.inlineBlocks?.length) {
+            for (const block of props.inlineBlocks){
+                clientProps.reducedInlineBlocks.push({
+                    slug: block.slug,
+                    LabelComponent: block?.admin?.components?.Label,
+                    fieldMap: [],
+                    imageAltText: block.imageAltText,
+                    imageURL: block.imageURL,
+                    labels: block.labels
+                });
+            }
         }
         return {
             ClientFeature: BlocksFeatureClient,
             clientFeatureProps: clientProps,
-            generateSchemaMap: ({ config, i18n, props })=>{
-                const validRelationships = config.collections.map((c)=>c.slug) || [];
+            generateSchemaMap: ({ props })=>{
                 /**
          * 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
          * sub-fields from the component map. Thus, we need to put them in the component map here.
          */ const schemaMap = new Map();
-                for (const block of props.blocks){
-                    schemaMap.set(block.slug, block.fields || []);
-                    traverseFields({
-                        config,
-                        fields: block.fields,
-                        i18n,
-                        schemaMap,
-                        schemaPath: block.slug,
-                        validRelationships
-                    });
+                if (props?.blocks?.length) {
+                    for (const block of props.blocks){
+                        schemaMap.set(block.slug, block.fields || []);
+                    }
+                }
+                if (props?.inlineBlocks?.length) {
+                    for (const block of props.inlineBlocks){
+                        schemaMap.set(block.slug, block.fields || []);
+                    }
                 }
                 return schemaMap;
             },
             generatedTypes: {
                 modifyOutputSchema: ({ collectionIDFieldTypes, config, currentSchema, field, interfaceNameDefinitions })=>{
-                    if (!props?.blocks?.length) {
+                    if (!props?.blocks?.length && !props?.inlineBlocks?.length) {
                         return currentSchema;
                     }
-                    const blocksField = {
-                        name: field?.name + '_lexical_blocks',
-                        type: 'blocks',
-                        blocks: props.blocks
-                    };
-                    // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.
-                    // we don't actually use the JSON Schema itself in the generated types yet.
-                    fieldsToJSONSchema(collectionIDFieldTypes, [
-                        blocksField
-                    ], interfaceNameDefinitions, config);
+                    const fields = [];
+                    if (props?.blocks?.length) {
+                        fields.push({
+                            name: field?.name + '_lexical_blocks',
+                            type: 'blocks',
+                            blocks: props.blocks
+                        });
+                    }
+                    if (props?.inlineBlocks?.length) {
+                        fields.push({
+                            name: field?.name + '_lexical_inline_blocks',
+                            type: 'blocks',
+                            blocks: props.inlineBlocks
+                        });
+                    }
+                    if (fields.length) {
+                        // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.
+                        // we don't actually use the JSON Schema itself in the generated types yet.
+                        fieldsToJSONSchema(collectionIDFieldTypes, fields, interfaceNameDefinitions, config);
+                    }
                     return currentSchema;
                 }
             },
@@ -88,11 +126,28 @@ export const BlocksFeature = createServerFeature({
                         return node?.fields;
                     },
                     graphQLPopulationPromises: [
-                        blockPopulationPromiseHOC(props)
+                        blockPopulationPromiseHOC(props.blocks)
                     ],
                     node: BlockNode,
                     validations: [
-                        blockValidationHOC(props)
+                        blockValidationHOC(props.blocks)
+                    ]
+                }),
+                createNode({
+                    getSubFields: ({ node })=>{
+                        const blockType = node.fields.blockType;
+                        const block = props.inlineBlocks.find((block)=>block.slug === blockType);
+                        return block?.fields;
+                    },
+                    getSubFieldsData: ({ node })=>{
+                        return node?.fields;
+                    },
+                    graphQLPopulationPromises: [
+                        blockPopulationPromiseHOC(props.inlineBlocks)
+                    ],
+                    node: InlineBlockNode,
+                    validations: [
+                        blockValidationHOC(props.inlineBlocks)
                     ]
                 })
             ],

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/features/blocks/feature.server.ts"],"sourcesContent":["import type { Block, BlockField, Config, Field } from 'payload'\n\nimport { traverseFields } from '@payloadcms/ui/utilities/buildFieldSchemaMap/traverseFields'\nimport { baseBlockFields, fieldsToJSONSchema, formatLabels, sanitizeFields } from 'payload'\n\nimport type { BlocksFeatureClientProps } from './feature.client.js'\n\n// eslint-disable-next-line payload/no-imports-from-exports-dir\nimport { BlocksFeatureClient } from '../../exports/client/index.js'\nimport { createServerFeature } from '../../utilities/createServerFeature.js'\nimport { createNode } from '../typeUtilities.js'\nimport { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { BlockNode } from './nodes/BlocksNode.js'\nimport { blockValidationHOC } from './validate.js'\n\nexport type BlocksFeatureProps = {\n  blocks: Block[]\n}\n\nexport const BlocksFeature = createServerFeature<\n  BlocksFeatureProps,\n  BlocksFeatureProps,\n  BlocksFeatureClientProps\n>({\n  feature: async ({ config: _config, isRoot, props }) => {\n    if (props?.blocks?.length) {\n      const validRelationships = _config.collections.map((c) => c.slug) || []\n\n      for (const block of props.blocks) {\n        block.fields = block.fields.concat(baseBlockFields)\n        block.labels = !block.labels ? formatLabels(block.slug) : block.labels\n\n        block.fields = await sanitizeFields({\n          config: _config as unknown as Config,\n          fields: block.fields,\n          requireFieldLevelRichTextEditor: isRoot,\n          validRelationships,\n        })\n      }\n    }\n\n    // Build clientProps\n    const clientProps: BlocksFeatureClientProps = {\n      reducedBlocks: [],\n    }\n    for (const block of props.blocks) {\n      clientProps.reducedBlocks.push({\n        slug: block.slug,\n        fieldMap: [],\n        imageAltText: block.imageAltText,\n        imageURL: block.imageURL,\n        labels: block.labels,\n      })\n    }\n\n    return {\n      ClientFeature: BlocksFeatureClient,\n      clientFeatureProps: clientProps,\n      generateSchemaMap: ({ config, i18n, props }) => {\n        const validRelationships = config.collections.map((c) => c.slug) || []\n\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        for (const block of props.blocks) {\n          schemaMap.set(block.slug, block.fields || [])\n\n          traverseFields({\n            config,\n            fields: block.fields,\n            i18n,\n            schemaMap,\n            schemaPath: block.slug,\n            validRelationships,\n          })\n        }\n\n        return schemaMap\n      },\n      generatedTypes: {\n        modifyOutputSchema: ({\n          collectionIDFieldTypes,\n          config,\n          currentSchema,\n          field,\n          interfaceNameDefinitions,\n        }) => {\n          if (!props?.blocks?.length) {\n            return currentSchema\n          }\n\n          const blocksField: BlockField = {\n            name: field?.name + '_lexical_blocks',\n            type: 'blocks',\n            blocks: props.blocks,\n          }\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(\n            collectionIDFieldTypes,\n            [blocksField],\n            interfaceNameDefinitions,\n            config,\n          )\n\n          return currentSchema\n        },\n      },\n      i18n,\n      nodes: [\n        createNode({\n          getSubFields: ({ node }) => {\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)],\n          node: BlockNode,\n          validations: [blockValidationHOC(props)],\n        }),\n      ],\n      sanitizedServerFeatureProps: props,\n    }\n  },\n  key: 'blocks',\n})\n"],"names":["traverseFields","baseBlockFields","fieldsToJSONSchema","formatLabels","sanitizeFields","BlocksFeatureClient","createServerFeature","createNode","blockPopulationPromiseHOC","i18n","BlockNode","blockValidationHOC","BlocksFeature","feature","config","_config","isRoot","props","blocks","length","validRelationships","collections","map","c","slug","block","fields","concat","labels","requireFieldLevelRichTextEditor","clientProps","reducedBlocks","push","fieldMap","imageAltText","imageURL","ClientFeature","clientFeatureProps","generateSchemaMap","schemaMap","Map","set","schemaPath","generatedTypes","modifyOutputSchema","collectionIDFieldTypes","currentSchema","field","interfaceNameDefinitions","blocksField","name","type","nodes","getSubFields","node","blockType","find","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/features/blocks/feature.server.ts"],"sourcesContent":["import type { Block, BlockField, Config, Field } from 'payload'\n\nimport { baseBlockFields, fieldsToJSONSchema, formatLabels, sanitizeFields } from 'payload'\n\nimport type { BlocksFeatureClientProps } from './feature.client.js'\n\n// eslint-disable-next-line payload/no-imports-from-exports-dir\nimport { BlocksFeatureClient } from '../../exports/client/index.js'\nimport { createServerFeature } from '../../utilities/createServerFeature.js'\nimport { createNode } from '../typeUtilities.js'\nimport { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { BlockNode } from './nodes/BlocksNode.js'\nimport { InlineBlockNode } 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, props }) => {\n    if (props?.blocks?.length || props?.inlineBlocks?.length) {\n      const validRelationships = _config.collections.map((c) => c.slug) || []\n\n      if (props?.blocks?.length) {\n        for (const block of props.blocks) {\n          block.fields = block.fields.concat(baseBlockFields)\n          block.labels = !block.labels ? formatLabels(block.slug) : block.labels\n\n          block.fields = await sanitizeFields({\n            config: _config as unknown as Config,\n            fields: block.fields,\n            requireFieldLevelRichTextEditor: isRoot,\n            validRelationships,\n          })\n        }\n      }\n      if (props?.inlineBlocks?.length) {\n        for (const block of props.inlineBlocks) {\n          block.fields = block.fields.concat(baseBlockFields)\n          block.labels = !block.labels ? formatLabels(block.slug) : block.labels\n\n          block.fields = await sanitizeFields({\n            config: _config as unknown as Config,\n            fields: block.fields,\n            requireFieldLevelRichTextEditor: isRoot,\n            validRelationships,\n          })\n        }\n      }\n    }\n\n    // Build clientProps\n    const clientProps: BlocksFeatureClientProps = {\n      reducedBlocks: [],\n      reducedInlineBlocks: [],\n    }\n    if (props?.blocks?.length) {\n      for (const block of props.blocks) {\n        clientProps.reducedBlocks.push({\n          slug: block.slug,\n          LabelComponent: block?.admin?.components?.Label,\n          fieldMap: [],\n          imageAltText: block.imageAltText,\n          imageURL: block.imageURL,\n          labels: block.labels,\n        })\n      }\n    }\n    if (props?.inlineBlocks?.length) {\n      for (const block of props.inlineBlocks) {\n        clientProps.reducedInlineBlocks.push({\n          slug: block.slug,\n          LabelComponent: block?.admin?.components?.Label,\n          fieldMap: [],\n          imageAltText: block.imageAltText,\n          imageURL: block.imageURL,\n          labels: block.labels,\n        })\n      }\n    }\n\n    return {\n      ClientFeature: BlocksFeatureClient,\n      clientFeatureProps: clientProps,\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          for (const block of props.blocks) {\n            schemaMap.set(block.slug, block.fields || [])\n          }\n        }\n\n        if (props?.inlineBlocks?.length) {\n          for (const block of props.inlineBlocks) {\n            schemaMap.set(block.slug, block.fields || [])\n          }\n        }\n\n        return schemaMap\n      },\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: BlockField[] = []\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      i18n,\n      nodes: [\n        createNode({\n          getSubFields: ({ node }) => {\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: BlockNode,\n          validations: [blockValidationHOC(props.blocks)],\n        }),\n        createNode({\n          getSubFields: ({ node }) => {\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: InlineBlockNode,\n          validations: [blockValidationHOC(props.inlineBlocks)],\n        }),\n      ],\n      sanitizedServerFeatureProps: props,\n    }\n  },\n  key: 'blocks',\n})\n"],"names":["baseBlockFields","fieldsToJSONSchema","formatLabels","sanitizeFields","BlocksFeatureClient","createServerFeature","createNode","blockPopulationPromiseHOC","i18n","BlockNode","InlineBlockNode","blockValidationHOC","BlocksFeature","feature","config","_config","isRoot","props","blocks","length","inlineBlocks","validRelationships","collections","map","c","slug","block","fields","concat","labels","requireFieldLevelRichTextEditor","clientProps","reducedBlocks","reducedInlineBlocks","push","LabelComponent","admin","components","Label","fieldMap","imageAltText","imageURL","ClientFeature","clientFeatureProps","generateSchemaMap","schemaMap","Map","set","generatedTypes","modifyOutputSchema","collectionIDFieldTypes","currentSchema","field","interfaceNameDefinitions","name","type","nodes","getSubFields","node","blockType","find","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"mappings":"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"}

package/dist/features/blocks/graphQLPopulationPromise.d.ts

@@ -1,5 +1,6 @@
-import type { PopulationPromise } from '../types.js';
-import type { BlocksFeatureProps } from './feature.server.js';
+import type { Block } from 'payload';
+import type { PopulationPromise } from '../typesServer.js';
 import type { SerializedBlockNode } from './nodes/BlocksNode.js';
-export declare const blockPopulationPromiseHOC: (props: BlocksFeatureProps) => PopulationPromise<SerializedBlockNode>;
+import type { SerializedInlineBlockNode } from './nodes/InlineBlocksNode.js';
+export declare const blockPopulationPromiseHOC: (blocks: Block[]) => PopulationPromise<SerializedBlockNode | SerializedInlineBlockNode>;
 //# sourceMappingURL=graphQLPopulationPromise.d.ts.map

package/dist/features/blocks/graphQLPopulationPromise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphQLPopulationPromise.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/graphQLPopulationPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAIhE,eAAO,MAAM,yBAAyB,UAC7B,kBAAkB,KACxB,iBAAiB,CAAC,mBAAmB,CA4CvC,CAAA"}
+{"version":3,"file":"graphQLPopulationPromise.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/graphQLPopulationPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAI5E,eAAO,MAAM,yBAAyB,WAC5B,KAAK,EAAE,KACd,iBAAiB,CAAC,mBAAmB,GAAG,yBAAyB,CA4CnE,CAAA"}

package/dist/features/blocks/graphQLPopulationPromise.js

@@ -1,9 +1,9 @@
 import { recursivelyPopulateFieldsForGraphQL } from '../../populateGraphQL/recursivelyPopulateFieldsForGraphQL.js';
-export const blockPopulationPromiseHOC = (props)=>{
+export const blockPopulationPromiseHOC = (blocks)=>{
     const blockPopulationPromise = ({ context, currentDepth, depth, draft, editorPopulationPromises, fieldPromises, findMany, flattenLocales, node, overrideAccess, populationPromises, req, showHiddenFields })=>{
         const blockFieldData = node.fields;
         // find block used in this node
-        const block = props.blocks.find((block)=>block.slug === blockFieldData.blockType);
+        const block = blocks.find((block)=>block.slug === blockFieldData.blockType);
         if (!block || !block?.fields?.length || !blockFieldData) {
             return;
         }