eddev 2.3.14 → 2.3.15

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

@@ -1 +1 @@
-{"version":3,"file":"block-templates.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/block-templates.tsx"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,EAAE,CAAA;AAE9F,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,UAAO,UAO7D;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAI7E;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,GAAG,EAAE,EACpB,MAAM,EAAE;IACN,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,cAAc,CAAC,EAAE,aAAa,CAAA;CAC/B,SA2CF;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAO,EAAE,cAAc,UAAO,GAAG,GAAG,CAyB5G"}
+{"version":3,"file":"block-templates.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/block-templates.tsx"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,EAAE,CAAA;AAE9F,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,UAAO,UAO7D;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAU7E;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,GAAG,EAAE,EACpB,MAAM,EAAE;IACN,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,cAAc,CAAC,EAAE,aAAa,CAAA;CAC/B,SA2CF;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAO,EAAE,cAAc,UAAO,GAAG,GAAG,CA2B5G"}

package/dist/app/lib/blocks/editor/block-templates.js

@@ -9,7 +9,15 @@ export function resolveAcfBlockName(name, check = true) {
 }
 export function transformBlockTemplate(template) {
     return template.map(([name, props, children]) => {
-        return [resolveAcfBlockName(name), props, children ? transformBlockTemplate(children) : undefined];
+        const blockName = resolveAcfBlockName(name);
+        const outProps = { ...props };
+        if (blockName.startsWith("acf/")) {
+            if (!outProps.data)
+                outProps.data = {};
+            if (!outProps.inline)
+                outProps.inline = {};
+        }
+        return [blockName, outProps, children ? transformBlockTemplate(children) : undefined];
     });
 }
 export function applyTemplateBlocks(currentBlocks, config) {
@@ -50,12 +58,15 @@ export function applyTemplateBlocks(currentBlocks, config) {
 }
 export function transformTemplateToBlocks(template, locked = true, isFromTemplate = true) {
     return template.map(([name, props, children]) => {
+        const blockName = resolveAcfBlockName(name);
         const attributes = {
-            data: {},
-            inline: {},
             isFromTemplate: isFromTemplate,
             lock: undefined,
         };
+        if (blockName.startsWith("acf/")) {
+            attributes.data = {};
+            attributes.inline = {};
+        }
         if (props.locked === false) {
             attributes.lock = { move: false, remove: false };
         }
@@ -66,13 +77,8 @@ export function transformTemplateToBlocks(template, locked = true, isFromTemplat
             attributes.lock = props.lock;
         }
         Object.assign(attributes, props);
-        return {
-            clientId: "block-" + Math.random().toString(36),
-            name: resolveAcfBlockName(name),
-            attributes: attributes,
-            innerBlocks: children ? transformTemplateToBlocks(children, false, isFromTemplate) : [],
-            isValid: true,
-            validationIssues: [],
-        };
+        const block = wp.blocks.createBlock(blockName, attributes, children ? transformTemplateToBlocks(children, false, isFromTemplate) : []);
+        Object.assign(block.attributes, attributes);
+        return block;
     });
 }

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

@@ -1,5 +1,5 @@
 export declare const blockMetaDescriptors: Map<string, BlockMeta> & {
-    $$valtioSnapshot: Omit<Map<string, BlockMeta>, "set" | "delete" | "clear">;
+    $$valtioSnapshot: Omit<Map<string, BlockMeta>, "set" | "clear" | "delete">;
 };
 export declare function whenEditorIsReady(): Promise<void>;
 export declare function installEDGutenbergHooks(): void;

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":"AA2BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAyTtC"}
+{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAmTtC"}

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

@@ -1,7 +1,7 @@
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { forwardRef, Fragment, useEffect, useMemo } from "react";
-import { proxy, ref, subscribe, useSnapshot } from "valtio";
+import { Fragment, useEffect, useMemo } from "react";
+import { proxy, subscribe, useSnapshot } from "valtio";
 import { proxyMap } from "valtio/utils";
 import { addBlockMetadata, getBlockMetadata } from "../block-utils.js";
 import { registerBuiltinBlocks } from "../builtin-blocks.js";
@@ -199,11 +199,13 @@ export function installEDGutenbergHooks() {
             item.attributes.inline = { type: "object" };
             item.attributes.values = { type: "object" };
             // Add className support to all ACF blocks
-            const defaultStyleName = item.styles?.find((s) => s.isDefault)?.name;
-            item.attributes.className = {
-                type: "string",
-                default: item.attributes?.className?.default ?? (defaultStyleName ? "is-style-" + defaultStyleName : undefined),
-            };
+            if (item.styles) {
+                const defaultStyleName = item.styles?.find((s) => s.isDefault)?.name;
+                item.attributes.className = {
+                    type: "string",
+                    default: item.attributes?.className?.default ?? (defaultStyleName ? "is-style-" + defaultStyleName : undefined),
+                };
+            }
             item.attributes.isFromTemplate = { type: "boolean" };
             item.supports.customClassName = false;
             item.edit = function (props) {
@@ -268,45 +270,34 @@ export function installEDGutenbergHooks() {
         registerBuiltinBlocks();
     }
     const acf = "acf" in window ? window.acf : {};
-    acf.parseJSX = (html) => {
-        let payload;
-        try {
-            payload = JSON.parse(html);
-        }
-        catch (err) {
-            console.error(err);
-            throw new Error("eddev: Error parsing block data from: \n" + html);
-        }
-        return _jsx(EditableBlock, { payload: payload ?? {} });
-    };
-    acf.addFilter("blocks/preview/render", (data) => {
-        let clientId = null;
+    // acf.parseJSX = (html: string) => {
+    //   let payload: any
+    //   try {
+    //     payload = JSON.parse(html)
+    //   } catch (err) {
+    //     console.error(err)
+    //     throw new Error("eddev: Error parsing block data from: \n" + html)
+    //   }
+    //   return <EditableBlock payload={payload ?? {}} />
+    // }
+    acf.addFilter("blocks/preview/render", (html) => {
+        const trimmed = html.trim();
         try {
-            const key = String(data);
-            const existing = BlockPropsStore.blocks.get(data.__clientId);
-            if (!existing || existing.key !== data.__key) {
-                const payload = JSON.parse(data);
-                clientId = payload.__clientId;
-                BlockPropsStore.blocks.set(payload.__clientId, {
-                    payload: payload ? ref(payload) : null,
-                    key: key,
-                });
-            }
-            else {
-                clientId = existing.payload?.__clientId;
-            }
+            JSON.parse(trimmed);
+            return `<edblock data-payload="${encodeURIComponent(trimmed)}"></edblock>`;
         }
-        catch (err) {
-            console.error("eddev: Error parsing block data from: \n" + data);
-            console.error(err);
+        catch {
+            return html;
         }
-        return '<edblock data-clientid="' + clientId + '" />';
     });
     if (acf.jsxNameReplacements) {
-        acf.jsxNameReplacements["edblock"] = forwardRef(function EDBlock(props, ref) {
-            const payload = useSnapshot(BlockPropsStore).blocks.get(props["data-clientid"])?.payload;
-            return useMemo(() => _jsx(EditableBlock, { payload: payload }), [payload]);
-        });
+        acf.jsxNameReplacements["edblock"] = function EDBlock(props) {
+            const payload = useMemo(() => {
+                const raw = props["data-payload"];
+                return raw ? JSON.parse(decodeURIComponent(raw)) : null;
+            }, [props["data-payload"]]);
+            return _jsx(EditableBlock, { payload: payload ?? {} });
+        };
     }
 }
 const BlockPropsStore = proxy({

package/dist/node/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.3.14";
+export declare const VERSION = "2.3.15";
 //# sourceMappingURL=version.d.ts.map

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.14";
+export const VERSION = "2.3.15";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "description": "",
   "main": "index.js",
   "type": "module",