@wordpress/block-library 8.4.0 → 8.6.0

package/build-module/template-part/edit/import-controls.js

@@ -7,7 +7,6 @@ import { __, sprintf } from '@wordpress/i18n';
 import { useMemo, useState } from '@wordpress/element';
 import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
 import { Button, FlexBlock, FlexItem, SelectControl, __experimentalHStack as HStack, __experimentalSpacer as Spacer } from '@wordpress/components';
-import { switchToBlockType, getPossibleBlockTransformations } from '@wordpress/blocks';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as noticesStore } from '@wordpress/notices';
 /**
@@ -16,6 +15,10 @@ import { store as noticesStore } from '@wordpress/notices';
 
 import { useCreateTemplatePartFromBlocks } from './utils/hooks';
 import { transformWidgetToBlock } from './utils/transformers';
+const SIDEBARS_QUERY = {
+  per_page: -1,
+  _fields: 'id,name,description,status,widgets'
+};
 export function TemplatePartImportControls(_ref) {
   let {
     area,
@@ -24,11 +27,18 @@ export function TemplatePartImportControls(_ref) {
   const [selectedSidebar, setSelectedSidebar] = useState('');
   const [isBusy, setIsBusy] = useState(false);
   const registry = useRegistry();
-  const sidebars = useSelect(select => {
-    return select(coreStore).getSidebars({
-      per_page: -1,
-      _fields: 'id,name,description,status,widgets'
-    });
+  const {
+    sidebars,
+    hasResolved
+  } = useSelect(select => {
+    const {
+      getSidebars,
+      hasFinishedResolution
+    } = select(coreStore);
+    return {
+      sidebars: getSidebars(SIDEBARS_QUERY),
+      hasResolved: hasFinishedResolution('getSidebars', [SIDEBARS_QUERY])
+    };
   }, []);
   const {
     createErrorNotice
@@ -50,7 +60,18 @@ export function TemplatePartImportControls(_ref) {
       value: '',
       label: __('Select widget area')
     }, ...sidebarOptions];
-  }, [sidebars]);
+  }, [sidebars]); // Render an empty node while data is loading to avoid SlotFill re-positioning bug.
+  // See: https://github.com/WordPress/gutenberg/issues/15641.
+
+  if (!hasResolved) {
+    return createElement(Spacer, {
+      marginBottom: "0"
+    });
+  }
+
+  if (hasResolved && !options.length) {
+    return null;
+  }
 
   async function createFromWidgets(event) {
     event.preventDefault();
@@ -76,32 +97,14 @@ export function TemplatePartImportControls(_ref) {
     });
     const skippedWidgets = new Set();
     const blocks = widgets.flatMap(widget => {
-      const block = transformWidgetToBlock(widget);
+      const block = transformWidgetToBlock(widget); // Skip the block if we have no matching transformations.
 
-      if (block.name !== 'core/legacy-widget') {
-        return block;
-      }
-
-      const transforms = getPossibleBlockTransformations([block]).filter(item => {
-        var _item$transforms, _item$transforms$from, _item$transforms2, _item$transforms2$to;
-
-        // The block without any transformations can't be a wildcard.
-        if (!item.transforms) {
-          return true;
-        }
-
-        const hasWildCardFrom = (_item$transforms = item.transforms) === null || _item$transforms === void 0 ? void 0 : (_item$transforms$from = _item$transforms.from) === null || _item$transforms$from === void 0 ? void 0 : _item$transforms$from.find(from => from.blocks && from.blocks.includes('*'));
-        const hasWildCardTo = (_item$transforms2 = item.transforms) === null || _item$transforms2 === void 0 ? void 0 : (_item$transforms2$to = _item$transforms2.to) === null || _item$transforms2$to === void 0 ? void 0 : _item$transforms2$to.find(to => to.blocks && to.blocks.includes('*'));
-        return !hasWildCardFrom && !hasWildCardTo;
-      }); // Skip the block if we have no matching transformations.
-
-      if (!transforms.length) {
+      if (!block) {
         skippedWidgets.add(widget.id_base);
         return [];
-      } // Try transforming the Legacy Widget into a first matching block.
-
+      }
 
-      return switchToBlockType(block, transforms[0].name);
+      return block;
     });
     await createFromBlocks(blocks,
     /* translators: %s: name of the widget area */

