@wordpress/edit-widgets 5.18.1-next.5a1d1283.0 → 5.19.1

package/build-module/components/secondary-sidebar/list-view-sidebar.js

@@ -4,9 +4,9 @@ import { createElement } from "@wordpress/element";
  */
 import { __experimentalListView as ListView } from '@wordpress/block-editor';
 import { Button } from '@wordpress/components';
-import { useFocusOnMount, useFocusReturn, useMergeRefs } from '@wordpress/compose';
+import { useFocusOnMount, useMergeRefs } from '@wordpress/compose';
 import { useDispatch } from '@wordpress/data';
-import { useState } from '@wordpress/element';
+import { useCallback, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { closeSmall } from '@wordpress/icons';
 import { ESCAPE } from '@wordpress/keycodes';
@@ -15,7 +15,9 @@ import { ESCAPE } from '@wordpress/keycodes';
  * Internal dependencies
  */
 import { store as editWidgetsStore } from '../../store';
-export default function ListViewSidebar() {
+export default function ListViewSidebar({
+  listViewToggleElement
+}) {
   const {
     setIsListViewOpened
   } = useDispatch(editWidgetsStore);
@@ -24,29 +26,32 @@ export default function ListViewSidebar() {
   // re-renders when the dropZoneElement updates.
   const [dropZoneElement, setDropZoneElement] = useState(null);
   const focusOnMountRef = useFocusOnMount('firstElement');
-  const headerFocusReturnRef = useFocusReturn();
-  const contentFocusReturnRef = useFocusReturn();
-  function closeOnEscape(event) {
+
+  // When closing the list view, focus should return to the toggle button.
+  const closeListView = useCallback(() => {
+    setIsListViewOpened(false);
+    listViewToggleElement?.focus();
+  }, [listViewToggleElement, setIsListViewOpened]);
+  const closeOnEscape = useCallback(event => {
     if (event.keyCode === ESCAPE && !event.defaultPrevented) {
       event.preventDefault();
-      setIsListViewOpened(false);
+      closeListView();
     }
-  }
+  }, [closeListView]);
   return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     createElement("div", {
       className: "edit-widgets-editor__list-view-panel",
       onKeyDown: closeOnEscape
     }, createElement("div", {
-      className: "edit-widgets-editor__list-view-panel-header",
-      ref: headerFocusReturnRef
+      className: "edit-widgets-editor__list-view-panel-header"
     }, createElement("strong", null, __('List View')), createElement(Button, {
       icon: closeSmall,
       label: __('Close'),
-      onClick: () => setIsListViewOpened(false)
+      onClick: closeListView
     })), createElement("div", {
       className: "edit-widgets-editor__list-view-panel-content",
-      ref: useMergeRefs([contentFocusReturnRef, focusOnMountRef, setDropZoneElement])
+      ref: useMergeRefs([focusOnMountRef, setDropZoneElement])
     }, createElement(ListView, {
       dropZoneElement: dropZoneElement
     })))

package/build-module/components/secondary-sidebar/list-view-sidebar.js.map

@@ -1 +1 @@
-{"version":3,"names":["__experimentalListView","ListView","Button","useFocusOnMount","useFocusReturn","useMergeRefs","useDispatch","useState","__","closeSmall","ESCAPE","store","editWidgetsStore","ListViewSidebar","setIsListViewOpened","dropZoneElement","setDropZoneElement","focusOnMountRef","headerFocusReturnRef","contentFocusReturnRef","closeOnEscape","event","keyCode","defaultPrevented","preventDefault","createElement","className","onKeyDown","ref","icon","label","onClick"],"sources":["@wordpress/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __experimentalListView as ListView } from '@wordpress/block-editor';\nimport { Button } from '@wordpress/components';\nimport {\n\tuseFocusOnMount,\n\tuseFocusReturn,\n\tuseMergeRefs,\n} from '@wordpress/compose';\nimport { useDispatch } from '@wordpress/data';\nimport { useState } from '@wordpress/element';\nimport { __ } from '@wordpress/i18n';\nimport { closeSmall } from '@wordpress/icons';\nimport { ESCAPE } from '@wordpress/keycodes';\n\n/**\n * Internal dependencies\n */\nimport { store as editWidgetsStore } from '../../store';\n\nexport default function ListViewSidebar() {\n\tconst { setIsListViewOpened } = useDispatch( editWidgetsStore );\n\n\t// Use internal state instead of a ref to make sure that the component\n\t// re-renders when the dropZoneElement updates.\n\tconst [ dropZoneElement, setDropZoneElement ] = useState( null );\n\n\tconst focusOnMountRef = useFocusOnMount( 'firstElement' );\n\tconst headerFocusReturnRef = useFocusReturn();\n\tconst contentFocusReturnRef = useFocusReturn();\n\n\tfunction closeOnEscape( event ) {\n\t\tif ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {\n\t\t\tevent.preventDefault();\n\t\t\tsetIsListViewOpened( false );\n\t\t}\n\t}\n\n\treturn (\n\t\t// eslint-disable-next-line jsx-a11y/no-static-element-interactions\n\t\t<div\n\t\t\tclassName=\"edit-widgets-editor__list-view-panel\"\n\t\t\tonKeyDown={ closeOnEscape }\n\t\t>\n\t\t\t<div\n\t\t\t\tclassName=\"edit-widgets-editor__list-view-panel-header\"\n\t\t\t\tref={ headerFocusReturnRef }\n\t\t\t>\n\t\t\t\t<strong>{ __( 'List View' ) }</strong>\n\t\t\t\t<Button\n\t\t\t\t\ticon={ closeSmall }\n\t\t\t\t\tlabel={ __( 'Close' ) }\n\t\t\t\t\tonClick={ () => setIsListViewOpened( false ) }\n\t\t\t\t/>\n\t\t\t</div>\n\t\t\t<div\n\t\t\t\tclassName=\"edit-widgets-editor__list-view-panel-content\"\n\t\t\t\tref={ useMergeRefs( [\n\t\t\t\t\tcontentFocusReturnRef,\n\t\t\t\t\tfocusOnMountRef,\n\t\t\t\t\tsetDropZoneElement,\n\t\t\t\t] ) }\n\t\t\t>\n\t\t\t\t<ListView dropZoneElement={ dropZoneElement } />\n\t\t\t</div>\n\t\t</div>\n\t);\n}\n"],"mappings":";AAAA;AACA;AACA;AACA,SAASA,sBAAsB,IAAIC,QAAQ,QAAQ,yBAAyB;AAC5E,SAASC,MAAM,QAAQ,uBAAuB;AAC9C,SACCC,eAAe,EACfC,cAAc,EACdC,YAAY,QACN,oBAAoB;AAC3B,SAASC,WAAW,QAAQ,iBAAiB;AAC7C,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,EAAE,QAAQ,iBAAiB;AACpC,SAASC,UAAU,QAAQ,kBAAkB;AAC7C,SAASC,MAAM,QAAQ,qBAAqB;;AAE5C;AACA;AACA;AACA,SAASC,KAAK,IAAIC,gBAAgB,QAAQ,aAAa;AAEvD,eAAe,SAASC,eAAeA,CAAA,EAAG;EACzC,MAAM;IAAEC;EAAoB,CAAC,GAAGR,WAAW,CAAEM,gBAAiB,CAAC;;EAE/D;EACA;EACA,MAAM,CAAEG,eAAe,EAAEC,kBAAkB,CAAE,GAAGT,QAAQ,CAAE,IAAK,CAAC;EAEhE,MAAMU,eAAe,GAAGd,eAAe,CAAE,cAAe,CAAC;EACzD,MAAMe,oBAAoB,GAAGd,cAAc,CAAC,CAAC;EAC7C,MAAMe,qBAAqB,GAAGf,cAAc,CAAC,CAAC;EAE9C,SAASgB,aAAaA,CAAEC,KAAK,EAAG;IAC/B,IAAKA,KAAK,CAACC,OAAO,KAAKZ,MAAM,IAAI,CAAEW,KAAK,CAACE,gBAAgB,EAAG;MAC3DF,KAAK,CAACG,cAAc,CAAC,CAAC;MACtBV,mBAAmB,CAAE,KAAM,CAAC;IAC7B;EACD;EAEA;IACC;IACAW,aAAA;MACCC,SAAS,EAAC,sCAAsC;MAChDC,SAAS,EAAGP;IAAe,GAE3BK,aAAA;MACCC,SAAS,EAAC,6CAA6C;MACvDE,GAAG,EAAGV;IAAsB,GAE5BO,aAAA,iBAAUjB,EAAE,CAAE,WAAY,CAAW,CAAC,EACtCiB,aAAA,CAACvB,MAAM;MACN2B,IAAI,EAAGpB,UAAY;MACnBqB,KAAK,EAAGtB,EAAE,CAAE,OAAQ,CAAG;MACvBuB,OAAO,EAAGA,CAAA,KAAMjB,mBAAmB,CAAE,KAAM;IAAG,CAC9C,CACG,CAAC,EACNW,aAAA;MACCC,SAAS,EAAC,8CAA8C;MACxDE,GAAG,EAAGvB,YAAY,CAAE,CACnBc,qBAAqB,EACrBF,eAAe,EACfD,kBAAkB,CACjB;IAAG,GAELS,aAAA,CAACxB,QAAQ;MAACc,eAAe,EAAGA;IAAiB,CAAE,CAC3C,CACD;EAAC;AAER"}
+{"version":3,"names":["__experimentalListView","ListView","Button","useFocusOnMount","useMergeRefs","useDispatch","useCallback","useState","__","closeSmall","ESCAPE","store","editWidgetsStore","ListViewSidebar","listViewToggleElement","setIsListViewOpened","dropZoneElement","setDropZoneElement","focusOnMountRef","closeListView","focus","closeOnEscape","event","keyCode","defaultPrevented","preventDefault","createElement","className","onKeyDown","icon","label","onClick","ref"],"sources":["@wordpress/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __experimentalListView as ListView } from '@wordpress/block-editor';\nimport { Button } from '@wordpress/components';\nimport { useFocusOnMount, useMergeRefs } from '@wordpress/compose';\nimport { useDispatch } from '@wordpress/data';\nimport { useCallback, useState } from '@wordpress/element';\nimport { __ } from '@wordpress/i18n';\nimport { closeSmall } from '@wordpress/icons';\nimport { ESCAPE } from '@wordpress/keycodes';\n\n/**\n * Internal dependencies\n */\nimport { store as editWidgetsStore } from '../../store';\n\nexport default function ListViewSidebar( { listViewToggleElement } ) {\n\tconst { setIsListViewOpened } = useDispatch( editWidgetsStore );\n\n\t// Use internal state instead of a ref to make sure that the component\n\t// re-renders when the dropZoneElement updates.\n\tconst [ dropZoneElement, setDropZoneElement ] = useState( null );\n\n\tconst focusOnMountRef = useFocusOnMount( 'firstElement' );\n\n\t// When closing the list view, focus should return to the toggle button.\n\tconst closeListView = useCallback( () => {\n\t\tsetIsListViewOpened( false );\n\t\tlistViewToggleElement?.focus();\n\t}, [ listViewToggleElement, setIsListViewOpened ] );\n\n\tconst closeOnEscape = useCallback(\n\t\t( event ) => {\n\t\t\tif ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {\n\t\t\t\tevent.preventDefault();\n\t\t\t\tcloseListView();\n\t\t\t}\n\t\t},\n\t\t[ closeListView ]\n\t);\n\n\treturn (\n\t\t// eslint-disable-next-line jsx-a11y/no-static-element-interactions\n\t\t<div\n\t\t\tclassName=\"edit-widgets-editor__list-view-panel\"\n\t\t\tonKeyDown={ closeOnEscape }\n\t\t>\n\t\t\t<div className=\"edit-widgets-editor__list-view-panel-header\">\n\t\t\t\t<strong>{ __( 'List View' ) }</strong>\n\t\t\t\t<Button\n\t\t\t\t\ticon={ closeSmall }\n\t\t\t\t\tlabel={ __( 'Close' ) }\n\t\t\t\t\tonClick={ closeListView }\n\t\t\t\t/>\n\t\t\t</div>\n\t\t\t<div\n\t\t\t\tclassName=\"edit-widgets-editor__list-view-panel-content\"\n\t\t\t\tref={ useMergeRefs( [ focusOnMountRef, setDropZoneElement ] ) }\n\t\t\t>\n\t\t\t\t<ListView dropZoneElement={ dropZoneElement } />\n\t\t\t</div>\n\t\t</div>\n\t);\n}\n"],"mappings":";AAAA;AACA;AACA;AACA,SAASA,sBAAsB,IAAIC,QAAQ,QAAQ,yBAAyB;AAC5E,SAASC,MAAM,QAAQ,uBAAuB;AAC9C,SAASC,eAAe,EAAEC,YAAY,QAAQ,oBAAoB;AAClE,SAASC,WAAW,QAAQ,iBAAiB;AAC7C,SAASC,WAAW,EAAEC,QAAQ,QAAQ,oBAAoB;AAC1D,SAASC,EAAE,QAAQ,iBAAiB;AACpC,SAASC,UAAU,QAAQ,kBAAkB;AAC7C,SAASC,MAAM,QAAQ,qBAAqB;;AAE5C;AACA;AACA;AACA,SAASC,KAAK,IAAIC,gBAAgB,QAAQ,aAAa;AAEvD,eAAe,SAASC,eAAeA,CAAE;EAAEC;AAAsB,CAAC,EAAG;EACpE,MAAM;IAAEC;EAAoB,CAAC,GAAGV,WAAW,CAAEO,gBAAiB,CAAC;;EAE/D;EACA;EACA,MAAM,CAAEI,eAAe,EAAEC,kBAAkB,CAAE,GAAGV,QAAQ,CAAE,IAAK,CAAC;EAEhE,MAAMW,eAAe,GAAGf,eAAe,CAAE,cAAe,CAAC;;EAEzD;EACA,MAAMgB,aAAa,GAAGb,WAAW,CAAE,MAAM;IACxCS,mBAAmB,CAAE,KAAM,CAAC;IAC5BD,qBAAqB,EAAEM,KAAK,CAAC,CAAC;EAC/B,CAAC,EAAE,CAAEN,qBAAqB,EAAEC,mBAAmB,CAAG,CAAC;EAEnD,MAAMM,aAAa,GAAGf,WAAW,CAC9BgB,KAAK,IAAM;IACZ,IAAKA,KAAK,CAACC,OAAO,KAAKb,MAAM,IAAI,CAAEY,KAAK,CAACE,gBAAgB,EAAG;MAC3DF,KAAK,CAACG,cAAc,CAAC,CAAC;MACtBN,aAAa,CAAC,CAAC;IAChB;EACD,CAAC,EACD,CAAEA,aAAa,CAChB,CAAC;EAED;IACC;IACAO,aAAA;MACCC,SAAS,EAAC,sCAAsC;MAChDC,SAAS,EAAGP;IAAe,GAE3BK,aAAA;MAAKC,SAAS,EAAC;IAA6C,GAC3DD,aAAA,iBAAUlB,EAAE,CAAE,WAAY,CAAW,CAAC,EACtCkB,aAAA,CAACxB,MAAM;MACN2B,IAAI,EAAGpB,UAAY;MACnBqB,KAAK,EAAGtB,EAAE,CAAE,OAAQ,CAAG;MACvBuB,OAAO,EAAGZ;IAAe,CACzB,CACG,CAAC,EACNO,aAAA;MACCC,SAAS,EAAC,8CAA8C;MACxDK,GAAG,EAAG5B,YAAY,CAAE,CAAEc,eAAe,EAAED,kBAAkB,CAAG;IAAG,GAE/DS,aAAA,CAACzB,QAAQ;MAACe,eAAe,EAAGA;IAAiB,CAAE,CAC3C,CACD;EAAC;AAER"}

package/build-module/components/widget-areas-block-editor-content/index.js

@@ -22,7 +22,8 @@ export default function WidgetAreasBlockEditorContent({
   return createElement("div", {
     className: "edit-widgets-block-editor"
   }, createElement(Notices, null), createElement(BlockTools, null, createElement(KeyboardShortcuts, null), createElement(EditorStyles, {
-    styles: styles
+    styles: styles,
+    scope: ".editor-styles-wrapper"
   }), createElement(BlockSelectionClearer, null, createElement(WritingFlow, null, createElement(BlockList, {
     className: "edit-widgets-main-block-list"
   })))));

package/build-module/components/widget-areas-block-editor-content/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["BlockList","BlockTools","BlockSelectionClearer","WritingFlow","__unstableEditorStyles","EditorStyles","useSelect","useMemo","store","preferencesStore","Notices","KeyboardShortcuts","WidgetAreasBlockEditorContent","blockEditorSettings","hasThemeStyles","select","get","styles","createElement","className"],"sources":["@wordpress/edit-widgets/src/components/widget-areas-block-editor-content/index.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tBlockList,\n\tBlockTools,\n\tBlockSelectionClearer,\n\tWritingFlow,\n\t__unstableEditorStyles as EditorStyles,\n} from '@wordpress/block-editor';\nimport { useSelect } from '@wordpress/data';\nimport { useMemo } from '@wordpress/element';\nimport { store as preferencesStore } from '@wordpress/preferences';\n\n/**\n * Internal dependencies\n */\nimport Notices from '../notices';\nimport KeyboardShortcuts from '../keyboard-shortcuts';\n\nexport default function WidgetAreasBlockEditorContent( {\n\tblockEditorSettings,\n} ) {\n\tconst hasThemeStyles = useSelect(\n\t\t( select ) =>\n\t\t\t!! select( preferencesStore ).get(\n\t\t\t\t'core/edit-widgets',\n\t\t\t\t'themeStyles'\n\t\t\t),\n\t\t[]\n\t);\n\n\tconst styles = useMemo( () => {\n\t\treturn hasThemeStyles ? blockEditorSettings.styles : [];\n\t}, [ blockEditorSettings, hasThemeStyles ] );\n\n\treturn (\n\t\t<div className=\"edit-widgets-block-editor\">\n\t\t\t<Notices />\n\t\t\t<BlockTools>\n\t\t\t\t<KeyboardShortcuts />\n\t\t\t\t<EditorStyles styles={ styles } />\n\t\t\t\t<BlockSelectionClearer>\n\t\t\t\t\t<WritingFlow>\n\t\t\t\t\t\t<BlockList className=\"edit-widgets-main-block-list\" />\n\t\t\t\t\t</WritingFlow>\n\t\t\t\t</BlockSelectionClearer>\n\t\t\t</BlockTools>\n\t\t</div>\n\t);\n}\n"],"mappings":";AAAA;AACA;AACA;AACA,SACCA,SAAS,EACTC,UAAU,EACVC,qBAAqB,EACrBC,WAAW,EACXC,sBAAsB,IAAIC,YAAY,QAChC,yBAAyB;AAChC,SAASC,SAAS,QAAQ,iBAAiB;AAC3C,SAASC,OAAO,QAAQ,oBAAoB;AAC5C,SAASC,KAAK,IAAIC,gBAAgB,QAAQ,wBAAwB;;AAElE;AACA;AACA;AACA,OAAOC,OAAO,MAAM,YAAY;AAChC,OAAOC,iBAAiB,MAAM,uBAAuB;AAErD,eAAe,SAASC,6BAA6BA,CAAE;EACtDC;AACD,CAAC,EAAG;EACH,MAAMC,cAAc,GAAGR,SAAS,CAC7BS,MAAM,IACP,CAAC,CAAEA,MAAM,CAAEN,gBAAiB,CAAC,CAACO,GAAG,CAChC,mBAAmB,EACnB,aACD,CAAC,EACF,EACD,CAAC;EAED,MAAMC,MAAM,GAAGV,OAAO,CAAE,MAAM;IAC7B,OAAOO,cAAc,GAAGD,mBAAmB,CAACI,MAAM,GAAG,EAAE;EACxD,CAAC,EAAE,CAAEJ,mBAAmB,EAAEC,cAAc,CAAG,CAAC;EAE5C,OACCI,aAAA;IAAKC,SAAS,EAAC;EAA2B,GACzCD,aAAA,CAACR,OAAO,MAAE,CAAC,EACXQ,aAAA,CAACjB,UAAU,QACViB,aAAA,CAACP,iBAAiB,MAAE,CAAC,EACrBO,aAAA,CAACb,YAAY;IAACY,MAAM,EAAGA;EAAQ,CAAE,CAAC,EAClCC,aAAA,CAAChB,qBAAqB,QACrBgB,aAAA,CAACf,WAAW,QACXe,aAAA,CAAClB,SAAS;IAACmB,SAAS,EAAC;EAA8B,CAAE,CACzC,CACS,CACZ,CACR,CAAC;AAER"}
+{"version":3,"names":["BlockList","BlockTools","BlockSelectionClearer","WritingFlow","__unstableEditorStyles","EditorStyles","useSelect","useMemo","store","preferencesStore","Notices","KeyboardShortcuts","WidgetAreasBlockEditorContent","blockEditorSettings","hasThemeStyles","select","get","styles","createElement","className","scope"],"sources":["@wordpress/edit-widgets/src/components/widget-areas-block-editor-content/index.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tBlockList,\n\tBlockTools,\n\tBlockSelectionClearer,\n\tWritingFlow,\n\t__unstableEditorStyles as EditorStyles,\n} from '@wordpress/block-editor';\nimport { useSelect } from '@wordpress/data';\nimport { useMemo } from '@wordpress/element';\nimport { store as preferencesStore } from '@wordpress/preferences';\n\n/**\n * Internal dependencies\n */\nimport Notices from '../notices';\nimport KeyboardShortcuts from '../keyboard-shortcuts';\n\nexport default function WidgetAreasBlockEditorContent( {\n\tblockEditorSettings,\n} ) {\n\tconst hasThemeStyles = useSelect(\n\t\t( select ) =>\n\t\t\t!! select( preferencesStore ).get(\n\t\t\t\t'core/edit-widgets',\n\t\t\t\t'themeStyles'\n\t\t\t),\n\t\t[]\n\t);\n\n\tconst styles = useMemo( () => {\n\t\treturn hasThemeStyles ? blockEditorSettings.styles : [];\n\t}, [ blockEditorSettings, hasThemeStyles ] );\n\n\treturn (\n\t\t<div className=\"edit-widgets-block-editor\">\n\t\t\t<Notices />\n\t\t\t<BlockTools>\n\t\t\t\t<KeyboardShortcuts />\n\t\t\t\t<EditorStyles\n\t\t\t\t\tstyles={ styles }\n\t\t\t\t\tscope=\".editor-styles-wrapper\"\n\t\t\t\t/>\n\t\t\t\t<BlockSelectionClearer>\n\t\t\t\t\t<WritingFlow>\n\t\t\t\t\t\t<BlockList className=\"edit-widgets-main-block-list\" />\n\t\t\t\t\t</WritingFlow>\n\t\t\t\t</BlockSelectionClearer>\n\t\t\t</BlockTools>\n\t\t</div>\n\t);\n}\n"],"mappings":";AAAA;AACA;AACA;AACA,SACCA,SAAS,EACTC,UAAU,EACVC,qBAAqB,EACrBC,WAAW,EACXC,sBAAsB,IAAIC,YAAY,QAChC,yBAAyB;AAChC,SAASC,SAAS,QAAQ,iBAAiB;AAC3C,SAASC,OAAO,QAAQ,oBAAoB;AAC5C,SAASC,KAAK,IAAIC,gBAAgB,QAAQ,wBAAwB;;AAElE;AACA;AACA;AACA,OAAOC,OAAO,MAAM,YAAY;AAChC,OAAOC,iBAAiB,MAAM,uBAAuB;AAErD,eAAe,SAASC,6BAA6BA,CAAE;EACtDC;AACD,CAAC,EAAG;EACH,MAAMC,cAAc,GAAGR,SAAS,CAC7BS,MAAM,IACP,CAAC,CAAEA,MAAM,CAAEN,gBAAiB,CAAC,CAACO,GAAG,CAChC,mBAAmB,EACnB,aACD,CAAC,EACF,EACD,CAAC;EAED,MAAMC,MAAM,GAAGV,OAAO,CAAE,MAAM;IAC7B,OAAOO,cAAc,GAAGD,mBAAmB,CAACI,MAAM,GAAG,EAAE;EACxD,CAAC,EAAE,CAAEJ,mBAAmB,EAAEC,cAAc,CAAG,CAAC;EAE5C,OACCI,aAAA;IAAKC,SAAS,EAAC;EAA2B,GACzCD,aAAA,CAACR,OAAO,MAAE,CAAC,EACXQ,aAAA,CAACjB,UAAU,QACViB,aAAA,CAACP,iBAAiB,MAAE,CAAC,EACrBO,aAAA,CAACb,YAAY;IACZY,MAAM,EAAGA,MAAQ;IACjBG,KAAK,EAAC;EAAwB,CAC9B,CAAC,EACFF,aAAA,CAAChB,qBAAqB,QACrBgB,aAAA,CAACf,WAAW,QACXe,aAAA,CAAClB,SAAS;IAACmB,SAAS,EAAC;EAA8B,CAAE,CACzC,CACS,CACZ,CACR,CAAC;AAER"}

package/build-module/components/widget-areas-block-editor-provider/index.js

@@ -9,7 +9,6 @@ import { useEntityBlockEditor, store as coreStore, useResourcePermissions } from
 import { useMemo } from '@wordpress/element';
 import { CopyHandler, privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
-import { ShortcutProvider } from '@wordpress/keyboard-shortcuts';
 import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
@@ -77,7 +76,7 @@ export default function WidgetAreasBlockEditorProvider({
   const [blocks, onInput, onChange] = useEntityBlockEditor(KIND, POST_TYPE, {
     id: buildWidgetAreasPostId()
   });
-  return createElement(ShortcutProvider, null, createElement(KeyboardShortcuts.Register, null), createElement(SlotFillProvider, null, createElement(ExperimentalBlockEditorProvider, {
+  return createElement(SlotFillProvider, null, createElement(KeyboardShortcuts.Register, null), createElement(ExperimentalBlockEditorProvider, {
     value: blocks,
     onInput: onInput,
     onChange: onChange,
@@ -86,6 +85,6 @@ export default function WidgetAreasBlockEditorProvider({
     ...props
   }, createElement(CopyHandler, null, children), createElement(PatternsMenuItems, {
     rootClientId: widgetAreaId
-  }))));
+  })));
 }
 //# sourceMappingURL=index.js.map

package/build-module/components/widget-areas-block-editor-provider/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["SlotFillProvider","uploadMedia","useDispatch","useSelect","useEntityBlockEditor","store","coreStore","useResourcePermissions","useMemo","CopyHandler","privateApis","blockEditorPrivateApis","editPatternsPrivateApis","ShortcutProvider","preferencesStore","KeyboardShortcuts","buildWidgetAreasPostId","KIND","POST_TYPE","useLastSelectedWidgetArea","editWidgetsStore","ALLOW_REUSABLE_BLOCKS","unlock","ExperimentalBlockEditorProvider","PatternsMenuItems","WidgetAreasBlockEditorProvider","blockEditorSettings","children","props","mediaPermissions","reusableBlocks","isFixedToolbarActive","keepCaretInsideBlock","select","widgetAreas","getWidgetAreas","widgets","getWidgets","getEntityRecords","get","setIsInserterOpened","settings","mediaUploadBlockEditor","canCreate","onError","argumentsObject","wpAllowedMimeTypes","allowedMimeTypes","message","__experimentalReusableBlocks","hasFixedToolbar","mediaUpload","templateLock","__experimentalSetIsInserterOpened","widgetAreaId","blocks","onInput","onChange","id","createElement","Register","value","useSubRegistry","rootClientId"],"sources":["@wordpress/edit-widgets/src/components/widget-areas-block-editor-provider/index.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { SlotFillProvider } from '@wordpress/components';\nimport { uploadMedia } from '@wordpress/media-utils';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport {\n\tuseEntityBlockEditor,\n\tstore as coreStore,\n\tuseResourcePermissions,\n} from '@wordpress/core-data';\nimport { useMemo } from '@wordpress/element';\nimport {\n\tCopyHandler,\n\tprivateApis as blockEditorPrivateApis,\n} from '@wordpress/block-editor';\nimport { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';\nimport { ShortcutProvider } from '@wordpress/keyboard-shortcuts';\nimport { store as preferencesStore } from '@wordpress/preferences';\n\n/**\n * Internal dependencies\n */\nimport KeyboardShortcuts from '../keyboard-shortcuts';\nimport { buildWidgetAreasPostId, KIND, POST_TYPE } from '../../store/utils';\nimport useLastSelectedWidgetArea from '../../hooks/use-last-selected-widget-area';\nimport { store as editWidgetsStore } from '../../store';\nimport { ALLOW_REUSABLE_BLOCKS } from '../../constants';\nimport { unlock } from '../../lock-unlock';\n\nconst { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );\nconst { PatternsMenuItems } = unlock( editPatternsPrivateApis );\nexport default function WidgetAreasBlockEditorProvider( {\n\tblockEditorSettings,\n\tchildren,\n\t...props\n} ) {\n\tconst mediaPermissions = useResourcePermissions( 'media' );\n\tconst { reusableBlocks, isFixedToolbarActive, keepCaretInsideBlock } =\n\t\tuseSelect(\n\t\t\t( select ) => ( {\n\t\t\t\twidgetAreas: select( editWidgetsStore ).getWidgetAreas(),\n\t\t\t\twidgets: select( editWidgetsStore ).getWidgets(),\n\t\t\t\treusableBlocks: ALLOW_REUSABLE_BLOCKS\n\t\t\t\t\t? select( coreStore ).getEntityRecords(\n\t\t\t\t\t\t\t'postType',\n\t\t\t\t\t\t\t'wp_block'\n\t\t\t\t\t  )\n\t\t\t\t\t: [],\n\t\t\t\tisFixedToolbarActive: !! select( preferencesStore ).get(\n\t\t\t\t\t'core/edit-widgets',\n\t\t\t\t\t'fixedToolbar'\n\t\t\t\t),\n\t\t\t\tkeepCaretInsideBlock: !! select( preferencesStore ).get(\n\t\t\t\t\t'core/edit-widgets',\n\t\t\t\t\t'keepCaretInsideBlock'\n\t\t\t\t),\n\t\t\t} ),\n\t\t\t[]\n\t\t);\n\tconst { setIsInserterOpened } = useDispatch( editWidgetsStore );\n\n\tconst settings = useMemo( () => {\n\t\tlet mediaUploadBlockEditor;\n\t\tif ( mediaPermissions.canCreate ) {\n\t\t\tmediaUploadBlockEditor = ( { onError, ...argumentsObject } ) => {\n\t\t\t\tuploadMedia( {\n\t\t\t\t\twpAllowedMimeTypes: blockEditorSettings.allowedMimeTypes,\n\t\t\t\t\tonError: ( { message } ) => onError( message ),\n\t\t\t\t\t...argumentsObject,\n\t\t\t\t} );\n\t\t\t};\n\t\t}\n\t\treturn {\n\t\t\t...blockEditorSettings,\n\t\t\t__experimentalReusableBlocks: reusableBlocks,\n\t\t\thasFixedToolbar: isFixedToolbarActive,\n\t\t\tkeepCaretInsideBlock,\n\t\t\tmediaUpload: mediaUploadBlockEditor,\n\t\t\ttemplateLock: 'all',\n\t\t\t__experimentalSetIsInserterOpened: setIsInserterOpened,\n\t\t};\n\t}, [\n\t\tblockEditorSettings,\n\t\tisFixedToolbarActive,\n\t\tkeepCaretInsideBlock,\n\t\tmediaPermissions.canCreate,\n\t\treusableBlocks,\n\t\tsetIsInserterOpened,\n\t] );\n\n\tconst widgetAreaId = useLastSelectedWidgetArea();\n\n\tconst [ blocks, onInput, onChange ] = useEntityBlockEditor(\n\t\tKIND,\n\t\tPOST_TYPE,\n\t\t{ id: buildWidgetAreasPostId() }\n\t);\n\n\treturn (\n\t\t<ShortcutProvider>\n\t\t\t<KeyboardShortcuts.Register />\n\t\t\t<SlotFillProvider>\n\t\t\t\t<ExperimentalBlockEditorProvider\n\t\t\t\t\tvalue={ blocks }\n\t\t\t\t\tonInput={ onInput }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\tsettings={ settings }\n\t\t\t\t\tuseSubRegistry={ false }\n\t\t\t\t\t{ ...props }\n\t\t\t\t>\n\t\t\t\t\t<CopyHandler>{ children }</CopyHandler>\n\t\t\t\t\t<PatternsMenuItems rootClientId={ widgetAreaId } />\n\t\t\t\t</ExperimentalBlockEditorProvider>\n\t\t\t</SlotFillProvider>\n\t\t</ShortcutProvider>\n\t);\n}\n"],"mappings":"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"}
+{"version":3,"names":["SlotFillProvider","uploadMedia","useDispatch","useSelect","useEntityBlockEditor","store","coreStore","useResourcePermissions","useMemo","CopyHandler","privateApis","blockEditorPrivateApis","editPatternsPrivateApis","preferencesStore","KeyboardShortcuts","buildWidgetAreasPostId","KIND","POST_TYPE","useLastSelectedWidgetArea","editWidgetsStore","ALLOW_REUSABLE_BLOCKS","unlock","ExperimentalBlockEditorProvider","PatternsMenuItems","WidgetAreasBlockEditorProvider","blockEditorSettings","children","props","mediaPermissions","reusableBlocks","isFixedToolbarActive","keepCaretInsideBlock","select","widgetAreas","getWidgetAreas","widgets","getWidgets","getEntityRecords","get","setIsInserterOpened","settings","mediaUploadBlockEditor","canCreate","onError","argumentsObject","wpAllowedMimeTypes","allowedMimeTypes","message","__experimentalReusableBlocks","hasFixedToolbar","mediaUpload","templateLock","__experimentalSetIsInserterOpened","widgetAreaId","blocks","onInput","onChange","id","createElement","Register","value","useSubRegistry","rootClientId"],"sources":["@wordpress/edit-widgets/src/components/widget-areas-block-editor-provider/index.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { SlotFillProvider } from '@wordpress/components';\nimport { uploadMedia } from '@wordpress/media-utils';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport {\n\tuseEntityBlockEditor,\n\tstore as coreStore,\n\tuseResourcePermissions,\n} from '@wordpress/core-data';\nimport { useMemo } from '@wordpress/element';\nimport {\n\tCopyHandler,\n\tprivateApis as blockEditorPrivateApis,\n} from '@wordpress/block-editor';\nimport { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';\nimport { store as preferencesStore } from '@wordpress/preferences';\n\n/**\n * Internal dependencies\n */\nimport KeyboardShortcuts from '../keyboard-shortcuts';\nimport { buildWidgetAreasPostId, KIND, POST_TYPE } from '../../store/utils';\nimport useLastSelectedWidgetArea from '../../hooks/use-last-selected-widget-area';\nimport { store as editWidgetsStore } from '../../store';\nimport { ALLOW_REUSABLE_BLOCKS } from '../../constants';\nimport { unlock } from '../../lock-unlock';\n\nconst { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );\nconst { PatternsMenuItems } = unlock( editPatternsPrivateApis );\nexport default function WidgetAreasBlockEditorProvider( {\n\tblockEditorSettings,\n\tchildren,\n\t...props\n} ) {\n\tconst mediaPermissions = useResourcePermissions( 'media' );\n\tconst { reusableBlocks, isFixedToolbarActive, keepCaretInsideBlock } =\n\t\tuseSelect(\n\t\t\t( select ) => ( {\n\t\t\t\twidgetAreas: select( editWidgetsStore ).getWidgetAreas(),\n\t\t\t\twidgets: select( editWidgetsStore ).getWidgets(),\n\t\t\t\treusableBlocks: ALLOW_REUSABLE_BLOCKS\n\t\t\t\t\t? select( coreStore ).getEntityRecords(\n\t\t\t\t\t\t\t'postType',\n\t\t\t\t\t\t\t'wp_block'\n\t\t\t\t\t  )\n\t\t\t\t\t: [],\n\t\t\t\tisFixedToolbarActive: !! select( preferencesStore ).get(\n\t\t\t\t\t'core/edit-widgets',\n\t\t\t\t\t'fixedToolbar'\n\t\t\t\t),\n\t\t\t\tkeepCaretInsideBlock: !! select( preferencesStore ).get(\n\t\t\t\t\t'core/edit-widgets',\n\t\t\t\t\t'keepCaretInsideBlock'\n\t\t\t\t),\n\t\t\t} ),\n\t\t\t[]\n\t\t);\n\tconst { setIsInserterOpened } = useDispatch( editWidgetsStore );\n\n\tconst settings = useMemo( () => {\n\t\tlet mediaUploadBlockEditor;\n\t\tif ( mediaPermissions.canCreate ) {\n\t\t\tmediaUploadBlockEditor = ( { onError, ...argumentsObject } ) => {\n\t\t\t\tuploadMedia( {\n\t\t\t\t\twpAllowedMimeTypes: blockEditorSettings.allowedMimeTypes,\n\t\t\t\t\tonError: ( { message } ) => onError( message ),\n\t\t\t\t\t...argumentsObject,\n\t\t\t\t} );\n\t\t\t};\n\t\t}\n\t\treturn {\n\t\t\t...blockEditorSettings,\n\t\t\t__experimentalReusableBlocks: reusableBlocks,\n\t\t\thasFixedToolbar: isFixedToolbarActive,\n\t\t\tkeepCaretInsideBlock,\n\t\t\tmediaUpload: mediaUploadBlockEditor,\n\t\t\ttemplateLock: 'all',\n\t\t\t__experimentalSetIsInserterOpened: setIsInserterOpened,\n\t\t};\n\t}, [\n\t\tblockEditorSettings,\n\t\tisFixedToolbarActive,\n\t\tkeepCaretInsideBlock,\n\t\tmediaPermissions.canCreate,\n\t\treusableBlocks,\n\t\tsetIsInserterOpened,\n\t] );\n\n\tconst widgetAreaId = useLastSelectedWidgetArea();\n\n\tconst [ blocks, onInput, onChange ] = useEntityBlockEditor(\n\t\tKIND,\n\t\tPOST_TYPE,\n\t\t{ id: buildWidgetAreasPostId() }\n\t);\n\n\treturn (\n\t\t<SlotFillProvider>\n\t\t\t<KeyboardShortcuts.Register />\n\t\t\t<ExperimentalBlockEditorProvider\n\t\t\t\tvalue={ blocks }\n\t\t\t\tonInput={ onInput }\n\t\t\t\tonChange={ onChange }\n\t\t\t\tsettings={ settings }\n\t\t\t\tuseSubRegistry={ false }\n\t\t\t\t{ ...props }\n\t\t\t>\n\t\t\t\t<CopyHandler>{ children }</CopyHandler>\n\t\t\t\t<PatternsMenuItems rootClientId={ widgetAreaId } />\n\t\t\t</ExperimentalBlockEditorProvider>\n\t\t</SlotFillProvider>\n\t);\n}\n"],"mappings":"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"}

package/build-style/style-rtl.css

@@ -475,7 +475,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   display: none;
   margin: 0;
 }
-.interface-pinned-items .components-button:nth-last-child(1), .interface-pinned-items .components-button:nth-last-child(2) {
+.interface-pinned-items .components-button[aria-controls="edit-post:document"], .interface-pinned-items .components-button[aria-controls="edit-post:block"], .interface-pinned-items .components-button[aria-controls="edit-site:template"], .interface-pinned-items .components-button[aria-controls="edit-site:block-inspector"], .interface-pinned-items .components-button[aria-controls="edit-site:global-styles"] {
   display: flex;
 }
 .interface-pinned-items .components-button svg {
@@ -637,7 +637,6 @@ body.is-dragging-components-draggable .wp-block[data-type="core/widget-area"] .c
   align-items: center;
   justify-content: space-between;
   height: 60px;
-  padding: 0 16px;
   overflow: auto;
   background: #fff;
 }
@@ -651,6 +650,7 @@ body.is-dragging-components-draggable .wp-block[data-type="core/widget-area"] .c
   display: flex;
   align-items: center;
   justify-content: center;
+  padding-right: 16px;
 }
 
 .edit-widgets-header__title {
@@ -662,6 +662,7 @@ body.is-dragging-components-draggable .wp-block[data-type="core/widget-area"] .c
 .edit-widgets-header__actions {
   display: flex;
   align-items: center;
+  padding-left: 16px;
   gap: 4px;
 }
 @media (min-width: 600px) {
@@ -989,8 +990,7 @@ body.is-fullscreen-mode .edit-widgets-notices__snackbar {
   flex-grow: 1;
 }
 .edit-widgets-block-editor > div:last-of-type,
-.edit-widgets-block-editor .block-editor-writing-flow,
-.edit-widgets-block-editor .block-editor-writing-flow > div {
+.edit-widgets-block-editor .block-editor-writing-flow {
   display: flex;
   flex-direction: column;
   flex-grow: 1;
@@ -1006,6 +1006,105 @@ body.is-fullscreen-mode .edit-widgets-notices__snackbar {
   padding: 6px;
 }
 
+.edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  /* Set left position when auto-fold is not on the body element. */
+  right: 0;
+}
+@media (min-width: 783px) {
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    right: 160px;
+  }
+}
+
+.auto-fold .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  /* Auto fold is when on smaller breakpoints, nav menu auto collapses. */
+}
+@media (min-width: 783px) {
+  .auto-fold .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    right: 36px;
+  }
+}
+@media (min-width: 961px) {
+  .auto-fold .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    right: 160px;
+  }
+}
+
+/* Sidebar manually collapsed. */
+.folded .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  right: 0;
+}
+@media (min-width: 783px) {
+  .folded .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    right: 36px;
+  }
+}
+
+body.is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  right: 0 !important;
+}
+
+.edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  position: sticky;
+  top: 0;
+  z-index: 31;
+  display: block;
+  width: 100%;
+}
+@media (min-width: 782px) {
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-right: 180px;
+    position: fixed;
+    top: 32px;
+    min-height: initial;
+    border-bottom: none;
+    display: flex;
+    height: 60px;
+    align-items: center;
+    width: calc(100% - 180px);
+  }
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed.is-collapsed {
+    width: initial;
+  }
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed:empty {
+    width: initial;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-right: 240px;
+    top: 0;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed.is-collapsed {
+    width: initial;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed:empty {
+    width: initial;
+  }
+  .show-icon-labels .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-right: 80px;
+    width: calc(100% + 40px - 180px);
+  }
+  .is-fullscreen-mode .show-icon-labels .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-right: 144px;
+  }
+  .blocks-widgets-container .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-right: 153.6px;
+  }
+  .blocks-widgets-container .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed.is-collapsed {
+    margin-right: 268.8px;
+  }
+}
+@media (min-width: 960px) {
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    width: auto;
+  }
+  .show-icon-labels .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    width: auto;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    width: calc(100% - 280px - 256px);
+  }
+}
+
 .edit-widgets-editor__list-view-panel {
   height: 100%;
   display: flex;

package/build-style/style.css

@@ -475,7 +475,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   display: none;
   margin: 0;
 }
