eddev 2.0.0-beta.251 → 2.0.0-beta.252

package/dist/app/entry/MetaTags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetaTags.d.ts","sourceRoot":"","sources":["../../../src/app/entry/MetaTags.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,YAAY,EAAE,CAAA;CACrB,CAAA;AAiBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,2CAqBpC"}
+{"version":3,"file":"MetaTags.d.ts","sourceRoot":"","sources":["../../../src/app/entry/MetaTags.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,YAAY,EAAE,CAAA;CACrB,CAAA;AAmBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,2CAqBpC"}

package/dist/app/entry/MetaTags.js

@@ -4,6 +4,8 @@ const REACT_ATTRIBUTES = {
     class: "className",
     "http-equiv": "httpEquiv",
     "accept-charset": "acceptCharset",
+    hreflang: "hrefLang",
+    crossorigin: "crossOrigin",
 };
 function toReactAttributes(attributes) {
     return Object.fromEntries(Object.entries(attributes).map(([key, value]) => {

package/dist/app/lib/blocks/InnerBlocks.js

@@ -91,7 +91,7 @@ export function InnerBlocks(props) {
                     wp.data.dispatch(wp.blockEditor.store).replaceInnerBlocks(blockId, newBlocks);
                 }
             }, [
-                hash(inlineContext?.innerBlocks.filter((b) => !!b).map((b) => [b.blockName, b.clientId])),
+                hash(inlineContext?.innerBlocks.map((b) => [b.blockName, b.clientId])),
                 hash([props.template, props.defaultBlocks, props.headerTemplate, props.footerTemplate]),
                 blockId,
             ]);

package/dist/app/lib/blocks/SlotBlocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,kDAyD1C"}
+{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,kDA+C1C"}

package/dist/app/lib/blocks/SlotBlocks.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { hash } from "object-code";
 import { useEffect } from "react";
 import { ContentBlocks } from "./ContentBlocks";
-import { InlineEditingContextProvider, useBlockContext, useInnerBlocks } from "./inline-editing";
+import { useBlockContext, useInnerBlocks } from "./inline-editing";
 export function SlotBlocks(props) {
     if (env.admin) {
         const clientId = useBlockContext()?.block[1].clientId;
@@ -26,12 +26,13 @@ export function SlotBlocks(props) {
             else {
                 return;
             }
+            console.log("Changed");
             if (changed) {
                 wp.data.dispatch("core/block-editor").replaceInnerBlocks(clientId, blocks);
             }
         }, [block?.clientId, hash(props)]);
         if (block) {
-            return (_jsx(InlineEditingContextProvider, { values: {}, innerBlocks: block.innerBlocks, block: ["core/slot-group", block], index: -1, onChange: (attrs) => { }, insertBlocksAfter: () => { }, children: _jsx(wp.blockEditor.BlockEdit, { ...block }) }));
+            return _jsx(wp.blockEditor.BlockEdit, { ...block });
         }
         else {
             return null;

package/dist/app/lib/blocks/block-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/block-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,kBAAkB;;EAEjC;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,EAAE,CA4B1F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM;;;;;;;;EAYjD"}
+{"version":3,"file":"block-utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/block-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,kBAAkB;;EAEjC;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,EAAE,CAc1F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM;;;;;;;;EAYjD"}

package/dist/app/lib/blocks/block-utils.js

@@ -18,28 +18,13 @@ export function addBlockMetadata(blocks) {
     for (let block of out) {
         if (!block)
             continue;
-        const info = infos[block.blockName ?? block.name];
+        const info = infos[block.blockName];
         block.tags = info?.tags ?? [];
         block.flags = info?.flags ?? {};
         block.slug = (info?.slug ?? block.blockName);
         if (block.innerBlocks && block.innerBlocks.length) {
             addBlockMetadata(block.innerBlocks);
         }
-        if (env.admin) {
-            if (!Object.hasOwn(block, "props")) {
-                Object.defineProperty(block, "props", {
-                    // @ts-ignore
-                    get: () => block.attributes?.props || {},
-                    set: (value) => {
-                        // @ts-ignore
-                        if (!block.attributes)
-                            block.attributes = {};
-                        // @ts-ignore
-                        block.attributes.props = value;
-                    },
-                });
-            }
-        }
     }
     return out;
 }

package/dist/app/lib/blocks/editor/EditorSupport.d.ts

@@ -1,2 +1,6 @@
+export declare const BlockContext: import("react").Context<{
+    name: string;
+    props: any;
+} | undefined>;
 export declare function EditableBlock({ payload }: any): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=EditorSupport.d.ts.map

package/dist/app/lib/blocks/editor/EditorSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"AAUA,wBAAgB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,kDAkC7C"}
+{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;UAAyB,MAAM;WAAS,GAAG;cAA0B,CAAA;AAE9F,wBAAgB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,kDA+B7C"}

package/dist/app/lib/blocks/editor/EditorSupport.js

@@ -1,32 +1,26 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Suspense, useMemo } from "react";
+import { createContext, Suspense, useContext, useEffect } from "react";
 import { blockManifestReader } from "../../internal/read-block-manifest.js";
 import { APIProvider } from "../../../utils/APIProvider.js";
-import { useBlockMutation } from "../BlockPropMutator.js";
-import { useBlockContext } from "../inline-editing.js";
 import { ErrorBoundaryEditor } from "./ErrorBoundaryEditor.js";
-// export const BlockContext = createContext<{ name: string; props: any } | undefined>(undefined)
+export const BlockContext = createContext(undefined);
 export function EditableBlock({ payload }) {
     if (!env.admin)
         throw new Error("`EditableBlock` can only be used in the admin environment");
-    const info = useBlockContext();
-    const mutation = useBlockMutation();
-    const block = info?.editorBlock;
-    const props = useMemo(() => {
-        let props = payload ?? {};
-        if (!block)
-            return props;
-        props.blockStyle = info?.editorBlock?.attributes?.className?.replace("is-style-", "");
-        block.props = props;
-        if (mutation.mutate) {
-            mutation.mutate(block);
+    const info = useContext(BlockContext);
+    const props = payload ?? {};
+    props.blockStyle = info?.props?.attributes?.className?.replace("is-style-", "");
+    useEffect(() => {
+        const block = wp.data.select("core/block-editor").getBlock(info?.props.clientId);
+        if (block && block.attributes) {
+            // @ts-ignore
+            block.attributes.props = payload;
         }
-        return block.props;
-    }, [block, payload, mutation.mutate]);
+    }, [payload, info?.props.clientId]);
     if (!info)
         return null;
-    const BlockComponent = blockManifestReader.value[info.editorBlock?.name ?? ""];
+    const BlockComponent = blockManifestReader.value[info.name];
     if (!BlockComponent)
         return _jsx("div", { children: "Unable to load block component" });
-    return (_jsx(ErrorBoundaryEditor, { children: _jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(BlockComponent, { ...props }) }) }) }));
+    return (_jsx(ErrorBoundaryEditor, { children: _jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(BlockComponent, { ...payload }) }) }) }));
 }