package/build-module/template-part/edit/import-controls.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/template-part/edit/import-controls.js"],"names":["__","sprintf","useMemo","useState","useDispatch","useSelect","useRegistry","Button","FlexBlock","FlexItem","SelectControl","__experimentalHStack","HStack","__experimentalSpacer","Spacer","switchToBlockType","getPossibleBlockTransformations","store","coreStore","noticesStore","useCreateTemplatePartFromBlocks","transformWidgetToBlock","TemplatePartImportControls","area","setAttributes","selectedSidebar","setSelectedSidebar","isBusy","setIsBusy","registry","sidebars","select","getSidebars","per_page","_fields","createErrorNotice","createFromBlocks","options","sidebarOptions","filter","widgetArea","id","widgets","length","map","value","label","name","createFromWidgets","event","preventDefault","sidebar","find","getWidgets","resolveSelect","_embed","skippedWidgets","Set","blocks","flatMap","widget","block","transforms","item","hasWildCardFrom","from","includes","hasWildCardTo","to","add","id_base","size","Array","join","type","marginBottom","marginTop"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, sprintf } from '@wordpress/i18n';\nimport { useMemo, useState } from '@wordpress/element';\nimport { useDispatch, useSelect, useRegistry } from '@wordpress/data';\nimport {\n\tButton,\n\tFlexBlock,\n\tFlexItem,\n\tSelectControl,\n\t__experimentalHStack as HStack,\n\t__experimentalSpacer as Spacer,\n} from '@wordpress/components';\nimport {\n\tswitchToBlockType,\n\tgetPossibleBlockTransformations,\n} from '@wordpress/blocks';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { store as noticesStore } from '@wordpress/notices';\n\n/**\n * Internal dependencies\n */\nimport { useCreateTemplatePartFromBlocks } from './utils/hooks';\nimport { transformWidgetToBlock } from './utils/transformers';\n\nexport function TemplatePartImportControls( { area, setAttributes } ) {\n\tconst [ selectedSidebar, setSelectedSidebar ] = useState( '' );\n\tconst [ isBusy, setIsBusy ] = useState( false );\n\n\tconst registry = useRegistry();\n\tconst sidebars = useSelect( ( select ) => {\n\t\treturn select( coreStore ).getSidebars( {\n\t\t\tper_page: -1,\n\t\t\t_fields: 'id,name,description,status,widgets',\n\t\t} );\n\t}, [] );\n\tconst { createErrorNotice } = useDispatch( noticesStore );\n\n\tconst createFromBlocks = useCreateTemplatePartFromBlocks(\n\t\tarea,\n\t\tsetAttributes\n\t);\n\n\tconst options = useMemo( () => {\n\t\tconst sidebarOptions = ( sidebars ?? [] )\n\t\t\t.filter(\n\t\t\t\t( widgetArea ) =>\n\t\t\t\t\twidgetArea.id !== 'wp_inactive_widgets' &&\n\t\t\t\t\twidgetArea.widgets.length > 0\n\t\t\t)\n\t\t\t.map( ( widgetArea ) => {\n\t\t\t\treturn {\n\t\t\t\t\tvalue: widgetArea.id,\n\t\t\t\t\tlabel: widgetArea.name,\n\t\t\t\t};\n\t\t\t} );\n\n\t\tif ( ! sidebarOptions.length ) {\n\t\t\treturn [];\n\t\t}\n\n\t\treturn [\n\t\t\t{ value: '', label: __( 'Select widget area' ) },\n\t\t\t...sidebarOptions,\n\t\t];\n\t}, [ sidebars ] );\n\n\tasync function createFromWidgets( event ) {\n\t\tevent.preventDefault();\n\n\t\tif ( isBusy || ! selectedSidebar ) {\n\t\t\treturn;\n\t\t}\n\n\t\tsetIsBusy( true );\n\n\t\tconst sidebar = options.find(\n\t\t\t( { value } ) => value === selectedSidebar\n\t\t);\n\t\tconst { getWidgets } = registry.resolveSelect( coreStore );\n\n\t\t// The widgets API always returns a successful response.\n\t\tconst widgets = await getWidgets( {\n\t\t\tsidebar: sidebar.value,\n\t\t\t_embed: 'about',\n\t\t} );\n\n\t\tconst skippedWidgets = new Set();\n\t\tconst blocks = widgets.flatMap( ( widget ) => {\n\t\t\tconst block = transformWidgetToBlock( widget );\n\n\t\t\tif ( block.name !== 'core/legacy-widget' ) {\n\t\t\t\treturn block;\n\t\t\t}\n\n\t\t\tconst transforms = getPossibleBlockTransformations( [\n\t\t\t\tblock,\n\t\t\t] ).filter( ( item ) => {\n\t\t\t\t// The block without any transformations can't be a wildcard.\n\t\t\t\tif ( ! item.transforms ) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\n\t\t\t\tconst hasWildCardFrom = item.transforms?.from?.find(\n\t\t\t\t\t( from ) => from.blocks && from.blocks.includes( '*' )\n\t\t\t\t);\n\t\t\t\tconst hasWildCardTo = item.transforms?.to?.find(\n\t\t\t\t\t( to ) => to.blocks && to.blocks.includes( '*' )\n\t\t\t\t);\n\n\t\t\t\treturn ! hasWildCardFrom && ! hasWildCardTo;\n\t\t\t} );\n\n\t\t\t// Skip the block if we have no matching transformations.\n\t\t\tif ( ! transforms.length ) {\n\t\t\t\tskippedWidgets.add( widget.id_base );\n\t\t\t\treturn [];\n\t\t\t}\n\n\t\t\t// Try transforming the Legacy Widget into a first matching block.\n\t\t\treturn switchToBlockType( block, transforms[ 0 ].name );\n\t\t} );\n\n\t\tawait createFromBlocks(\n\t\t\tblocks,\n\t\t\t/* translators: %s: name of the widget area */\n\t\t\tsprintf( __( 'Widget area: %s' ), sidebar.label )\n\t\t);\n\n\t\tif ( skippedWidgets.size ) {\n\t\t\tcreateErrorNotice(\n\t\t\t\tsprintf(\n\t\t\t\t\t/* translators: %s: the list of widgets */\n\t\t\t\t\t__( 'Unable to import the following widgets: %s.' ),\n\t\t\t\t\tArray.from( skippedWidgets ).join( ', ' )\n\t\t\t\t),\n\t\t\t\t{\n\t\t\t\t\ttype: 'snackbar',\n\t\t\t\t}\n\t\t\t);\n\t\t}\n\n\t\tsetIsBusy( false );\n\t}\n\n\treturn (\n\t\t<Spacer marginBottom=\"4\">\n\t\t\t<HStack as=\"form\" onSubmit={ createFromWidgets }>\n\t\t\t\t<FlexBlock>\n\t\t\t\t\t<SelectControl\n\t\t\t\t\t\tlabel={ __( 'Import widget area' ) }\n\t\t\t\t\t\tvalue={ selectedSidebar }\n\t\t\t\t\t\toptions={ options }\n\t\t\t\t\t\tonChange={ ( value ) => setSelectedSidebar( value ) }\n\t\t\t\t\t\tdisabled={ ! options.length }\n\t\t\t\t\t\t__next36pxDefaultSize\n\t\t\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\t\t/>\n\t\t\t\t</FlexBlock>\n\t\t\t\t<FlexItem\n\t\t\t\t\tstyle={ {\n\t\t\t\t\t\tmarginBottom: '8px',\n\t\t\t\t\t\tmarginTop: 'auto',\n\t\t\t\t\t} }\n\t\t\t\t>\n\t\t\t\t\t<Button\n\t\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\t\ttype=\"submit\"\n\t\t\t\t\t\tisBusy={ isBusy }\n\t\t\t\t\t\taria-disabled={ isBusy || ! selectedSidebar }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Import' ) }\n\t\t\t\t\t</Button>\n\t\t\t\t</FlexItem>\n\t\t\t</HStack>\n\t\t</Spacer>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/template-part/edit/import-controls.js"],"names":["__","sprintf","useMemo","useState","useDispatch","useSelect","useRegistry","Button","FlexBlock","FlexItem","SelectControl","__experimentalHStack","HStack","__experimentalSpacer","Spacer","store","coreStore","noticesStore","useCreateTemplatePartFromBlocks","transformWidgetToBlock","SIDEBARS_QUERY","per_page","_fields","TemplatePartImportControls","area","setAttributes","selectedSidebar","setSelectedSidebar","isBusy","setIsBusy","registry","sidebars","hasResolved","select","getSidebars","hasFinishedResolution","createErrorNotice","createFromBlocks","options","sidebarOptions","filter","widgetArea","id","widgets","length","map","value","label","name","createFromWidgets","event","preventDefault","sidebar","find","getWidgets","resolveSelect","_embed","skippedWidgets","Set","blocks","flatMap","widget","block","add","id_base","size","Array","from","join","type","marginBottom","marginTop"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, sprintf } from '@wordpress/i18n';\nimport { useMemo, useState } from '@wordpress/element';\nimport { useDispatch, useSelect, useRegistry } from '@wordpress/data';\nimport {\n\tButton,\n\tFlexBlock,\n\tFlexItem,\n\tSelectControl,\n\t__experimentalHStack as HStack,\n\t__experimentalSpacer as Spacer,\n} from '@wordpress/components';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { store as noticesStore } from '@wordpress/notices';\n\n/**\n * Internal dependencies\n */\nimport { useCreateTemplatePartFromBlocks } from './utils/hooks';\nimport { transformWidgetToBlock } from './utils/transformers';\n\nconst SIDEBARS_QUERY = {\n\tper_page: -1,\n\t_fields: 'id,name,description,status,widgets',\n};\n\nexport function TemplatePartImportControls( { area, setAttributes } ) {\n\tconst [ selectedSidebar, setSelectedSidebar ] = useState( '' );\n\tconst [ isBusy, setIsBusy ] = useState( false );\n\n\tconst registry = useRegistry();\n\tconst { sidebars, hasResolved } = useSelect( ( select ) => {\n\t\tconst { getSidebars, hasFinishedResolution } = select( coreStore );\n\n\t\treturn {\n\t\t\tsidebars: getSidebars( SIDEBARS_QUERY ),\n\t\t\thasResolved: hasFinishedResolution( 'getSidebars', [\n\t\t\t\tSIDEBARS_QUERY,\n\t\t\t] ),\n\t\t};\n\t}, [] );\n\tconst { createErrorNotice } = useDispatch( noticesStore );\n\n\tconst createFromBlocks = useCreateTemplatePartFromBlocks(\n\t\tarea,\n\t\tsetAttributes\n\t);\n\n\tconst options = useMemo( () => {\n\t\tconst sidebarOptions = ( sidebars ?? [] )\n\t\t\t.filter(\n\t\t\t\t( widgetArea ) =>\n\t\t\t\t\twidgetArea.id !== 'wp_inactive_widgets' &&\n\t\t\t\t\twidgetArea.widgets.length > 0\n\t\t\t)\n\t\t\t.map( ( widgetArea ) => {\n\t\t\t\treturn {\n\t\t\t\t\tvalue: widgetArea.id,\n\t\t\t\t\tlabel: widgetArea.name,\n\t\t\t\t};\n\t\t\t} );\n\n\t\tif ( ! sidebarOptions.length ) {\n\t\t\treturn [];\n\t\t}\n\n\t\treturn [\n\t\t\t{ value: '', label: __( 'Select widget area' ) },\n\t\t\t...sidebarOptions,\n\t\t];\n\t}, [ sidebars ] );\n\n\t// Render an empty node while data is loading to avoid SlotFill re-positioning bug.\n\t// See: https://github.com/WordPress/gutenberg/issues/15641.\n\tif ( ! hasResolved ) {\n\t\treturn <Spacer marginBottom=\"0\" />;\n\t}\n\n\tif ( hasResolved && ! options.length ) {\n\t\treturn null;\n\t}\n\n\tasync function createFromWidgets( event ) {\n\t\tevent.preventDefault();\n\n\t\tif ( isBusy || ! selectedSidebar ) {\n\t\t\treturn;\n\t\t}\n\n\t\tsetIsBusy( true );\n\n\t\tconst sidebar = options.find(\n\t\t\t( { value } ) => value === selectedSidebar\n\t\t);\n\t\tconst { getWidgets } = registry.resolveSelect( coreStore );\n\n\t\t// The widgets API always returns a successful response.\n\t\tconst widgets = await getWidgets( {\n\t\t\tsidebar: sidebar.value,\n\t\t\t_embed: 'about',\n\t\t} );\n\n\t\tconst skippedWidgets = new Set();\n\t\tconst blocks = widgets.flatMap( ( widget ) => {\n\t\t\tconst block = transformWidgetToBlock( widget );\n\n\t\t\t// Skip the block if we have no matching transformations.\n\t\t\tif ( ! block ) {\n\t\t\t\tskippedWidgets.add( widget.id_base );\n\t\t\t\treturn [];\n\t\t\t}\n\n\t\t\treturn block;\n\t\t} );\n\n\t\tawait createFromBlocks(\n\t\t\tblocks,\n\t\t\t/* translators: %s: name of the widget area */\n\t\t\tsprintf( __( 'Widget area: %s' ), sidebar.label )\n\t\t);\n\n\t\tif ( skippedWidgets.size ) {\n\t\t\tcreateErrorNotice(\n\t\t\t\tsprintf(\n\t\t\t\t\t/* translators: %s: the list of widgets */\n\t\t\t\t\t__( 'Unable to import the following widgets: %s.' ),\n\t\t\t\t\tArray.from( skippedWidgets ).join( ', ' )\n\t\t\t\t),\n\t\t\t\t{\n\t\t\t\t\ttype: 'snackbar',\n\t\t\t\t}\n\t\t\t);\n\t\t}\n\n\t\tsetIsBusy( false );\n\t}\n\n\treturn (\n\t\t<Spacer marginBottom=\"4\">\n\t\t\t<HStack as=\"form\" onSubmit={ createFromWidgets }>\n\t\t\t\t<FlexBlock>\n\t\t\t\t\t<SelectControl\n\t\t\t\t\t\tlabel={ __( 'Import widget area' ) }\n\t\t\t\t\t\tvalue={ selectedSidebar }\n\t\t\t\t\t\toptions={ options }\n\t\t\t\t\t\tonChange={ ( value ) => setSelectedSidebar( value ) }\n\t\t\t\t\t\tdisabled={ ! options.length }\n\t\t\t\t\t\t__next36pxDefaultSize\n\t\t\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\t\t/>\n\t\t\t\t</FlexBlock>\n\t\t\t\t<FlexItem\n\t\t\t\t\tstyle={ {\n\t\t\t\t\t\tmarginBottom: '8px',\n\t\t\t\t\t\tmarginTop: 'auto',\n\t\t\t\t\t} }\n\t\t\t\t>\n\t\t\t\t\t<Button\n\t\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\t\ttype=\"submit\"\n\t\t\t\t\t\tisBusy={ isBusy }\n\t\t\t\t\t\taria-disabled={ isBusy || ! selectedSidebar }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Import' ) }\n\t\t\t\t\t</Button>\n\t\t\t\t</FlexItem>\n\t\t\t</HStack>\n\t\t</Spacer>\n\t);\n}\n"]}

package/build-module/template-part/edit/utils/transformers.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createBlock, parse } from '@wordpress/blocks';
+import { parse, cloneBlock, createBlock, getGroupingBlockName, getPossibleBlockTransformations, switchToBlockType } from '@wordpress/blocks';
 /**
  * Converts a widget entity record into a block.
  *
@@ -10,31 +10,80 @@ import { createBlock, parse } from '@wordpress/blocks';
  */
 
 export function transformWidgetToBlock(widget) {
-  if (widget.id_base === 'block') {
-    const parsedBlocks = parse(widget.instance.raw.content, {
-      __unstableSkipAutop: true
-    });
+  if (widget.id_base !== 'block') {
+    let attributes;
 
-    if (!parsedBlocks.length) {
-      return createBlock('core/paragraph', {}, []);
+    if (widget._embedded.about[0].is_multi) {
+      attributes = {
+        idBase: widget.id_base,
+        instance: widget.instance
+      };
+    } else {
+      attributes = {
+        id: widget.id
+      };
     }
 
-    return parsedBlocks[0];
+    return switchLegacyWidgetType(createBlock('core/legacy-widget', attributes));
   }
 
-  let attributes;
-
-  if (widget._embedded.about[0].is_multi) {
-    attributes = {
-      idBase: widget.id_base,
-      instance: widget.instance
-    };
-  } else {
-    attributes = {
-      id: widget.id
-    };
+  const parsedBlocks = parse(widget.instance.raw.content, {
+    __unstableSkipAutop: true
+  });
+
+  if (!parsedBlocks.length) {
+    return undefined;
+  }
+
+  const block = parsedBlocks[0];
+
+  if (block.name === 'core/widget-group') {
+    return createBlock(getGroupingBlockName(), undefined, transformInnerBlocks(block.innerBlocks));
+  }
+
+  if (block.innerBlocks.length > 0) {
+    return cloneBlock(block, undefined, transformInnerBlocks(block.innerBlocks));
+  }
+
+  return block;
+}
+/**
+ * Switch Legacy Widget to the first matching transformation block.
+ *
+ * @param {Object} block Legacy Widget block object
+ * @return {Object|undefined} a block
+ */
+
+function switchLegacyWidgetType(block) {
+  const transforms = getPossibleBlockTransformations([block]).filter(item => {
+    var _item$transforms, _item$transforms$from, _item$transforms2, _item$transforms2$to;
+
+    // The block without any transformations can't be a wildcard.
+    if (!item.transforms) {
+      return true;
+    }
+
+    const hasWildCardFrom = (_item$transforms = item.transforms) === null || _item$transforms === void 0 ? void 0 : (_item$transforms$from = _item$transforms.from) === null || _item$transforms$from === void 0 ? void 0 : _item$transforms$from.find(from => from.blocks && from.blocks.includes('*'));
+    const hasWildCardTo = (_item$transforms2 = item.transforms) === null || _item$transforms2 === void 0 ? void 0 : (_item$transforms2$to = _item$transforms2.to) === null || _item$transforms2$to === void 0 ? void 0 : _item$transforms2$to.find(to => to.blocks && to.blocks.includes('*')); // Skip wildcard transformations.
+
+    return !hasWildCardFrom && !hasWildCardTo;
+  });
+
+  if (!transforms.length) {
+    return undefined;
   }
 
-  return createBlock('core/legacy-widget', attributes, []);
+  return switchToBlockType(block, transforms[0].name);
+}
+
+function transformInnerBlocks() {
+  let innerBlocks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return innerBlocks.flatMap(block => {
+    if (block.name === 'core/legacy-widget') {
+      return switchLegacyWidgetType(block);
+    }
+
+    return createBlock(block.name, block.attributes, transformInnerBlocks(block.innerBlocks));
+  }).filter(block => !!block);
 }
 //# sourceMappingURL=transformers.js.map

package/build-module/template-part/edit/utils/transformers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/template-part/edit/utils/transformers.js"],"names":["createBlock","parse","transformWidgetToBlock","widget","id_base","parsedBlocks","instance","raw","content","__unstableSkipAutop","length","attributes","_embedded","about","is_multi","idBase","id"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,WAAT,EAAsBC,KAAtB,QAAmC,mBAAnC;AAEA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,sBAAT,CAAiCC,MAAjC,EAA0C;AAChD,MAAKA,MAAM,CAACC,OAAP,KAAmB,OAAxB,EAAkC;AACjC,UAAMC,YAAY,GAAGJ,KAAK,CAAEE,MAAM,CAACG,QAAP,CAAgBC,GAAhB,CAAoBC,OAAtB,EAA+B;AACxDC,MAAAA,mBAAmB,EAAE;AADmC,KAA/B,CAA1B;;AAGA,QAAK,CAAEJ,YAAY,CAACK,MAApB,EAA6B;AAC5B,aAAOV,WAAW,CAAE,gBAAF,EAAoB,EAApB,EAAwB,EAAxB,CAAlB;AACA;;AAED,WAAOK,YAAY,CAAE,CAAF,CAAnB;AACA;;AAED,MAAIM,UAAJ;;AACA,MAAKR,MAAM,CAACS,SAAP,CAAiBC,KAAjB,CAAwB,CAAxB,EAA4BC,QAAjC,EAA4C;AAC3CH,IAAAA,UAAU,GAAG;AACZI,MAAAA,MAAM,EAAEZ,MAAM,CAACC,OADH;AAEZE,MAAAA,QAAQ,EAAEH,MAAM,CAACG;AAFL,KAAb;AAIA,GALD,MAKO;AACNK,IAAAA,UAAU,GAAG;AACZK,MAAAA,EAAE,EAAEb,MAAM,CAACa;AADC,KAAb;AAGA;;AAED,SAAOhB,WAAW,CAAE,oBAAF,EAAwBW,UAAxB,EAAoC,EAApC,CAAlB;AACA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { createBlock, parse } from '@wordpress/blocks';\n\n/**\n * Converts a widget entity record into a block.\n *\n * @param {Object} widget The widget entity record.\n * @return {Object} a block (converted from the entity record).\n */\nexport function transformWidgetToBlock( widget ) {\n\tif ( widget.id_base === 'block' ) {\n\t\tconst parsedBlocks = parse( widget.instance.raw.content, {\n\t\t\t__unstableSkipAutop: true,\n\t\t} );\n\t\tif ( ! parsedBlocks.length ) {\n\t\t\treturn createBlock( 'core/paragraph', {}, [] );\n\t\t}\n\n\t\treturn parsedBlocks[ 0 ];\n\t}\n\n\tlet attributes;\n\tif ( widget._embedded.about[ 0 ].is_multi ) {\n\t\tattributes = {\n\t\t\tidBase: widget.id_base,\n\t\t\tinstance: widget.instance,\n\t\t};\n\t} else {\n\t\tattributes = {\n\t\t\tid: widget.id,\n\t\t};\n\t}\n\n\treturn createBlock( 'core/legacy-widget', attributes, [] );\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/template-part/edit/utils/transformers.js"],"names":["parse","cloneBlock","createBlock","getGroupingBlockName","getPossibleBlockTransformations","switchToBlockType","transformWidgetToBlock","widget","id_base","attributes","_embedded","about","is_multi","idBase","instance","id","switchLegacyWidgetType","parsedBlocks","raw","content","__unstableSkipAutop","length","undefined","block","name","transformInnerBlocks","innerBlocks","transforms","filter","item","hasWildCardFrom","from","find","blocks","includes","hasWildCardTo","to","flatMap"],"mappings":"AAAA;AACA;AACA;AACA,SACCA,KADD,EAECC,UAFD,EAGCC,WAHD,EAICC,oBAJD,EAKCC,+BALD,EAMCC,iBAND,QAOO,mBAPP;AASA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,sBAAT,CAAiCC,MAAjC,EAA0C;AAChD,MAAKA,MAAM,CAACC,OAAP,KAAmB,OAAxB,EAAkC;AACjC,QAAIC,UAAJ;;AACA,QAAKF,MAAM,CAACG,SAAP,CAAiBC,KAAjB,CAAwB,CAAxB,EAA4BC,QAAjC,EAA4C;AAC3CH,MAAAA,UAAU,GAAG;AACZI,QAAAA,MAAM,EAAEN,MAAM,CAACC,OADH;AAEZM,QAAAA,QAAQ,EAAEP,MAAM,CAACO;AAFL,OAAb;AAIA,KALD,MAKO;AACNL,MAAAA,UAAU,GAAG;AACZM,QAAAA,EAAE,EAAER,MAAM,CAACQ;AADC,OAAb;AAGA;;AAED,WAAOC,sBAAsB,CAC5Bd,WAAW,CAAE,oBAAF,EAAwBO,UAAxB,CADiB,CAA7B;AAGA;;AAED,QAAMQ,YAAY,GAAGjB,KAAK,CAAEO,MAAM,CAACO,QAAP,CAAgBI,GAAhB,CAAoBC,OAAtB,EAA+B;AACxDC,IAAAA,mBAAmB,EAAE;AADmC,GAA/B,CAA1B;;AAIA,MAAK,CAAEH,YAAY,CAACI,MAApB,EAA6B;AAC5B,WAAOC,SAAP;AACA;;AAED,QAAMC,KAAK,GAAGN,YAAY,CAAE,CAAF,CAA1B;;AAEA,MAAKM,KAAK,CAACC,IAAN,KAAe,mBAApB,EAA0C;AACzC,WAAOtB,WAAW,CACjBC,oBAAoB,EADH,EAEjBmB,SAFiB,EAGjBG,oBAAoB,CAAEF,KAAK,CAACG,WAAR,CAHH,CAAlB;AAKA;;AAED,MAAKH,KAAK,CAACG,WAAN,CAAkBL,MAAlB,GAA2B,CAAhC,EAAoC;AACnC,WAAOpB,UAAU,CAChBsB,KADgB,EAEhBD,SAFgB,EAGhBG,oBAAoB,CAAEF,KAAK,CAACG,WAAR,CAHJ,CAAjB;AAKA;;AAED,SAAOH,KAAP;AACA;AAED;AACA;AACA;AACA;AACA;AACA;;AACA,SAASP,sBAAT,CAAiCO,KAAjC,EAAyC;AACxC,QAAMI,UAAU,GAAGvB,+BAA+B,CAAE,CAAEmB,KAAF,CAAF,CAA/B,CAA6CK,MAA7C,CAChBC,IAAF,IAAY;AAAA;;AACX;AACA,QAAK,CAAEA,IAAI,CAACF,UAAZ,EAAyB;AACxB,aAAO,IAAP;AACA;;AAED,UAAMG,eAAe,uBAAGD,IAAI,CAACF,UAAR,8EAAG,iBAAiBI,IAApB,0DAAG,sBAAuBC,IAAvB,CACrBD,IAAF,IAAYA,IAAI,CAACE,MAAL,IAAeF,IAAI,CAACE,MAAL,CAAYC,QAAZ,CAAsB,GAAtB,CADJ,CAAxB;AAGA,UAAMC,aAAa,wBAAGN,IAAI,CAACF,UAAR,8EAAG,kBAAiBS,EAApB,yDAAG,qBAAqBJ,IAArB,CACnBI,EAAF,IAAUA,EAAE,CAACH,MAAH,IAAaG,EAAE,CAACH,MAAH,CAAUC,QAAV,CAAoB,GAApB,CADF,CAAtB,CATW,CAaX;;AACA,WAAO,CAAEJ,eAAF,IAAqB,CAAEK,aAA9B;AACA,GAhBiB,CAAnB;;AAmBA,MAAK,CAAER,UAAU,CAACN,MAAlB,EAA2B;AAC1B,WAAOC,SAAP;AACA;;AAED,SAAOjB,iBAAiB,CAAEkB,KAAF,EAASI,UAAU,CAAE,CAAF,CAAV,CAAgBH,IAAzB,CAAxB;AACA;;AAED,SAASC,oBAAT,GAAkD;AAAA,MAAnBC,WAAmB,uEAAL,EAAK;AACjD,SAAOA,WAAW,CAChBW,OADK,CACMd,KAAF,IAAa;AACtB,QAAKA,KAAK,CAACC,IAAN,KAAe,oBAApB,EAA2C;AAC1C,aAAOR,sBAAsB,CAAEO,KAAF,CAA7B;AACA;;AAED,WAAOrB,WAAW,CACjBqB,KAAK,CAACC,IADW,EAEjBD,KAAK,CAACd,UAFW,EAGjBgB,oBAAoB,CAAEF,KAAK,CAACG,WAAR,CAHH,CAAlB;AAKA,GAXK,EAYLE,MAZK,CAYKL,KAAF,IAAa,CAAC,CAAEA,KAZnB,CAAP;AAaA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tparse,\n\tcloneBlock,\n\tcreateBlock,\n\tgetGroupingBlockName,\n\tgetPossibleBlockTransformations,\n\tswitchToBlockType,\n} from '@wordpress/blocks';\n\n/**\n * Converts a widget entity record into a block.\n *\n * @param {Object} widget The widget entity record.\n * @return {Object} a block (converted from the entity record).\n */\nexport function transformWidgetToBlock( widget ) {\n\tif ( widget.id_base !== 'block' ) {\n\t\tlet attributes;\n\t\tif ( widget._embedded.about[ 0 ].is_multi ) {\n\t\t\tattributes = {\n\t\t\t\tidBase: widget.id_base,\n\t\t\t\tinstance: widget.instance,\n\t\t\t};\n\t\t} else {\n\t\t\tattributes = {\n\t\t\t\tid: widget.id,\n\t\t\t};\n\t\t}\n\n\t\treturn switchLegacyWidgetType(\n\t\t\tcreateBlock( 'core/legacy-widget', attributes )\n\t\t);\n\t}\n\n\tconst parsedBlocks = parse( widget.instance.raw.content, {\n\t\t__unstableSkipAutop: true,\n\t} );\n\n\tif ( ! parsedBlocks.length ) {\n\t\treturn undefined;\n\t}\n\n\tconst block = parsedBlocks[ 0 ];\n\n\tif ( block.name === 'core/widget-group' ) {\n\t\treturn createBlock(\n\t\t\tgetGroupingBlockName(),\n\t\t\tundefined,\n\t\t\ttransformInnerBlocks( block.innerBlocks )\n\t\t);\n\t}\n\n\tif ( block.innerBlocks.length > 0 ) {\n\t\treturn cloneBlock(\n\t\t\tblock,\n\t\t\tundefined,\n\t\t\ttransformInnerBlocks( block.innerBlocks )\n\t\t);\n\t}\n\n\treturn block;\n}\n\n/**\n * Switch Legacy Widget to the first matching transformation block.\n *\n * @param {Object} block Legacy Widget block object\n * @return {Object|undefined} a block\n */\nfunction switchLegacyWidgetType( block ) {\n\tconst transforms = getPossibleBlockTransformations( [ block ] ).filter(\n\t\t( item ) => {\n\t\t\t// The block without any transformations can't be a wildcard.\n\t\t\tif ( ! item.transforms ) {\n\t\t\t\treturn true;\n\t\t\t}\n\n\t\t\tconst hasWildCardFrom = item.transforms?.from?.find(\n\t\t\t\t( from ) => from.blocks && from.blocks.includes( '*' )\n\t\t\t);\n\t\t\tconst hasWildCardTo = item.transforms?.to?.find(\n\t\t\t\t( to ) => to.blocks && to.blocks.includes( '*' )\n\t\t\t);\n\n\t\t\t// Skip wildcard transformations.\n\t\t\treturn ! hasWildCardFrom && ! hasWildCardTo;\n\t\t}\n\t);\n\n\tif ( ! transforms.length ) {\n\t\treturn undefined;\n\t}\n\n\treturn switchToBlockType( block, transforms[ 0 ].name );\n}\n\nfunction transformInnerBlocks( innerBlocks = [] ) {\n\treturn innerBlocks\n\t\t.flatMap( ( block ) => {\n\t\t\tif ( block.name === 'core/legacy-widget' ) {\n\t\t\t\treturn switchLegacyWidgetType( block );\n\t\t\t}\n\n\t\t\treturn createBlock(\n\t\t\t\tblock.name,\n\t\t\t\tblock.attributes,\n\t\t\t\ttransformInnerBlocks( block.innerBlocks )\n\t\t\t);\n\t\t} )\n\t\t.filter( ( block ) => !! block );\n}\n"]}

