@payloadcms/richtext-lexical 3.0.0-canary.926cbeb → 3.0.0-canary.95fcd13

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"],"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":"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"}

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("../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;AAI/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,6HAsGxB,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

@@ -6,34 +6,65 @@ 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,
@@ -43,26 +74,43 @@ export const BlocksFeature = createServerFeature({
          * 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 || []);
+                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;
                 }
             },
@@ -78,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 { 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: ({ 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        for (const block of props.blocks) {\n          schemaMap.set(block.slug, block.fields || [])\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":["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","generatedTypes","modifyOutputSchema","collectionIDFieldTypes","currentSchema","field","interfaceNameDefinitions","blocksField","name","type","nodes","getSubFields","node","blockType","find","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"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 { Block } from 'payload';
 import type { PopulationPromise } from '../typesServer.js';
-import type { BlocksFeatureProps } from './feature.server.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,mBAAmB,CAAA;AAC1D,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;
         }

package/dist/features/blocks/graphQLPopulationPromise.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/features/blocks/graphQLPopulationPromise.ts"],"sourcesContent":["import type { PopulationPromise } from '../typesServer.js'\nimport type { BlocksFeatureProps } from './feature.server.js'\nimport type { SerializedBlockNode } from './nodes/BlocksNode.js'\n\nimport { recursivelyPopulateFieldsForGraphQL } from '../../populateGraphQL/recursivelyPopulateFieldsForGraphQL.js'\n\nexport const blockPopulationPromiseHOC = (\n  props: BlocksFeatureProps,\n): PopulationPromise<SerializedBlockNode> => {\n  const blockPopulationPromise: PopulationPromise<SerializedBlockNode> = ({\n    context,\n    currentDepth,\n    depth,\n    draft,\n    editorPopulationPromises,\n    fieldPromises,\n    findMany,\n    flattenLocales,\n    node,\n    overrideAccess,\n    populationPromises,\n    req,\n    showHiddenFields,\n  }) => {\n    const blockFieldData = node.fields\n\n    // find block used in this node\n    const block = props.blocks.find((block) => block.slug === blockFieldData.blockType)\n    if (!block || !block?.fields?.length || !blockFieldData) {\n      return\n    }\n\n    recursivelyPopulateFieldsForGraphQL({\n      context,\n      currentDepth,\n      data: blockFieldData,\n      depth,\n      draft,\n      editorPopulationPromises,\n      fieldPromises,\n      fields: block.fields,\n      findMany,\n      flattenLocales,\n      overrideAccess,\n      populationPromises,\n      req,\n      showHiddenFields,\n      siblingDoc: blockFieldData,\n    })\n  }\n\n  return blockPopulationPromise\n}\n"],"names":["recursivelyPopulateFieldsForGraphQL","blockPopulationPromiseHOC","props","blockPopulationPromise","context","currentDepth","depth","draft","editorPopulationPromises","fieldPromises","findMany","flattenLocales","node","overrideAccess","populationPromises","req","showHiddenFields","blockFieldData","fields","block","blocks","find","slug","blockType","length","data","siblingDoc"],"mappings":"AAIA,SAASA,mCAAmC,QAAQ,+DAA8D;AAElH,OAAO,MAAMC,4BAA4B,CACvCC;IAEA,MAAMC,yBAAiE,CAAC,EACtEC,OAAO,EACPC,YAAY,EACZC,KAAK,EACLC,KAAK,EACLC,wBAAwB,EACxBC,aAAa,EACbC,QAAQ,EACRC,cAAc,EACdC,IAAI,EACJC,cAAc,EACdC,kBAAkB,EAClBC,GAAG,EACHC,gBAAgB,EACjB;QACC,MAAMC,iBAAiBL,KAAKM,MAAM;QAElC,+BAA+B;QAC/B,MAAMC,QAAQjB,MAAMkB,MAAM,CAACC,IAAI,CAAC,CAACF,QAAUA,MAAMG,IAAI,KAAKL,eAAeM,SAAS;QAClF,IAAI,CAACJ,SAAS,CAACA,OAAOD,QAAQM,UAAU,CAACP,gBAAgB;YACvD;QACF;QAEAjB,oCAAoC;YAClCI;YACAC;YACAoB,MAAMR;YACNX;YACAC;YACAC;YACAC;YACAS,QAAQC,MAAMD,MAAM;YACpBR;YACAC;YACAE;YACAC;YACAC;YACAC;YACAU,YAAYT;QACd;IACF;IAEA,OAAOd;AACT,EAAC"}
+{"version":3,"sources":["../../../src/features/blocks/graphQLPopulationPromise.ts"],"sourcesContent":["import type { Block } from 'payload'\n\nimport type { PopulationPromise } from '../typesServer.js'\nimport type { SerializedBlockNode } from './nodes/BlocksNode.js'\nimport type { SerializedInlineBlockNode } from './nodes/InlineBlocksNode.js'\n\nimport { recursivelyPopulateFieldsForGraphQL } from '../../populateGraphQL/recursivelyPopulateFieldsForGraphQL.js'\n\nexport const blockPopulationPromiseHOC = (\n  blocks: Block[],\n): PopulationPromise<SerializedBlockNode | SerializedInlineBlockNode> => {\n  const blockPopulationPromise: PopulationPromise<SerializedBlockNode> = ({\n    context,\n    currentDepth,\n    depth,\n    draft,\n    editorPopulationPromises,\n    fieldPromises,\n    findMany,\n    flattenLocales,\n    node,\n    overrideAccess,\n    populationPromises,\n    req,\n    showHiddenFields,\n  }) => {\n    const blockFieldData = node.fields\n\n    // find block used in this node\n    const block = blocks.find((block) => block.slug === blockFieldData.blockType)\n    if (!block || !block?.fields?.length || !blockFieldData) {\n      return\n    }\n\n    recursivelyPopulateFieldsForGraphQL({\n      context,\n      currentDepth,\n      data: blockFieldData,\n      depth,\n      draft,\n      editorPopulationPromises,\n      fieldPromises,\n      fields: block.fields,\n      findMany,\n      flattenLocales,\n      overrideAccess,\n      populationPromises,\n      req,\n      showHiddenFields,\n      siblingDoc: blockFieldData,\n    })\n  }\n\n  return blockPopulationPromise\n}\n"],"names":["recursivelyPopulateFieldsForGraphQL","blockPopulationPromiseHOC","blocks","blockPopulationPromise","context","currentDepth","depth","draft","editorPopulationPromises","fieldPromises","findMany","flattenLocales","node","overrideAccess","populationPromises","req","showHiddenFields","blockFieldData","fields","block","find","slug","blockType","length","data","siblingDoc"],"mappings":"AAMA,SAASA,mCAAmC,QAAQ,+DAA8D;AAElH,OAAO,MAAMC,4BAA4B,CACvCC;IAEA,MAAMC,yBAAiE,CAAC,EACtEC,OAAO,EACPC,YAAY,EACZC,KAAK,EACLC,KAAK,EACLC,wBAAwB,EACxBC,aAAa,EACbC,QAAQ,EACRC,cAAc,EACdC,IAAI,EACJC,cAAc,EACdC,kBAAkB,EAClBC,GAAG,EACHC,gBAAgB,EACjB;QACC,MAAMC,iBAAiBL,KAAKM,MAAM;QAElC,+BAA+B;QAC/B,MAAMC,QAAQjB,OAAOkB,IAAI,CAAC,CAACD,QAAUA,MAAME,IAAI,KAAKJ,eAAeK,SAAS;QAC5E,IAAI,CAACH,SAAS,CAACA,OAAOD,QAAQK,UAAU,CAACN,gBAAgB;YACvD;QACF;QAEAjB,oCAAoC;YAClCI;YACAC;YACAmB,MAAMP;YACNX;YACAC;YACAC;YACAC;YACAS,QAAQC,MAAMD,MAAM;YACpBR;YACAC;YACAE;YACAC;YACAC;YACAC;YACAS,YAAYR;QACd;IACF;IAEA,OAAOd;AACT,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEhE,eAAO,MAAM,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAiG1C,CAAA"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../src/features/blocks/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEhE,eAAO,MAAM,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAiS1C,CAAA"}

package/dist/features/blocks/i18n.js

@@ -1,98 +1,290 @@
 export const i18n = {
     ar: {
+        inlineBlocks: {
+            create: 'أنشئ {{label}}',
+            edit: 'تحرير {{التسمية}}',
+            label: 'الكتل الداخلية',
+            remove: 'إزالة {{التسمية}}'
+        },
         label: 'كتل'
     },
     az: {
+        inlineBlocks: {
+            create: 'Yarat {{label}}',
+            edit: '{{label}} redaktə et',
+            label: 'Sıralı Bloklar',
+            remove: '{{label}} silin'
+        },
         label: 'Bloklar'
     },
     bg: {
+        inlineBlocks: {
+            create: 'Създайте {{етикет}}',
+            edit: 'Редактирай {{етикет}}',
+            label: 'Вградени блокове',
+            remove: 'Премахнете {{етикет}}'
+        },
         label: 'Блокове'
     },
     cs: {
+        inlineBlocks: {
+            create: 'Vytvořte {{štítek}}',
+            edit: 'Upravit {{label}}',
+            label: 'Inline bloky',
+            remove: 'Odstraňte {{label}}'
+        },
         label: 'Bloky'
     },
     de: {
+        inlineBlocks: {
+            create: 'Erstelle {{label}}',
+            edit: 'Bearbeite {{label}}',
+            label: 'Inline-Blöcke',
+            remove: 'Entferne {{label}}'
+        },
         label: 'Blöcke'
     },
     en: {
+        inlineBlocks: {
+            create: 'Create {{label}}',
+            edit: 'Edit {{label}}',
+            label: 'Inline Blocks',
+            remove: 'Remove {{label}}'
+        },
         label: 'Blocks'
     },
     es: {
+        inlineBlocks: {
+            create: 'Crear {{etiqueta}}',
+            edit: 'Editar {{etiqueta}}',
+            label: 'Bloques en línea',
+            remove: 'Eliminar {{label}}'
+        },
         label: 'Bloques'
     },
     fa: {
+        inlineBlocks: {
+            create: 'ایجاد {{برچسب}}',
+            edit: 'ویرایش {{برچسب}}',
+            label: 'بلوک‌های درون خطی',
+            remove: 'حذف {{برچسب}}'
+        },
         label: 'بلوک ها'
     },
     fr: {
+        inlineBlocks: {
+            create: 'Créer {{label}}',
+            edit: 'Modifier {{label}}',
+            label: 'Blocs en ligne',
+            remove: 'Supprimer {{label}}'
+        },
         label: 'Blocs'
     },
     he: {
+        inlineBlocks: {
+            create: 'צור {{תווית}}',
+            edit: 'ערוך {{תווית}}',
+            label: 'בלוקים משורשרים',
+            remove: 'הסר {{תווית}}'
+        },
         label: 'חסימות'
     },
     hr: {
+        inlineBlocks: {
+            create: 'Stvori {{oznaka}}',
+            edit: 'Uredi {{label}}',
+            label: 'Unutrašnji blokovi',
+            remove: 'Ukloni {{oznaka}}'
+        },
         label: 'Blokovi'
     },
     hu: {
+        inlineBlocks: {
+            create: 'Hozzon létre {{címke}}',
+            edit: 'Szerkesztés {{címke}}',
+            label: 'Beágyazott blokkok',
+            remove: 'Távolítsa el a {{label}}'
+        },
         label: 'Blokkok'
     },
     it: {
+        inlineBlocks: {
+            create: 'Crea {{etichetta}}',
+            edit: 'Modifica {{label}}',
+            label: 'Blocchi in linea',
+            remove: 'Rimuovi {{label}}'
+        },
         label: 'Blocchi'
     },
     ja: {
+        inlineBlocks: {
+            create: '{{label}}を作成する',
+            edit: '{{label}}を編集する',
+            label: 'インラインブロック',
+            remove: '{{ラベル}}を削除します'
+        },
         label: 'ブロック'
     },
     ko: {
+        inlineBlocks: {
+            create: '{{label}} 생성하기',
+            edit: '{{label}} 수정하기',
+            label: '인라인 블록',
+            remove: '{{label}} 제거하세요'
+        },
         label: '블록'
     },
     my: {
+        inlineBlocks: {
+            create: 'Cipta {{label}}',
+            edit: 'Sunting {{label}}',
+            label: 'Inline Blocks [SKIPPED]',
+            remove: 'Buang {{label}}'
+        },
         label: 'တံတားများ'
     },
     nb: {
+        inlineBlocks: {
+            create: 'Opprett {{label}}',
+            edit: 'Rediger {{label}}',
+            label: 'In-line blokker',
+            remove: 'Fjern {{label}}'
+        },
         label: 'Blokker'
     },
     nl: {
+        inlineBlocks: {
+            create: 'Maak {{label}}',
+            edit: 'Bewerk {{label}}',
+            label: 'Inline Blocks',
+            remove: 'Verwijder {{label}}'
+        },
         label: 'Blokken'
     },
     pl: {
+        inlineBlocks: {
+            create: 'Utwórz {{label}}',
+            edit: 'Edytuj {{etykieta}}',
+            label: 'Blokowanie w linii',
+            remove: 'Usuń {{etykieta}}'
+        },
         label: 'Bloki'
     },
     pt: {
+        inlineBlocks: {
+            create: 'Crie {{label}}',
+            edit: 'Editar {{label}}',
+            label: 'Blocos em linha',
+            remove: 'Remova {{label}}'
+        },
         label: 'Blocos'
     },
     ro: {
+        inlineBlocks: {
+            create: 'Creează {{eticheta}}',
+            edit: 'Editați {{eticheta}}',
+            label: 'Blocuri in linie',
+            remove: 'Ștergeți {{etichetă}}'
+        },
         label: 'Blocuri'
     },
     rs: {
+        inlineBlocks: {
+            create: 'Kreiraj {{label}}',
+            edit: 'Izmeni {{label}}',
+            label: 'Umetnuti blokovi',
+            remove: 'Ukloni {{label}}'
+        },
         label: 'Blokovi'
     },
     'rs-latin': {
+        inlineBlocks: {
+            create: 'Kreiraj {{label}}',
+            edit: 'Izmeni {{label}}',
+            label: 'Unutar blokovi',
+            remove: 'Ukloni {{oznaka}}'
+        },
         label: 'Blokovi'
     },
     ru: {
+        inlineBlocks: {
+            create: 'Создать {{label}}',
+            edit: 'Изменить {{метка}}',
+            label: 'Встроенные блоки',
+            remove: 'Удалить {{метка}}'
+        },
         label: 'Блоки'
     },
     sk: {
+        inlineBlocks: {
+            create: 'Vytvorte {{označenie}}',
+            edit: 'Upraviť {{label}}',
+            label: 'Inline bloky',
+            remove: 'Odstráňte {{label}}'
+        },
         label: 'Bloky'
     },
     sv: {
+        inlineBlocks: {
+            create: 'Skapa {{label}}',
+            edit: 'Redigera {{etikett}}',
+            label: 'Inline-blockar',
+            remove: 'Ta bort {{etikett}}'
+        },
         label: 'Block'
     },
     th: {
+        inlineBlocks: {
+            create: 'สร้าง {{label}}',
+            edit: 'แก้ไข {{label}}',
+            label: 'บล็อกแบบอินไลน์',
+            remove: 'ลบ {{label}}'
+        },
         label: 'บล็อค'
     },
     tr: {
+        inlineBlocks: {
+            create: '{{Etiketi}} oluşturun',
+            edit: "{{Etiket}}'i düzenleyin",
+            label: 'Satır İçi Bloklar',
+            remove: '{{Etiketi}} kaldırın'
+        },
         label: 'Bloklar'
     },
     uk: {
+        inlineBlocks: {
+            create: 'Створити {{label}}',
+            edit: 'Редагувати {{label}}',
+            label: 'Вбудовані блоки',
+            remove: 'Видалити {{мітку}}'
+        },
         label: 'Блоки'
     },
     vi: {
+        inlineBlocks: {
+            create: 'Tạo {{label}}',
+            edit: 'Chỉnh sửa {{nhãn}}',
+            label: 'Khối nội tuyến',
+            remove: 'Xóa {{nhãn}}'
+        },
         label: 'Khối'
     },
     zh: {
+        inlineBlocks: {
+            create: '创建{{label}}',
+            edit: '编辑 {{label}}',
+            label: '内联块',
+            remove: '删除{{label}}'
+        },
         label: '块'
     },
     'zh-TW': {
+        inlineBlocks: {
+            create: '創建 {{label}}',
+            edit: '編輯 {{label}}',
+            label: '內聯區塊',
+            remove: '移除 {{label}}'
+        },
         label: '區塊'
     }
 };