Editor: update packages.

The following package versions were changed: @wordpress/block-directory: 1.13.6 -> 1.13.7 @wordpress/block-editor: 4.3.6 -> 4.3.7 @wordpress/block-library: 2.22.6 -> 2.22.7 @wordpress/components: 10.0.5 -> 10.0.6 @wordpress/edit-post: 3.21.6 -> 3.21.7 @wordpress/editor: 9.20.6 -> 9.20.7 @wordpress/format-library: 1.22.6 -> 1.22.7 @wordpress/list-reusable-blocks: 1.21.5 -> 1.21.6 @wordpress/nux: 3.20.5 -> 3.20.6 @wordpress/server-side-render: 1.16.5 -> 1.16.6 Includes PR WordPress/gutenberg#24828 Props nosolosw, desrosj, SergeyBiryukov, youknowriad. Merges [48884] to the 5.5 branch. Fixes: #51151. Built from https://develop.svn.wordpress.org/branches/5.5@48885 git-svn-id: http://core.svn.wordpress.org/branches/5.5@48647 1a063a9b-81f0-0310-95a4-ce76da25c4cd
markjaquith · Aug 27, 2020 · 5228943 · 5228943
1 parent 5b5de79
commit 5228943
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 26 deletions.
diff --git a/wp-includes/assets/script-loader-packages.php b/wp-includes/assets/script-loader-packages.php
diff --git a/wp-includes/css/dist/block-editor/style-rtl.css b/wp-includes/css/dist/block-editor/style-rtl.css
@@ -877,6 +877,12 @@
   .block-editor-block-navigation-leaf .block-editor-block-icon {
     align-self: flex-start;
     margin-left: 6px; }