package/dist/app/lib/blocks/editor/editor-config.d.ts

@@ -32,8 +32,7 @@ type EditorBlock = {
     attributes: any;
     clientId: string;
     rootClientId: string;
-    isRootBlock: boolean;
-    getParent: () => EditorBlock | null;
+    isRootBlock: string;
     canMove: boolean;
     canRemove: boolean;
     isSelected: boolean;

package/dist/app/lib/blocks/editor/editor-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-config.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/editor-config.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"editor-config.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/editor-config.tsx"],"names":[],"mappings":"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"}

package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAyQtC"}
+{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SA4OtC"}

package/dist/app/lib/blocks/editor/installGutenbergHooks.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { subscribe, useSnapshot } from "valtio";
 import { proxyMap } from "valtio/utils";
-import { addBlockMetadata, getBlockMetadata } from "../block-utils.js";
+import { getBlockMetadata } from "../block-utils.js";
 import { registerBuiltinBlocks } from "../builtin-blocks.js";
 import { InlineEditingContextProvider } from "../inline-editing.js";
 import { EditorHighlights } from "./EditorHighlights.js";
-import { EditableBlock } from "./EditorSupport.js";
+import { BlockContext, EditableBlock } from "./EditorSupport.js";
 import { resolveAcfBlockName } from "./block-templates.js";
 import { blocksByTag } from "./blocks-by-tag.js";
 import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
@@ -58,64 +58,11 @@ export function installEDGutenbergHooks() {
             const generateClass = useSnapshot(editorConfigStore).currentBlocksConfig?.generateBlockClassName;
             Object.assign(props, getBlockMetadata(props.name));
             props.isRootBlock = !props.rootClientId;
-            props.getParent = () => props.rootClientId ? wp.data.select("core/block-editor").getBlock(props.rootClientId) : null;
             let className = generateClass ? generateClass(props, getEditingPostInfo()) : "";
             return _jsx(BlockListBlock, { ...props, className: className });
         };
     }, "withClientIdClassName");
     wp.hooks.addFilter("editor.BlockListBlock", "ed", withClientIdClassName);
