eddev 2.0.0-beta.9 → 2.0.0-beta.91

package/dist/app/lib/blocks/editor/editor-config.js

@@ -1,8 +1,8 @@
 import { proxy } from "valtio";
-import { resolveAcfBlockName, transformBlockTemplate } from "./block-templates";
+import { resolveAcfBlockName, transformBlockTemplate } from "./block-templates.js";
 export const editorConfigStore = proxy({
     config: null,
-    currentBlocksConfig: null,
+    currentBlocksConfig: {},
 });
 export function configureEditorBlocks(config) {
     const wp = window.wp;
@@ -27,14 +27,27 @@ export function configureEditorBlocks(config) {
     }
     const currentBlocks = wp.data.select("core/block-editor").getBlocks();
     const templateBlocks = currentBlocks.filter((block) => block.attributes.isFromTemplate);
-    let blocks = currentBlocks.filter((block) => !block.attributes.isFromTemplate);
     let header = config.headerTemplate ? syncBlocks(transformTemplateToBlocks(config.headerTemplate)) : [];
     let footer = config.footerTemplate ? syncBlocks(transformTemplateToBlocks(config.footerTemplate)) : [];
+    let blocks = currentBlocks.filter((block) => !header.includes(block) && !footer.includes(block));
+    blocks.forEach((block) => {
+        delete block.attributes.lock;
+        delete block.isFromTemplate;
+    });
+    // const blocksToDelete = currentBlocks.filter((block: any) => {
+    //   return !header.includes(block) && !footer.includes(block) && !blocks.includes(block)
+    // })
+    // blocksToDelete.forEach((block: any) => {
+    //   delete block.attributes.lock
+    //   delete block.isFromTemplate
+    // })
+    // blocks = [...blocks, ...blocksToDelete]
+    // console.log("blocks", blocks)
+    // console.log("blocksToDelete", blocksToDelete)
     if (!blocks.length && config.defaultBlocks) {
-        blocks = transformTemplateToBlocks(config.defaultBlocks, false);
+        blocks = transformTemplateToBlocks(config.defaultBlocks, false, false);
     }
     let newBlocks = [...header, ...blocks, ...footer];
-    // console.log("Configuring", newBlocks)
     wp.data.dispatch("core/block-editor").resetBlocks(newBlocks);
     function syncBlocks(blocks) {
         return blocks.map((block) => {
@@ -48,12 +61,12 @@ export function configureEditorBlocks(config) {
         });
     }
 }
-export function transformTemplateToBlocks(template, locked = true) {
+export function transformTemplateToBlocks(template, locked = true, isFromTemplate = true) {
     return template.map(([name, props, children]) => {
         const attributes = {
             data: {},
             inline: {},
-            isFromTemplate: true,
+            isFromTemplate: isFromTemplate,
             lock: undefined,
         };
         if (props.locked === false) {
@@ -70,7 +83,7 @@ export function transformTemplateToBlocks(template, locked = true) {
             clientId: "block-" + Math.random().toString(36),
             name: resolveAcfBlockName(name),
             attributes: attributes,
-            innerBlocks: children ? transformTemplateToBlocks(children, false) : [],
+            innerBlocks: children ? transformTemplateToBlocks(children, false, isFromTemplate) : [],
             isValid: true,
             validationIssues: [],
         };
@@ -174,7 +187,6 @@ function setWrapperBlock(blockName, blocks) {
 }
 function setTemplate(template) {
     const wp = window.wp;
-    // console.log("Setting template", template)
     let currentBlocks = wp.data.select("core/block-editor").getBlocks();
     wp.data.dispatch("core/block-editor").updateSettings({
         templateLock: "all",

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

@@ -1,11 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from "react";
-import { InlineEditingContextProvider } from "../inline-editing";
-import { BlockContext, EditableBlock } from "./EditorSupport";
-import { blocksByTag } from "./blocks-by-tag";
-import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config";
 import { useSnapshot } from "valtio";
-import { getBlockMetadata } from "../block-utils";
+import { getBlockMetadata } from "../block-utils.js";
+import { InlineEditingContextProvider } from "../inline-editing.js";
+import { BlockContext, EditableBlock } from "./EditorSupport.js";
+import { blocksByTag } from "./blocks-by-tag.js";
+import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
+import { rootBlocks } from "./root-blocks.js";
+import { EditorHighlights } from "./EditorHighlights.js";
 function listenForHandleResize() {
     let interval = setInterval(() => {
         let viewportTarget = document.querySelector(".interface-interface-skeleton__content");
@@ -53,6 +55,8 @@ export function installEDGutenbergHooks() {
     wp.richText.unregisterFormatType("core/keyboard");
     wp.richText.unregisterFormatType("core/text-color");
     whenEditorIsReady().then(() => watchEditorTemplate());
+    // Recalculate registered blocks when rootBlocks change
+    rootBlocks.listen();
     wp.hooks.addFilter("blocks.registerBlockType", "ed", (item, name) => {
         // Hook into ACF blocks, customising the edit mode.
         if (name.startsWith("acf/")) {
@@ -63,6 +67,7 @@ export function installEDGutenbergHooks() {
             };
             // Add an 'inline' object attribute, which will hold all inline contents
             item.attributes.inline = { type: "object" };
+            item.attributes.values = { type: "object" };
             item.attributes.isFromTemplate = { type: "boolean" };
             item.supports.customClassName = false;
             item.edit = function (props) {
@@ -71,17 +76,20 @@ export function installEDGutenbergHooks() {
                     ;
                     wp.data.dispatch("core/block-editor").setTemplateValidity(true);
                 }, []);
-                const children = wp.data.useSelect((select) => {
-                    const { getBlock, getBlockOrder } = select("core/block-editor");
+                const { children, index } = wp.data.useSelect((select) => {
+                    const { getBlock, getBlockOrder, getBlockIndex } = select("core/block-editor");
                     const innerBlockIDs = getBlockOrder(props.clientId);
                     const children = innerBlockIDs.map((id) => {
                         return getBlock(id);
                     });
-                    return children;
+                    return {
+                        children,
+                        index: getBlockIndex(props.clientId),
+                    };
                 }, []);
-                return (_jsx(BlockContext.Provider, { value: { name, props }, children: _jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [name, props], index: -1, onChange: (attrs) => {
+                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: edit.call(self, props) }) }));
+                        }, insertBlocksAfter: props.insertBlocksAfter, children: _jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }) }) }));
             };
         }
         // Find PHP-defined 'tags' for core blocks.
@@ -99,13 +107,11 @@ export function installEDGutenbergHooks() {
             item.tags = [];
         }
         blocksByTag.add(item.name, item.tags);
+        const isRootBlock = rootBlocks.isRootBlock(name, item.tags);
         return {
             ...item,
             get parent() {
-                return blocksByTag.expand([
-                    ...(item.parent ?? []),
-                    ...(item.tags.includes("root") ? ["core/post-content"] : []),
-                ]);
+                return blocksByTag.expand([...(item.parent ?? []), ...(isRootBlock ? ["core/post-content"] : [])]);
             },
             get ancestor() {
                 return item.ancestor ? blocksByTag.expand(item.ancestor) : undefined;

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

@@ -0,0 +1,6 @@
+export declare const rootBlocks: {
+    listen(): void;
+    update(): void;
+    getRootBlocks(): Set<string>;
+    isRootBlock(blockName: string, tags?: string[]): boolean | undefined;
+};

package/dist/app/lib/blocks/editor/root-blocks.js

@@ -0,0 +1,30 @@
+import { hash } from "object-code";
+import { subscribe, snapshot } from "valtio";
+import { editorConfigStore } from "./editor-config";
+import { blocksByTag } from "./blocks-by-tag";
+let constraint = ["root"];
+let rootBlockList = new Set(["root"]);
+export const rootBlocks = {
+    listen() {
+        let key = hash(rootBlocks);
+        subscribe(editorConfigStore, () => {
+            constraint = snapshot(editorConfigStore.currentBlocksConfig).rootBlocks ?? ["root"];
+            let newKey = hash(constraint);
+            if (key === newKey)
+                return;
+            // The root blocks config have changed, so we need to recalculate the registered blocks
+            key = newKey;
+            rootBlocks.update();
+        });
+    },
+    update() {
+        rootBlockList = new Set(blocksByTag.expand(constraint));
+        wp.data.dispatch("core/blocks").reapplyBlockTypeFilters();
+    },
+    getRootBlocks() {
+        return rootBlockList;
+    },
+    isRootBlock(blockName, tags) {
+        return rootBlockList.has(blockName) || (tags && tags.some((tag) => rootBlockList.has(tag)));
+    },
+};

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

@@ -1,4 +1,4 @@
-import { InlineValueStore } from "../inline-editing";
+import { InlineValueStore } from "../inline-editing.js";
 export declare function usePostEditor(): {
     post: any;
     updatePost(update: any): void;

package/dist/app/lib/blocks/index.d.ts

@@ -1,9 +1,9 @@
-export * from "./ContentBlocks";
-export * from "./EditableText";
-export * from "./InnerBlocks";
-export * from "./defineBlock";
-export * from "./editor/controls";
-export * from "./editor/usePostEditor";
-export * from "./block-utils";
-export { defineEditorConfig } from "./editor/editor-config";
-export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate } from "./inline-editing";
+export * from "./ContentBlocks.js";
+export * from "./EditableText.js";
+export * from "./InnerBlocks.js";
+export * from "./defineBlock.js";
+export * from "./editor/controls.js";
+export * from "./editor/usePostEditor.js";
+export * from "./block-utils.js";
+export { defineEditorConfig } from "./editor/editor-config.js";
+export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate } from "./inline-editing.js";

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

@@ -1,9 +1,9 @@
-export * from "./ContentBlocks";
-export * from "./EditableText";
-export * from "./InnerBlocks";
-export * from "./defineBlock";
-export * from "./editor/controls";
-export * from "./editor/usePostEditor";
-export * from "./block-utils";
-export { defineEditorConfig } from "./editor/editor-config";
-export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate } from "./inline-editing";
+export * from "./ContentBlocks.js";
+export * from "./EditableText.js";
+export * from "./InnerBlocks.js";
+export * from "./defineBlock.js";
+export * from "./editor/controls.js";
+export * from "./editor/usePostEditor.js";
+export * from "./block-utils.js";
+export { defineEditorConfig } from "./editor/editor-config.js";
+export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate } from "./inline-editing.js";

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

@@ -1,4 +1,4 @@
-import { ContentBlock } from "./ContentBlocks";
+import { ContentBlock } from "./ContentBlocks.js";
 import { PropsWithChildren } from "react";
 type Attributes = Record<string, any>;
 export type InlineValueStore<T> = [value: T, setValue: (value: T) => void];

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

@@ -1,12 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, useContext } from "react";
-import { usePostEditor } from "./editor/usePostEditor";
-import { useRoute } from "../routing";
-import { addBlockMetadata } from "./block-utils";
+import { createContext, useContext, useMemo } from "react";
+import { usePostEditor } from "./editor/usePostEditor.js";
+import { useRoute } from "../routing/index.js";
+import { addBlockMetadata } from "./block-utils.js";
 const InlineEditingContext = createContext(undefined);
 export function InlineEditingContextProvider(props) {
     const parentContext = useContext(InlineEditingContext);
-    addBlockMetadata(props.innerBlocks);
+    useMemo(() => {
+        addBlockMetadata(props.innerBlocks ?? []);
+    }, [props.innerBlocks]);
     return (_jsx(InlineEditingContext.Provider, { value: {
             values: props.values,
             innerBlocks: props.innerBlocks,

package/dist/app/lib/devtools/components/BreakpointIndicator.js

@@ -1,7 +1,7 @@
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from "react";
-import { useTailwindConfig } from "../hooks/useTailwind.js";
 import { usePersistState } from "../hooks/usePersistState.js";
+import { useTailwindConfig } from "../hooks/useTailwind.js";
 function parseBreakpointMin(breakpoint) {
     return parseInt(breakpoint);
 }

package/dist/app/lib/devtools/components/DevUI.js

@@ -1,6 +1,7 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import "../../../../../css/devtools.css";
-import { BreakpointIndicator } from "./BreakpointIndicator";
+import { BreakpointIndicator } from "./BreakpointIndicator.js";
+import { GridIndicator } from "./GridIndicator";
 export default function DevUI() {
-    return (_jsx("div", { className: "eddev-ui", children: _jsx(BreakpointIndicator, {}) }));
+    return (_jsxs("div", { className: "eddev-ui", children: [_jsx(BreakpointIndicator, {}), _jsx(GridIndicator, {})] }));
 }

package/dist/app/lib/devtools/components/GridIndicator.d.ts

@@ -0,0 +1 @@
+export declare function GridIndicator(): import("react/jsx-runtime").JSX.Element | null;

package/dist/app/lib/devtools/components/GridIndicator.js

@@ -0,0 +1,29 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useLayoutEffect } from "react";
+import { usePersistState } from "../hooks/usePersistState.js";
+export function GridIndicator() {
+    const [enabled, setEnabled] = usePersistState("gridOverlayEnabled", false);
+    useEffect(() => {
+        const handleKeyDown = (e) => {
+            if (e.key === "g" && e.ctrlKey) {
+                setEnabled((e) => !e);
+            }
+        };
+        window.addEventListener("keydown", handleKeyDown);
+        return () => {
+            window.removeEventListener("keydown", handleKeyDown);
+        };
+    }, []);
+    const cols = [];
+    for (let i = 0; i < 12; i++) {
+        cols.push(_jsx("div", { style: { height: "100%", backgroundColor: "rgba(255,0,0,0.1)" } }));
+    }
+    if (env.client) {
+        useLayoutEffect(() => {
+            document.documentElement.classList.toggle("debug-grid", enabled);
+        }, [enabled]);
+    }
+    if (!enabled)
+        return null;
+    return (_jsx("div", { style: { position: "fixed", inset: 0, zIndex: 999999999, pointerEvents: "none" }, children: _jsx("div", { className: "grid-auto debug-display", style: { height: "100%" }, children: cols }) }));
+}

package/dist/app/lib/devtools/hooks/usePersistState.d.ts

@@ -1 +1 @@
-export declare function usePersistState<T>(id: string, initial: T): [T, (value: T) => void];
+export declare function usePersistState<T>(id: string, initial: T): [T, (value: T | ((current: T) => T)) => void];

package/dist/app/lib/devtools/hooks/usePersistState.js

@@ -24,8 +24,17 @@ export function usePersistState(id, initial) {
     return [
         value,
         (value) => {
-            set(id, value);
-            setValue(value);
+            if (typeof value === "function") {
+                return setValue((cur) => {
+                    const next = value(cur);
+                    set(id, next);
+                    return next;
+                });
+            }
+            else {
+                set(id, value);
+                setValue(value);
+            }
         },
     ];
 }