eddev 2.0.0-beta.98 → 2.1.0

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

@@ -0,0 +1,10 @@
+import { BlockInstance } from "../inline-editing";
+/**
+ * Creates a block instance for the editor. This doesn't add the block to the editor on it's own.
+ * @param name The name of the block
+ * @param attributes
+ * @param innerBlocks
+ * @returns
+ */
+export declare function createBlock(name: ChildBlockTypeName, attributes?: Record<string, any>, innerBlocks?: BlockInstance[]): BlockInstance;
+//# sourceMappingURL=create-block.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create-block.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/create-block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,EACxB,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,EACpC,WAAW,GAAE,aAAa,EAAO,GAChC,aAAa,CAKf"}

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

@@ -0,0 +1,13 @@
+/**
+ * Creates a block instance for the editor. This doesn't add the block to the editor on it's own.
+ * @param name The name of the block
+ * @param attributes
+ * @param innerBlocks
+ * @returns
+ */
+export function createBlock(name, attributes = {}, innerBlocks = []) {
+    if (!env.admin) {
+        throw new Error("`createBlock` can only be used in the admin environment");
+    }
+    return wp.blocks.createBlock(name, attributes, innerBlocks);
+}

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

@@ -26,29 +26,49 @@ export type EditorConfigItem = {
     /** A full-page block template */
     template?: BlockTemplate;
 };
-type BlockWrapperClassGenerator = (block: {
+type EditorBlock = {
     name: string;
     slug: BlockTypeName | (string & {});
     attributes: any;
     clientId: string;
     rootClientId: string;
+    isRootBlock: boolean;
+    getParent: () => EditorBlock | null;
     canMove: boolean;
     canRemove: boolean;
     isSelected: boolean;
     isSelectionEnabled: boolean;
-    tags?: DefinedBlockTags;
+    tags?: (keyof DefinedBlockTags)[];
     flags?: DefinedBlockFlags;
-}, post: PostInfo) => string | void;
+};
+export type BlockWrapperClassGenerator = (block: EditorBlock, post: PostInfo) => string | void;
 export declare const editorConfigStore: {
     config: EditorConfig | null;
     currentBlocksConfig: EditorConfigItem;
 };
 export declare function configureEditorBlocks(config: EditorConfigItem): void;