+  .block-editor-block-navigation-leaf.is-selected .block-editor-block-icon svg,
+  .block-editor-block-navigation-leaf.is-selected:focus .block-editor-block-icon svg {
+    color: #fff;
+    background: #1e1e1e;
+    box-shadow: 0 0 0 1px #1e1e1e;
+    border-radius: 1px; }
   .block-editor-block-navigation-leaf .block-editor-block-navigation-block__menu-cell,
   .block-editor-block-navigation-leaf .block-editor-block-navigation-block__mover-cell,
   .block-editor-block-navigation-leaf .block-editor-block-navigation-block__contents-cell {

diff --git a/wp-includes/css/dist/block-editor/style-rtl.min.css b/wp-includes/css/dist/block-editor/style-rtl.min.css
diff --git a/wp-includes/css/dist/block-editor/style.css b/wp-includes/css/dist/block-editor/style.css
@@ -881,6 +881,12 @@
   .block-editor-block-navigation-leaf .block-editor-block-icon {
     align-self: flex-start;
     margin-right: 6px; }
+  .block-editor-block-navigation-leaf.is-selected .block-editor-block-icon svg,
+  .block-editor-block-navigation-leaf.is-selected:focus .block-editor-block-icon svg {
+    color: #fff;
+    background: #1e1e1e;
+    box-shadow: 0 0 0 1px #1e1e1e;
+    border-radius: 1px; }
   .block-editor-block-navigation-leaf .block-editor-block-navigation-block__menu-cell,
   .block-editor-block-navigation-leaf .block-editor-block-navigation-block__mover-cell,
   .block-editor-block-navigation-leaf .block-editor-block-navigation-block__contents-cell {

diff --git a/wp-includes/css/dist/block-editor/style.min.css b/wp-includes/css/dist/block-editor/style.min.css
diff --git a/wp-includes/css/dist/block-library/style-rtl.css b/wp-includes/css/dist/block-library/style-rtl.css
@@ -109,7 +109,7 @@
 .wp-block-button__link.no-border-radius {
   border-radius: 0 !important; }
 
-.wp-block-button.is-style-outline .wp-block-button__link,
+.is-style-outline .wp-block-button__link,
 .wp-block-button__link.is-style-outline {
   color: #32373c;
   background-color: transparent;

diff --git a/wp-includes/css/dist/block-library/style-rtl.min.css b/wp-includes/css/dist/block-library/style-rtl.min.css
diff --git a/wp-includes/css/dist/block-library/style.css b/wp-includes/css/dist/block-library/style.css
@@ -110,7 +110,7 @@
 .wp-block-button__link.no-border-radius {
   border-radius: 0 !important; }
 
-.wp-block-button.is-style-outline .wp-block-button__link,
+.is-style-outline .wp-block-button__link,
 .wp-block-button__link.is-style-outline {
   color: #32373c;
   background-color: transparent;

diff --git a/wp-includes/css/dist/block-library/style.min.css b/wp-includes/css/dist/block-library/style.min.css
diff --git a/wp-includes/js/dist/block-editor.js b/wp-includes/js/dist/block-editor.js
@@ -30593,7 +30593,7 @@ function BlockNavigationBlockSelectButton(_ref, ref) {
       isSelected = _ref.isSelected,
       onClick = _ref.onClick,
       position = _ref.position,
-      siblingCount = _ref.siblingCount,
+      siblingBlockCount = _ref.siblingBlockCount,
       level = _ref.level,
       tabIndex = _ref.tabIndex,
       onFocus = _ref.onFocus;
@@ -30603,7 +30603,7 @@ function BlockNavigationBlockSelectButton(_ref, ref) {
   var blockDisplayName = Object(external_this_wp_blocks_["__experimentalGetBlockLabel"])(blockType, attributes);
   var instanceId = Object(external_this_wp_compose_["useInstanceId"])(BlockNavigationBlockSelectButton);
   var descriptionId = "block-navigation-block-select-button__".concat(instanceId);
-  var blockPositionDescription = utils_getBlockPositionDescription(position, siblingCount, level);
+  var blockPositionDescription = utils_getBlockPositionDescription(position, siblingBlockCount, level);
   return Object(external_this_wp_element_["createElement"])(external_this_wp_element_["Fragment"], null, Object(external_this_wp_element_["createElement"])(external_this_wp_components_["Button"], {
     className: classnames_default()('block-editor-block-navigation-block-select-button', className),
     onClick: onClick,
@@ -30673,14 +30673,14 @@ function BlockNavigationBlockSlot(props, ref) {
         block = props.block,
         isSelected = props.isSelected,
         position = props.position,
-        siblingCount = props.siblingCount,
+        siblingBlockCount = props.siblingBlockCount,
         level = props.level,
         tabIndex = props.tabIndex,
         onFocus = props.onFocus;
     var name = block.name;
     var blockType = Object(external_this_wp_blocks_["getBlockType"])(name);
     var descriptionId = "block-navigation-block-slot__".concat(instanceId);
-    var blockPositionDescription = utils_getBlockPositionDescription(position, siblingCount, level);
+    var blockPositionDescription = utils_getBlockPositionDescription(position, siblingBlockCount, level);
     var forwardedFillProps = {
       // Ensure that the component in the slot can receive
       // keyboard navigation.
@@ -30736,9 +30736,9 @@ var BlockNavigationBlockContents = Object(external_this_wp_element_["forwardRef"
       block = _ref.block,
       isSelected = _ref.isSelected,
       position = _ref.position,
-      siblingCount = _ref.siblingCount,
+      siblingBlockCount = _ref.siblingBlockCount,
       level = _ref.level,
-      props = Object(objectWithoutProperties["a" /* default */])(_ref, ["onClick", "block", "isSelected", "position", "siblingCount", "level"]);
+      props = Object(objectWithoutProperties["a" /* default */])(_ref, ["onClick", "block", "isSelected", "position", "siblingBlockCount", "level"]);
 
   var _useBlockNavigationCo = context_useBlockNavigationContext(),
       withBlockNavigationSlots = _useBlockNavigationCo.__experimentalFeatures;
@@ -30750,7 +30750,7 @@ var BlockNavigationBlockContents = Object(external_this_wp_element_["forwardRef"
     onClick: onClick,
     isSelected: isSelected,
     position: position,
-    siblingCount: siblingCount,
+    siblingBlockCount: siblingBlockCount,
     level: level
   }, props)) : Object(external_this_wp_element_["createElement"])(block_select_button, Object(esm_extends["a" /* default */])({
     ref: ref,
@@ -30759,7 +30759,7 @@ var BlockNavigationBlockContents = Object(external_this_wp_element_["forwardRef"
     onClick: onClick,
     isSelected: isSelected,
     position: position,
-    siblingCount: siblingCount,
+    siblingBlockCount: siblingBlockCount,
     level: level
   }, props));
 });
@@ -30801,6 +30801,7 @@ function BlockNavigationBlock(_ref) {
       position = _ref.position,
       level = _ref.level,
       rowCount = _ref.rowCount,
+      siblingBlockCount = _ref.siblingBlockCount,
       showBlockMovers = _ref.showBlockMovers,
       terminatedLevels = _ref.terminatedLevels,
       path = _ref.path;
@@ -30819,10 +30820,8 @@ function BlockNavigationBlock(_ref) {
   var _useDispatch = Object(external_this_wp_data_["useDispatch"])('core/block-editor'),
       selectEditorBlock = _useDispatch.selectBlock;
 
-  var clientId = block.clientId; // Subtract 1 from rowCount, as it includes the block appender.
-
-  var siblingCount = rowCount - 1;
-  var hasSiblings = siblingCount > 1;
+  var clientId = block.clientId;
+  var hasSiblings = siblingBlockCount > 0;
   var hasRenderedMovers = showBlockMovers && hasSiblings;
   var hasVisibleMovers = isHovered || isFocused;
   var moverCellClassName = classnames_default()('block-editor-block-navigation-block__mover-cell', {
@@ -30881,7 +30880,7 @@ function BlockNavigationBlock(_ref) {
       },
       isSelected: isSelected,
       position: position,
-      siblingCount: siblingCount,
+      siblingBlockCount: siblingBlockCount,
       level: level,
       ref: ref,
       tabIndex: tabIndex,
@@ -31062,7 +31061,8 @@ function BlockNavigationBranch(props) {
 
   var hasAppender = itemHasAppender(parentBlockClientId); // Add +1 to the rowCount to take the block appender into account.
 
-  var rowCount = hasAppender ? filteredBlocks.length + 1 : filteredBlocks.length;
+  var blockCount = filteredBlocks.length;
+  var rowCount = hasAppender ? blockCount + 1 : blockCount;
   var appenderPosition = rowCount;
   return Object(external_this_wp_element_["createElement"])(external_this_wp_element_["Fragment"], null, Object(external_this_lodash_["map"])(filteredBlocks, function (block, index) {
     var clientId = block.clientId,
@@ -31082,6 +31082,7 @@ function BlockNavigationBranch(props) {
       level: level,
       position: position,
       rowCount: rowCount,
+      siblingBlockCount: blockCount,
       showBlockMovers: showBlockMovers,
       terminatedLevels: terminatedLevels,
       path: updatedPath
@@ -36315,14 +36316,18 @@ function useResizeCanvas(deviceType) {
   };
 
   var contentInlineStyles = function contentInlineStyles(device) {
+    var height = device === 'Mobile' ? '768px' : '1024px';
+
     switch (device) {
       case 'Tablet':
       case 'Mobile':
         return {
           width: getCanvasWidth(device),
           margin: marginValue() + 'px auto',
           flexGrow: 0,
-          maxHeight: device === 'Mobile' ? '768px' : '1024px',
+          height: height,
+          minHeight: height,
+          maxHeight: height,
           overflowY: 'auto'
         };
 

diff --git a/wp-includes/js/dist/block-editor.min.js b/wp-includes/js/dist/block-editor.min.js
diff --git a/wp-includes/js/dist/components.js b/wp-includes/js/dist/components.js
@@ -42989,7 +42989,8 @@ function QueryControls(_ref) {
     categoriesList: categoriesList,
     label: Object(external_this_wp_i18n_["__"])('Category'),
     noOptionLabel: Object(external_this_wp_i18n_["__"])('All'),
-    selectedCategoryId: selectedCategoryId
+    selectedCategoryId: selectedCategoryId,
+    onChange: onCategoryChange
   }), categorySuggestions && onCategoryChange && Object(external_this_wp_element_["createElement"])(form_token_field, {
     key: "query-controls-categories-select",
     label: Object(external_this_wp_i18n_["__"])('Categories'),

diff --git a/wp-includes/js/dist/components.min.js b/wp-includes/js/dist/components.min.js
diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5.1-alpha-48883';
+$wp_version = '5.5.1-alpha-48885';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.