-    const withBlockContext = wp.compose.createHigherOrderComponent((BlockEdit) => {
-        return (props) => {
-            function getChildren() {
-                const { getBlock, getBlockOrder, getBlockIndex, getBlockRootClientId } = wp.data.select("core/block-editor");
-                const block = getBlock(props.clientId);
-                const rootClientId = getBlockRootClientId(props.clientId);
-                const index = getBlockIndex(props.clientId, rootClientId || undefined);
-                const innerBlockIDs = getBlockOrder(props.clientId);
-                if (block) {
-                    addBlockMetadata([block]);
-                }
-                const children = innerBlockIDs.map((id) => {
-                    return getBlock(id);
-                });
-                addBlockMetadata(children);
-                return {
-                    block,
-                    children,
-                    index,
-                };
-            }
-            const { block, children, index } = getChildren();
-            // const block = wp.data.useSelect(
-            //   (select) => {
-            //     // @ts-ignore
-            //     return select("block-editor").getBlock(props.clientId)
-            //   },
-            //   [props.clientId],
-            // )
-            // const [index, setIndex] = useState(getIndex)
-            // const [children, setChildren] = useState<any[]>(getChildren)
-            // useEffect(() => {
-            //   return wp.data.subscribe(() => {
-            //     setIndex(getIndex())
-            //     const children = getChildren()
-            //     setChildren((current) =>
-            //       current.length === children.length
-            //         ? current.every((item, i) => item === children[i])
-            //           ? current
-            //           : children
-            //         : children,
-            //     )
-            //   }, [])
-            // }, [props.clientId, props.attributes])
-            if (!block)
-                return null;
-            return (_jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [props.name, props], editorBlock: block, index: index ?? -1, onChange: (attrs) => {
-                    props.setAttributes({ ...props.attributes, inline: attrs });
-                }, insertBlocksAfter: props.insertBlocksAfter, clientId: props.clientId, children: _jsx(BlockEdit, { ...props }, "edit") }));
-        };
-    }, "withMyPluginControls");
-    wp.hooks.addFilter("editor.BlockEdit", "ed", withBlockContext);
     // if (wp.blocks) {
     // }
     // Manage custom rich text formats
@@ -195,7 +142,34 @@ export function installEDGutenbergHooks() {
                     ;
                     wp.data.dispatch("core/block-editor").setTemplateValidity(true);
                 }, []);
-                return (_jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }));
+                function getIndex() {
+                    const { getBlockIndex } = wp.data.select("core/block-editor");
+                    return getBlockIndex(props.clientId);
+                }
+                function getChildren() {
+                    const { getBlock, getBlockOrder } = wp.data.select("core/block-editor");
+                    const innerBlockIDs = getBlockOrder(props.clientId);
+                    const children = innerBlockIDs.map((id) => {
+                        return getBlock(id);
+                    });
+                    return children;
+                }
+                const [index, setIndex] = useState(getIndex);
+                const [children, setChildren] = useState(getChildren);
+                useEffect(() => {
+                    return wp.data.subscribe(() => {
+                        setIndex(getIndex());
+                        const children = getChildren();
+                        setChildren((current) => current.length === children.length
+                            ? current.every((item, i) => item === children[i])
+                                ? current
+                                : children
+                            : children);
+                    }, []);
+                }, [props.clientId, props.attributes]);
+                return (_jsx(BlockContext.Provider, { value: { name, props }, children: _jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [name, props], index: index ?? -1, onChange: (attrs) => {
+                            props.setAttributes({ ...props.attributes, inline: attrs });
+                        }, insertBlocksAfter: props.insertBlocksAfter, children: _jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }) }) }));
             };
         }
         // Find PHP-defined 'tags' for core blocks.

package/dist/app/lib/blocks/index.js

@@ -9,4 +9,3 @@ export * from "./editor/usePostEditor.js";
 export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate, useBlockSelection, } from "./inline-editing.js";
 export * from "./InnerBlocks.js";
 export * from "./SlotBlocks.js";
-// export { BlockPropMutator } from "./BlockPropMutator.js"