-export declare function transformTemplateToBlocks(template: BlockTemplate, locked?: boolean, isFromTemplate?: boolean): any;
 type PostInfo = {
-    template: TemplateName | "default";
     type: PostTypeName;
+    isPattern: false;
+    isTemplatePart: false;
+    template: TemplateName | "default";
+    slug: string;
+    parent: number;
+    title: string;
+    link: string;
+} | {
+    type: "wp_block";
+    isPattern: true;
+    isTemplatePart: false;
+    title: string;
+} | {
+    type: "wp_template_part";
+    isPattern: false;
+    isTemplatePart: true;
+    area: string;
+    title: string;
     slug: string;
+    wp_pattern_category?: number[];
 };
 type MatcherFunction = (post: PostInfo) => boolean | void;
 type Matcher = {
@@ -57,9 +77,45 @@ type Matcher = {
     /** Configuration for the editor, when the post type and template match */
     config: EditorConfigItem | ((post: PostInfo) => EditorConfigItem);
 };
+export type BlockTransform = {
+    from: ChildBlockTypeName[];
+    to: ChildBlockTypeName;
+};
+export type CustomRichTextFormat = {
+    /** The ID of the format, eg. `"custom/fancy"` */
+    id: string;
+    /** The title of the format, shown on the tooltip */
+    title: string;
+    /**
+     * The HTML tag name to use.
+     * @default `"span"`
+     **/
+    tagName?: string;
+    /**
+     * The class name to apply to the element.
+     * @default `undefined`
+     **/
+    className?: string;
+    /**
+     * The icon to use in the toolbar.
+     */
+    icon?: string;
+    /**
+     * Whether format makes content interactive or not.
+     * @default `false`
+     */
+    interactive?: boolean;
+    /**
+     * Whether to disable this format by default. If `true`, you must pass the format ID to `allowedFormats` on a `EditableText` component.
+     *
+     * @default `false`
+     */
+    disabledByDefault?: boolean;
+};
 type EditorConfig = {
-    /** A list of template/post type matchers, and the resulting editor config */
-    matchers: Matcher[];
+    customRichTextFormats?: CustomRichTextFormat[];
+    /** A list of template/post type matchers, and resulting editor config that they will apply */
+    matchers?: Matcher[];
 };
 /**
  * This call should be placed in blocks/_editor.tsx
@@ -69,3 +125,4 @@ export declare function getEditingPostInfo(): PostInfo;
 export declare function updateTemplateConfig(): void;
 export declare function watchEditorTemplate(): void;
 export {};
+//# sourceMappingURL=editor-config.d.ts.map

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

@@ -0,0 +1 @@
+{"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/editor-config.js

@@ -1,5 +1,5 @@
 import { proxy } from "valtio";
-import { resolveAcfBlockName, transformBlockTemplate } from "./block-templates.js";
+import { applyTemplateBlocks, resolveAcfBlockName, transformBlockTemplate, transformTemplateToBlocks, } from "./block-templates.js";
 export const editorConfigStore = proxy({
     config: null,
     currentBlocksConfig: {},
@@ -21,73 +21,13 @@ export function configureEditorBlocks(config) {
     if (config.template) {
         setTemplate(config.template);
         if (config.headerTemplate || config.footerTemplate) {
-            console.error("You cannot use both a template and header/footer templates at the same time.");
+            console.error("You cannot use both a 'template' alongside 'headerBlock'/'footerBlock'. Did you mean to use 'defaultBlocks' instead?");
             return;
         }
     }
     const currentBlocks = wp.data.select("core/block-editor").getBlocks();
-    const templateBlocks = 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, false);
-    }
-    let newBlocks = [...header, ...blocks, ...footer];
+    const newBlocks = applyTemplateBlocks(currentBlocks, config);
     wp.data.dispatch("core/block-editor").resetBlocks(newBlocks);
-    function syncBlocks(blocks) {
-        return blocks.map((block) => {
-            const matched = templateBlocks.find((templateBlock) => templateBlock.name === block.name);
-            templateBlocks.splice(templateBlocks.indexOf(matched), 1);
-            if (matched) {
-                matched.attributes.lock = block.attributes.lock;
-                return matched;
-            }
-            return block;
-        });
-    }
-}
-export function transformTemplateToBlocks(template, locked = true, isFromTemplate = true) {
-    return template.map(([name, props, children]) => {
-        const attributes = {
-            data: {},
-            inline: {},
-            isFromTemplate: isFromTemplate,
-            lock: undefined,
-        };
-        if (props.locked === false) {
-            attributes.lock = { move: false, remove: false };
-        }
-        else if (locked || props.locked === true || props.locked === "all") {
-            attributes.lock = { move: true, remove: true };
-        }
-        else {
-            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: [],
-        };
-    });
 }
 /**
  * This call should be placed in blocks/_editor.tsx
@@ -105,10 +45,18 @@ export function getEditingPostInfo() {
     const postInfo = {
         ...post,
         ...edits,
+        isTemplatePart: false,
+        isPattern: false,
     };
     if (!postInfo.template)
         postInfo.template = "default";
     postInfo.template = postInfo.template.replace(/(^views\/|\.tsx?$)/g, "");
+    if (postInfo.type === "wp_template_part") {
+        postInfo.isTemplatePart = true;
+    }
+    if (postInfo.type === "wp_block") {
+        postInfo.isPattern = true;
+    }
     return postInfo;
 }
 export function updateTemplateConfig() {
@@ -117,7 +65,7 @@ export function updateTemplateConfig() {
     const editorConfig = editorConfigStore.config;
     if (!editorConfig)
         return;
-    const matched = editorConfig.matchers.find((matcher) => {
+    const matched = editorConfig.matchers?.find((matcher) => {
         return matcher.match(postInfo);
     });
     if (matched) {
@@ -131,17 +79,24 @@ export function updateTemplateConfig() {
     }
 }
 export function watchEditorTemplate() {
-    let lastTemplate = "unknown";
-    wp.data.subscribe(() => {
-        setTimeout(() => {
-            const post = wp.data.select("core/editor").getCurrentPost();
-            let template = wp.data.select("core/editor").getPostEdits()?.template ?? post?.template ?? "";
-            if (template !== lastTemplate) {
-                lastTemplate = template;
+    let lastKey = "unknown";
+    let timer = 0;
+    const update = () => {
+        const post = wp.data.select("core/editor").getCurrentPost();
+        const template = wp.data.select("core/editor").getPostEdits()?.template ?? post?.template ?? "";
+        const key = [post.type, template, post.slug, post.title].join(";");
+        if (key !== lastKey) {
+            lastKey = key;
+            clearTimeout(timer);
+            timer = setTimeout(() => {
                 updateTemplateConfig();
-            }
-        }, 10);
+            }, 20);
+        }
+    };
+    wp.data.subscribe(() => {
+        update();
     });
+    update();
 }
 function setWrapperBlock(blockName, blocks) {
     const wp = window.wp;

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

@@ -1,2 +1,6 @@
+export declare const blockMetaDescriptors: Map<string, BlockMeta> & {
+    $$valtioSnapshot: Omit<Map<string, BlockMeta>, "set" | "clear" | "delete">;
+};
 export declare function whenEditorIsReady(): Promise<void>;
 export declare function installEDGutenbergHooks(): void;
+//# sourceMappingURL=installGutenbergHooks.d.ts.map

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

@@ -0,0 +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"}

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

@@ -1,13 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from "react";
-import { useSnapshot } from "valtio";
-import { getBlockMetadata } from "../block-utils.js";
+import { subscribe, useSnapshot } from "valtio";
+import { proxyMap } from "valtio/utils";
+import { addBlockMetadata, getBlockMetadata } from "../block-utils.js";
+import { registerBuiltinBlocks } from "../builtin-blocks.js";
 import { InlineEditingContextProvider } from "../inline-editing.js";
-import { BlockContext, EditableBlock } from "./EditorSupport.js";
+import { EditorHighlights } from "./EditorHighlights.js";
+import { 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";
 import { rootBlocks } from "./root-blocks.js";
-import { EditorHighlights } from "./EditorHighlights.js";
 function listenForHandleResize() {
     let interval = setInterval(() => {
         let viewportTarget = document.querySelector(".interface-interface-skeleton__content");
@@ -21,16 +24,28 @@ function listenForHandleResize() {
         }
     }, 100);
 }
+export const blockMetaDescriptors = proxyMap();
 export function whenEditorIsReady() {
     return new Promise((resolve) => {
+        let ready = false;
         const unsubscribe = wp.data.subscribe(() => {
             // This will trigger after the initial render blocking, before the window load event
             // This seems currently more reliable than using __unstableIsEditorReady
-            if (wp.data.select("core/editor").isCleanNewPost() || wp.data.select("core/block-editor").getBlockCount() > 0) {
+            if (wp.data.select("core/editor").isCleanNewPost(undefined) ||
+                wp.data.select("core/block-editor").getBlockCount() > 0) {
+                if (ready)
+                    return;
+                ready = true;
                 unsubscribe();
                 resolve();
             }
         });
+        setTimeout(() => {
+            if (ready)
+                return;
+            unsubscribe();
+            resolve();
+        }, 1000);
     });
 }
 export function installEDGutenbergHooks() {
@@ -42,19 +57,117 @@ export function installEDGutenbergHooks() {
         return (props) => {
             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
+    setTimeout(() => {
+        subscribe(editorConfigStore, () => {
+            const formats = editorConfigStore.config?.customRichTextFormats;
+            if (formats) {
+                const activeFormats = wp.data.select("core/rich-text").getFormatTypes();
+                formats.forEach((format) => {
+                    if (activeFormats.some((f) => f.name === format.id)) {
+                        wp.richText.unregisterFormatType(format.id);
+                    }
+                    const EditComponent = (props) => {
+                        if (format.disabledByDefault) {
+                            const explicitlyEnabled = props.contentRef.current
+                                ?.getAttribute("data-allowed-formats")
+                                ?.includes(format.id);
+                            if (!explicitlyEnabled) {
+                                return null;
+                            }
+                        }
+                        return (_jsx(wp.components.Fill, { name: "BlockFormatControls", children: _jsx(wp.components.ToolbarButton, { icon: format.icon, title: format.title, onClick: () => {
+                                    props.onChange(wp.richText.toggleFormat(props.value, {
+                                        type: format.id,
+                                    }));
+                                }, isActive: props.isActive }) }));
+                    };
+                    wp.richText.registerFormatType(format.id, {
+                        name: format.id,
+                        title: format.title,
+                        tagName: format.tagName ?? "span",
+                        className: format.className,
+                        interactive: false,
+                        edit: EditComponent,
+                        // @ts-ignore
+                        disabledByDefault: format.disabledByDefault,
+                    });
+                });
+            }
+        });
+    });
     listenForHandleResize();
     // Remove unwanted formatting options
     // https://developer.wordpress.org/block-editor/how-to-guides/format-api/
-    wp.richText.unregisterFormatType("core/image");
-    wp.richText.unregisterFormatType("core/language");
-    wp.richText.unregisterFormatType("core/keyboard");
-    wp.richText.unregisterFormatType("core/text-color");
-    whenEditorIsReady().then(() => watchEditorTemplate());
+    const { removeFormatTypes } = wp.data.dispatch("core/rich-text");
+    removeFormatTypes("core/image");
+    removeFormatTypes("core/language");
+    removeFormatTypes("core/keyboard");
+    removeFormatTypes("core/text-color");
+    whenEditorIsReady().then(() => {
+        watchEditorTemplate();
+    });
     // Recalculate registered blocks when rootBlocks change
     rootBlocks.listen();
     wp.hooks.addFilter("blocks.registerBlockType", "ed", (item, name) => {
@@ -68,6 +181,12 @@ export function installEDGutenbergHooks() {
             // Add an 'inline' object attribute, which will hold all inline contents
             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),
+            };
             item.attributes.isFromTemplate = { type: "boolean" };
             item.supports.customClassName = false;
             item.edit = function (props) {
@@ -76,20 +195,7 @@ export function installEDGutenbergHooks() {
                     ;
                     wp.data.dispatch("core/block-editor").setTemplateValidity(true);
                 }, []);
-                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,
-                        index: getBlockIndex(props.clientId),
-                    };
-                }, []);
-                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) }) }) }));
+                return (_jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }));
             };
         }
         // Find PHP-defined 'tags' for core blocks.
@@ -111,18 +217,37 @@ export function installEDGutenbergHooks() {
         return {
             ...item,
             get parent() {
+                if (name === "core/block" || name === "core/slot-group")
+                    return undefined;
                 return blocksByTag.expand([...(item.parent ?? []), ...(isRootBlock ? ["core/post-content"] : [])]);
             },
+            get transforms() {
+                const result = {
+                    from: item.transforms?.from ?? [],
+                    to: item.transforms?.to ?? [],
+                    ungroup: item.transforms?.ungroup,
+                };
+                const meta = blockMetaDescriptors.get(resolveAcfBlockName(name, false));
+                if (meta?.transforms) {
+                    result.from = [...(result.from ?? []), ...(meta.transforms.from ?? [])];
+                    result.to = [...(result.to ?? []), ...(meta.transforms.to ?? [])];
+                }
+                return result;
+            },
             get ancestor() {
+                if (name === "core/block" || name === "core/slot-group")
+                    return undefined;
                 return item.ancestor ? blocksByTag.expand(item.ancestor) : undefined;
             },
             get allowedBlocks() {
-                return item.allowedBlocks ? blocksByTag.expand(item.allowedBlocks) : undefined;
+                return item.allowedBlocks ? [...blocksByTag.expand(item.allowedBlocks), "core/slot-group"] : undefined;
             },
         };
     });
+    if (wp.blocks) {
+        registerBuiltinBlocks();
+    }
     const acf = "acf" in window ? window.acf : {};
-    const parseJSX = acf.parseJSX;
     acf.parseJSX = (html) => {
         let payload;
         try {
@@ -132,6 +257,6 @@ export function installEDGutenbergHooks() {
             console.error(err);
             throw new Error("eddev: Error parsing block data from: \n" + html);
         }
-        return _jsx(EditableBlock, { payload: payload });
+        return _jsx(EditableBlock, { payload: payload ?? {} });
     };
 }

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

@@ -4,3 +4,4 @@ export declare const rootBlocks: {
     getRootBlocks(): Set<string>;
     isRootBlock(blockName: string, tags?: string[]): boolean | undefined;
 };
+//# sourceMappingURL=root-blocks.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"root-blocks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/root-blocks.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU;;;;2BAoBE,MAAM,SAAS,MAAM,EAAE;CAG/C,CAAA"}

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

@@ -14,7 +14,17 @@ export declare function usePostEditor(): {
  *
  * @returns [title, setTitle]
  */
-export declare function usePostTitleEditor(title?: string): InlineValueStore<string>;
+export declare function usePostTitleEditor(value?: string): InlineValueStore<string>;
+/**
+ * Returns the current post excerpt, allowing it to be updated.
+ *
+ * NOTE: This only works in the editor.
+ *
+ * For convenience, you can pass in a default title to use when not in the editor, which you can fetch via GraphQL
+ *
+ * @returns [excerpt, setExcerpt]
+ */
+export declare function usePostExcerptEditor(value?: string): InlineValueStore<string>;
 /**
  * Returns a post meta value, allowing it to be updated.
  *
@@ -25,3 +35,4 @@ export declare function usePostTitleEditor(title?: string): InlineValueStore<str
  * @returns [value, setValue]
  */
 export declare function usePostMetaEditor<K extends keyof PostMetaTypes>(key: K, value?: PostMetaTypes[K]): InlineValueStore<PostMetaTypes[K]>;
+//# sourceMappingURL=usePostEditor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"usePostEditor.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/usePostEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAmB,MAAM,sBAAsB,CAAA;AAExE,wBAAgB,aAAa;;uBAgBN,GAAG;;;EAMzB;AA+BD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,SAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAEvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,SAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAMzE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,aAAa,EAC7D,GAAG,EAAE,CAAC,EACN,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GACvB,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAmBpC"}

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

@@ -1,3 +1,4 @@
+import { useBlockContext } from "../inline-editing.js";
 export function usePostEditor() {
     const post = wp.data.useSelect((select) => {
         const editor = select("core/editor");
@@ -18,17 +19,9 @@ export function usePostEditor() {
         updateMeta,
     };
 }
-/**
- * Returns the current post title, allowing it to be updated.
- *
- * NOTE: This only works in the editor.
- *
- * For convenience, you can pass in a default title to use when not in the editor, which you can fetch via GraphQL
- *
- * @returns [title, setTitle]
- */
-export function usePostTitleEditor(title = "") {
+function usePostFieldEditor(key, value) {
     if (env.admin) {
+        const isReadOnly = useBlockContext()?.readonly;
         const post = wp.data.useSelect((select) => {
             const editor = select("core/editor");
             const post = editor.getCurrentPost();
@@ -38,15 +31,47 @@ export function usePostTitleEditor(title = "") {
                 ...edits,
             };
         }, []);
+        if (isReadOnly) {
+            return [value, () => { }];
+        }
         return [
-            post.title ?? "",
+            post[key] ?? "",
             (title) => {
-                wp.data.dispatch("core/editor").editPost({ title });
+                wp.data.dispatch("core/editor").editPost({ [key]: title });
             },
         ];
     }
     else {
-        return [title, () => { }];
+        return [value, () => { }];
+    }
+}
+/**
+ * Returns the current post title, allowing it to be updated.
+ *
+ * NOTE: This only works in the editor.
+ *
+ * For convenience, you can pass in a default title to use when not in the editor, which you can fetch via GraphQL
+ *
+ * @returns [title, setTitle]
+ */
+export function usePostTitleEditor(value = "") {
+    return usePostFieldEditor("title", value);
+}
+/**
+ * Returns the current post excerpt, allowing it to be updated.
+ *
+ * NOTE: This only works in the editor.
+ *
+ * For convenience, you can pass in a default title to use when not in the editor, which you can fetch via GraphQL
+ *
+ * @returns [excerpt, setExcerpt]
+ */
+export function usePostExcerptEditor(value = "") {
+    if (!env.admin) {
+        return [value, () => { }];
+    }
+    else {
+        return usePostFieldEditor("excerpt", value);
     }
 }
 /**