@wordpress/edit-site 5.11.0 → 5.12.1

package/build/components/sidebar-navigation-screen-navigation-menus/index.js

@@ -10,8 +10,6 @@ exports.default = SidebarNavigationScreenNavigationMenus;
 
 var _element = require("@wordpress/element");
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _i18n = require("@wordpress/i18n");
 
 var _coreData = require("@wordpress/core-data");
@@ -30,6 +28,10 @@ var _constants = require("./constants");
 
 var _link = require("../routes/link");
 
+var _singleNavigationMenu = _interopRequireDefault(require("../sidebar-navigation-screen-navigation-menu/single-navigation-menu"));
+
+var _useNavigationMenuHandlers = _interopRequireDefault(require("../sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers"));
+
 /**
  * WordPress dependencies
  */
@@ -37,12 +39,33 @@ var _link = require("../routes/link");
 /**
  * Internal dependencies
  */
+// Copied from packages/block-library/src/navigation/edit/navigation-menu-selector.js.
+function buildMenuLabel(title, id, status) {
+  if (!title?.rendered) {
+    /* translators: %s is the index of the menu in the list of menus. */
+    return (0, _i18n.sprintf)((0, _i18n.__)('(no title %s)'), id);
+  }
+
+  if (status === 'publish') {
+    return (0, _htmlEntities.decodeEntities)(title?.rendered);
+  }
+
+  return (0, _i18n.sprintf)( // translators: %1s: title of the menu; %2s: status of the menu (draft, pending, etc.).
+  (0, _i18n.__)('%1$s (%2$s)'), (0, _htmlEntities.decodeEntities)(title?.rendered), status);
+}
+
 function SidebarNavigationScreenNavigationMenus() {
   const {
     records: navigationMenus,
     isResolving: isLoading
   } = (0, _coreData.useEntityRecords)('postType', `wp_navigation`, _constants.PRELOADED_NAVIGATION_MENUS_QUERY);
-  const hasNavigationMenus = !!(navigationMenus !== null && navigationMenus !== void 0 && navigationMenus.length);
+  const firstNavigationMenu = navigationMenus?.[0];
+  const {
+    handleSave,
+    handleDelete,
+    handleDuplicate
+  } = (0, _useNavigationMenuHandlers.default)();
+  const hasNavigationMenus = !!navigationMenus?.length;
 
   if (isLoading) {
     return (0, _element.createElement)(SidebarNavigationScreenWrapper, null, (0, _element.createElement)(_components.Spinner, {
@@ -54,27 +77,36 @@ function SidebarNavigationScreenNavigationMenus() {
     return (0, _element.createElement)(SidebarNavigationScreenWrapper, {
       description: (0, _i18n.__)('No Navigation Menus found.')
     });
-  }
+  } // if single menu then render it
 
-  return (0, _element.createElement)(SidebarNavigationScreenWrapper, null, (0, _element.createElement)(_components.__experimentalItemGroup, null, navigationMenus === null || navigationMenus === void 0 ? void 0 : navigationMenus.map(navMenu => {
-    var _navMenu$title;
 
-    return (0, _element.createElement)(NavMenuItem, {
-      postId: navMenu.id,
-      key: navMenu.id,
-      withChevron: true,
-      icon: _icons.navigation
-    }, (0, _htmlEntities.decodeEntities)(((_navMenu$title = navMenu.title) === null || _navMenu$title === void 0 ? void 0 : _navMenu$title.rendered) || navMenu.slug));
-  })));
-}
+  if (navigationMenus?.length === 1) {
+    return (0, _element.createElement)(_singleNavigationMenu.default, {
+      navigationMenu: firstNavigationMenu,
+      handleDelete: () => handleDelete(firstNavigationMenu),
+      handleDuplicate: () => handleDuplicate(firstNavigationMenu),
+      handleSave: () => handleSave(firstNavigationMenu)
+    });
+  }
 
-function SidebarNavigationScreenWrapper(_ref) {
-  let {
-    children,
-    actions,
+  return (0, _element.createElement)(SidebarNavigationScreenWrapper, null, (0, _element.createElement)(_components.__experimentalItemGroup, null, navigationMenus?.map(({
+    id,
     title,
-    description
-  } = _ref;
+    status
+  }, index) => (0, _element.createElement)(NavMenuItem, {
+    postId: id,
+    key: id,
+    withChevron: true,
+    icon: _icons.navigation
+  }, buildMenuLabel(title, index + 1, status)))));
+}
+
+function SidebarNavigationScreenWrapper({
+  children,
+  actions,
+  title,
+  description
+}) {
   return (0, _element.createElement)(_sidebarNavigationScreen.default, {
     title: title || (0, _i18n.__)('Navigation'),
     actions: actions,
@@ -83,15 +115,16 @@ function SidebarNavigationScreenWrapper(_ref) {
   });
 }
 
-const NavMenuItem = _ref2 => {
-  let {
-    postId,
-    ...props
-  } = _ref2;
+const NavMenuItem = ({
+  postId,
+  ...props
+}) => {
   const linkInfo = (0, _link.useLink)({
     postId,
     postType: 'wp_navigation'
   });
-  return (0, _element.createElement)(_sidebarNavigationItem.default, (0, _extends2.default)({}, linkInfo, props));
+  return (0, _element.createElement)(_sidebarNavigationItem.default, { ...linkInfo,
+    ...props
+  });
 };
 //# sourceMappingURL=index.js.map

package/build/components/sidebar-navigation-screen-navigation-menus/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js"],"names":["SidebarNavigationScreenNavigationMenus","records","navigationMenus","isResolving","isLoading","PRELOADED_NAVIGATION_MENUS_QUERY","hasNavigationMenus","length","map","navMenu","id","navigation","title","rendered","slug","SidebarNavigationScreenWrapper","children","actions","description","NavMenuItem","postId","props","linkInfo","postType"],"mappings":";;;;;;;;;;;;;;AAGA;;AACA;;AAEA;;AACA;;AAIA;;AAKA;;AACA;;AACA;;AACA;;AAnBA;AACA;AACA;;AAWA;AACA;AACA;AAMe,SAASA,sCAAT,GAAkD;AAChE,QAAM;AAAEC,IAAAA,OAAO,EAAEC,eAAX;AAA4BC,IAAAA,WAAW,EAAEC;AAAzC,MACL,gCACC,UADD,EAEE,eAFF,EAGCC,2CAHD,CADD;AAOA,QAAMC,kBAAkB,GAAG,CAAC,EAAEJ,eAAF,aAAEA,eAAF,eAAEA,eAAe,CAAEK,MAAnB,CAA5B;;AAEA,MAAKH,SAAL,EAAiB;AAChB,WACC,4BAAC,8BAAD,QACC,4BAAC,mBAAD;AAAS,MAAA,SAAS,EAAC;AAAnB,MADD,CADD;AAKA;;AAED,MAAK,CAAEA,SAAF,IAAe,CAAEE,kBAAtB,EAA2C;AAC1C,WACC,4BAAC,8BAAD;AACC,MAAA,WAAW,EAAG,cAAI,4BAAJ;AADf,MADD;AAKA;;AAED,SACC,4BAAC,8BAAD,QACC,4BAAC,mCAAD,QACGJ,eADH,aACGA,eADH,uBACGA,eAAe,CAAEM,GAAjB,CAAwBC,OAAF;AAAA;;AAAA,WACvB,4BAAC,WAAD;AACC,MAAA,MAAM,EAAGA,OAAO,CAACC,EADlB;AAEC,MAAA,GAAG,EAAGD,OAAO,CAACC,EAFf;AAGC,MAAA,WAAW,MAHZ;AAIC,MAAA,IAAI,EAAGC;AAJR,OAMG,kCACD,mBAAAF,OAAO,CAACG,KAAR,kEAAeC,QAAf,KAA2BJ,OAAO,CAACK,IADlC,CANH,CADuB;AAAA,GAAtB,CADH,CADD,CADD;AAkBA;;AAEM,SAASC,8BAAT,OAKH;AAAA,MAL4C;AAC/CC,IAAAA,QAD+C;AAE/CC,IAAAA,OAF+C;AAG/CL,IAAAA,KAH+C;AAI/CM,IAAAA;AAJ+C,GAK5C;AACH,SACC,4BAAC,gCAAD;AACC,IAAA,KAAK,EAAGN,KAAK,IAAI,cAAI,YAAJ,CADlB;AAEC,IAAA,OAAO,EAAGK,OAFX;AAGC,IAAA,WAAW,EAAGC,WAAW,IAAI,cAAI,+BAAJ,CAH9B;AAIC,IAAA,OAAO,EAAGF;AAJX,IADD;AAQA;;AAED,MAAMG,WAAW,GAAG,SAA4B;AAAA,MAA1B;AAAEC,IAAAA,MAAF;AAAU,OAAGC;AAAb,GAA0B;AAC/C,QAAMC,QAAQ,GAAG,mBAAS;AACzBF,IAAAA,MADyB;AAEzBG,IAAAA,QAAQ,EAAE;AAFe,GAAT,CAAjB;AAIA,SAAO,4BAAC,8BAAD,6BAA4BD,QAA5B,EAA4CD,KAA5C,EAAP;AACA,CAND","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { useEntityRecords } from '@wordpress/core-data';\n\nimport { decodeEntities } from '@wordpress/html-entities';\nimport {\n\t__experimentalItemGroup as ItemGroup,\n\tSpinner,\n} from '@wordpress/components';\nimport { navigation } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\nimport { PRELOADED_NAVIGATION_MENUS_QUERY } from './constants';\nimport { useLink } from '../routes/link';\n\nexport default function SidebarNavigationScreenNavigationMenus() {\n\tconst { records: navigationMenus, isResolving: isLoading } =\n\t\tuseEntityRecords(\n\t\t\t'postType',\n\t\t\t`wp_navigation`,\n\t\t\tPRELOADED_NAVIGATION_MENUS_QUERY\n\t\t);\n\n\tconst hasNavigationMenus = !! navigationMenus?.length;\n\n\tif ( isLoading ) {\n\t\treturn (\n\t\t\t<SidebarNavigationScreenWrapper>\n\t\t\t\t<Spinner className=\"edit-site-sidebar-navigation-screen-navigation-menus__loading\" />\n\t\t\t</SidebarNavigationScreenWrapper>\n\t\t);\n\t}\n\n\tif ( ! isLoading && ! hasNavigationMenus ) {\n\t\treturn (\n\t\t\t<SidebarNavigationScreenWrapper\n\t\t\t\tdescription={ __( 'No Navigation Menus found.' ) }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn (\n\t\t<SidebarNavigationScreenWrapper>\n\t\t\t<ItemGroup>\n\t\t\t\t{ navigationMenus?.map( ( navMenu ) => (\n\t\t\t\t\t<NavMenuItem\n\t\t\t\t\t\tpostId={ navMenu.id }\n\t\t\t\t\t\tkey={ navMenu.id }\n\t\t\t\t\t\twithChevron\n\t\t\t\t\t\ticon={ navigation }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ decodeEntities(\n\t\t\t\t\t\t\tnavMenu.title?.rendered || navMenu.slug\n\t\t\t\t\t\t) }\n\t\t\t\t\t</NavMenuItem>\n\t\t\t\t) ) }\n\t\t\t</ItemGroup>\n\t\t</SidebarNavigationScreenWrapper>\n\t);\n}\n\nexport function SidebarNavigationScreenWrapper( {\n\tchildren,\n\tactions,\n\ttitle,\n\tdescription,\n} ) {\n\treturn (\n\t\t<SidebarNavigationScreen\n\t\t\ttitle={ title || __( 'Navigation' ) }\n\t\t\tactions={ actions }\n\t\t\tdescription={ description || __( 'Manage your Navigation menus.' ) }\n\t\t\tcontent={ children }\n\t\t/>\n\t);\n}\n\nconst NavMenuItem = ( { postId, ...props } ) => {\n\tconst linkInfo = useLink( {\n\t\tpostId,\n\t\tpostType: 'wp_navigation',\n\t} );\n\treturn <SidebarNavigationItem { ...linkInfo } { ...props } />;\n};\n"]}
+{"version":3,"sources":["@wordpress/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js"],"names":["buildMenuLabel","title","id","status","rendered","SidebarNavigationScreenNavigationMenus","records","navigationMenus","isResolving","isLoading","PRELOADED_NAVIGATION_MENUS_QUERY","firstNavigationMenu","handleSave","handleDelete","handleDuplicate","hasNavigationMenus","length","map","index","navigation","SidebarNavigationScreenWrapper","children","actions","description","NavMenuItem","postId","props","linkInfo","postType"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, sprintf } from '@wordpress/i18n';\nimport { useEntityRecords } from '@wordpress/core-data';\n\nimport { decodeEntities } from '@wordpress/html-entities';\nimport {\n\t__experimentalItemGroup as ItemGroup,\n\tSpinner,\n} from '@wordpress/components';\nimport { navigation } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\nimport { PRELOADED_NAVIGATION_MENUS_QUERY } from './constants';\nimport { useLink } from '../routes/link';\nimport SingleNavigationMenu from '../sidebar-navigation-screen-navigation-menu/single-navigation-menu';\nimport useNavigationMenuHandlers from '../sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers';\n\n// Copied from packages/block-library/src/navigation/edit/navigation-menu-selector.js.\nfunction buildMenuLabel( title, id, status ) {\n\tif ( ! title?.rendered ) {\n\t\t/* translators: %s is the index of the menu in the list of menus. */\n\t\treturn sprintf( __( '(no title %s)' ), id );\n\t}\n\n\tif ( status === 'publish' ) {\n\t\treturn decodeEntities( title?.rendered );\n\t}\n\n\treturn sprintf(\n\t\t// translators: %1s: title of the menu; %2s: status of the menu (draft, pending, etc.).\n\t\t__( '%1$s (%2$s)' ),\n\t\tdecodeEntities( title?.rendered ),\n\t\tstatus\n\t);\n}\n\nexport default function SidebarNavigationScreenNavigationMenus() {\n\tconst { records: navigationMenus, isResolving: isLoading } =\n\t\tuseEntityRecords(\n\t\t\t'postType',\n\t\t\t`wp_navigation`,\n\t\t\tPRELOADED_NAVIGATION_MENUS_QUERY\n\t\t);\n\n\tconst firstNavigationMenu = navigationMenus?.[ 0 ];\n\n\tconst { handleSave, handleDelete, handleDuplicate } =\n\t\tuseNavigationMenuHandlers();\n\n\tconst hasNavigationMenus = !! navigationMenus?.length;\n\n\tif ( isLoading ) {\n\t\treturn (\n\t\t\t<SidebarNavigationScreenWrapper>\n\t\t\t\t<Spinner className=\"edit-site-sidebar-navigation-screen-navigation-menus__loading\" />\n\t\t\t</SidebarNavigationScreenWrapper>\n\t\t);\n\t}\n\n\tif ( ! isLoading && ! hasNavigationMenus ) {\n\t\treturn (\n\t\t\t<SidebarNavigationScreenWrapper\n\t\t\t\tdescription={ __( 'No Navigation Menus found.' ) }\n\t\t\t/>\n\t\t);\n\t}\n\n\t// if single menu then render it\n\tif ( navigationMenus?.length === 1 ) {\n\t\treturn (\n\t\t\t<SingleNavigationMenu\n\t\t\t\tnavigationMenu={ firstNavigationMenu }\n\t\t\t\thandleDelete={ () => handleDelete( firstNavigationMenu ) }\n\t\t\t\thandleDuplicate={ () => handleDuplicate( firstNavigationMenu ) }\n\t\t\t\thandleSave={ () => handleSave( firstNavigationMenu ) }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn (\n\t\t<SidebarNavigationScreenWrapper>\n\t\t\t<ItemGroup>\n\t\t\t\t{ navigationMenus?.map( ( { id, title, status }, index ) => (\n\t\t\t\t\t<NavMenuItem\n\t\t\t\t\t\tpostId={ id }\n\t\t\t\t\t\tkey={ id }\n\t\t\t\t\t\twithChevron\n\t\t\t\t\t\ticon={ navigation }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ buildMenuLabel( title, index + 1, status ) }\n\t\t\t\t\t</NavMenuItem>\n\t\t\t\t) ) }\n\t\t\t</ItemGroup>\n\t\t</SidebarNavigationScreenWrapper>\n\t);\n}\n\nexport function SidebarNavigationScreenWrapper( {\n\tchildren,\n\tactions,\n\ttitle,\n\tdescription,\n} ) {\n\treturn (\n\t\t<SidebarNavigationScreen\n\t\t\ttitle={ title || __( 'Navigation' ) }\n\t\t\tactions={ actions }\n\t\t\tdescription={ description || __( 'Manage your Navigation menus.' ) }\n\t\t\tcontent={ children }\n\t\t/>\n\t);\n}\n\nconst NavMenuItem = ( { postId, ...props } ) => {\n\tconst linkInfo = useLink( {\n\t\tpostId,\n\t\tpostType: 'wp_navigation',\n\t} );\n\treturn <SidebarNavigationItem { ...linkInfo } { ...props } />;\n};\n"]}

package/build/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,8 +7,6 @@ exports.default = LeafMoreMenu;
 
 var _element = require("@wordpress/element");
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _icons = require("@wordpress/icons");
 
 var _components = require("@wordpress/components");
@@ -21,16 +17,29 @@ var _i18n = require("@wordpress/i18n");
 
 var _blockEditor = require("@wordpress/block-editor");
 
+var _router = require("@wordpress/router");
+
+var _isPreviewingTheme = require("../../utils/is-previewing-theme");
+
+var _lockUnlock = require("../../lock-unlock");
+
 /**
  * WordPress dependencies
  */
 const POPOVER_PROPS = {
   className: 'block-editor-block-settings-menu__popover',
-  position: 'bottom right',
-  variant: 'toolbar'
+  placement: 'bottom-start'
 };
+/**
+ * Internal dependencies
+ */
+
+const {
+  useHistory
+} = (0, _lockUnlock.unlock)(_router.privateApis);
 
 function LeafMoreMenu(props) {
+  const history = useHistory();
   const {
     block
   } = props;
@@ -48,40 +57,75 @@ function LeafMoreMenu(props) {
     clientId,
     maximumLength: 25
   }));
+  const goToLabel = (0, _i18n.sprintf)(
+  /* translators: %s: block name */
+  (0, _i18n.__)('Go to %s'), (0, _blockEditor.BlockTitle)({
+    clientId,
+    maximumLength: 25
+  }));
   const rootClientId = (0, _data.useSelect)(select => {
     const {
       getBlockRootClientId
     } = select(_blockEditor.store);
     return getBlockRootClientId(clientId);
   }, [clientId]);
-  return (0, _element.createElement)(_components.DropdownMenu, (0, _extends2.default)({
+  const onGoToPage = (0, _element.useCallback)(selectedBlock => {
+    const {
+      attributes,
+      name
+    } = selectedBlock;
+
+    if (attributes.kind === 'post-type' && attributes.id && attributes.type && history) {
+      history.push({
+        postType: attributes.type,
+        postId: attributes.id,
+        ...((0, _isPreviewingTheme.isPreviewingTheme)() && {
+          wp_theme_preview: (0, _isPreviewingTheme.currentlyPreviewingTheme)()
+        })
+      });
+    }
+
+    if (name === 'core/page-list-item' && attributes.id && history) {
+      history.push({
+        postType: 'page',
+        postId: attributes.id,
+        ...((0, _isPreviewingTheme.isPreviewingTheme)() && {
+          wp_theme_preview: (0, _isPreviewingTheme.currentlyPreviewingTheme)()
+        })
+      });
+    }
+  }, [history]);
+  return (0, _element.createElement)(_components.DropdownMenu, {
     icon: _icons.moreVertical,
     label: (0, _i18n.__)('Options'),
     className: "block-editor-block-settings-menu",
     popoverProps: POPOVER_PROPS,
-    noIcons: true
-  }, props), _ref => {
-    let {
-      onClose
-    } = _ref;
-    return (0, _element.createElement)(_element.Fragment, null, (0, _element.createElement)(_components.MenuGroup, null, (0, _element.createElement)(_components.MenuItem, {
-      icon: _icons.chevronUp,
-      onClick: () => {
-        moveBlocksUp([clientId], rootClientId);
-        onClose();
-      }
-    }, (0, _i18n.__)('Move up')), (0, _element.createElement)(_components.MenuItem, {
-      icon: _icons.chevronDown,
-      onClick: () => {
-        moveBlocksDown([clientId], rootClientId);
-        onClose();
-      }
-    }, (0, _i18n.__)('Move down'))), (0, _element.createElement)(_components.MenuGroup, null, (0, _element.createElement)(_components.MenuItem, {
-      onClick: () => {
-        removeBlocks([clientId], false);
-        onClose();
-      }
-    }, removeLabel)));
-  });
+    noIcons: true,
+    ...props
+  }, ({
+    onClose
+  }) => (0, _element.createElement)(_element.Fragment, null, (0, _element.createElement)(_components.MenuGroup, null, (0, _element.createElement)(_components.MenuItem, {
+    icon: _icons.chevronUp,
+    onClick: () => {
+      moveBlocksUp([clientId], rootClientId);
+      onClose();
+    }
+  }, (0, _i18n.__)('Move up')), (0, _element.createElement)(_components.MenuItem, {
+    icon: _icons.chevronDown,
+    onClick: () => {
+      moveBlocksDown([clientId], rootClientId);
+      onClose();
+    }
+  }, (0, _i18n.__)('Move down')), block.attributes?.id && (0, _element.createElement)(_components.MenuItem, {
+    onClick: () => {
+      onGoToPage(block);
+      onClose();
+    }
+  }, goToLabel)), (0, _element.createElement)(_components.MenuGroup, null, (0, _element.createElement)(_components.MenuItem, {
+    onClick: () => {
+      removeBlocks([clientId], false);
+      onClose();
+    }
+  }, removeLabel))));
 }
 //# sourceMappingURL=leaf-more-menu.js.map

package/build/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/edit-site/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js"],"names":["POPOVER_PROPS","className","position","variant","LeafMoreMenu","props","block","clientId","moveBlocksDown","moveBlocksUp","removeBlocks","blockEditorStore","removeLabel","maximumLength","rootClientId","select","getBlockRootClientId","moreVertical","onClose","chevronUp","chevronDown"],"mappings":";;;;;;;;;;;;;AAIA;;AACA;;AACA;;AACA;;AACA;;AARA;AACA;AACA;AAQA,MAAMA,aAAa,GAAG;AACrBC,EAAAA,SAAS,EAAE,2CADU;AAErBC,EAAAA,QAAQ,EAAE,cAFW;AAGrBC,EAAAA,OAAO,EAAE;AAHY,CAAtB;;AAMe,SAASC,YAAT,CAAuBC,KAAvB,EAA+B;AAC7C,QAAM;AAAEC,IAAAA;AAAF,MAAYD,KAAlB;AACA,QAAM;AAAEE,IAAAA;AAAF,MAAeD,KAArB;AACA,QAAM;AAAEE,IAAAA,cAAF;AAAkBC,IAAAA,YAAlB;AAAgCC,IAAAA;AAAhC,MACL,uBAAaC,kBAAb,CADD;AAGA,QAAMC,WAAW,GAAG;AACnB;AACA,gBAAI,WAAJ,CAFmB,EAGnB,6BAAY;AAAEL,IAAAA,QAAF;AAAYM,IAAAA,aAAa,EAAE;AAA3B,GAAZ,CAHmB,CAApB;AAMA,QAAMC,YAAY,GAAG,qBAClBC,MAAF,IAAc;AACb,UAAM;AAAEC,MAAAA;AAAF,QAA2BD,MAAM,CAAEJ,kBAAF,CAAvC;AAEA,WAAOK,oBAAoB,CAAET,QAAF,CAA3B;AACA,GALmB,EAMpB,CAAEA,QAAF,CANoB,CAArB;AASA,SACC,4BAAC,wBAAD;AACC,IAAA,IAAI,EAAGU,mBADR;AAEC,IAAA,KAAK,EAAG,cAAI,SAAJ,CAFT;AAGC,IAAA,SAAS,EAAC,kCAHX;AAIC,IAAA,YAAY,EAAGjB,aAJhB;AAKC,IAAA,OAAO;AALR,KAMMK,KANN,GAQG;AAAA,QAAE;AAAEa,MAAAA;AAAF,KAAF;AAAA,WACD,qDACC,4BAAC,qBAAD,QACC,4BAAC,oBAAD;AACC,MAAA,IAAI,EAAGC,gBADR;AAEC,MAAA,OAAO,EAAG,MAAM;AACfV,QAAAA,YAAY,CAAE,CAAEF,QAAF,CAAF,EAAgBO,YAAhB,CAAZ;AACAI,QAAAA,OAAO;AACP;AALF,OAOG,cAAI,SAAJ,CAPH,CADD,EAUC,4BAAC,oBAAD;AACC,MAAA,IAAI,EAAGE,kBADR;AAEC,MAAA,OAAO,EAAG,MAAM;AACfZ,QAAAA,cAAc,CAAE,CAAED,QAAF,CAAF,EAAgBO,YAAhB,CAAd;AACAI,QAAAA,OAAO;AACP;AALF,OAOG,cAAI,WAAJ,CAPH,CAVD,CADD,EAqBC,4BAAC,qBAAD,QACC,4BAAC,oBAAD;AACC,MAAA,OAAO,EAAG,MAAM;AACfR,QAAAA,YAAY,CAAE,CAAEH,QAAF,CAAF,EAAgB,KAAhB,CAAZ;AACAW,QAAAA,OAAO;AACP;AAJF,OAMGN,WANH,CADD,CArBD,CADC;AAAA,GARH,CADD;AA6CA","sourcesContent":["/**\n * WordPress dependencies\n */\n\nimport { chevronUp, chevronDown, moreVertical } from '@wordpress/icons';\nimport { DropdownMenu, MenuItem, MenuGroup } from '@wordpress/components';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport { __, sprintf } from '@wordpress/i18n';\nimport { BlockTitle, store as blockEditorStore } from '@wordpress/block-editor';\n\nconst POPOVER_PROPS = {\n\tclassName: 'block-editor-block-settings-menu__popover',\n\tposition: 'bottom right',\n\tvariant: 'toolbar',\n};\n\nexport default function LeafMoreMenu( props ) {\n\tconst { block } = props;\n\tconst { clientId } = block;\n\tconst { moveBlocksDown, moveBlocksUp, removeBlocks } =\n\t\tuseDispatch( blockEditorStore );\n\n\tconst removeLabel = sprintf(\n\t\t/* translators: %s: block name */\n\t\t__( 'Remove %s' ),\n\t\tBlockTitle( { clientId, maximumLength: 25 } )\n\t);\n\n\tconst rootClientId = useSelect(\n\t\t( select ) => {\n\t\t\tconst { getBlockRootClientId } = select( blockEditorStore );\n\n\t\t\treturn getBlockRootClientId( clientId );\n\t\t},\n\t\t[ clientId ]\n\t);\n\n\treturn (\n\t\t<DropdownMenu\n\t\t\ticon={ moreVertical }\n\t\t\tlabel={ __( 'Options' ) }\n\t\t\tclassName=\"block-editor-block-settings-menu\"\n\t\t\tpopoverProps={ POPOVER_PROPS }\n\t\t\tnoIcons\n\t\t\t{ ...props }\n\t\t>\n\t\t\t{ ( { onClose } ) => (\n\t\t\t\t<>\n\t\t\t\t\t<MenuGroup>\n\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\ticon={ chevronUp }\n\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\tmoveBlocksUp( [ clientId ], rootClientId );\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Move up' ) }\n\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\ticon={ chevronDown }\n\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\tmoveBlocksDown( [ clientId ], rootClientId );\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Move down' ) }\n\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t</MenuGroup>\n\t\t\t\t\t<MenuGroup>\n\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\tremoveBlocks( [ clientId ], false );\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ removeLabel }\n\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t</MenuGroup>\n\t\t\t\t</>\n\t\t\t) }\n\t\t</DropdownMenu>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/edit-site/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js"],"names":["POPOVER_PROPS","className","placement","useHistory","routerPrivateApis","LeafMoreMenu","props","history","block","clientId","moveBlocksDown","moveBlocksUp","removeBlocks","blockEditorStore","removeLabel","maximumLength","goToLabel","rootClientId","select","getBlockRootClientId","onGoToPage","selectedBlock","attributes","name","kind","id","type","push","postType","postId","wp_theme_preview","moreVertical","onClose","chevronUp","chevronDown"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\n\nimport { chevronUp, chevronDown, moreVertical } from '@wordpress/icons';\nimport { DropdownMenu, MenuItem, MenuGroup } from '@wordpress/components';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport { useCallback } from '@wordpress/element';\nimport { __, sprintf } from '@wordpress/i18n';\nimport { BlockTitle, store as blockEditorStore } from '@wordpress/block-editor';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\n\nconst POPOVER_PROPS = {\n\tclassName: 'block-editor-block-settings-menu__popover',\n\tplacement: 'bottom-start',\n};\n\n/**\n * Internal dependencies\n */\nimport {\n\tisPreviewingTheme,\n\tcurrentlyPreviewingTheme,\n} from '../../utils/is-previewing-theme';\nimport { unlock } from '../../lock-unlock';\n\nconst { useHistory } = unlock( routerPrivateApis );\n\nexport default function LeafMoreMenu( props ) {\n\tconst history = useHistory();\n\tconst { block } = props;\n\tconst { clientId } = block;\n\tconst { moveBlocksDown, moveBlocksUp, removeBlocks } =\n\t\tuseDispatch( blockEditorStore );\n\n\tconst removeLabel = sprintf(\n\t\t/* translators: %s: block name */\n\t\t__( 'Remove %s' ),\n\t\tBlockTitle( { clientId, maximumLength: 25 } )\n\t);\n\n\tconst goToLabel = sprintf(\n\t\t/* translators: %s: block name */\n\t\t__( 'Go to %s' ),\n\t\tBlockTitle( { clientId, maximumLength: 25 } )\n\t);\n\n\tconst rootClientId = useSelect(\n\t\t( select ) => {\n\t\t\tconst { getBlockRootClientId } = select( blockEditorStore );\n\n\t\t\treturn getBlockRootClientId( clientId );\n\t\t},\n\t\t[ clientId ]\n\t);\n\n\tconst onGoToPage = useCallback(\n\t\t( selectedBlock ) => {\n\t\t\tconst { attributes, name } = selectedBlock;\n\t\t\tif (\n\t\t\t\tattributes.kind === 'post-type' &&\n\t\t\t\tattributes.id &&\n\t\t\t\tattributes.type &&\n\t\t\t\thistory\n\t\t\t) {\n\t\t\t\thistory.push( {\n\t\t\t\t\tpostType: attributes.type,\n\t\t\t\t\tpostId: attributes.id,\n\t\t\t\t\t...( isPreviewingTheme() && {\n\t\t\t\t\t\twp_theme_preview: currentlyPreviewingTheme(),\n\t\t\t\t\t} ),\n\t\t\t\t} );\n\t\t\t}\n\t\t\tif ( name === 'core/page-list-item' && attributes.id && history ) {\n\t\t\t\thistory.push( {\n\t\t\t\t\tpostType: 'page',\n\t\t\t\t\tpostId: attributes.id,\n\t\t\t\t\t...( isPreviewingTheme() && {\n\t\t\t\t\t\twp_theme_preview: currentlyPreviewingTheme(),\n\t\t\t\t\t} ),\n\t\t\t\t} );\n\t\t\t}\n\t\t},\n\t\t[ history ]\n\t);\n\n\treturn (\n\t\t<DropdownMenu\n\t\t\ticon={ moreVertical }\n\t\t\tlabel={ __( 'Options' ) }\n\t\t\tclassName=\"block-editor-block-settings-menu\"\n\t\t\tpopoverProps={ POPOVER_PROPS }\n\t\t\tnoIcons\n\t\t\t{ ...props }\n\t\t>\n\t\t\t{ ( { onClose } ) => (\n\t\t\t\t<>\n\t\t\t\t\t<MenuGroup>\n\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\ticon={ chevronUp }\n\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\tmoveBlocksUp( [ clientId ], rootClientId );\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Move up' ) }\n\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\ticon={ chevronDown }\n\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\tmoveBlocksDown( [ clientId ], rootClientId );\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Move down' ) }\n\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t\t{ block.attributes?.id && (\n\t\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\t\tonGoToPage( block );\n\t\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t\t>\n\t\t\t\t\t\t\t\t{ goToLabel }\n\t\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t\t) }\n\t\t\t\t\t</MenuGroup>\n\t\t\t\t\t<MenuGroup>\n\t\t\t\t\t\t<MenuItem\n\t\t\t\t\t\t\tonClick={ () => {\n\t\t\t\t\t\t\t\tremoveBlocks( [ clientId ], false );\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ removeLabel }\n\t\t\t\t\t\t</MenuItem>\n\t\t\t\t\t</MenuGroup>\n\t\t\t\t</>\n\t\t\t) }\n\t\t</DropdownMenu>\n\t);\n}\n"]}

package/build/components/sidebar-navigation-screen-navigation-menus/navigation-menu-content.js

@@ -15,11 +15,9 @@ var _data = require("@wordpress/data");
 
 var _blocks = require("@wordpress/blocks");
 
-var _components = require("@wordpress/components");
-
 var _coreData = require("@wordpress/core-data");
 
-var _privateApis = require("../../private-apis");
+var _lockUnlock = require("../../lock-unlock");
 
 var _leafMoreMenu = _interopRequireDefault(require("./leaf-more-menu"));
 
@@ -30,7 +28,10 @@ var _leafMoreMenu = _interopRequireDefault(require("./leaf-more-menu"));
 /**
  * Internal dependencies
  */
-// Needs to be kept in sync with the query used at packages/block-library/src/page-list/edit.js.
+const {
+  PrivateListView
+} = (0, _lockUnlock.unlock)(_blockEditor.privateApis); // Needs to be kept in sync with the query used at packages/block-library/src/page-list/edit.js.
+
 const MAX_PAGE_COUNT = 100;
 const PAGES_QUERY = ['postType', 'page', {
   per_page: MAX_PAGE_COUNT,
@@ -42,84 +43,53 @@ const PAGES_QUERY = ['postType', 'page', {
   order: 'asc'
 }];
 
-function NavigationMenuContent(_ref) {
-  let {
-    rootClientId,
-    onSelect
-  } = _ref;
-  const [isLoading, setIsLoading] = (0, _element.useState)(true);
+function NavigationMenuContent({
+  rootClientId
+}) {
   const {
-    clientIdsTree,
-    shouldKeepLoading,
-    isSinglePageList
+    listViewRootClientId,
+    isLoading
   } = (0, _data.useSelect)(select => {
     const {
-      __unstableGetClientIdsTree,
       areInnerBlocksControlled,
-      getBlockName
+      getBlockName,
+      getBlockCount,
+      getBlockOrder
     } = select(_blockEditor.store);
     const {
       isResolving
     } = select(_coreData.store);
-
-    const _clientIdsTree = __unstableGetClientIdsTree(rootClientId);
-
-    const hasOnlyPageListBlock = _clientIdsTree.length === 1 && getBlockName(_clientIdsTree[0].clientId) === 'core/page-list';
+    const blockClientIds = getBlockOrder(rootClientId);
+    const hasOnlyPageListBlock = blockClientIds.length === 1 && getBlockName(blockClientIds[0]) === 'core/page-list';
+    const pageListHasBlocks = hasOnlyPageListBlock && getBlockCount(blockClientIds[0]) > 0;
     const isLoadingPages = isResolving('getEntityRecords', PAGES_QUERY);
     return {
-      clientIdsTree: _clientIdsTree,
+      listViewRootClientId: pageListHasBlocks ? blockClientIds[0] : rootClientId,
       // This is a small hack to wait for the navigation block
       // to actually load its inner blocks.
-      shouldKeepLoading: !areInnerBlocksControlled(rootClientId) || isLoadingPages,
-      isSinglePageList: hasOnlyPageListBlock && !isLoadingPages && _clientIdsTree[0].innerBlocks.length > 0
+      isLoading: !areInnerBlocksControlled(rootClientId) || isLoadingPages
     };
   }, [rootClientId]);
   const {
     replaceBlock,
     __unstableMarkNextChangeAsNotPersistent
-  } = (0, _data.useDispatch)(_blockEditor.store); // Delay loading stop by 50ms to avoid flickering.
-
-  (0, _element.useEffect)(() => {
-    let timeoutId;
-
-    if (shouldKeepLoading && !isLoading) {
-      setIsLoading(true);
-    }
-
-    if (!shouldKeepLoading && isLoading) {
-      timeoutId = setTimeout(() => {
-        setIsLoading(false);
-        timeoutId = undefined;
-      }, 50);
-    }
-
-    return () => {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-    };
-  }, [shouldKeepLoading, clientIdsTree, isLoading]);
-  const {
-    PrivateListView
-  } = (0, _privateApis.unlock)(_blockEditor.privateApis);
+  } = (0, _data.useDispatch)(_blockEditor.store);
   const offCanvasOnselect = (0, _element.useCallback)(block => {
     if (block.name === 'core/navigation-link' && !block.attributes.url) {
       __unstableMarkNextChangeAsNotPersistent();
 
       replaceBlock(block.clientId, (0, _blocks.createBlock)('core/navigation-link', block.attributes));
-    } else {
-      onSelect(block);
     }
-  }, [onSelect, __unstableMarkNextChangeAsNotPersistent, replaceBlock]); // The hidden block is needed because it makes block edit side effects trigger.
+  }, [__unstableMarkNextChangeAsNotPersistent, replaceBlock]); // The hidden block is needed because it makes block edit side effects trigger.
   // For example a navigation page list load its items has an effect on edit to load its items.
 
   return (0, _element.createElement)(_element.Fragment, null, !isLoading && (0, _element.createElement)(PrivateListView, {
-    blocks: isSinglePageList ? clientIdsTree[0].innerBlocks : clientIdsTree,
+    rootClientId: listViewRootClientId,
     onSelect: offCanvasOnselect,
     blockSettingsMenu: _leafMoreMenu.default,
     showAppender: false
-  }), (0, _element.createElement)(_components.VisuallyHidden, {
-    "aria-hidden": "true"
+  }), (0, _element.createElement)("div", {
+    className: "edit-site-sidebar-navigation-screen-navigation-menus__helper-block-editor"
   }, (0, _element.createElement)(_blockEditor.BlockTools, null, (0, _element.createElement)(_blockEditor.BlockList, null))));
 }
 //# sourceMappingURL=navigation-menu-content.js.map

package/build/components/sidebar-navigation-screen-navigation-menus/navigation-menu-content.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/edit-site/src/components/sidebar-navigation-screen-navigation-menus/navigation-menu-content.js"],"names":["MAX_PAGE_COUNT","PAGES_QUERY","per_page","_fields","orderby","order","NavigationMenuContent","rootClientId","onSelect","isLoading","setIsLoading","clientIdsTree","shouldKeepLoading","isSinglePageList","select","__unstableGetClientIdsTree","areInnerBlocksControlled","getBlockName","blockEditorStore","isResolving","coreStore","_clientIdsTree","hasOnlyPageListBlock","length","clientId","isLoadingPages","innerBlocks","replaceBlock","__unstableMarkNextChangeAsNotPersistent","timeoutId","setTimeout","undefined","clearTimeout","PrivateListView","blockEditorPrivateApis","offCanvasOnselect","block","name","attributes","url","LeafMoreMenu"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tprivateApis as blockEditorPrivateApis,\n\tstore as blockEditorStore,\n\tBlockList,\n\tBlockTools,\n} from '@wordpress/block-editor';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport { createBlock } from '@wordpress/blocks';\nimport { VisuallyHidden } from '@wordpress/components';\nimport { useCallback, useEffect, useState } from '@wordpress/element';\nimport { store as coreStore } from '@wordpress/core-data';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../private-apis';\nimport LeafMoreMenu from './leaf-more-menu';\n\n// Needs to be kept in sync with the query used at packages/block-library/src/page-list/edit.js.\nconst MAX_PAGE_COUNT = 100;\nconst PAGES_QUERY = [\n\t'postType',\n\t'page',\n\t{\n\t\tper_page: MAX_PAGE_COUNT,\n\t\t_fields: [ 'id', 'link', 'menu_order', 'parent', 'title', 'type' ],\n\t\t// TODO: When https://core.trac.wordpress.org/ticket/39037 REST API support for multiple orderby\n\t\t// values is resolved, update 'orderby' to [ 'menu_order', 'post_title' ] to provide a consistent\n\t\t// sort.\n\t\torderby: 'menu_order',\n\t\torder: 'asc',\n\t},\n];\n\nexport default function NavigationMenuContent( { rootClientId, onSelect } ) {\n\tconst [ isLoading, setIsLoading ] = useState( true );\n\tconst { clientIdsTree, shouldKeepLoading, isSinglePageList } = useSelect(\n\t\t( select ) => {\n\t\t\tconst {\n\t\t\t\t__unstableGetClientIdsTree,\n\t\t\t\tareInnerBlocksControlled,\n\t\t\t\tgetBlockName,\n\t\t\t} = select( blockEditorStore );\n\t\t\tconst { isResolving } = select( coreStore );\n\n\t\t\tconst _clientIdsTree = __unstableGetClientIdsTree( rootClientId );\n\t\t\tconst hasOnlyPageListBlock =\n\t\t\t\t_clientIdsTree.length === 1 &&\n\t\t\t\tgetBlockName( _clientIdsTree[ 0 ].clientId ) ===\n\t\t\t\t\t'core/page-list';\n\t\t\tconst isLoadingPages = isResolving(\n\t\t\t\t'getEntityRecords',\n\t\t\t\tPAGES_QUERY\n\t\t\t);\n\t\t\treturn {\n\t\t\t\tclientIdsTree: _clientIdsTree,\n\t\t\t\t// This is a small hack to wait for the navigation block\n\t\t\t\t// to actually load its inner blocks.\n\t\t\t\tshouldKeepLoading:\n\t\t\t\t\t! areInnerBlocksControlled( rootClientId ) ||\n\t\t\t\t\tisLoadingPages,\n\t\t\t\tisSinglePageList:\n\t\t\t\t\thasOnlyPageListBlock &&\n\t\t\t\t\t! isLoadingPages &&\n\t\t\t\t\t_clientIdsTree[ 0 ].innerBlocks.length > 0,\n\t\t\t};\n\t\t},\n\t\t[ rootClientId ]\n\t);\n\tconst { replaceBlock, __unstableMarkNextChangeAsNotPersistent } =\n\t\tuseDispatch( blockEditorStore );\n\n\t// Delay loading stop by 50ms to avoid flickering.\n\tuseEffect( () => {\n\t\tlet timeoutId;\n\t\tif ( shouldKeepLoading && ! isLoading ) {\n\t\t\tsetIsLoading( true );\n\t\t}\n\t\tif ( ! shouldKeepLoading && isLoading ) {\n\t\t\ttimeoutId = setTimeout( () => {\n\t\t\t\tsetIsLoading( false );\n\t\t\t\ttimeoutId = undefined;\n\t\t\t}, 50 );\n\t\t}\n\t\treturn () => {\n\t\t\tif ( timeoutId ) {\n\t\t\t\tclearTimeout( timeoutId );\n\t\t\t}\n\t\t};\n\t}, [ shouldKeepLoading, clientIdsTree, isLoading ] );\n\n\tconst { PrivateListView } = unlock( blockEditorPrivateApis );\n\tconst offCanvasOnselect = useCallback(\n\t\t( block ) => {\n\t\t\tif (\n\t\t\t\tblock.name === 'core/navigation-link' &&\n\t\t\t\t! block.attributes.url\n\t\t\t) {\n\t\t\t\t__unstableMarkNextChangeAsNotPersistent();\n\t\t\t\treplaceBlock(\n\t\t\t\t\tblock.clientId,\n\t\t\t\t\tcreateBlock( 'core/navigation-link', block.attributes )\n\t\t\t\t);\n\t\t\t} else {\n\t\t\t\tonSelect( block );\n\t\t\t}\n\t\t},\n\t\t[ onSelect, __unstableMarkNextChangeAsNotPersistent, replaceBlock ]\n\t);\n\n\t// The hidden block is needed because it makes block edit side effects trigger.\n\t// For example a navigation page list load its items has an effect on edit to load its items.\n\treturn (\n\t\t<>\n\t\t\t{ ! isLoading && (\n\t\t\t\t<PrivateListView\n\t\t\t\t\tblocks={\n\t\t\t\t\t\tisSinglePageList\n\t\t\t\t\t\t\t? clientIdsTree[ 0 ].innerBlocks\n\t\t\t\t\t\t\t: clientIdsTree\n\t\t\t\t\t}\n\t\t\t\t\tonSelect={ offCanvasOnselect }\n\t\t\t\t\tblockSettingsMenu={ LeafMoreMenu }\n\t\t\t\t\tshowAppender={ false }\n\t\t\t\t/>\n\t\t\t) }\n\t\t\t<VisuallyHidden aria-hidden=\"true\">\n\t\t\t\t<BlockTools>\n\t\t\t\t\t<BlockList />\n\t\t\t\t</BlockTools>\n\t\t\t</VisuallyHidden>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/edit-site/src/components/sidebar-navigation-screen-navigation-menus/navigation-menu-content.js"],"names":["PrivateListView","blockEditorPrivateApis","MAX_PAGE_COUNT","PAGES_QUERY","per_page","_fields","orderby","order","NavigationMenuContent","rootClientId","listViewRootClientId","isLoading","select","areInnerBlocksControlled","getBlockName","getBlockCount","getBlockOrder","blockEditorStore","isResolving","coreStore","blockClientIds","hasOnlyPageListBlock","length","pageListHasBlocks","isLoadingPages","replaceBlock","__unstableMarkNextChangeAsNotPersistent","offCanvasOnselect","block","name","attributes","url","clientId","LeafMoreMenu"],"mappings":";;;;;;;;;AAWA;;AARA;;AAMA;;AACA;;AAEA;;AAKA;;AACA;;AAlBA;AACA;AACA;;AAYA;AACA;AACA;AAIA,MAAM;AAAEA,EAAAA;AAAF,IAAsB,wBAAQC,wBAAR,CAA5B,C,CAEA;;AACA,MAAMC,cAAc,GAAG,GAAvB;AACA,MAAMC,WAAW,GAAG,CACnB,UADmB,EAEnB,MAFmB,EAGnB;AACCC,EAAAA,QAAQ,EAAEF,cADX;AAECG,EAAAA,OAAO,EAAE,CAAE,IAAF,EAAQ,MAAR,EAAgB,YAAhB,EAA8B,QAA9B,EAAwC,OAAxC,EAAiD,MAAjD,CAFV;AAGC;AACA;AACA;AACAC,EAAAA,OAAO,EAAE,YANV;AAOCC,EAAAA,KAAK,EAAE;AAPR,CAHmB,CAApB;;AAce,SAASC,qBAAT,CAAgC;AAAEC,EAAAA;AAAF,CAAhC,EAAmD;AACjE,QAAM;AAAEC,IAAAA,oBAAF;AAAwBC,IAAAA;AAAxB,MAAsC,qBACzCC,MAAF,IAAc;AACb,UAAM;AACLC,MAAAA,wBADK;AAELC,MAAAA,YAFK;AAGLC,MAAAA,aAHK;AAILC,MAAAA;AAJK,QAKFJ,MAAM,CAAEK,kBAAF,CALV;AAMA,UAAM;AAAEC,MAAAA;AAAF,QAAkBN,MAAM,CAAEO,eAAF,CAA9B;AAEA,UAAMC,cAAc,GAAGJ,aAAa,CAAEP,YAAF,CAApC;AAEA,UAAMY,oBAAoB,GACzBD,cAAc,CAACE,MAAf,KAA0B,CAA1B,IACAR,YAAY,CAAEM,cAAc,CAAE,CAAF,CAAhB,CAAZ,KAAwC,gBAFzC;AAGA,UAAMG,iBAAiB,GACtBF,oBAAoB,IACpBN,aAAa,CAAEK,cAAc,CAAE,CAAF,CAAhB,CAAb,GAAuC,CAFxC;AAIA,UAAMI,cAAc,GAAGN,WAAW,CACjC,kBADiC,EAEjCf,WAFiC,CAAlC;AAKA,WAAO;AACNO,MAAAA,oBAAoB,EAAEa,iBAAiB,GACpCH,cAAc,CAAE,CAAF,CADsB,GAEpCX,YAHG;AAIN;AACA;AACAE,MAAAA,SAAS,EACR,CAAEE,wBAAwB,CAAEJ,YAAF,CAA1B,IACAe;AARK,KAAP;AAUA,GAlC0C,EAmC3C,CAAEf,YAAF,CAnC2C,CAA5C;AAqCA,QAAM;AAAEgB,IAAAA,YAAF;AAAgBC,IAAAA;AAAhB,MACL,uBAAaT,kBAAb,CADD;AAGA,QAAMU,iBAAiB,GAAG,0BACvBC,KAAF,IAAa;AACZ,QACCA,KAAK,CAACC,IAAN,KAAe,sBAAf,IACA,CAAED,KAAK,CAACE,UAAN,CAAiBC,GAFpB,EAGE;AACDL,MAAAA,uCAAuC;;AACvCD,MAAAA,YAAY,CACXG,KAAK,CAACI,QADK,EAEX,yBAAa,sBAAb,EAAqCJ,KAAK,CAACE,UAA3C,CAFW,CAAZ;AAIA;AACD,GAZwB,EAazB,CAAEJ,uCAAF,EAA2CD,YAA3C,CAbyB,CAA1B,CAzCiE,CAyDjE;AACA;;AACA,SACC,qDACG,CAAEd,SAAF,IACD,4BAAC,eAAD;AACC,IAAA,YAAY,EAAGD,oBADhB;AAEC,IAAA,QAAQ,EAAGiB,iBAFZ;AAGC,IAAA,iBAAiB,EAAGM,qBAHrB;AAIC,IAAA,YAAY,EAAG;AAJhB,IAFF,EASC;AAAK,IAAA,SAAS,EAAC;AAAf,KACC,4BAAC,uBAAD,QACC,4BAAC,sBAAD,OADD,CADD,CATD,CADD;AAiBA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tprivateApis as blockEditorPrivateApis,\n\tstore as blockEditorStore,\n\tBlockList,\n\tBlockTools,\n} from '@wordpress/block-editor';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport { createBlock } from '@wordpress/blocks';\nimport { useCallback } from '@wordpress/element';\nimport { store as coreStore } from '@wordpress/core-data';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport LeafMoreMenu from './leaf-more-menu';\n\nconst { PrivateListView } = unlock( blockEditorPrivateApis );\n\n// Needs to be kept in sync with the query used at packages/block-library/src/page-list/edit.js.\nconst MAX_PAGE_COUNT = 100;\nconst PAGES_QUERY = [\n\t'postType',\n\t'page',\n\t{\n\t\tper_page: MAX_PAGE_COUNT,\n\t\t_fields: [ 'id', 'link', 'menu_order', 'parent', 'title', 'type' ],\n\t\t// TODO: When https://core.trac.wordpress.org/ticket/39037 REST API support for multiple orderby\n\t\t// values is resolved, update 'orderby' to [ 'menu_order', 'post_title' ] to provide a consistent\n\t\t// sort.\n\t\torderby: 'menu_order',\n\t\torder: 'asc',\n\t},\n];\n\nexport default function NavigationMenuContent( { rootClientId } ) {\n\tconst { listViewRootClientId, isLoading } = useSelect(\n\t\t( select ) => {\n\t\t\tconst {\n\t\t\t\tareInnerBlocksControlled,\n\t\t\t\tgetBlockName,\n\t\t\t\tgetBlockCount,\n\t\t\t\tgetBlockOrder,\n\t\t\t} = select( blockEditorStore );\n\t\t\tconst { isResolving } = select( coreStore );\n\n\t\t\tconst blockClientIds = getBlockOrder( rootClientId );\n\n\t\t\tconst hasOnlyPageListBlock =\n\t\t\t\tblockClientIds.length === 1 &&\n\t\t\t\tgetBlockName( blockClientIds[ 0 ] ) === 'core/page-list';\n\t\t\tconst pageListHasBlocks =\n\t\t\t\thasOnlyPageListBlock &&\n\t\t\t\tgetBlockCount( blockClientIds[ 0 ] ) > 0;\n\n\t\t\tconst isLoadingPages = isResolving(\n\t\t\t\t'getEntityRecords',\n\t\t\t\tPAGES_QUERY\n\t\t\t);\n\n\t\t\treturn {\n\t\t\t\tlistViewRootClientId: pageListHasBlocks\n\t\t\t\t\t? blockClientIds[ 0 ]\n\t\t\t\t\t: rootClientId,\n\t\t\t\t// This is a small hack to wait for the navigation block\n\t\t\t\t// to actually load its inner blocks.\n\t\t\t\tisLoading:\n\t\t\t\t\t! areInnerBlocksControlled( rootClientId ) ||\n\t\t\t\t\tisLoadingPages,\n\t\t\t};\n\t\t},\n\t\t[ rootClientId ]\n\t);\n\tconst { replaceBlock, __unstableMarkNextChangeAsNotPersistent } =\n\t\tuseDispatch( blockEditorStore );\n\n\tconst offCanvasOnselect = useCallback(\n\t\t( block ) => {\n\t\t\tif (\n\t\t\t\tblock.name === 'core/navigation-link' &&\n\t\t\t\t! block.attributes.url\n\t\t\t) {\n\t\t\t\t__unstableMarkNextChangeAsNotPersistent();\n\t\t\t\treplaceBlock(\n\t\t\t\t\tblock.clientId,\n\t\t\t\t\tcreateBlock( 'core/navigation-link', block.attributes )\n\t\t\t\t);\n\t\t\t}\n\t\t},\n\t\t[ __unstableMarkNextChangeAsNotPersistent, replaceBlock ]\n\t);\n\n\t// The hidden block is needed because it makes block edit side effects trigger.\n\t// For example a navigation page list load its items has an effect on edit to load its items.\n\treturn (\n\t\t<>\n\t\t\t{ ! isLoading && (\n\t\t\t\t<PrivateListView\n\t\t\t\t\trootClientId={ listViewRootClientId }\n\t\t\t\t\tonSelect={ offCanvasOnselect }\n\t\t\t\t\tblockSettingsMenu={ LeafMoreMenu }\n\t\t\t\t\tshowAppender={ false }\n\t\t\t\t/>\n\t\t\t) }\n\t\t\t<div className=\"edit-site-sidebar-navigation-screen-navigation-menus__helper-block-editor\">\n\t\t\t\t<BlockTools>\n\t\t\t\t\t<BlockList />\n\t\t\t\t</BlockTools>\n\t\t\t</div>\n\t\t</>\n\t);\n}\n"]}

package/build/components/sidebar-navigation-screen-page/index.js

@@ -21,14 +21,26 @@ var _htmlEntities = require("@wordpress/html-entities");
 
 var _icons = require("@wordpress/icons");
 
+var _dom = require("@wordpress/dom");
+
+var _escapeHtml = require("@wordpress/escape-html");
+
+var _url = require("@wordpress/url");
+
 var _sidebarNavigationScreen = _interopRequireDefault(require("../sidebar-navigation-screen"));
 
-var _privateApis = require("../../private-apis");
+var _lockUnlock = require("../../lock-unlock");
 
 var _store = require("../../store");
 
 var _sidebarButton = _interopRequireDefault(require("../sidebar-button"));
 
+var _pageDetails = _interopRequireDefault(require("./page-details"));
+
+var _pageActions = _interopRequireDefault(require("../page-actions"));
+
+var _sidebarNavigationScreenDetailsFooter = _interopRequireDefault(require("../sidebar-navigation-screen-details-footer"));
+
 /**
  * WordPress dependencies
  */
@@ -37,11 +49,10 @@ var _sidebarButton = _interopRequireDefault(require("../sidebar-button"));
  * Internal dependencies
  */
 function SidebarNavigationScreenPage() {
-  var _record$title, _record$description;
-
+  const navigator = (0, _components.__experimentalUseNavigator)();
   const {
     setCanvasMode
-  } = (0, _privateApis.unlock)((0, _data.useDispatch)(_store.store));
+  } = (0, _lockUnlock.unlock)((0, _data.useDispatch)(_store.store));
   const {
     params: {
       postId
@@ -50,18 +61,58 @@ function SidebarNavigationScreenPage() {
   const {
     record
   } = (0, _coreData.useEntityRecord)('postType', 'page', postId);
-  return (0, _element.createElement)(_sidebarNavigationScreen.default, {
-    title: record ? (0, _htmlEntities.decodeEntities)(record === null || record === void 0 ? void 0 : (_record$title = record.title) === null || _record$title === void 0 ? void 0 : _record$title.rendered) : null,
-    actions: (0, _element.createElement)(_sidebarButton.default, {
+  const {
+    featuredMediaAltText,
+    featuredMediaSourceUrl
+  } = (0, _data.useSelect)(select => {
+    const {
+      getEntityRecord
+    } = select(_coreData.store); // Featured image.
+
+    const attachedMedia = record?.featured_media ? getEntityRecord('postType', 'attachment', record?.featured_media) : null;
+    return {
+      featuredMediaSourceUrl: attachedMedia?.media_details.sizes?.medium?.source_url || attachedMedia?.source_url,
+      featuredMediaAltText: (0, _escapeHtml.escapeAttribute)(attachedMedia?.alt_text || attachedMedia?.description?.raw || '')
+    };
+  }, [record]);
+  const featureImageAltText = featuredMediaAltText ? (0, _htmlEntities.decodeEntities)(featuredMediaAltText) : (0, _htmlEntities.decodeEntities)(record?.title?.rendered || (0, _i18n.__)('Featured image'));
+  return record ? (0, _element.createElement)(_sidebarNavigationScreen.default, {
+    title: (0, _htmlEntities.decodeEntities)(record?.title?.rendered || (0, _i18n.__)('(no title)')),
+    actions: (0, _element.createElement)(_element.Fragment, null, (0, _element.createElement)(_pageActions.default, {
+      postId: postId,
+      toggleProps: {
+        as: _sidebarButton.default
+      },
+      onRemove: () => {
+        navigator.goTo('/page');
+      }
+    }), (0, _element.createElement)(_sidebarButton.default, {
       onClick: () => setCanvasMode('edit'),
       label: (0, _i18n.__)('Edit'),
       icon: _icons.pencil
-    }),
-    description: (0, _i18n.__)('Pages are static and are not listed by date. Pages do not use tags or categories.'),
-    content: (0, _element.createElement)(_element.Fragment, null, record !== null && record !== void 0 && record.link ? (0, _element.createElement)(_components.ExternalLink, {
+    })),
+    meta: (0, _element.createElement)(_components.ExternalLink, {
       className: "edit-site-sidebar-navigation-screen__page-link",
       href: record.link
-    }, record.link) : null, record ? (0, _htmlEntities.decodeEntities)(record === null || record === void 0 ? void 0 : (_record$description = record.description) === null || _record$description === void 0 ? void 0 : _record$description.rendered) : null)
-  });
+    }, (0, _url.filterURLForDisplay)((0, _url.safeDecodeURIComponent)(record.link))),
+    content: (0, _element.createElement)(_element.Fragment, null, !!featuredMediaSourceUrl && (0, _element.createElement)(_components.__experimentalVStack, {
+      className: "edit-site-sidebar-navigation-screen-page__featured-image-wrapper",
+      alignment: "left",
+      spacing: 2
+    }, (0, _element.createElement)("div", {
+      className: "edit-site-sidebar-navigation-screen-page__featured-image has-image"
+    }, (0, _element.createElement)("img", {
+      alt: featureImageAltText,
+      src: featuredMediaSourceUrl
+    }))), !!record?.excerpt?.rendered && (0, _element.createElement)(_components.__experimentalTruncate, {
+      className: "edit-site-sidebar-navigation-screen-page__excerpt",
+      numberOfLines: 3
+    }, (0, _dom.__unstableStripHTML)(record.excerpt.rendered)), (0, _element.createElement)(_pageDetails.default, {
+      id: postId
+    })),
+    footer: (0, _element.createElement)(_sidebarNavigationScreenDetailsFooter.default, {
+      lastModifiedDateTime: record?.modified
+    })
+  }) : null;
 }
 //# sourceMappingURL=index.js.map