package/dist/app/lib/blocks/inline-editing.d.ts

@@ -9,32 +9,27 @@ export type BlockInstance = {
     isValid: boolean;
     name: string;
     originalContent?: string | undefined;
-    props?: any;
 };
 type InlineEditingContext = {
     values: Attributes;
     innerBlocks: ContentBlock[];
     parents: [string, Attributes][];
     block: [string, Attributes];
-    editorBlock?: BlockInstance;
     index: number;
     setValue(key: string, value: any): any;
     getValue(key: string): any;
     insertBlocksAfter?: (block: any) => void;
     readonly?: boolean;
-    clientId?: string;
 };
-export declare const InlineEditingContext: import("react").Context<InlineEditingContext | undefined>;
+declare const InlineEditingContext: import("react").Context<InlineEditingContext | undefined>;
 type ProviderProps = PropsWithChildren<{
     values: Attributes;
     innerBlocks: ContentBlock[];
     block: [string, Attributes];
-    editorBlock?: BlockInstance;
     index: number;
     onChange?: (attrs: Attributes) => void;
     insertBlocksAfter?: (block: any) => void;
     readonly?: boolean;
-    clientId?: string;
 }>;
 export declare function InlineEditingContextProvider(props: ProviderProps): import("react/jsx-runtime").JSX.Element;
 export declare function ReadonlyInlineEditingProvider(props: PropsWithChildren<{}>): import("react/jsx-runtime").JSX.Element;

package/dist/app/lib/blocks/inline-editing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inline-editing.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/inline-editing.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"inline-editing.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/inline-editing.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAiB,iBAAiB,EAAuB,MAAM,OAAO,CAAA;AAK7E,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAErC,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC,CAAA;AAE1E,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,aAAa,EAAE,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,MAAM,EAAE,UAAU,CAAA;IAClB,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAA;IAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG,CAAA;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;IAC1B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,QAAA,MAAM,oBAAoB,2DAA6D,CAAA;AAEvF,KAAK,aAAa,GAAG,iBAAiB,CAAC;IACrC,MAAM,EAAE,UAAU,CAAA;IAClB,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IACtC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAC,CAAA;AAEF,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,aAAa,2CAmChE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC,2CAazE;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAQ5F;AAED;;;IAGI;AACJ,wBAAgB,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAexG;AAED,wBAAgB,gBAAgB,aA3GF,GAAG,KAAK,IAAI,cA8GzC;AAED,wBAAgB,cAAc,IAAI,YAAY,EAAE,CAG/C;AAED,wBAAgB,eAAe,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAGxD;AAED,wBAAgB,eAAe,qCAE9B;AAED,wBAAgB,iBAAiB,QAOhC;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,IAAI,MAAM,SAAS,CAa7C"}

package/dist/app/lib/blocks/inline-editing.js

@@ -3,7 +3,7 @@ import { createContext, useContext, useMemo } from "react";
 import { usePostEditor } from "./editor/usePostEditor.js";
 import { useRoute } from "../routing/index.js";
 import { addBlockMetadata } from "./block-utils.js";
-export const InlineEditingContext = createContext(undefined);
+const InlineEditingContext = createContext(undefined);
 export function InlineEditingContextProvider(props) {
     const parentContext = useContext(InlineEditingContext);
     useMemo(() => {
@@ -14,7 +14,6 @@ export function InlineEditingContextProvider(props) {
             innerBlocks: props.innerBlocks,
             block: props.block,
             index: props.index,
-            clientId: props.clientId,
             parents: [...(parentContext?.block ? [parentContext?.block] : []), ...(parentContext?.parents || [])].filter(Boolean),
             getValue(key) {
                 return props.values?.[key];
@@ -29,7 +28,6 @@ export function InlineEditingContextProvider(props) {
             },
             insertBlocksAfter: props.insertBlocksAfter,
             readonly: props.readonly || parentContext?.readonly,
-            editorBlock: props.editorBlock,
         }, children: props.children }));
 }
 export function ReadonlyInlineEditingProvider(props) {
@@ -83,9 +81,6 @@ export function useBlockAppender() {
 }
 export function useInnerBlocks() {
     const ctx = useContext(InlineEditingContext);
-    if (env.admin && ctx?.innerBlocks) {
-        addBlockMetadata(ctx?.innerBlocks);
-    }
     return ctx?.innerBlocks || [];
 }
 export function useBlockParents() {