@wordpress/block-library 8.14.0 → 8.16.0

package/build-module/file/view-interactivity.js

@@ -0,0 +1,19 @@
+/**
+ * WordPress dependencies
+ */
+import { store } from '@wordpress/interactivity';
+/**
+ * Internal dependencies
+ */
+
+import { browserSupportsPdfs as hasPdfPreview } from './utils';
+store({
+  selectors: {
+    core: {
+      file: {
+        hasPdfPreview
+      }
+    }
+  }
+});
+//# sourceMappingURL=view-interactivity.js.map

package/build-module/file/view-interactivity.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["@wordpress/block-library/src/file/view-interactivity.js"],"names":["store","browserSupportsPdfs","hasPdfPreview","selectors","core","file"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,KAAT,QAAsB,0BAAtB;AACA;AACA;AACA;;AACA,SAASC,mBAAmB,IAAIC,aAAhC,QAAqD,SAArD;AAEAF,KAAK,CAAE;AACNG,EAAAA,SAAS,EAAE;AACVC,IAAAA,IAAI,EAAE;AACLC,MAAAA,IAAI,EAAE;AACLH,QAAAA;AADK;AADD;AADI;AADL,CAAF,CAAL","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { store } from '@wordpress/interactivity';\n/**\n * Internal dependencies\n */\nimport { browserSupportsPdfs as hasPdfPreview } from './utils';\n\nstore( {\n\tselectors: {\n\t\tcore: {\n\t\t\tfile: {\n\t\t\t\thasPdfPreview,\n\t\t\t},\n\t\t},\n\t},\n} );\n"]}

package/build-module/file/view.js

@@ -1,19 +1,6 @@
-/**
- * WordPress dependencies
- */
-import { store } from '@wordpress/interactivity';
 /**
  * Internal dependencies
  */
-
-import { browserSupportsPdfs as hasPdfPreview } from './utils';
-store({
-  selectors: {
-    core: {
-      file: {
-        hasPdfPreview
-      }
-    }
-  }
-});
+import { hidePdfEmbedsOnUnsupportedBrowsers } from './utils';
+document.addEventListener('DOMContentLoaded', hidePdfEmbedsOnUnsupportedBrowsers);
 //# sourceMappingURL=view.js.map

package/build-module/file/view.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/file/view.js"],"names":["store","browserSupportsPdfs","hasPdfPreview","selectors","core","file"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,KAAT,QAAsB,0BAAtB;AACA;AACA;AACA;;AACA,SAASC,mBAAmB,IAAIC,aAAhC,QAAqD,SAArD;AAEAF,KAAK,CAAE;AACNG,EAAAA,SAAS,EAAE;AACVC,IAAAA,IAAI,EAAE;AACLC,MAAAA,IAAI,EAAE;AACLH,QAAAA;AADK;AADD;AADI;AADL,CAAF,CAAL","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { store } from '@wordpress/interactivity';\n/**\n * Internal dependencies\n */\nimport { browserSupportsPdfs as hasPdfPreview } from './utils';\n\nstore( {\n\tselectors: {\n\t\tcore: {\n\t\t\tfile: {\n\t\t\t\thasPdfPreview,\n\t\t\t},\n\t\t},\n\t},\n} );\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/file/view.js"],"names":["hidePdfEmbedsOnUnsupportedBrowsers","document","addEventListener"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,kCAAT,QAAmD,SAAnD;AAEAC,QAAQ,CAACC,gBAAT,CACC,kBADD,EAECF,kCAFD","sourcesContent":["/**\n * Internal dependencies\n */\nimport { hidePdfEmbedsOnUnsupportedBrowsers } from './utils';\n\ndocument.addEventListener(\n\t'DOMContentLoaded',\n\thidePdfEmbedsOnUnsupportedBrowsers\n);\n"]}

package/build-module/footnotes/edit.js

@@ -3,8 +3,11 @@ import { createElement } from "@wordpress/element";
 /**
  * WordPress dependencies
  */
-import { RichText, useBlockProps } from '@wordpress/block-editor';
+import { BlockIcon, RichText, useBlockProps } from '@wordpress/block-editor';
 import { useEntityProp } from '@wordpress/core-data';
+import { __ } from '@wordpress/i18n';
+import { Placeholder } from '@wordpress/components';
+import { formatListNumbered as icon } from '@wordpress/icons';
 export default function FootnotesEdit({
   context: {
     postType,
@@ -13,7 +16,31 @@ export default function FootnotesEdit({
 }) {
   const [meta, updateMeta] = useEntityProp('postType', postType, 'meta', postId);
   const footnotes = meta?.footnotes ? JSON.parse(meta.footnotes) : [];
-  return createElement("ol", { ...useBlockProps()
+  const blockProps = useBlockProps();
+
+  if (postType !== 'post' && postType !== 'page') {
+    return createElement("div", { ...blockProps
+    }, createElement(Placeholder, {
+      icon: createElement(BlockIcon, {
+        icon: icon
+      }),
+      label: __('Footnotes') // To do: add instructions. We can't add new string in RC.
+
+    }));
+  }
+
+  if (!footnotes.length) {
+    return createElement("div", { ...blockProps
+    }, createElement(Placeholder, {
+      icon: createElement(BlockIcon, {
+        icon: icon
+      }),
+      label: __('Footnotes'),
+      instructions: __('Footnotes found in blocks within this document will be displayed here.')
+    }));
+  }
+
+  return createElement("ol", { ...blockProps
   }, footnotes.map(({
     id,
     content

package/build-module/footnotes/edit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/footnotes/edit.js"],"names":["RichText","useBlockProps","useEntityProp","FootnotesEdit","context","postType","postId","meta","updateMeta","footnotes","JSON","parse","map","id","content","event","target","textContent","trim","scrollIntoView","nextFootnote","stringify","footnote"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,QAAT,EAAmBC,aAAnB,QAAwC,yBAAxC;AACA,SAASC,aAAT,QAA8B,sBAA9B;AAEA,eAAe,SAASC,aAAT,CAAwB;AAAEC,EAAAA,OAAO,EAAE;AAAEC,IAAAA,QAAF;AAAYC,IAAAA;AAAZ;AAAX,CAAxB,EAA4D;AAC1E,QAAM,CAAEC,IAAF,EAAQC,UAAR,IAAuBN,aAAa,CACzC,UADyC,EAEzCG,QAFyC,EAGzC,MAHyC,EAIzCC,MAJyC,CAA1C;AAMA,QAAMG,SAAS,GAAGF,IAAI,EAAEE,SAAN,GAAkBC,IAAI,CAACC,KAAL,CAAYJ,IAAI,CAACE,SAAjB,CAAlB,GAAiD,EAAnE;AACA,SACC,yBAASR,aAAa;AAAtB,KACGQ,SAAS,CAACG,GAAV,CAAe,CAAE;AAAEC,IAAAA,EAAF;AAAMC,IAAAA;AAAN,GAAF,KAChB;AAAI,IAAA,GAAG,EAAGD;AAAV,KACC,cAAC,QAAD;AACC,IAAA,EAAE,EAAGA,EADN;AAEC,IAAA,OAAO,EAAC,MAFT;AAGC,IAAA,KAAK,EAAGC,OAHT;AAIC,IAAA,UAAU,EAAGD,EAJd,CAKC;AACA;AAND;AAOC,IAAA,OAAO,EAAKE,KAAF,IAAa;AACtB,UAAK,CAAEA,KAAK,CAACC,MAAN,CAAaC,WAAb,CAAyBC,IAAzB,EAAP,EAAyC;AACxCH,QAAAA,KAAK,CAACC,MAAN,CAAaG,cAAb;AACA;AACD,KAXF;AAYC,IAAA,QAAQ,EAAKC,YAAF,IAAoB;AAC9BZ,MAAAA,UAAU,CAAE,EACX,GAAGD,IADQ;AAEXE,QAAAA,SAAS,EAAEC,IAAI,CAACW,SAAL,CACVZ,SAAS,CAACG,GAAV,CAAiBU,QAAF,IAAgB;AAC9B,iBAAOA,QAAQ,CAACT,EAAT,KAAgBA,EAAhB,GACJ;AACAC,YAAAA,OAAO,EAAEM,YADT;AAEAP,YAAAA;AAFA,WADI,GAKJS,QALH;AAMA,SAPD,CADU;AAFA,OAAF,CAAV;AAaA;AA1BF,IADD,EA4BK,GA5BL,EA6BC;AAAG,IAAA,IAAI,EAAI,IAAIT,EAAI;AAAnB,oBA7BD,CADC,CADH,CADD;AAqCA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { RichText, useBlockProps } from '@wordpress/block-editor';\nimport { useEntityProp } from '@wordpress/core-data';\n\nexport default function FootnotesEdit( { context: { postType, postId } } ) {\n\tconst [ meta, updateMeta ] = useEntityProp(\n\t\t'postType',\n\t\tpostType,\n\t\t'meta',\n\t\tpostId\n\t);\n\tconst footnotes = meta?.footnotes ? JSON.parse( meta.footnotes ) : [];\n\treturn (\n\t\t<ol { ...useBlockProps() }>\n\t\t\t{ footnotes.map( ( { id, content } ) => (\n\t\t\t\t<li key={ id }>\n\t\t\t\t\t<RichText\n\t\t\t\t\t\tid={ id }\n\t\t\t\t\t\ttagName=\"span\"\n\t\t\t\t\t\tvalue={ content }\n\t\t\t\t\t\tidentifier={ id }\n\t\t\t\t\t\t// To do: figure out why the browser is not scrolling\n\t\t\t\t\t\t// into view when it receives focus.\n\t\t\t\t\t\tonFocus={ ( event ) => {\n\t\t\t\t\t\t\tif ( ! event.target.textContent.trim() ) {\n\t\t\t\t\t\t\t\tevent.target.scrollIntoView();\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} }\n\t\t\t\t\t\tonChange={ ( nextFootnote ) => {\n\t\t\t\t\t\t\tupdateMeta( {\n\t\t\t\t\t\t\t\t...meta,\n\t\t\t\t\t\t\t\tfootnotes: JSON.stringify(\n\t\t\t\t\t\t\t\t\tfootnotes.map( ( footnote ) => {\n\t\t\t\t\t\t\t\t\t\treturn footnote.id === id\n\t\t\t\t\t\t\t\t\t\t\t? {\n\t\t\t\t\t\t\t\t\t\t\t\t\tcontent: nextFootnote,\n\t\t\t\t\t\t\t\t\t\t\t\t\tid,\n\t\t\t\t\t\t\t\t\t\t\t  }\n\t\t\t\t\t\t\t\t\t\t\t: footnote;\n\t\t\t\t\t\t\t\t\t} )\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t} );\n\t\t\t\t\t\t} }\n\t\t\t\t\t/>{ ' ' }\n\t\t\t\t\t<a href={ `#${ id }-link` }>↩︎</a>\n\t\t\t\t</li>\n\t\t\t) ) }\n\t\t</ol>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/footnotes/edit.js"],"names":["BlockIcon","RichText","useBlockProps","useEntityProp","__","Placeholder","formatListNumbered","icon","FootnotesEdit","context","postType","postId","meta","updateMeta","footnotes","JSON","parse","blockProps","length","map","id","content","event","target","textContent","trim","scrollIntoView","nextFootnote","stringify","footnote"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,SAAT,EAAoBC,QAApB,EAA8BC,aAA9B,QAAmD,yBAAnD;AACA,SAASC,aAAT,QAA8B,sBAA9B;AACA,SAASC,EAAT,QAAmB,iBAAnB;AACA,SAASC,WAAT,QAA4B,uBAA5B;AACA,SAASC,kBAAkB,IAAIC,IAA/B,QAA2C,kBAA3C;AAEA,eAAe,SAASC,aAAT,CAAwB;AAAEC,EAAAA,OAAO,EAAE;AAAEC,IAAAA,QAAF;AAAYC,IAAAA;AAAZ;AAAX,CAAxB,EAA4D;AAC1E,QAAM,CAAEC,IAAF,EAAQC,UAAR,IAAuBV,aAAa,CACzC,UADyC,EAEzCO,QAFyC,EAGzC,MAHyC,EAIzCC,MAJyC,CAA1C;AAMA,QAAMG,SAAS,GAAGF,IAAI,EAAEE,SAAN,GAAkBC,IAAI,CAACC,KAAL,CAAYJ,IAAI,CAACE,SAAjB,CAAlB,GAAiD,EAAnE;AACA,QAAMG,UAAU,GAAGf,aAAa,EAAhC;;AAEA,MAAKQ,QAAQ,KAAK,MAAb,IAAuBA,QAAQ,KAAK,MAAzC,EAAkD;AACjD,WACC,0BAAUO;AAAV,OACC,cAAC,WAAD;AACC,MAAA,IAAI,EAAG,cAAC,SAAD;AAAW,QAAA,IAAI,EAAGV;AAAlB,QADR;AAEC,MAAA,KAAK,EAAGH,EAAE,CAAE,WAAF,CAFX,CAGC;;AAHD,MADD,CADD;AASA;;AAED,MAAK,CAAEU,SAAS,CAACI,MAAjB,EAA0B;AACzB,WACC,0BAAUD;AAAV,OACC,cAAC,WAAD;AACC,MAAA,IAAI,EAAG,cAAC,SAAD;AAAW,QAAA,IAAI,EAAGV;AAAlB,QADR;AAEC,MAAA,KAAK,EAAGH,EAAE,CAAE,WAAF,CAFX;AAGC,MAAA,YAAY,EAAGA,EAAE,CAChB,wEADgB;AAHlB,MADD,CADD;AAWA;;AAED,SACC,yBAASa;AAAT,KACGH,SAAS,CAACK,GAAV,CAAe,CAAE;AAAEC,IAAAA,EAAF;AAAMC,IAAAA;AAAN,GAAF,KAChB;AAAI,IAAA,GAAG,EAAGD;AAAV,KACC,cAAC,QAAD;AACC,IAAA,EAAE,EAAGA,EADN;AAEC,IAAA,OAAO,EAAC,MAFT;AAGC,IAAA,KAAK,EAAGC,OAHT;AAIC,IAAA,UAAU,EAAGD,EAJd,CAKC;AACA;AAND;AAOC,IAAA,OAAO,EAAKE,KAAF,IAAa;AACtB,UAAK,CAAEA,KAAK,CAACC,MAAN,CAAaC,WAAb,CAAyBC,IAAzB,EAAP,EAAyC;AACxCH,QAAAA,KAAK,CAACC,MAAN,CAAaG,cAAb;AACA;AACD,KAXF;AAYC,IAAA,QAAQ,EAAKC,YAAF,IAAoB;AAC9Bd,MAAAA,UAAU,CAAE,EACX,GAAGD,IADQ;AAEXE,QAAAA,SAAS,EAAEC,IAAI,CAACa,SAAL,CACVd,SAAS,CAACK,GAAV,CAAiBU,QAAF,IAAgB;AAC9B,iBAAOA,QAAQ,CAACT,EAAT,KAAgBA,EAAhB,GACJ;AACAC,YAAAA,OAAO,EAAEM,YADT;AAEAP,YAAAA;AAFA,WADI,GAKJS,QALH;AAMA,SAPD,CADU;AAFA,OAAF,CAAV;AAaA;AA1BF,IADD,EA4BK,GA5BL,EA6BC;AAAG,IAAA,IAAI,EAAI,IAAIT,EAAI;AAAnB,oBA7BD,CADC,CADH,CADD;AAqCA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { BlockIcon, RichText, useBlockProps } from '@wordpress/block-editor';\nimport { useEntityProp } from '@wordpress/core-data';\nimport { __ } from '@wordpress/i18n';\nimport { Placeholder } from '@wordpress/components';\nimport { formatListNumbered as icon } from '@wordpress/icons';\n\nexport default function FootnotesEdit( { context: { postType, postId } } ) {\n\tconst [ meta, updateMeta ] = useEntityProp(\n\t\t'postType',\n\t\tpostType,\n\t\t'meta',\n\t\tpostId\n\t);\n\tconst footnotes = meta?.footnotes ? JSON.parse( meta.footnotes ) : [];\n\tconst blockProps = useBlockProps();\n\n\tif ( postType !== 'post' && postType !== 'page' ) {\n\t\treturn (\n\t\t\t<div { ...blockProps }>\n\t\t\t\t<Placeholder\n\t\t\t\t\ticon={ <BlockIcon icon={ icon } /> }\n\t\t\t\t\tlabel={ __( 'Footnotes' ) }\n\t\t\t\t\t// To do: add instructions. We can't add new string in RC.\n\t\t\t\t/>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif ( ! footnotes.length ) {\n\t\treturn (\n\t\t\t<div { ...blockProps }>\n\t\t\t\t<Placeholder\n\t\t\t\t\ticon={ <BlockIcon icon={ icon } /> }\n\t\t\t\t\tlabel={ __( 'Footnotes' ) }\n\t\t\t\t\tinstructions={ __(\n\t\t\t\t\t\t'Footnotes found in blocks within this document will be displayed here.'\n\t\t\t\t\t) }\n\t\t\t\t/>\n\t\t\t</div>\n\t\t);\n\t}\n\n\treturn (\n\t\t<ol { ...blockProps }>\n\t\t\t{ footnotes.map( ( { id, content } ) => (\n\t\t\t\t<li key={ id }>\n\t\t\t\t\t<RichText\n\t\t\t\t\t\tid={ id }\n\t\t\t\t\t\ttagName=\"span\"\n\t\t\t\t\t\tvalue={ content }\n\t\t\t\t\t\tidentifier={ id }\n\t\t\t\t\t\t// To do: figure out why the browser is not scrolling\n\t\t\t\t\t\t// into view when it receives focus.\n\t\t\t\t\t\tonFocus={ ( event ) => {\n\t\t\t\t\t\t\tif ( ! event.target.textContent.trim() ) {\n\t\t\t\t\t\t\t\tevent.target.scrollIntoView();\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} }\n\t\t\t\t\t\tonChange={ ( nextFootnote ) => {\n\t\t\t\t\t\t\tupdateMeta( {\n\t\t\t\t\t\t\t\t...meta,\n\t\t\t\t\t\t\t\tfootnotes: JSON.stringify(\n\t\t\t\t\t\t\t\t\tfootnotes.map( ( footnote ) => {\n\t\t\t\t\t\t\t\t\t\treturn footnote.id === id\n\t\t\t\t\t\t\t\t\t\t\t? {\n\t\t\t\t\t\t\t\t\t\t\t\t\tcontent: nextFootnote,\n\t\t\t\t\t\t\t\t\t\t\t\t\tid,\n\t\t\t\t\t\t\t\t\t\t\t  }\n\t\t\t\t\t\t\t\t\t\t\t: footnote;\n\t\t\t\t\t\t\t\t\t} )\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t} );\n\t\t\t\t\t\t} }\n\t\t\t\t\t/>{ ' ' }\n\t\t\t\t\t<a href={ `#${ id }-link` }>↩︎</a>\n\t\t\t\t</li>\n\t\t\t) ) }\n\t\t</ol>\n\t);\n}\n"]}

package/build-module/footnotes/format.js

@@ -11,9 +11,9 @@ import { v4 as createId } from 'uuid';
 import { __ } from '@wordpress/i18n';
 import { formatListNumbered as icon } from '@wordpress/icons';
 import { insertObject } from '@wordpress/rich-text';
-import { RichTextToolbarButton, store as blockEditorStore } from '@wordpress/block-editor';
+import { RichTextToolbarButton, store as blockEditorStore, privateApis } from '@wordpress/block-editor';
 import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
-import { createBlock } from '@wordpress/blocks';
+import { createBlock, store as blocksStore } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
@@ -31,59 +31,155 @@ const {
   textdomain: "default",
   usesContext: ["postId", "postType"],
   supports: {
+    __experimentalBorder: {
+      radius: true,
+      color: true,
+      width: true,
+      style: true,
+      __experimentalDefaultControls: {
+        radius: false,
+        color: false,
+        width: false,
+        style: false
+      }
+    },
+    color: {
+      background: true,
+      link: true,
+      text: true,
+      __experimentalDefaultControls: {
+        link: true,
+        text: true
+      }
+    },
     html: false,
     multiple: false,
-    inserter: false,
-    reusable: false
+    reusable: false,
+    spacing: {
+      margin: true,
+      padding: true,
+      __experimentalDefaultControls: {
+        margin: false,
+        padding: false
+      }
+    },
+    typography: {
+      fontSize: true,
+      lineHeight: true,
+      __experimentalFontFamily: true,
+      __experimentalTextDecoration: true,
+      __experimentalFontStyle: true,
+      __experimentalFontWeight: true,
+      __experimentalLetterSpacing: true,
+      __experimentalTextTransform: true,
+      __experimentalWritingMode: true,
+      __experimentalDefaultControls: {
+        fontSize: true
+      }
+    }
   },
   style: "wp-block-footnotes"
 };
+import { unlock } from '../lock-unlock';
+const {
+  usesContextKey
+} = unlock(privateApis);
 export const formatName = 'core/footnote';
+const POST_CONTENT_BLOCK_NAME = 'core/post-content';
+const SYNCED_PATTERN_BLOCK_NAME = 'core/block';
 export const format = {
   title: __('Footnote'),
-  tagName: 'a',
+  tagName: 'sup',
   className: 'fn',
   attributes: {
-    id: 'id',
-    href: 'href',
     'data-fn': 'data-fn'
   },
   contentEditable: false,
+  [usesContextKey]: ['postType'],
   edit: function Edit({
     value,
     onChange,
-    isObjectActive
+    isObjectActive,
+    context: {
+      postType
+    }
   }) {
     const registry = useRegistry();
     const {
       getSelectedBlockClientId,
+      getBlocks,
       getBlockRootClientId,
       getBlockName,
-      getBlocks
+      getBlockParentsByBlockName
     } = useSelect(blockEditorStore);
+    const footnotesBlockType = useSelect(select => select(blocksStore).getBlockType(name));
+    /*
+     * This useSelect exists because we need to use its return value
+     * outside the event callback.
+     */
+
+    const isBlockWithinPattern = useSelect(select => {
+      const {
+        getBlockParentsByBlockName: _getBlockParentsByBlockName,
+        getSelectedBlockClientId: _getSelectedBlockClientId
+      } = select(blockEditorStore);
+
+      const parentCoreBlocks = _getBlockParentsByBlockName(_getSelectedBlockClientId(), SYNCED_PATTERN_BLOCK_NAME);
+
+      return parentCoreBlocks && parentCoreBlocks.length > 0;
+    }, []);
     const {
       selectionChange,
       insertBlock
     } = useDispatch(blockEditorStore);
 
+    if (!footnotesBlockType) {
+      return null;
+    }
+
+    if (postType !== 'post' && postType !== 'page') {
+      return null;
+    } // Checks if the selected block lives within a pattern.
+
+
+    if (isBlockWithinPattern) {
+      return null;
+    }
+
     function onClick() {
       registry.batch(() => {
-        const id = createId();
-        const newValue = insertObject(value, {
-          type: formatName,
-          attributes: {
-            href: '#' + id,
-            id: `${id}-link`,
-            'data-fn': id
-          },
-          innerHTML: '*'
-        }, value.end, value.end);
-        newValue.start = newValue.end - 1;
-        onChange(newValue); // BFS search to find the first footnote block.
+        let id;
+
+        if (isObjectActive) {
+          const object = value.replacements[value.start];
+          id = object?.attributes?.['data-fn'];
+        } else {
+          id = createId();
+          const newValue = insertObject(value, {
+            type: formatName,
+            attributes: {
+              'data-fn': id
+            },
+            innerHTML: `<a href="#${id}" id="${id}-link">*</a>`
+          }, value.end, value.end);
+          newValue.start = newValue.end - 1;
+          onChange(newValue);
+        }
+
+        const selectedClientId = getSelectedBlockClientId();
+        /*
+         * Attempts to find a common parent post content block.
+         * This allows for locating blocks within a page edited in the site editor.
+         */
+
+        const parentPostContent = getBlockParentsByBlockName(selectedClientId, POST_CONTENT_BLOCK_NAME); // When called with a post content block, getBlocks will return
+        // the block with controlled inner blocks included.
+
+        const blocks = parentPostContent.length ? getBlocks(parentPostContent[0]) : getBlocks(); // BFS search to find the first footnote block.
 
         let fnBlock = null;
         {
-          const queue = [...getBlocks()];
+          const queue = [...blocks];
 
           while (queue.length) {
             const block = queue.shift();
@@ -100,10 +196,9 @@ export const format = {
         // insert it at the bottom.
 
         if (!fnBlock) {
-          const clientId = getSelectedBlockClientId();
-          let rootClientId = getBlockRootClientId(clientId);
+          let rootClientId = getBlockRootClientId(selectedClientId);
 
-          while (rootClientId && getBlockName(rootClientId) !== 'core/post-content') {
+          while (rootClientId && getBlockName(rootClientId) !== POST_CONTENT_BLOCK_NAME) {
             rootClientId = getBlockRootClientId(rootClientId);
           }
 

package/build-module/footnotes/format.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/footnotes/format.js"],"names":["v4","createId","__","formatListNumbered","icon","insertObject","RichTextToolbarButton","store","blockEditorStore","useSelect","useDispatch","useRegistry","createBlock","formatName","format","title","tagName","className","attributes","id","href","contentEditable","edit","Edit","value","onChange","isObjectActive","registry","getSelectedBlockClientId","getBlockRootClientId","getBlockName","getBlocks","selectionChange","insertBlock","onClick","batch","newValue","type","innerHTML","end","start","fnBlock","queue","length","block","shift","name","push","innerBlocks","clientId","rootClientId","undefined"],"mappings":"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","sourcesContent":["/**\n * External dependencies\n */\nimport { v4 as createId } from 'uuid';\n\n/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { formatListNumbered as icon } from '@wordpress/icons';\nimport { insertObject } from '@wordpress/rich-text';\nimport {\n\tRichTextToolbarButton,\n\tstore as blockEditorStore,\n} from '@wordpress/block-editor';\nimport { useSelect, useDispatch, useRegistry } from '@wordpress/data';\nimport { createBlock } from '@wordpress/blocks';\n\n/**\n * Internal dependencies\n */\nimport { name } from './block.json';\n\nexport const formatName = 'core/footnote';\nexport const format = {\n\ttitle: __( 'Footnote' ),\n\ttagName: 'a',\n\tclassName: 'fn',\n\tattributes: {\n\t\tid: 'id',\n\t\thref: 'href',\n\t\t'data-fn': 'data-fn',\n\t},\n\tcontentEditable: false,\n\tedit: function Edit( { value, onChange, isObjectActive } ) {\n\t\tconst registry = useRegistry();\n\t\tconst {\n\t\t\tgetSelectedBlockClientId,\n\t\t\tgetBlockRootClientId,\n\t\t\tgetBlockName,\n\t\t\tgetBlocks,\n\t\t} = useSelect( blockEditorStore );\n\t\tconst { selectionChange, insertBlock } =\n\t\t\tuseDispatch( blockEditorStore );\n\t\tfunction onClick() {\n\t\t\tregistry.batch( () => {\n\t\t\t\tconst id = createId();\n\t\t\t\tconst newValue = insertObject(\n\t\t\t\t\tvalue,\n\t\t\t\t\t{\n\t\t\t\t\t\ttype: formatName,\n\t\t\t\t\t\tattributes: {\n\t\t\t\t\t\t\thref: '#' + id,\n\t\t\t\t\t\t\tid: `${ id }-link`,\n\t\t\t\t\t\t\t'data-fn': id,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tinnerHTML: '*',\n\t\t\t\t\t},\n\t\t\t\t\tvalue.end,\n\t\t\t\t\tvalue.end\n\t\t\t\t);\n\t\t\t\tnewValue.start = newValue.end - 1;\n\n\t\t\t\tonChange( newValue );\n\n\t\t\t\t// BFS search to find the first footnote block.\n\t\t\t\tlet fnBlock = null;\n\t\t\t\t{\n\t\t\t\t\tconst queue = [ ...getBlocks() ];\n\t\t\t\t\twhile ( queue.length ) {\n\t\t\t\t\t\tconst block = queue.shift();\n\t\t\t\t\t\tif ( block.name === name ) {\n\t\t\t\t\t\t\tfnBlock = block;\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tqueue.push( ...block.innerBlocks );\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t// Maybe this should all also be moved to the entity provider.\n\t\t\t\t// When there is no footnotes block in the post, create one and\n\t\t\t\t// insert it at the bottom.\n\t\t\t\tif ( ! fnBlock ) {\n\t\t\t\t\tconst clientId = getSelectedBlockClientId();\n\t\t\t\t\tlet rootClientId = getBlockRootClientId( clientId );\n\n\t\t\t\t\twhile (\n\t\t\t\t\t\trootClientId &&\n\t\t\t\t\t\tgetBlockName( rootClientId ) !== 'core/post-content'\n\t\t\t\t\t) {\n\t\t\t\t\t\trootClientId = getBlockRootClientId( rootClientId );\n\t\t\t\t\t}\n\n\t\t\t\t\tfnBlock = createBlock( name );\n\n\t\t\t\t\tinsertBlock( fnBlock, undefined, rootClientId );\n\t\t\t\t}\n\n\t\t\t\tselectionChange( fnBlock.clientId, id, 0, 0 );\n\t\t\t} );\n\t\t}\n\n\t\treturn (\n\t\t\t<RichTextToolbarButton\n\t\t\t\ticon={ icon }\n\t\t\t\ttitle={ __( 'Footnote' ) }\n\t\t\t\tonClick={ onClick }\n\t\t\t\tisActive={ isObjectActive }\n\t\t\t/>\n\t\t);\n\t},\n};\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/footnotes/format.js"],"names":["v4","createId","__","formatListNumbered","icon","insertObject","RichTextToolbarButton","store","blockEditorStore","privateApis","useSelect","useDispatch","useRegistry","createBlock","blocksStore","unlock","usesContextKey","formatName","POST_CONTENT_BLOCK_NAME","SYNCED_PATTERN_BLOCK_NAME","format","title","tagName","className","attributes","contentEditable","edit","Edit","value","onChange","isObjectActive","context","postType","registry","getSelectedBlockClientId","getBlocks","getBlockRootClientId","getBlockName","getBlockParentsByBlockName","footnotesBlockType","select","getBlockType","name","isBlockWithinPattern","_getBlockParentsByBlockName","_getSelectedBlockClientId","parentCoreBlocks","length","selectionChange","insertBlock","onClick","batch","id","object","replacements","start","newValue","type","innerHTML","end","selectedClientId","parentPostContent","blocks","fnBlock","queue","block","shift","push","innerBlocks","rootClientId","undefined","clientId"],"mappings":"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","sourcesContent":["/**\n * External dependencies\n */\nimport { v4 as createId } from 'uuid';\n\n/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { formatListNumbered as icon } from '@wordpress/icons';\nimport { insertObject } from '@wordpress/rich-text';\nimport {\n\tRichTextToolbarButton,\n\tstore as blockEditorStore,\n\tprivateApis,\n} from '@wordpress/block-editor';\nimport { useSelect, useDispatch, useRegistry } from '@wordpress/data';\nimport { createBlock, store as blocksStore } from '@wordpress/blocks';\n\n/**\n * Internal dependencies\n */\nimport { name } from './block.json';\nimport { unlock } from '../lock-unlock';\n\nconst { usesContextKey } = unlock( privateApis );\n\nexport const formatName = 'core/footnote';\n\nconst POST_CONTENT_BLOCK_NAME = 'core/post-content';\nconst SYNCED_PATTERN_BLOCK_NAME = 'core/block';\n\nexport const format = {\n\ttitle: __( 'Footnote' ),\n\ttagName: 'sup',\n\tclassName: 'fn',\n\tattributes: {\n\t\t'data-fn': 'data-fn',\n\t},\n\tcontentEditable: false,\n\t[ usesContextKey ]: [ 'postType' ],\n\tedit: function Edit( {\n\t\tvalue,\n\t\tonChange,\n\t\tisObjectActive,\n\t\tcontext: { postType },\n\t} ) {\n\t\tconst registry = useRegistry();\n\t\tconst {\n\t\t\tgetSelectedBlockClientId,\n\t\t\tgetBlocks,\n\t\t\tgetBlockRootClientId,\n\t\t\tgetBlockName,\n\t\t\tgetBlockParentsByBlockName,\n\t\t} = useSelect( blockEditorStore );\n\t\tconst footnotesBlockType = useSelect( ( select ) =>\n\t\t\tselect( blocksStore ).getBlockType( name )\n\t\t);\n\t\t/*\n\t\t * This useSelect exists because we need to use its return value\n\t\t * outside the event callback.\n\t\t */\n\t\tconst isBlockWithinPattern = useSelect( ( select ) => {\n\t\t\tconst {\n\t\t\t\tgetBlockParentsByBlockName: _getBlockParentsByBlockName,\n\t\t\t\tgetSelectedBlockClientId: _getSelectedBlockClientId,\n\t\t\t} = select( blockEditorStore );\n\t\t\tconst parentCoreBlocks = _getBlockParentsByBlockName(\n\t\t\t\t_getSelectedBlockClientId(),\n\t\t\t\tSYNCED_PATTERN_BLOCK_NAME\n\t\t\t);\n\t\t\treturn parentCoreBlocks && parentCoreBlocks.length > 0;\n\t\t}, [] );\n\n\t\tconst { selectionChange, insertBlock } =\n\t\t\tuseDispatch( blockEditorStore );\n\n\t\tif ( ! footnotesBlockType ) {\n\t\t\treturn null;\n\t\t}\n\n\t\tif ( postType !== 'post' && postType !== 'page' ) {\n\t\t\treturn null;\n\t\t}\n\n\t\t// Checks if the selected block lives within a pattern.\n\t\tif ( isBlockWithinPattern ) {\n\t\t\treturn null;\n\t\t}\n\n\t\tfunction onClick() {\n\t\t\tregistry.batch( () => {\n\t\t\t\tlet id;\n\t\t\t\tif ( isObjectActive ) {\n\t\t\t\t\tconst object = value.replacements[ value.start ];\n\t\t\t\t\tid = object?.attributes?.[ 'data-fn' ];\n\t\t\t\t} else {\n\t\t\t\t\tid = createId();\n\t\t\t\t\tconst newValue = insertObject(\n\t\t\t\t\t\tvalue,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttype: formatName,\n\t\t\t\t\t\t\tattributes: {\n\t\t\t\t\t\t\t\t'data-fn': id,\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\tinnerHTML: `<a href=\"#${ id }\" id=\"${ id }-link\">*</a>`,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tvalue.end,\n\t\t\t\t\t\tvalue.end\n\t\t\t\t\t);\n\t\t\t\t\tnewValue.start = newValue.end - 1;\n\t\t\t\t\tonChange( newValue );\n\t\t\t\t}\n\n\t\t\t\tconst selectedClientId = getSelectedBlockClientId();\n\n\t\t\t\t/*\n\t\t\t\t * Attempts to find a common parent post content block.\n\t\t\t\t * This allows for locating blocks within a page edited in the site editor.\n\t\t\t\t */\n\t\t\t\tconst parentPostContent = getBlockParentsByBlockName(\n\t\t\t\t\tselectedClientId,\n\t\t\t\t\tPOST_CONTENT_BLOCK_NAME\n\t\t\t\t);\n\n\t\t\t\t// When called with a post content block, getBlocks will return\n\t\t\t\t// the block with controlled inner blocks included.\n\t\t\t\tconst blocks = parentPostContent.length\n\t\t\t\t\t? getBlocks( parentPostContent[ 0 ] )\n\t\t\t\t\t: getBlocks();\n\n\t\t\t\t// BFS search to find the first footnote block.\n\t\t\t\tlet fnBlock = null;\n\t\t\t\t{\n\t\t\t\t\tconst queue = [ ...blocks ];\n\t\t\t\t\twhile ( queue.length ) {\n\t\t\t\t\t\tconst block = queue.shift();\n\t\t\t\t\t\tif ( block.name === name ) {\n\t\t\t\t\t\t\tfnBlock = block;\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tqueue.push( ...block.innerBlocks );\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t// Maybe this should all also be moved to the entity provider.\n\t\t\t\t// When there is no footnotes block in the post, create one and\n\t\t\t\t// insert it at the bottom.\n\t\t\t\tif ( ! fnBlock ) {\n\t\t\t\t\tlet rootClientId = getBlockRootClientId( selectedClientId );\n\n\t\t\t\t\twhile (\n\t\t\t\t\t\trootClientId &&\n\t\t\t\t\t\tgetBlockName( rootClientId ) !== POST_CONTENT_BLOCK_NAME\n\t\t\t\t\t) {\n\t\t\t\t\t\trootClientId = getBlockRootClientId( rootClientId );\n\t\t\t\t\t}\n\n\t\t\t\t\tfnBlock = createBlock( name );\n\n\t\t\t\t\tinsertBlock( fnBlock, undefined, rootClientId );\n\t\t\t\t}\n\n\t\t\t\tselectionChange( fnBlock.clientId, id, 0, 0 );\n\t\t\t} );\n\t\t}\n\n\t\treturn (\n\t\t\t<RichTextToolbarButton\n\t\t\t\ticon={ icon }\n\t\t\t\ttitle={ __( 'Footnote' ) }\n\t\t\t\tonClick={ onClick }\n\t\t\t\tisActive={ isObjectActive }\n\t\t\t/>\n\t\t);\n\t},\n};\n"]}

package/build-module/footnotes/index.js

@@ -20,10 +20,52 @@ const metadata = {
   textdomain: "default",
   usesContext: ["postId", "postType"],
   supports: {
+    __experimentalBorder: {
+      radius: true,
+      color: true,
+      width: true,
+      style: true,
+      __experimentalDefaultControls: {
+        radius: false,
+        color: false,
+        width: false,
+        style: false
+      }
+    },
+    color: {
+      background: true,
+      link: true,
+      text: true,
+      __experimentalDefaultControls: {
+        link: true,
+        text: true
+      }
+    },
     html: false,
     multiple: false,
-    inserter: false,
-    reusable: false
+    reusable: false,
+    spacing: {
+      margin: true,
+      padding: true,
+      __experimentalDefaultControls: {
+        margin: false,
+        padding: false
+      }
+    },
+    typography: {
+      fontSize: true,
+      lineHeight: true,
+      __experimentalFontFamily: true,
+      __experimentalTextDecoration: true,
+      __experimentalFontStyle: true,
+      __experimentalFontWeight: true,
+      __experimentalLetterSpacing: true,
+      __experimentalTextTransform: true,
+      __experimentalWritingMode: true,
+      __experimentalDefaultControls: {
+        fontSize: true
+      }
+    }
   },
   style: "wp-block-footnotes"
 };
@@ -35,8 +77,7 @@ export { metadata, name };
 export const settings = {
   icon,
   edit
-}; // Would be good to remove the format and HoR if the block is unregistered.
-
+};
 registerFormatType(formatName, format);
 export const init = () => {
   initBlock({

package/build-module/footnotes/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/footnotes/index.js"],"names":["formatListNumbered","icon","registerFormatType","initBlock","edit","formatName","format","name","metadata","settings","init"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,kBAAkB,IAAIC,IAA/B,QAA2C,kBAA3C;AACA,SAASC,kBAAT,QAAmC,sBAAnC;AAEA;AACA;AACA;;AACA,OAAOC,SAAP,MAAsB,qBAAtB;AACA,OAAOC,IAAP,MAAiB,QAAjB;;;;;;;;;;;;;;;;;;;AAEA,SAASC,UAAT,EAAqBC,MAArB,QAAmC,UAAnC;AAEA,MAAM;AAAEC,EAAAA;AAAF,IAAWC,QAAjB;AAEA,SAASA,QAAT,EAAmBD,IAAnB;AAEA,OAAO,MAAME,QAAQ,GAAG;AACvBR,EAAAA,IADuB;AAEvBG,EAAAA;AAFuB,CAAjB,C,CAKP;;AACAF,kBAAkB,CAAEG,UAAF,EAAcC,MAAd,CAAlB;AAEA,OAAO,MAAMI,IAAI,GAAG,MAAM;AACzBP,EAAAA,SAAS,CAAE;AAAEI,IAAAA,IAAF;AAAQC,IAAAA,QAAR;AAAkBC,IAAAA;AAAlB,GAAF,CAAT;AACA,CAFM","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { formatListNumbered as icon } from '@wordpress/icons';\nimport { registerFormatType } from '@wordpress/rich-text';\n\n/**\n * Internal dependencies\n */\nimport initBlock from '../utils/init-block';\nimport edit from './edit';\nimport metadata from './block.json';\nimport { formatName, format } from './format';\n\nconst { name } = metadata;\n\nexport { metadata, name };\n\nexport const settings = {\n\ticon,\n\tedit,\n};\n\n// Would be good to remove the format and HoR if the block is unregistered.\nregisterFormatType( formatName, format );\n\nexport const init = () => {\n\tinitBlock( { name, metadata, settings } );\n};\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/footnotes/index.js"],"names":["formatListNumbered","icon","registerFormatType","initBlock","edit","formatName","format","name","metadata","settings","init"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,kBAAkB,IAAIC,IAA/B,QAA2C,kBAA3C;AACA,SAASC,kBAAT,QAAmC,sBAAnC;AAEA;AACA;AACA;;AACA,OAAOC,SAAP,MAAsB,qBAAtB;AACA,OAAOC,IAAP,MAAiB,QAAjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,SAASC,UAAT,EAAqBC,MAArB,QAAmC,UAAnC;AAEA,MAAM;AAAEC,EAAAA;AAAF,IAAWC,QAAjB;AAEA,SAASA,QAAT,EAAmBD,IAAnB;AAEA,OAAO,MAAME,QAAQ,GAAG;AACvBR,EAAAA,IADuB;AAEvBG,EAAAA;AAFuB,CAAjB;AAKPF,kBAAkB,CAAEG,UAAF,EAAcC,MAAd,CAAlB;AAEA,OAAO,MAAMI,IAAI,GAAG,MAAM;AACzBP,EAAAA,SAAS,CAAE;AAAEI,IAAAA,IAAF;AAAQC,IAAAA,QAAR;AAAkBC,IAAAA;AAAlB,GAAF,CAAT;AACA,CAFM","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { formatListNumbered as icon } from '@wordpress/icons';\nimport { registerFormatType } from '@wordpress/rich-text';\n\n/**\n * Internal dependencies\n */\nimport initBlock from '../utils/init-block';\nimport edit from './edit';\nimport metadata from './block.json';\nimport { formatName, format } from './format';\n\nconst { name } = metadata;\n\nexport { metadata, name };\n\nexport const settings = {\n\ticon,\n\tedit,\n};\n\nregisterFormatType( formatName, format );\n\nexport const init = () => {\n\tinitBlock( { name, metadata, settings } );\n};\n"]}

package/build-module/gallery/edit.js

@@ -60,7 +60,8 @@ function GalleryEdit(props) {
     clientId,
     isSelected,
     insertBlocksAfter,
-    isContentLocked
+    isContentLocked,
+    onFocus
   } = props;
   const {
     columns,
@@ -361,7 +362,8 @@ function GalleryEdit(props) {
       isAppender: hasImages,
       disableMediaButtons: hasImages && !isSelected || imagesUploading,
       value: hasImageIds ? images : {},
-      autoOpenMediaUpload: !hasImages && isSelected && wasBlockJustInserted
+      autoOpenMediaUpload: !hasImages && isSelected && wasBlockJustInserted,
+      onFocus
     }
   });
   const mediaPlaceholder = createElement(MediaPlaceholder, {
@@ -409,7 +411,7 @@ function GalleryEdit(props) {
     max: Math.min(MAX_COLUMNS, images.length),
     ...MOBILE_CONTROL_PROPS_RANGE_CONTROL,
     required: true,
-    size: "__unstable-large"
+    __next40pxDefaultSize: true
   }), createElement(ToggleControl, {
     __nextHasNoMarginBottom: true,
     label: __('Crop images'),
@@ -442,7 +444,7 @@ function GalleryEdit(props) {
     className: 'gallery-image-sizes'
   }, createElement(BaseControl.VisualLabel, null, __('Resolution')), createElement(View, {
     className: 'gallery-image-sizes__loading'
-  }, createElement(Spinner, null), __('Loading options…'))))), createElement(BlockControls, {
+  }, createElement(Spinner, null), __('Loading options…'))))), Platform.isWeb && createElement(Fragment, null, createElement(BlockControls, {
     group: "block"
   }, !isContentLocked && createElement(ToolbarButton, {
     onClick: () => {
@@ -468,10 +470,10 @@ function GalleryEdit(props) {
     multiple: true,
     mediaIds: images.filter(image => image.id).map(image => image.id),
     addToGallery: hasImageIds
-  })), Platform.isWeb && createElement(GapStyles, {
+  })), createElement(GapStyles, {
     blockGap: attributes.style?.spacing?.blockGap,
     clientId: clientId
-  }), createElement(Gallery, { ...props,
+  })), createElement(Gallery, { ...props,
     showCaption: showCaption,
     ref: Platform.isWeb ? captionRef : undefined,
     images: images,