package/build-module/text-columns/edit.js

@@ -1,13 +1,8 @@
 import { createElement, Fragment } from "@wordpress/element";
 
-/**
- * External dependencies
- */
-import { get } from 'lodash';
 /**
  * WordPress dependencies
  */
-
 import { __, sprintf } from '@wordpress/i18n';
 import { PanelBody, RangeControl } from '@wordpress/components';
 import { BlockControls, BlockAlignmentToolbar, InspectorControls, RichText, useBlockProps } from '@wordpress/block-editor';
@@ -47,12 +42,14 @@ export default function TextColumnsEdit(_ref) {
   }), Array.from({
     length: columns
   }).map((_, index) => {
+    var _content$index;
+
     return createElement("div", {
       className: "wp-block-column",
       key: `column-${index}`
     }, createElement(RichText, {
       tagName: "p",
-      value: get(content, [index, 'children']),
+      value: content === null || content === void 0 ? void 0 : (_content$index = content[index]) === null || _content$index === void 0 ? void 0 : _content$index.children,
       onChange: nextContent => {
         setAttributes({
           content: [...content.slice(0, index), {

package/build-module/text-columns/edit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/text-columns/edit.js"],"names":["get","__","sprintf","PanelBody","RangeControl","BlockControls","BlockAlignmentToolbar","InspectorControls","RichText","useBlockProps","deprecated","TextColumnsEdit","attributes","setAttributes","width","content","columns","since","alternative","nextWidth","value","className","Array","from","length","map","_","index","nextContent","slice","children"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,GAAT,QAAoB,QAApB;AAEA;AACA;AACA;;AACA,SAASC,EAAT,EAAaC,OAAb,QAA4B,iBAA5B;AACA,SAASC,SAAT,EAAoBC,YAApB,QAAwC,uBAAxC;AACA,SACCC,aADD,EAECC,qBAFD,EAGCC,iBAHD,EAICC,QAJD,EAKCC,aALD,QAMO,yBANP;AAOA,OAAOC,UAAP,MAAuB,uBAAvB;AAEA,eAAe,SAASC,eAAT,OAA0D;AAAA,MAAhC;AAAEC,IAAAA,UAAF;AAAcC,IAAAA;AAAd,GAAgC;AACxE,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,OAAT;AAAkBC,IAAAA;AAAlB,MAA8BJ,UAApC;AAEAF,EAAAA,UAAU,CAAE,wBAAF,EAA4B;AACrCO,IAAAA,KAAK,EAAE,KAD8B;AAErCC,IAAAA,WAAW,EAAE;AAFwB,GAA5B,CAAV;AAKA,SACC,8BACC,cAAC,aAAD,QACC,cAAC,qBAAD;AACC,IAAA,KAAK,EAAGJ,KADT;AAEC,IAAA,QAAQ,EAAKK,SAAF,IACVN,aAAa,CAAE;AAAEC,MAAAA,KAAK,EAAEK;AAAT,KAAF,CAHf;AAKC,IAAA,QAAQ,EAAG,CAAE,QAAF,EAAY,MAAZ,EAAoB,MAApB;AALZ,IADD,CADD,EAUC,cAAC,iBAAD,QACC,cAAC,SAAD,QACC,cAAC,YAAD;AACC,IAAA,uBAAuB,MADxB;AAEC,IAAA,KAAK,EAAGlB,EAAE,CAAE,SAAF,CAFX;AAGC,IAAA,KAAK,EAAGe,OAHT;AAIC,IAAA,QAAQ,EAAKI,KAAF,IACVP,aAAa,CAAE;AAAEG,MAAAA,OAAO,EAAEI;AAAX,KAAF,CALf;AAOC,IAAA,GAAG,EAAG,CAPP;AAQC,IAAA,GAAG,EAAG,CARP;AASC,IAAA,QAAQ;AATT,IADD,CADD,CAVD,EAyBC,qBACMX,aAAa,CAAE;AACnBY,IAAAA,SAAS,EAAG,QAAQP,KAAO,YAAYE,OAAS;AAD7B,GAAF,CADnB,EAKGM,KAAK,CAACC,IAAN,CAAY;AAAEC,IAAAA,MAAM,EAAER;AAAV,GAAZ,EAAkCS,GAAlC,CAAuC,CAAEC,CAAF,EAAKC,KAAL,KAAgB;AACxD,WACC;AACC,MAAA,SAAS,EAAC,iBADX;AAEC,MAAA,GAAG,EAAI,UAAUA,KAAO;AAFzB,OAIC,cAAC,QAAD;AACC,MAAA,OAAO,EAAC,GADT;AAEC,MAAA,KAAK,EAAG3B,GAAG,CAAEe,OAAF,EAAW,CAAEY,KAAF,EAAS,UAAT,CAAX,CAFZ;AAGC,MAAA,QAAQ,EAAKC,WAAF,IAAmB;AAC7Bf,QAAAA,aAAa,CAAE;AACdE,UAAAA,OAAO,EAAE,CACR,GAAGA,OAAO,CAACc,KAAR,CAAe,CAAf,EAAkBF,KAAlB,CADK,EAER;AAAEG,YAAAA,QAAQ,EAAEF;AAAZ,WAFQ,EAGR,GAAGb,OAAO,CAACc,KAAR,CAAeF,KAAK,GAAG,CAAvB,CAHK;AADK,SAAF,CAAb;AAOA,OAXF;AAYC,oBAAazB,OAAO,EACnB;AACAD,MAAAA,EAAE,CAAE,gBAAF,CAFiB,EAGnB0B,KAAK,GAAG,CAHW,CAZrB;AAiBC,MAAA,WAAW,EAAG1B,EAAE,CAAE,YAAF;AAjBjB,MAJD,CADD;AA0BA,GA3BC,CALH,CAzBD,CADD;AA8DA","sourcesContent":["/**\n * External dependencies\n */\nimport { get } from 'lodash';\n\n/**\n * WordPress dependencies\n */\nimport { __, sprintf } from '@wordpress/i18n';\nimport { PanelBody, RangeControl } from '@wordpress/components';\nimport {\n\tBlockControls,\n\tBlockAlignmentToolbar,\n\tInspectorControls,\n\tRichText,\n\tuseBlockProps,\n} from '@wordpress/block-editor';\nimport deprecated from '@wordpress/deprecated';\n\nexport default function TextColumnsEdit( { attributes, setAttributes } ) {\n\tconst { width, content, columns } = attributes;\n\n\tdeprecated( 'The Text Columns block', {\n\t\tsince: '5.3',\n\t\talternative: 'the Columns block',\n\t} );\n\n\treturn (\n\t\t<>\n\t\t\t<BlockControls>\n\t\t\t\t<BlockAlignmentToolbar\n\t\t\t\t\tvalue={ width }\n\t\t\t\t\tonChange={ ( nextWidth ) =>\n\t\t\t\t\t\tsetAttributes( { width: nextWidth } )\n\t\t\t\t\t}\n\t\t\t\t\tcontrols={ [ 'center', 'wide', 'full' ] }\n\t\t\t\t/>\n\t\t\t</BlockControls>\n\t\t\t<InspectorControls>\n\t\t\t\t<PanelBody>\n\t\t\t\t\t<RangeControl\n\t\t\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\t\t\tlabel={ __( 'Columns' ) }\n\t\t\t\t\t\tvalue={ columns }\n\t\t\t\t\t\tonChange={ ( value ) =>\n\t\t\t\t\t\t\tsetAttributes( { columns: value } )\n\t\t\t\t\t\t}\n\t\t\t\t\t\tmin={ 2 }\n\t\t\t\t\t\tmax={ 4 }\n\t\t\t\t\t\trequired\n\t\t\t\t\t/>\n\t\t\t\t</PanelBody>\n\t\t\t</InspectorControls>\n\t\t\t<div\n\t\t\t\t{ ...useBlockProps( {\n\t\t\t\t\tclassName: `align${ width } columns-${ columns }`,\n\t\t\t\t} ) }\n\t\t\t>\n\t\t\t\t{ Array.from( { length: columns } ).map( ( _, index ) => {\n\t\t\t\t\treturn (\n\t\t\t\t\t\t<div\n\t\t\t\t\t\t\tclassName=\"wp-block-column\"\n\t\t\t\t\t\t\tkey={ `column-${ index }` }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t<RichText\n\t\t\t\t\t\t\t\ttagName=\"p\"\n\t\t\t\t\t\t\t\tvalue={ get( content, [ index, 'children' ] ) }\n\t\t\t\t\t\t\t\tonChange={ ( nextContent ) => {\n\t\t\t\t\t\t\t\t\tsetAttributes( {\n\t\t\t\t\t\t\t\t\t\tcontent: [\n\t\t\t\t\t\t\t\t\t\t\t...content.slice( 0, index ),\n\t\t\t\t\t\t\t\t\t\t\t{ children: nextContent },\n\t\t\t\t\t\t\t\t\t\t\t...content.slice( index + 1 ),\n\t\t\t\t\t\t\t\t\t\t],\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\taria-label={ sprintf(\n\t\t\t\t\t\t\t\t\t// translators: %d: column index (starting with 1)\n\t\t\t\t\t\t\t\t\t__( 'Column %d text' ),\n\t\t\t\t\t\t\t\t\tindex + 1\n\t\t\t\t\t\t\t\t) }\n\t\t\t\t\t\t\t\tplaceholder={ __( 'New Column' ) }\n\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t);\n\t\t\t\t} ) }\n\t\t\t</div>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/text-columns/edit.js"],"names":["__","sprintf","PanelBody","RangeControl","BlockControls","BlockAlignmentToolbar","InspectorControls","RichText","useBlockProps","deprecated","TextColumnsEdit","attributes","setAttributes","width","content","columns","since","alternative","nextWidth","value","className","Array","from","length","map","_","index","children","nextContent","slice"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,EAAT,EAAaC,OAAb,QAA4B,iBAA5B;AACA,SAASC,SAAT,EAAoBC,YAApB,QAAwC,uBAAxC;AACA,SACCC,aADD,EAECC,qBAFD,EAGCC,iBAHD,EAICC,QAJD,EAKCC,aALD,QAMO,yBANP;AAOA,OAAOC,UAAP,MAAuB,uBAAvB;AAEA,eAAe,SAASC,eAAT,OAA0D;AAAA,MAAhC;AAAEC,IAAAA,UAAF;AAAcC,IAAAA;AAAd,GAAgC;AACxE,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,OAAT;AAAkBC,IAAAA;AAAlB,MAA8BJ,UAApC;AAEAF,EAAAA,UAAU,CAAE,wBAAF,EAA4B;AACrCO,IAAAA,KAAK,EAAE,KAD8B;AAErCC,IAAAA,WAAW,EAAE;AAFwB,GAA5B,CAAV;AAKA,SACC,8BACC,cAAC,aAAD,QACC,cAAC,qBAAD;AACC,IAAA,KAAK,EAAGJ,KADT;AAEC,IAAA,QAAQ,EAAKK,SAAF,IACVN,aAAa,CAAE;AAAEC,MAAAA,KAAK,EAAEK;AAAT,KAAF,CAHf;AAKC,IAAA,QAAQ,EAAG,CAAE,QAAF,EAAY,MAAZ,EAAoB,MAApB;AALZ,IADD,CADD,EAUC,cAAC,iBAAD,QACC,cAAC,SAAD,QACC,cAAC,YAAD;AACC,IAAA,uBAAuB,MADxB;AAEC,IAAA,KAAK,EAAGlB,EAAE,CAAE,SAAF,CAFX;AAGC,IAAA,KAAK,EAAGe,OAHT;AAIC,IAAA,QAAQ,EAAKI,KAAF,IACVP,aAAa,CAAE;AAAEG,MAAAA,OAAO,EAAEI;AAAX,KAAF,CALf;AAOC,IAAA,GAAG,EAAG,CAPP;AAQC,IAAA,GAAG,EAAG,CARP;AASC,IAAA,QAAQ;AATT,IADD,CADD,CAVD,EAyBC,qBACMX,aAAa,CAAE;AACnBY,IAAAA,SAAS,EAAG,QAAQP,KAAO,YAAYE,OAAS;AAD7B,GAAF,CADnB,EAKGM,KAAK,CAACC,IAAN,CAAY;AAAEC,IAAAA,MAAM,EAAER;AAAV,GAAZ,EAAkCS,GAAlC,CAAuC,CAAEC,CAAF,EAAKC,KAAL,KAAgB;AAAA;;AACxD,WACC;AACC,MAAA,SAAS,EAAC,iBADX;AAEC,MAAA,GAAG,EAAI,UAAUA,KAAO;AAFzB,OAIC,cAAC,QAAD;AACC,MAAA,OAAO,EAAC,GADT;AAEC,MAAA,KAAK,EAAGZ,OAAH,aAAGA,OAAH,yCAAGA,OAAO,CAAIY,KAAJ,CAAV,mDAAG,eAAoBC,QAF7B;AAGC,MAAA,QAAQ,EAAKC,WAAF,IAAmB;AAC7BhB,QAAAA,aAAa,CAAE;AACdE,UAAAA,OAAO,EAAE,CACR,GAAGA,OAAO,CAACe,KAAR,CAAe,CAAf,EAAkBH,KAAlB,CADK,EAER;AAAEC,YAAAA,QAAQ,EAAEC;AAAZ,WAFQ,EAGR,GAAGd,OAAO,CAACe,KAAR,CAAeH,KAAK,GAAG,CAAvB,CAHK;AADK,SAAF,CAAb;AAOA,OAXF;AAYC,oBAAazB,OAAO,EACnB;AACAD,MAAAA,EAAE,CAAE,gBAAF,CAFiB,EAGnB0B,KAAK,GAAG,CAHW,CAZrB;AAiBC,MAAA,WAAW,EAAG1B,EAAE,CAAE,YAAF;AAjBjB,MAJD,CADD;AA0BA,GA3BC,CALH,CAzBD,CADD;AA8DA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, sprintf } from '@wordpress/i18n';\nimport { PanelBody, RangeControl } from '@wordpress/components';\nimport {\n\tBlockControls,\n\tBlockAlignmentToolbar,\n\tInspectorControls,\n\tRichText,\n\tuseBlockProps,\n} from '@wordpress/block-editor';\nimport deprecated from '@wordpress/deprecated';\n\nexport default function TextColumnsEdit( { attributes, setAttributes } ) {\n\tconst { width, content, columns } = attributes;\n\n\tdeprecated( 'The Text Columns block', {\n\t\tsince: '5.3',\n\t\talternative: 'the Columns block',\n\t} );\n\n\treturn (\n\t\t<>\n\t\t\t<BlockControls>\n\t\t\t\t<BlockAlignmentToolbar\n\t\t\t\t\tvalue={ width }\n\t\t\t\t\tonChange={ ( nextWidth ) =>\n\t\t\t\t\t\tsetAttributes( { width: nextWidth } )\n\t\t\t\t\t}\n\t\t\t\t\tcontrols={ [ 'center', 'wide', 'full' ] }\n\t\t\t\t/>\n\t\t\t</BlockControls>\n\t\t\t<InspectorControls>\n\t\t\t\t<PanelBody>\n\t\t\t\t\t<RangeControl\n\t\t\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\t\t\tlabel={ __( 'Columns' ) }\n\t\t\t\t\t\tvalue={ columns }\n\t\t\t\t\t\tonChange={ ( value ) =>\n\t\t\t\t\t\t\tsetAttributes( { columns: value } )\n\t\t\t\t\t\t}\n\t\t\t\t\t\tmin={ 2 }\n\t\t\t\t\t\tmax={ 4 }\n\t\t\t\t\t\trequired\n\t\t\t\t\t/>\n\t\t\t\t</PanelBody>\n\t\t\t</InspectorControls>\n\t\t\t<div\n\t\t\t\t{ ...useBlockProps( {\n\t\t\t\t\tclassName: `align${ width } columns-${ columns }`,\n\t\t\t\t} ) }\n\t\t\t>\n\t\t\t\t{ Array.from( { length: columns } ).map( ( _, index ) => {\n\t\t\t\t\treturn (\n\t\t\t\t\t\t<div\n\t\t\t\t\t\t\tclassName=\"wp-block-column\"\n\t\t\t\t\t\t\tkey={ `column-${ index }` }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t<RichText\n\t\t\t\t\t\t\t\ttagName=\"p\"\n\t\t\t\t\t\t\t\tvalue={ content?.[ index ]?.children }\n\t\t\t\t\t\t\t\tonChange={ ( nextContent ) => {\n\t\t\t\t\t\t\t\t\tsetAttributes( {\n\t\t\t\t\t\t\t\t\t\tcontent: [\n\t\t\t\t\t\t\t\t\t\t\t...content.slice( 0, index ),\n\t\t\t\t\t\t\t\t\t\t\t{ children: nextContent },\n\t\t\t\t\t\t\t\t\t\t\t...content.slice( index + 1 ),\n\t\t\t\t\t\t\t\t\t\t],\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\taria-label={ sprintf(\n\t\t\t\t\t\t\t\t\t// translators: %d: column index (starting with 1)\n\t\t\t\t\t\t\t\t\t__( 'Column %d text' ),\n\t\t\t\t\t\t\t\t\tindex + 1\n\t\t\t\t\t\t\t\t) }\n\t\t\t\t\t\t\t\tplaceholder={ __( 'New Column' ) }\n\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t);\n\t\t\t\t} ) }\n\t\t\t</div>\n\t\t</>\n\t);\n}\n"]}

package/build-module/text-columns/save.js

@@ -1,13 +1,8 @@
 import { createElement } from "@wordpress/element";
 
-/**
- * External dependencies
- */
-import { get } from 'lodash';
 /**
  * WordPress dependencies
  */
-
 import { RichText, useBlockProps } from '@wordpress/block-editor';
 export default function save(_ref) {
   let {
@@ -22,12 +17,16 @@ export default function save(_ref) {
     className: `align${width} columns-${columns}`
   }), Array.from({
     length: columns
-  }).map((_, index) => createElement("div", {
-    className: "wp-block-column",
-    key: `column-${index}`
-  }, createElement(RichText.Content, {
-    tagName: "p",
-    value: get(content, [index, 'children'])
-  }))));
+  }).map((_, index) => {
+    var _content$index;
+
+    return createElement("div", {
+      className: "wp-block-column",
+      key: `column-${index}`
+    }, createElement(RichText.Content, {
+      tagName: "p",
+      value: content === null || content === void 0 ? void 0 : (_content$index = content[index]) === null || _content$index === void 0 ? void 0 : _content$index.children
+    }));
+  }));
 }
 //# sourceMappingURL=save.js.map

package/build-module/text-columns/save.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/text-columns/save.js"],"names":["get","RichText","useBlockProps","save","attributes","width","content","columns","className","Array","from","length","map","_","index"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,GAAT,QAAoB,QAApB;AAEA;AACA;AACA;;AACA,SAASC,QAAT,EAAmBC,aAAnB,QAAwC,yBAAxC;AAEA,eAAe,SAASC,IAAT,OAAgC;AAAA,MAAjB;AAAEC,IAAAA;AAAF,GAAiB;AAC9C,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,OAAT;AAAkBC,IAAAA;AAAlB,MAA8BH,UAApC;AACA,SACC,qBACMF,aAAa,CAACC,IAAd,CAAoB;AACxBK,IAAAA,SAAS,EAAG,QAAQH,KAAO,YAAYE,OAAS;AADxB,GAApB,CADN,EAKGE,KAAK,CAACC,IAAN,CAAY;AAAEC,IAAAA,MAAM,EAAEJ;AAAV,GAAZ,EAAkCK,GAAlC,CAAuC,CAAEC,CAAF,EAAKC,KAAL,KACxC;AAAK,IAAA,SAAS,EAAC,iBAAf;AAAiC,IAAA,GAAG,EAAI,UAAUA,KAAO;AAAzD,KACC,cAAC,QAAD,CAAU,OAAV;AACC,IAAA,OAAO,EAAC,GADT;AAEC,IAAA,KAAK,EAAGd,GAAG,CAAEM,OAAF,EAAW,CAAEQ,KAAF,EAAS,UAAT,CAAX;AAFZ,IADD,CADC,CALH,CADD;AAgBA","sourcesContent":["/**\n * External dependencies\n */\nimport { get } from 'lodash';\n\n/**\n * WordPress dependencies\n */\nimport { RichText, useBlockProps } from '@wordpress/block-editor';\n\nexport default function save( { attributes } ) {\n\tconst { width, content, columns } = attributes;\n\treturn (\n\t\t<div\n\t\t\t{ ...useBlockProps.save( {\n\t\t\t\tclassName: `align${ width } columns-${ columns }`,\n\t\t\t} ) }\n\t\t>\n\t\t\t{ Array.from( { length: columns } ).map( ( _, index ) => (\n\t\t\t\t<div className=\"wp-block-column\" key={ `column-${ index }` }>\n\t\t\t\t\t<RichText.Content\n\t\t\t\t\t\ttagName=\"p\"\n\t\t\t\t\t\tvalue={ get( content, [ index, 'children' ] ) }\n\t\t\t\t\t/>\n\t\t\t\t</div>\n\t\t\t) ) }\n\t\t</div>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/text-columns/save.js"],"names":["RichText","useBlockProps","save","attributes","width","content","columns","className","Array","from","length","map","_","index","children"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,QAAT,EAAmBC,aAAnB,QAAwC,yBAAxC;AAEA,eAAe,SAASC,IAAT,OAAgC;AAAA,MAAjB;AAAEC,IAAAA;AAAF,GAAiB;AAC9C,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,OAAT;AAAkBC,IAAAA;AAAlB,MAA8BH,UAApC;AACA,SACC,qBACMF,aAAa,CAACC,IAAd,CAAoB;AACxBK,IAAAA,SAAS,EAAG,QAAQH,KAAO,YAAYE,OAAS;AADxB,GAApB,CADN,EAKGE,KAAK,CAACC,IAAN,CAAY;AAAEC,IAAAA,MAAM,EAAEJ;AAAV,GAAZ,EAAkCK,GAAlC,CAAuC,CAAEC,CAAF,EAAKC,KAAL;AAAA;;AAAA,WACxC;AAAK,MAAA,SAAS,EAAC,iBAAf;AAAiC,MAAA,GAAG,EAAI,UAAUA,KAAO;AAAzD,OACC,cAAC,QAAD,CAAU,OAAV;AACC,MAAA,OAAO,EAAC,GADT;AAEC,MAAA,KAAK,EAAGR,OAAH,aAAGA,OAAH,yCAAGA,OAAO,CAAIQ,KAAJ,CAAV,mDAAG,eAAoBC;AAF7B,MADD,CADwC;AAAA,GAAvC,CALH,CADD;AAgBA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { RichText, useBlockProps } from '@wordpress/block-editor';\n\nexport default function save( { attributes } ) {\n\tconst { width, content, columns } = attributes;\n\treturn (\n\t\t<div\n\t\t\t{ ...useBlockProps.save( {\n\t\t\t\tclassName: `align${ width } columns-${ columns }`,\n\t\t\t} ) }\n\t\t>\n\t\t\t{ Array.from( { length: columns } ).map( ( _, index ) => (\n\t\t\t\t<div className=\"wp-block-column\" key={ `column-${ index }` }>\n\t\t\t\t\t<RichText.Content\n\t\t\t\t\t\ttagName=\"p\"\n\t\t\t\t\t\tvalue={ content?.[ index ]?.children }\n\t\t\t\t\t/>\n\t\t\t\t</div>\n\t\t\t) ) }\n\t\t</div>\n\t);\n}\n"]}

package/build-module/video/edit-common-settings.js

@@ -62,23 +62,28 @@ const VideoSettings = _ref => {
     });
   }, []);
   return createElement(Fragment, null, createElement(ToggleControl, {
+    __nextHasNoMarginBottom: true,
     label: __('Autoplay'),
     onChange: toggleFactory.autoplay,
     checked: !!autoplay,
     help: getAutoplayHelp
   }), createElement(ToggleControl, {
+    __nextHasNoMarginBottom: true,
     label: __('Loop'),
     onChange: toggleFactory.loop,
     checked: !!loop
   }), createElement(ToggleControl, {
+    __nextHasNoMarginBottom: true,
     label: __('Muted'),
     onChange: toggleFactory.muted,
     checked: !!muted
   }), createElement(ToggleControl, {
+    __nextHasNoMarginBottom: true,
     label: __('Playback controls'),
     onChange: toggleFactory.controls,
     checked: !!controls
   }), createElement(ToggleControl, {
+    __nextHasNoMarginBottom: true,
     label: __('Play inline'),
     onChange: toggleFactory.playsInline,
     checked: !!playsInline

package/build-module/video/edit-common-settings.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/video/edit-common-settings.js"],"names":["__","_x","ToggleControl","SelectControl","useMemo","useCallback","Platform","options","value","label","VideoSettings","setAttributes","attributes","autoplay","controls","loop","muted","playsInline","preload","autoPlayHelpText","getAutoplayHelp","select","web","checked","native","toggleFactory","toggleAttribute","attribute","newValue","onChangePreload"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, _x } from '@wordpress/i18n';\nimport { ToggleControl, SelectControl } from '@wordpress/components';\nimport { useMemo, useCallback, Platform } from '@wordpress/element';\n\nconst options = [\n\t{ value: 'auto', label: __( 'Auto' ) },\n\t{ value: 'metadata', label: __( 'Metadata' ) },\n\t{ value: 'none', label: _x( 'None', 'Preload value' ) },\n];\n\nconst VideoSettings = ( { setAttributes, attributes } ) => {\n\tconst { autoplay, controls, loop, muted, playsInline, preload } =\n\t\tattributes;\n\n\tconst autoPlayHelpText = __(\n\t\t'Autoplay may cause usability issues for some users.'\n\t);\n\tconst getAutoplayHelp = Platform.select( {\n\t\tweb: useCallback( ( checked ) => {\n\t\t\treturn checked ? autoPlayHelpText : null;\n\t\t}, [] ),\n\t\tnative: autoPlayHelpText,\n\t} );\n\n\tconst toggleFactory = useMemo( () => {\n\t\tconst toggleAttribute = ( attribute ) => {\n\t\t\treturn ( newValue ) => {\n\t\t\t\tsetAttributes( { [ attribute ]: newValue } );\n\t\t\t};\n\t\t};\n\n\t\treturn {\n\t\t\tautoplay: toggleAttribute( 'autoplay' ),\n\t\t\tloop: toggleAttribute( 'loop' ),\n\t\t\tmuted: toggleAttribute( 'muted' ),\n\t\t\tcontrols: toggleAttribute( 'controls' ),\n\t\t\tplaysInline: toggleAttribute( 'playsInline' ),\n\t\t};\n\t}, [] );\n\n\tconst onChangePreload = useCallback( ( value ) => {\n\t\tsetAttributes( { preload: value } );\n\t}, [] );\n\n\treturn (\n\t\t<>\n\t\t\t<ToggleControl\n\t\t\t\tlabel={ __( 'Autoplay' ) }\n\t\t\t\tonChange={ toggleFactory.autoplay }\n\t\t\t\tchecked={ !! autoplay }\n\t\t\t\thelp={ getAutoplayHelp }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\tlabel={ __( 'Loop' ) }\n\t\t\t\tonChange={ toggleFactory.loop }\n\t\t\t\tchecked={ !! loop }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\tlabel={ __( 'Muted' ) }\n\t\t\t\tonChange={ toggleFactory.muted }\n\t\t\t\tchecked={ !! muted }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\tlabel={ __( 'Playback controls' ) }\n\t\t\t\tonChange={ toggleFactory.controls }\n\t\t\t\tchecked={ !! controls }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\tlabel={ __( 'Play inline' ) }\n\t\t\t\tonChange={ toggleFactory.playsInline }\n\t\t\t\tchecked={ !! playsInline }\n\t\t\t/>\n\t\t\t<SelectControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Preload' ) }\n\t\t\t\tvalue={ preload }\n\t\t\t\tonChange={ onChangePreload }\n\t\t\t\toptions={ options }\n\t\t\t\thideCancelButton={ true }\n\t\t\t/>\n\t\t</>\n\t);\n};\n\nexport default VideoSettings;\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/video/edit-common-settings.js"],"names":["__","_x","ToggleControl","SelectControl","useMemo","useCallback","Platform","options","value","label","VideoSettings","setAttributes","attributes","autoplay","controls","loop","muted","playsInline","preload","autoPlayHelpText","getAutoplayHelp","select","web","checked","native","toggleFactory","toggleAttribute","attribute","newValue","onChangePreload"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, _x } from '@wordpress/i18n';\nimport { ToggleControl, SelectControl } from '@wordpress/components';\nimport { useMemo, useCallback, Platform } from '@wordpress/element';\n\nconst options = [\n\t{ value: 'auto', label: __( 'Auto' ) },\n\t{ value: 'metadata', label: __( 'Metadata' ) },\n\t{ value: 'none', label: _x( 'None', 'Preload value' ) },\n];\n\nconst VideoSettings = ( { setAttributes, attributes } ) => {\n\tconst { autoplay, controls, loop, muted, playsInline, preload } =\n\t\tattributes;\n\n\tconst autoPlayHelpText = __(\n\t\t'Autoplay may cause usability issues for some users.'\n\t);\n\tconst getAutoplayHelp = Platform.select( {\n\t\tweb: useCallback( ( checked ) => {\n\t\t\treturn checked ? autoPlayHelpText : null;\n\t\t}, [] ),\n\t\tnative: autoPlayHelpText,\n\t} );\n\n\tconst toggleFactory = useMemo( () => {\n\t\tconst toggleAttribute = ( attribute ) => {\n\t\t\treturn ( newValue ) => {\n\t\t\t\tsetAttributes( { [ attribute ]: newValue } );\n\t\t\t};\n\t\t};\n\n\t\treturn {\n\t\t\tautoplay: toggleAttribute( 'autoplay' ),\n\t\t\tloop: toggleAttribute( 'loop' ),\n\t\t\tmuted: toggleAttribute( 'muted' ),\n\t\t\tcontrols: toggleAttribute( 'controls' ),\n\t\t\tplaysInline: toggleAttribute( 'playsInline' ),\n\t\t};\n\t}, [] );\n\n\tconst onChangePreload = useCallback( ( value ) => {\n\t\tsetAttributes( { preload: value } );\n\t}, [] );\n\n\treturn (\n\t\t<>\n\t\t\t<ToggleControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Autoplay' ) }\n\t\t\t\tonChange={ toggleFactory.autoplay }\n\t\t\t\tchecked={ !! autoplay }\n\t\t\t\thelp={ getAutoplayHelp }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Loop' ) }\n\t\t\t\tonChange={ toggleFactory.loop }\n\t\t\t\tchecked={ !! loop }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Muted' ) }\n\t\t\t\tonChange={ toggleFactory.muted }\n\t\t\t\tchecked={ !! muted }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Playback controls' ) }\n\t\t\t\tonChange={ toggleFactory.controls }\n\t\t\t\tchecked={ !! controls }\n\t\t\t/>\n\t\t\t<ToggleControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Play inline' ) }\n\t\t\t\tonChange={ toggleFactory.playsInline }\n\t\t\t\tchecked={ !! playsInline }\n\t\t\t/>\n\t\t\t<SelectControl\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tlabel={ __( 'Preload' ) }\n\t\t\t\tvalue={ preload }\n\t\t\t\tonChange={ onChangePreload }\n\t\t\t\toptions={ options }\n\t\t\t\thideCancelButton={ true }\n\t\t\t/>\n\t\t</>\n\t);\n};\n\nexport default VideoSettings;\n"]}

package/build-style/cover/style-rtl.css

@@ -311,11 +311,7 @@
 .wp-block-cover .wp-block-cover__inner-container {
   width: 100%;
   z-index: 1;
-  color: #fff; direction: rtl;
-}
-.wp-block-cover-image.is-light .wp-block-cover__inner-container,
-.wp-block-cover.is-light .wp-block-cover__inner-container {
-  color: #000;
+  color: inherit; direction: rtl;
 }
 .wp-block-cover-image p:not(.has-text-color),
 .wp-block-cover-image h1:not(.has-text-color),
@@ -496,4 +492,14 @@ section.wp-block-cover-image > h2,
   max-width: 840px;
   padding: 0.44em;
   text-align: center;
+}
+
+:where(.wp-block-cover:not(.has-text-color)),
+:where(.wp-block-cover-image:not(.has-text-color)) {
+  color: #fff;
+}
+
+:where(.wp-block-cover.is-light:not(.has-text-color)),
+:where(.wp-block-cover-image.is-light:not(.has-text-color)) {
+  color: #000;
 }

package/build-style/cover/style.css

@@ -312,13 +312,9 @@
 .wp-block-cover .wp-block-cover__inner-container {
   width: 100%;
   z-index: 1;
-  color: #fff;
+  color: inherit;
   /*rtl:raw: direction: rtl; */
 }
-.wp-block-cover-image.is-light .wp-block-cover__inner-container,
-.wp-block-cover.is-light .wp-block-cover__inner-container {
-  color: #000;
-}
 .wp-block-cover-image p:not(.has-text-color),
 .wp-block-cover-image h1:not(.has-text-color),
 .wp-block-cover-image h2:not(.has-text-color),
@@ -498,4 +494,14 @@ section.wp-block-cover-image > h2,
   max-width: 840px;
   padding: 0.44em;
   text-align: center;
+}
+
+:where(.wp-block-cover:not(.has-text-color)),
+:where(.wp-block-cover-image:not(.has-text-color)) {
+  color: #fff;
+}
+
+:where(.wp-block-cover.is-light:not(.has-text-color)),
+:where(.wp-block-cover-image.is-light:not(.has-text-color)) {
+  color: #000;
 }

package/build-style/editor-rtl.css

@@ -1909,7 +1909,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
     opacity: 1;
   }
 }
-.wp-block-navigation .components-spinner {
+.wp-block-navigation__loading-indicator-container {
   padding: 8px 12px;
 }
 
@@ -2213,6 +2213,10 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
   margin-right: 0;
 }
 
+.wp-block-page-list__loading-indicator-container {
+  padding: 8px 12px;
+}
+
 .block-editor-block-list__block[data-type="core/paragraph"].has-drop-cap:focus {
   min-height: auto !important;
 }
@@ -2226,7 +2230,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 }
 
 .wp-block-post-excerpt .wp-block-post-excerpt__excerpt.is-inline {
-  display: inline-block;
+  display: inline;
 }
 
 .wp-block-pullquote.is-style-solid-color blockquote p {
@@ -2355,8 +2359,8 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 }
 
 .wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder {
-  height: 120px;
-  width: 120px;
+  height: 60px;
+  width: 60px;
 }
 .wp-block-site-logo.wp-block-site-logo > div,
 .wp-block-site-logo.wp-block-site-logo .components-resizable-box__container {
@@ -2801,6 +2805,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
   position: sticky;
   top: 0;
   padding: 16px 0;
+  margin-bottom: 2px;
   z-index: 2;
 }
 

package/build-style/editor.css

@@ -1917,7 +1917,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
     opacity: 1;
   }
 }
-.wp-block-navigation .components-spinner {
+.wp-block-navigation__loading-indicator-container {
   padding: 8px 12px;
 }
 
@@ -2221,6 +2221,10 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
   margin-left: 0;
 }
 
+.wp-block-page-list__loading-indicator-container {
+  padding: 8px 12px;
+}
+
 .block-editor-block-list__block[data-type="core/paragraph"].has-drop-cap:focus {
   min-height: auto !important;
 }
@@ -2234,7 +2238,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 }
 
 .wp-block-post-excerpt .wp-block-post-excerpt__excerpt.is-inline {
-  display: inline-block;
+  display: inline;
 }
 
 .wp-block-pullquote.is-style-solid-color blockquote p {
@@ -2363,8 +2367,8 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 }
 
 .wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder {
-  height: 120px;
-  width: 120px;
+  height: 60px;
+  width: 60px;
 }
 .wp-block-site-logo.wp-block-site-logo > div,
 .wp-block-site-logo.wp-block-site-logo .components-resizable-box__container {
@@ -2809,6 +2813,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
   position: sticky;
   top: 0;
   padding: 16px 0;
+  margin-bottom: 2px;
   z-index: 2;
 }
 

package/build-style/navigation/editor-rtl.css

@@ -502,7 +502,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
     opacity: 1;
   }
 }
-.wp-block-navigation .components-spinner {
+.wp-block-navigation__loading-indicator-container {
   padding: 8px 12px;
 }
 

package/build-style/navigation/editor.css

@@ -502,7 +502,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
     opacity: 1;
   }
 }
-.wp-block-navigation .components-spinner {
+.wp-block-navigation__loading-indicator-container {
   padding: 8px 12px;
 }
 

package/build-style/page-list/editor-rtl.css

@@ -129,4 +129,8 @@
 
 .wp-block-page-list .components-notice {
   margin-right: 0;
+}
+
+.wp-block-page-list__loading-indicator-container {
+  padding: 8px 12px;
 }