-.interface-pinned-items .components-button:nth-last-child(1), .interface-pinned-items .components-button:nth-last-child(2) {
+.interface-pinned-items .components-button[aria-controls="edit-post:document"], .interface-pinned-items .components-button[aria-controls="edit-post:block"], .interface-pinned-items .components-button[aria-controls="edit-site:template"], .interface-pinned-items .components-button[aria-controls="edit-site:block-inspector"], .interface-pinned-items .components-button[aria-controls="edit-site:global-styles"] {
   display: flex;
 }
 .interface-pinned-items .components-button svg {
@@ -637,7 +637,6 @@ body.is-dragging-components-draggable .wp-block[data-type="core/widget-area"] .c
   align-items: center;
   justify-content: space-between;
   height: 60px;
-  padding: 0 16px;
   overflow: auto;
   background: #fff;
 }
@@ -651,6 +650,7 @@ body.is-dragging-components-draggable .wp-block[data-type="core/widget-area"] .c
   display: flex;
   align-items: center;
   justify-content: center;
+  padding-left: 16px;
 }
 
 .edit-widgets-header__title {
@@ -662,6 +662,7 @@ body.is-dragging-components-draggable .wp-block[data-type="core/widget-area"] .c
 .edit-widgets-header__actions {
   display: flex;
   align-items: center;
+  padding-right: 16px;
   gap: 4px;
 }
 @media (min-width: 600px) {
@@ -989,8 +990,7 @@ body.is-fullscreen-mode .edit-widgets-notices__snackbar {
   flex-grow: 1;
 }
 .edit-widgets-block-editor > div:last-of-type,
-.edit-widgets-block-editor .block-editor-writing-flow,
-.edit-widgets-block-editor .block-editor-writing-flow > div {
+.edit-widgets-block-editor .block-editor-writing-flow {
   display: flex;
   flex-direction: column;
   flex-grow: 1;
@@ -1006,6 +1006,105 @@ body.is-fullscreen-mode .edit-widgets-notices__snackbar {
   padding: 6px;
 }
 
+.edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  /* Set left position when auto-fold is not on the body element. */
+  left: 0;
+}
+@media (min-width: 783px) {
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    left: 160px;
+  }
+}
+
+.auto-fold .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  /* Auto fold is when on smaller breakpoints, nav menu auto collapses. */
+}
+@media (min-width: 783px) {
+  .auto-fold .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    left: 36px;
+  }
+}
+@media (min-width: 961px) {
+  .auto-fold .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    left: 160px;
+  }
+}
+
+/* Sidebar manually collapsed. */
+.folded .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  left: 0;
+}
+@media (min-width: 783px) {
+  .folded .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    left: 36px;
+  }
+}
+
+body.is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  left: 0 !important;
+}
+
+.edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+  position: sticky;
+  top: 0;
+  z-index: 31;
+  display: block;
+  width: 100%;
+}
+@media (min-width: 782px) {
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-left: 180px;
+    position: fixed;
+    top: 32px;
+    min-height: initial;
+    border-bottom: none;
+    display: flex;
+    height: 60px;
+    align-items: center;
+    width: calc(100% - 180px);
+  }
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed.is-collapsed {
+    width: initial;
+  }
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed:empty {
+    width: initial;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-left: 240px;
+    top: 0;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed.is-collapsed {
+    width: initial;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed:empty {
+    width: initial;
+  }
+  .show-icon-labels .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-left: 80px;
+    width: calc(100% + 40px - 180px);
+  }
+  .is-fullscreen-mode .show-icon-labels .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-left: 144px;
+  }
+  .blocks-widgets-container .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    margin-left: 153.6px;
+  }
+  .blocks-widgets-container .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed.is-collapsed {
+    margin-left: 268.8px;
+  }
+}
+@media (min-width: 960px) {
+  .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    width: auto;
+  }
+  .show-icon-labels .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    width: auto;
+  }
+  .is-fullscreen-mode .edit-widgets-block-editor .block-editor-block-contextual-toolbar.is-fixed {
+    width: calc(100% - 280px - 256px);
+  }
+}
+
 .edit-widgets-editor__list-view-panel {
   height: 100%;
   display: flex;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.18.1-next.5a1d1283.0",
+	"version": "5.19.1",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,32 +27,32 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "^6.38.1-next.5a1d1283.0",
-		"@wordpress/block-editor": "^12.9.1-next.5a1d1283.0",
-		"@wordpress/block-library": "^8.18.1-next.5a1d1283.0",
-		"@wordpress/blocks": "^12.18.1-next.5a1d1283.0",
-		"@wordpress/components": "^26.0.1-next.5a1d1283.0",
-		"@wordpress/compose": "^6.18.1-next.5a1d1283.0",
-		"@wordpress/core-data": "^6.18.1-next.5a1d1283.0",
-		"@wordpress/data": "^9.11.1-next.5a1d1283.0",
-		"@wordpress/deprecated": "^3.41.1-next.5a1d1283.0",
-		"@wordpress/dom": "^3.41.1-next.5a1d1283.0",
-		"@wordpress/element": "^5.18.1-next.5a1d1283.0",
-		"@wordpress/hooks": "^3.41.1-next.5a1d1283.0",
-		"@wordpress/i18n": "^4.41.1-next.5a1d1283.0",
-		"@wordpress/icons": "^9.32.1-next.5a1d1283.0",
-		"@wordpress/interface": "^5.18.1-next.5a1d1283.0",
-		"@wordpress/keyboard-shortcuts": "^4.18.1-next.5a1d1283.0",
-		"@wordpress/keycodes": "^3.41.1-next.5a1d1283.0",
-		"@wordpress/media-utils": "^4.32.1-next.5a1d1283.0",
-		"@wordpress/notices": "^4.9.1-next.5a1d1283.0",
-		"@wordpress/patterns": "^1.2.1-next.5a1d1283.0",
-		"@wordpress/plugins": "^6.9.1-next.5a1d1283.0",
-		"@wordpress/preferences": "^3.18.1-next.5a1d1283.0",
-		"@wordpress/private-apis": "^0.23.1-next.5a1d1283.0",
-		"@wordpress/reusable-blocks": "^4.18.1-next.5a1d1283.0",
-		"@wordpress/url": "^3.42.1-next.5a1d1283.0",
-		"@wordpress/widgets": "^3.18.1-next.5a1d1283.0",
+		"@wordpress/api-fetch": "^6.39.1",
+		"@wordpress/block-editor": "^12.10.1",
+		"@wordpress/block-library": "^8.19.1",
+		"@wordpress/blocks": "^12.19.1",
+		"@wordpress/components": "^25.8.1",
+		"@wordpress/compose": "^6.19.1",
+		"@wordpress/core-data": "^6.19.1",
+		"@wordpress/data": "^9.12.1",
+		"@wordpress/deprecated": "^3.42.1",
+		"@wordpress/dom": "^3.42.1",
+		"@wordpress/element": "^5.19.1",
+		"@wordpress/hooks": "^3.42.1",
+		"@wordpress/i18n": "^4.42.1",
+		"@wordpress/icons": "^9.33.1",
+		"@wordpress/interface": "^5.19.1",
+		"@wordpress/keyboard-shortcuts": "^4.19.1",
+		"@wordpress/keycodes": "^3.42.1",
+		"@wordpress/media-utils": "^4.33.1",
+		"@wordpress/notices": "^4.10.1",
+		"@wordpress/patterns": "^1.3.1",
+		"@wordpress/plugins": "^6.10.1",
+		"@wordpress/preferences": "^3.19.1",
+		"@wordpress/private-apis": "^0.24.1",
+		"@wordpress/reusable-blocks": "^4.19.1",
+		"@wordpress/url": "^3.43.1",
+		"@wordpress/widgets": "^3.19.1",
 		"classnames": "^2.3.1"
 	},
 	"peerDependencies": {
@@ -62,5 +62,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fa0b66987dab5a15f38663e06036d09bccffaa4b"
+	"gitHead": "4987d16acb5c41b62704dc4f88225acb97ddd698"
 }

package/src/components/header/index.js

@@ -27,7 +27,7 @@ import { unlock } from '../../lock-unlock';
 
 const { useShouldContextualToolbarShow } = unlock( blockEditorPrivateApis );
 
-function Header() {
+function Header( { setListViewToggleElement } ) {
 	const isMediumViewport = useViewportMatch( 'medium' );
 	const inserterButton = useRef();
 	const widgetAreaClientId = useLastSelectedWidgetArea();
@@ -140,6 +140,7 @@ function Header() {
 									/* translators: button label text should, if possible, be under 16 characters. */
 									label={ __( 'List View' ) }
 									onClick={ toggleListView }
+									ref={ setListViewToggleElement }
 								/>
 							</>
 						) }

package/src/components/header/style.scss

@@ -3,7 +3,6 @@
 	align-items: center;
 	justify-content: space-between;
 	height: $header-height;
-	padding: 0 $grid-unit-20;
 	overflow: auto;
 	background: #fff;
 
@@ -16,6 +15,7 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	padding-left: $grid-unit-20;
 }
 
 .edit-widgets-header__title {
@@ -27,7 +27,7 @@
 .edit-widgets-header__actions {
 	display: flex;
 	align-items: center;
-
+	padding-right: $grid-unit-20;
 	gap: $grid-unit-05;
 
 	@include break-small() {

package/src/components/layout/interface.js

@@ -3,7 +3,7 @@
  */
 import { useViewportMatch } from '@wordpress/compose';
 import { BlockBreadcrumb } from '@wordpress/block-editor';
-import { useEffect } from '@wordpress/element';
+import { useEffect, useState } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import {
 	InterfaceSkeleton,
@@ -68,6 +68,9 @@ function Interface( { blockEditorSettings } ) {
 		[]
 	);
 
+	const [ listViewToggleElement, setListViewToggleElement ] =
+		useState( null );
+
 	// Inserter and Sidebars are mutually exclusive
 	useEffect( () => {
 		if ( hasSidebarEnabled && ! isHugeViewport ) {
@@ -94,8 +97,16 @@ function Interface( { blockEditorSettings } ) {
 				...interfaceLabels,
 				secondarySidebar: secondarySidebarLabel,
 			} }
-			header={ <Header /> }
-			secondarySidebar={ hasSecondarySidebar && <SecondarySidebar /> }
+			header={
+				<Header setListViewToggleElement={ setListViewToggleElement } />
+			}
+			secondarySidebar={
+				hasSecondarySidebar && (
+					<SecondarySidebar
+						listViewToggleElement={ listViewToggleElement }
+					/>
+				)
+			}
 			sidebar={
 				hasSidebarEnabled && (
 					<ComplementaryArea.Slot scope="core/edit-widgets" />