@wordpress/block-editor 12.18.2 → 12.19.1

package/build-style/style.css

@@ -133,7 +133,7 @@ iframe[name=editor-canvas]:not(.has-editor-padding) {
 }
 
 iframe[name=editor-canvas].has-editor-padding {
-  padding: 48px 48px 0;
+  padding: 24px 24px 0;
 }
 
 .block-editor-block-icon {
@@ -539,13 +539,15 @@ iframe[name=editor-canvas].has-editor-padding {
 }
 .block-editor-block-card__title.block-editor-block-card__title {
   font-size: 13px;
-  line-height: 24px;
+  line-height: 1.4;
   margin: 0;
+  padding: 3px 0;
 }
 
 .block-editor-block-card__description {
   display: block;
   font-size: 13px;
+  line-height: 1.4;
   margin-top: 4px;
 }
 
@@ -700,13 +702,14 @@ iframe[name=editor-canvas].has-editor-padding {
   display: flex;
   padding: 0;
   border: none;
+  justify-content: center;
 }
 @media (min-width: 600px) {
   .block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container {
     flex-direction: column;
   }
   .block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container > * {
-    height: 24px;
+    height: 20px;
     width: 100%;
     min-width: 0 !important;
   }
@@ -714,11 +717,11 @@ iframe[name=editor-canvas].has-editor-padding {
     height: calc(100% - 4px);
   }
   .block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container .block-editor-block-mover-button.is-up-button svg {
-    top: 5px;
+    top: 3px;
     flex-shrink: 0;
   }
   .block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container .block-editor-block-mover-button.is-down-button svg {
-    bottom: 5px;
+    bottom: 3px;
     flex-shrink: 0;
   }
   .block-editor-block-mover.is-horizontal .block-editor-block-mover__move-button-container {
@@ -1539,38 +1542,37 @@ iframe[name=editor-canvas].has-editor-padding {
   text-transform: capitalize;
 }
 
-.block-editor-global-styles-effects-panel__toggle-icon {
+.block-editor-global-styles__toggle-icon {
   fill: currentColor;
 }
 
-.block-editor-global-styles-effects-panel__shadow-popover-container {
+.block-editor-global-styles__shadow-popover-container {
   width: 230px;
 }
 
 .block-editor-global-styles-filters-panel__dropdown,
-.block-editor-global-styles-effects-panel__shadow-dropdown {
+.block-editor-global-styles__shadow-dropdown {
   display: block;
   padding: 0;
 }
 .block-editor-global-styles-filters-panel__dropdown button,
-.block-editor-global-styles-effects-panel__shadow-dropdown button {
+.block-editor-global-styles__shadow-dropdown button {
   width: 100%;
   padding: 8px;
 }
 .block-editor-global-styles-filters-panel__dropdown button.is-open,
-.block-editor-global-styles-effects-panel__shadow-dropdown button.is-open {
+.block-editor-global-styles__shadow-dropdown button.is-open {
   background-color: #f0f0f0;
 }
 
-.block-editor-global-styles-effects-panel__shadow-indicator-wrapper {
+.block-editor-global-styles__shadow-indicator-wrapper {
   padding: 6px;
-  overflow: hidden;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-.block-editor-global-styles-effects-panel__shadow-indicator {
+.block-editor-global-styles__shadow-indicator {
   color: #2f2f2f;
   border: #e0e0e0 1px solid;
   border-radius: 2px;
@@ -1957,7 +1959,7 @@ iframe[name=editor-canvas].has-editor-padding {
 .block-editor-link-control__search-item .block-editor-link-control__search-item-header {
   display: block;
   flex-direction: row;
-  align-items: flex-start;
+  align-items: center;
   margin-right: 8px;
   gap: 8px;
   white-space: pre-wrap;
@@ -2010,6 +2012,9 @@ iframe[name=editor-canvas].has-editor-padding {
   border-radius: 2px;
   line-height: 1.1;
 }
+.block-editor-link-control__search-item .block-editor-link-control__search-item-title:focus {
+  box-shadow: none;
+}
 .block-editor-link-control__search-item .block-editor-link-control__search-item-title:focus-visible {
   box-shadow: inset 0 0 0 1px var(--wp-components-color-background, #fff), 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
   outline: 2px solid transparent;
@@ -2084,13 +2089,6 @@ iframe[name=editor-canvas].has-editor-padding {
   top: 0;
 }
 
-.block-editor-link-control__drawer {
-  display: flex;
-  order: 30;
-  flex-direction: column;
-  flex-basis: 100%;
-}
-
 .block-editor-link-control__drawer-inner {
   display: flex;
   flex-direction: column;
@@ -2098,11 +2096,6 @@ iframe[name=editor-canvas].has-editor-padding {
   position: relative;
 }
 
-.block-editor-link-control__unlink {
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
 .block-editor-link-control__setting {
   margin-bottom: 0;
   flex: 1;
@@ -2171,11 +2164,6 @@ iframe[name=editor-canvas].has-editor-padding {
   right: 12px;
 }
 
-.block-editor-link-control__search-item-action {
-  margin-left: auto;
-  flex-shrink: 0;
-}
-
 .block-editor-list-view-tree {
   width: 100%;
   border-collapse: collapse;
@@ -2693,7 +2681,7 @@ iframe[name=editor-canvas].has-editor-padding {
   margin-bottom: 8px;
 }
 .block-editor-media-flow__url-input .block-editor-link-control {
-  width: 200px;
+  width: 300px;
 }
 .block-editor-media-flow__url-input .block-editor-link-control .block-editor-url-input {
   padding: 0;
@@ -2917,8 +2905,6 @@ iframe[name=editor-canvas].has-editor-padding {
 .block-editor-url-input input[type=text] {
   width: 100%;
   padding: 8px 8px 8px 12px;
-  border: none;
-  border-radius: 0;
   margin-left: 0;
   margin-right: 0;
   /* Fonts smaller than 16px causes mobile safari to zoom. */
@@ -3101,7 +3087,6 @@ iframe[name=editor-canvas].has-editor-padding {
 
 .block-editor-url-popover__input-container {
   padding: 8px;
-  padding-left: 16px;
 }
 
 .block-editor-url-popover__row {
@@ -3111,7 +3096,7 @@ iframe[name=editor-canvas].has-editor-padding {
 
 .block-editor-url-popover__row > :not(.block-editor-url-popover__settings-toggle) {
   flex-grow: 1;
-  gap: 4px;
+  gap: 8px;
 }
 
 .block-editor-url-popover__additional-controls .components-button.has-icon {
@@ -3151,6 +3136,7 @@ iframe[name=editor-canvas].has-editor-padding {
   text-overflow: ellipsis;
   white-space: nowrap;
   margin-right: 8px;
+  max-width: 350px;
 }
 .block-editor-url-popover__link-viewer-url.has-invalid-link {
   color: #cc1818;
@@ -3160,27 +3146,18 @@ iframe[name=editor-canvas].has-editor-padding {
   display: flex;
   align-items: center;
   min-width: 350px;
-  overflow: hidden;
   white-space: nowrap;
 }
-.block-editor-url-popover__expand-on-click .fullscreen-icon {
-  padding-right: 4px;
-}
-.block-editor-url-popover__expand-on-click .fullscreen-icon > svg {
-  width: 24px;
-  height: 24px;
-}
 .block-editor-url-popover__expand-on-click .text {
   flex-grow: 1;
 }
 .block-editor-url-popover__expand-on-click .text p {
   margin: 0;
+  line-height: 16px;
 }
-.block-editor-url-popover__expand-on-click .description {
-  color: #949494;
-}
-.block-editor-url-popover__expand-on-click .remove-link {
-  margin-right: 8px;
+.block-editor-url-popover__expand-on-click .text p.description {
+  color: #757575;
+  font-size: 12px;
 }
 
 .html-anchor-control .components-external-link {
@@ -3437,6 +3414,35 @@ iframe[name=editor-canvas].has-editor-padding {
 .block-editor-block-contextual-toolbar .block-editor-block-toolbar {
   overflow: auto;
   overflow-y: hidden;
+  scrollbar-width: thin;
+  scrollbar-gutter: stable both-edges;
+  scrollbar-color: #e0e0e0 transparent;
+  will-change: transform;
+  scrollbar-gutter: auto;
+}
+.block-editor-block-contextual-toolbar .block-editor-block-toolbar::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+.block-editor-block-contextual-toolbar .block-editor-block-toolbar::-webkit-scrollbar-track {
+  background-color: transparent;
+}
+.block-editor-block-contextual-toolbar .block-editor-block-toolbar::-webkit-scrollbar-thumb {
+  background-color: #e0e0e0;
+  border-radius: 8px;
+  border: 3px solid transparent;
+  background-clip: padding-box;
+}
+.block-editor-block-contextual-toolbar .block-editor-block-toolbar:hover::-webkit-scrollbar-thumb, .block-editor-block-contextual-toolbar .block-editor-block-toolbar:focus::-webkit-scrollbar-thumb, .block-editor-block-contextual-toolbar .block-editor-block-toolbar:focus-within::-webkit-scrollbar-thumb {
+  background-color: #949494;
+}
+.block-editor-block-contextual-toolbar .block-editor-block-toolbar:hover, .block-editor-block-contextual-toolbar .block-editor-block-toolbar:focus, .block-editor-block-contextual-toolbar .block-editor-block-toolbar:focus-within {
+  scrollbar-color: #949494 transparent;
+}
+@media (hover: none) {
+  .block-editor-block-contextual-toolbar .block-editor-block-toolbar {
+    scrollbar-color: #949494 transparent;
+  }
 }
 .block-editor-block-contextual-toolbar .block-editor-block-toolbar > :last-child::after,
 .block-editor-block-contextual-toolbar .block-editor-block-toolbar > :last-child .components-toolbar-group::after,
@@ -3461,7 +3467,10 @@ iframe[name=editor-canvas].has-editor-padding {
   position: absolute;
   font-size: 16px;
   right: 0;
-  bottom: 16px;
+  height: 32px;
+  top: 0;
+  display: inline-flex;
+  align-items: center;
 }
 
 .block-editor-block-toolbar__block-controls .block-editor-block-switcher .components-dropdown-menu__toggle .block-editor-block-icon,
@@ -3674,9 +3683,6 @@ iframe[name=editor-canvas].has-editor-padding {
 .block-editor-inserter__search {
   padding: 16px 16px 0 16px;
 }
-.block-editor-inserter__search .components-search-control__icon {
-  right: 20px;
-}
 
 .block-editor-inserter__tabs {
   flex-grow: 1;
@@ -4136,13 +4142,8 @@ iframe[name=editor-canvas].has-editor-padding {
   justify-content: center;
   flex: 1;
 }
-.block-editor-inserter__media-panel .block-editor-inserter__media-panel-search.components-search-control input[type=search].components-search-control__input {
-  background: #fff;
-}
-.block-editor-inserter__media-panel .block-editor-inserter__media-panel-search.components-search-control button.components-button {
-  min-width: auto;
-  padding-left: 2px;
-  padding-right: 2px;
+.block-editor-inserter__media-panel .block-editor-inserter__media-panel-search:not(:focus-within) {
+  --wp-components-color-background: #fff;
 }
 
 .block-editor-inserter__media-list {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.18.2",
+	"version": "12.19.1",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -35,35 +35,35 @@
 		"@emotion/react": "^11.7.1",
 		"@emotion/styled": "^11.6.0",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^3.50.0",
-		"@wordpress/api-fetch": "^6.47.0",
-		"@wordpress/blob": "^3.50.0",
-		"@wordpress/blocks": "^12.27.1",
-		"@wordpress/commands": "^0.21.0",
-		"@wordpress/components": "^25.16.0",
-		"@wordpress/compose": "^6.27.0",
-		"@wordpress/data": "^9.20.0",
-		"@wordpress/date": "^4.50.0",
-		"@wordpress/deprecated": "^3.50.0",
-		"@wordpress/dom": "^3.50.0",
-		"@wordpress/element": "^5.27.0",
-		"@wordpress/escape-html": "^2.50.0",
-		"@wordpress/hooks": "^3.50.0",
-		"@wordpress/html-entities": "^3.50.0",
-		"@wordpress/i18n": "^4.50.0",
-		"@wordpress/icons": "^9.41.0",
-		"@wordpress/is-shallow-equal": "^4.50.0",
-		"@wordpress/keyboard-shortcuts": "^4.27.0",
-		"@wordpress/keycodes": "^3.50.0",
-		"@wordpress/notices": "^4.18.0",
-		"@wordpress/preferences": "^3.27.0",
-		"@wordpress/private-apis": "^0.32.0",
-		"@wordpress/rich-text": "^6.27.0",
-		"@wordpress/style-engine": "^1.33.1",
-		"@wordpress/token-list": "^2.50.0",
-		"@wordpress/url": "^3.51.0",
-		"@wordpress/warning": "^2.50.0",
-		"@wordpress/wordcount": "^3.50.0",
+		"@wordpress/a11y": "^3.51.0",
+		"@wordpress/api-fetch": "^6.48.0",
+		"@wordpress/blob": "^3.51.0",
+		"@wordpress/blocks": "^12.28.1",
+		"@wordpress/commands": "^0.22.1",
+		"@wordpress/components": "^26.0.1",
+		"@wordpress/compose": "^6.28.0",
+		"@wordpress/data": "^9.21.0",
+		"@wordpress/date": "^4.51.0",
+		"@wordpress/deprecated": "^3.51.0",
+		"@wordpress/dom": "^3.51.0",
+		"@wordpress/element": "^5.28.0",
+		"@wordpress/escape-html": "^2.51.0",
+		"@wordpress/hooks": "^3.51.0",
+		"@wordpress/html-entities": "^3.51.0",
+		"@wordpress/i18n": "^4.51.0",
+		"@wordpress/icons": "^9.42.0",
+		"@wordpress/is-shallow-equal": "^4.51.0",
+		"@wordpress/keyboard-shortcuts": "^4.28.0",
+		"@wordpress/keycodes": "^3.51.0",
+		"@wordpress/notices": "^4.19.0",
+		"@wordpress/preferences": "^3.28.1",
+		"@wordpress/private-apis": "^0.33.0",
+		"@wordpress/rich-text": "^6.28.1",
+		"@wordpress/style-engine": "^1.34.0",
+		"@wordpress/token-list": "^2.51.0",
+		"@wordpress/url": "^3.52.0",
+		"@wordpress/warning": "^2.51.0",
+		"@wordpress/wordcount": "^3.51.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.7.0",
@@ -87,5 +87,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fefb6f718fbfd5df9390f366d5733369f613084a"
+	"gitHead": "5902fc0f490528da6965dd4cf97f11192bcf5956"
 }

package/src/components/block-canvas/style.scss

@@ -9,5 +9,5 @@ iframe[name="editor-canvas"]:not(.has-editor-padding) {
 }
 
 iframe[name="editor-canvas"].has-editor-padding {
-	padding: $grid-unit-60 $grid-unit-60 0;
+	padding: $grid-unit-30 $grid-unit-30 0;
 }

package/src/components/block-card/style.scss

@@ -14,14 +14,16 @@
 
 	&.block-editor-block-card__title {
 		font-size: $default-font-size;
-		line-height: $button-size-small;
+		line-height: $default-line-height;
 		margin: 0;
+		padding: 3px 0; // This makes the title as high as the icon.
 	}
 }
 
 .block-editor-block-card__description {
 	display: block;
 	font-size: $default-font-size;
+	line-height: $default-line-height;
 	margin-top: $grid-unit-05;
 }
 

package/src/components/block-controls/README.md

@@ -49,7 +49,7 @@ export default function MyBlockEdit( { attributes, setAttributes } ) {
 <MyBlockEdit />;
 ```
 
-See [this custom block tutorial page](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) for more information and block controls examples.
+See [this custom block tutorial page](/docs/getting-started/fundamentals/block-in-the-editor.md) for more information and block controls examples.
 
 Furthermore, the READMEs of various components inside the block editor package and the components package include examples that also utilize `BlockControls` and can be a good reference.
 
@@ -69,7 +69,7 @@ Group of the block controls. Allows you to create and render multiple groups of
 
 Allows overriding the default `controls` if the `default` group is used. 
 
-See [this custom block tutorial page](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) for more details and examples with block controls.
+See [this custom block tutorial page](/docs/getting-started/fundamentals/block-in-the-editor.md) for more details and examples with block controls.
 
 - Type: `array`
 

package/src/components/block-inspector/index.js

@@ -30,6 +30,7 @@ import PositionControls from '../inspector-controls-tabs/position-controls-panel
 import useBlockInspectorAnimationSettings from './useBlockInspectorAnimationSettings';
 import BlockInfo from '../block-info-slot-fill';
 import BlockQuickNavigation from '../block-quick-navigation';
+import { getBorderPanelLabel } from '../../hooks/border';
 
 function BlockInspectorLockedBlocks( { topLevelLockedBlock } ) {
 	const contentClientIds = useSelect(
@@ -56,9 +57,11 @@ function BlockInspectorLockedBlocks( { topLevelLockedBlock } ) {
 			/>
 			<BlockVariationTransforms blockClientId={ topLevelLockedBlock } />
 			<BlockInfo.Slot />
-			<PanelBody title={ __( 'Content' ) }>
-				<BlockQuickNavigation clientIds={ contentClientIds } />
-			</PanelBody>
+			{ contentClientIds.length > 0 && (
+				<PanelBody title={ __( 'Content' ) }>
+					<BlockQuickNavigation clientIds={ contentClientIds } />
+				</PanelBody>
+			) }
 		</div>
 	);
 }
@@ -137,7 +140,9 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 						/>
 						<InspectorControls.Slot
 							group="border"
-							label={ __( 'Border' ) }
+							label={ getBorderPanelLabel( {
+								blockName: selectedBlockName,
+							} ) }
 						/>
 						<InspectorControls.Slot group="styles" />
 					</>
@@ -246,6 +251,7 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
 		[ blockName ]
 	);
 	const blockInformation = useBlockDisplayInformation( clientId );
+	const borderPanelLabel = getBorderPanelLabel( { blockName } );
 
 	return (
 		<div className="block-editor-block-inspector">
@@ -298,7 +304,7 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
 					/>
 					<InspectorControls.Slot
 						group="border"
-						label={ __( 'Border' ) }
+						label={ borderPanelLabel }
 					/>
 					<InspectorControls.Slot group="styles" />
 					<InspectorControls.Slot
@@ -306,10 +312,6 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
 						label={ __( 'Background' ) }
 					/>
 					<PositionControls />
-					<InspectorControls.Slot
-						group="effects"
-						label={ __( 'Effects' ) }
-					/>
 					<div>
 						<AdvancedControls />
 					</div>

package/src/components/block-list/block.js

@@ -6,7 +6,13 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { memo, useCallback, RawHTML, useContext } from '@wordpress/element';
+import {
+	memo,
+	useCallback,
+	RawHTML,
+	useContext,
+	useMemo,
+} from '@wordpress/element';
 import {
 	getBlockType,
 	getSaveContent,
@@ -497,7 +503,8 @@ function BlockListBlockProvider( props ) {
 				getBlockMode,
 				isSelectionEnabled,
 				getTemplateLock,
-				__unstableGetBlockWithoutInnerBlocks,
+				getBlockWithoutAttributes,
+				getBlockAttributes,
 				canRemoveBlock,
 				canMoveBlock,
 
@@ -517,20 +524,21 @@ function BlockListBlockProvider( props ) {
 				__unstableIsFullySelected,
 				__unstableSelectionHasUnmergeableBlock,
 				isBlockBeingDragged,
+				isDragging,
 				hasBlockMovingClientId,
 				canInsertBlockType,
-				getBlockRootClientId,
 				__unstableHasActiveBlockOverlayActive,
 				__unstableGetEditorMode,
 				getSelectedBlocksInitialCaretPosition,
 			} = unlock( select( blockEditorStore ) );
-			const block = __unstableGetBlockWithoutInnerBlocks( clientId );
+			const blockWithoutAttributes =
+				getBlockWithoutAttributes( clientId );
 
 			// This is a temporary fix.
 			// This function should never be called when a block is not
 			// present in the state. It happens now because the order in
 			// withSelect rendering is not correct.
-			if ( ! block ) {
+			if ( ! blockWithoutAttributes ) {
 				return;
 			}
 
@@ -539,10 +547,10 @@ function BlockListBlockProvider( props ) {
 				getActiveBlockVariation,
 			} = select( blocksStore );
 			const _isSelected = isBlockSelected( clientId );
-			const templateLock = getTemplateLock( rootClientId );
 			const canRemove = canRemoveBlock( clientId, rootClientId );
 			const canMove = canMoveBlock( clientId, rootClientId );
-			const { name: blockName, attributes, isValid } = block;
+			const attributes = getBlockAttributes( clientId );
+			const { name: blockName, isValid } = blockWithoutAttributes;
 			const blockType = getBlockType( blockName );
 			const match = getActiveBlockVariation( blockName, attributes );
 			const { outlineMode, supportsLayout } = getSettings();
@@ -555,18 +563,16 @@ function BlockListBlockProvider( props ) {
 			const typing = isTyping();
 			const hasLightBlockWrapper = blockType?.apiVersion > 1;
 			const movingClientId = hasBlockMovingClientId();
+			const blockEditingMode = getBlockEditingMode( clientId );
 
 			return {
 				mode: getBlockMode( clientId ),
 				isSelectionEnabled: isSelectionEnabled(),
-				isLocked: !! templateLock,
+				isLocked: !! getTemplateLock( rootClientId ),
+				templateLock: getTemplateLock( clientId ),
 				canRemove,
 				canMove,
-				// Users of the editor.BlockListBlock filter used to be able to
-				// access the block prop.
-				// Ideally these blocks would rely on the clientId prop only.
-				// This is kept for backward compatibility reasons.
-				block,
+				blockWithoutAttributes,
 				name: blockName,
 				attributes,
 				isValid,
@@ -574,7 +580,7 @@ function BlockListBlockProvider( props ) {
 				themeSupportsLayout: supportsLayout,
 				isTemporarilyEditingAsBlocks:
 					__unstableGetTemporarilyEditingAsBlocks() === clientId,
-				blockEditingMode: getBlockEditingMode( clientId ),
+				blockEditingMode,
 				mayDisplayControls:
 					_isSelected ||
 					( isFirstMultiSelectedBlock( clientId ) &&
@@ -590,9 +596,13 @@ function BlockListBlockProvider( props ) {
 				index: getBlockIndex( clientId ),
 				blockApiVersion: blockType?.apiVersion || 1,
 				blockTitle: match?.title || blockType?.title,
-				isSubtreeDisabled: isBlockSubtreeDisabled( clientId ),
+				isSubtreeDisabled:
+					blockEditingMode === 'disabled' &&
+					isBlockSubtreeDisabled( clientId ),
 				isOutlineEnabled: outlineMode,
-				hasOverlay: __unstableHasActiveBlockOverlayActive( clientId ),
+				hasOverlay:
+					__unstableHasActiveBlockOverlayActive( clientId ) &&
+					! isDragging(),
 				initialPosition:
 					_isSelected && __unstableGetEditorMode() === 'edit'
 						? getSelectedBlocksInitialCaretPosition()
@@ -612,10 +622,12 @@ function BlockListBlockProvider( props ) {
 					movingClientId &&
 					canInsertBlockType(
 						getBlockName( movingClientId ),
-						getBlockRootClientId( clientId )
+						rootClientId
 					),
-				isEditingDisabled:
-					getBlockEditingMode( clientId ) === 'disabled',
+				isEditingDisabled: blockEditingMode === 'disabled',
+				hasEditableOutline:
+					blockEditingMode !== 'disabled' &&
+					getBlockEditingMode( rootClientId ) === 'disabled',
 				className: hasLightBlockWrapper
 					? attributes.className
 					: undefined,
@@ -633,7 +645,7 @@ function BlockListBlockProvider( props ) {
 		isLocked,
 		canRemove,
 		canMove,
-		block,
+		blockWithoutAttributes,
 		name,
 		attributes,
 		isValid,
@@ -659,11 +671,22 @@ function BlockListBlockProvider( props ) {
 		removeOutline,
 		isBlockMovingMode,
 		canInsertMovingBlock,
+		templateLock,
 		isEditingDisabled,
+		hasEditableOutline,
 		className,
 		defaultClassName,
 	} = selectedProps;
 
+	// Users of the editor.BlockListBlock filter used to be able to
+	// access the block prop.
+	// Ideally these blocks would rely on the clientId prop only.
+	// This is kept for backward compatibility reasons.
+	const block = useMemo(
+		() => ( { ...blockWithoutAttributes, attributes } ),
+		[ blockWithoutAttributes, attributes ]
+	);
+
 	// Block is sometimes not mounted at the right time, causing it be
 	// undefined see issue for more info
 	// https://github.com/WordPress/gutenberg/issues/17013
@@ -694,7 +717,9 @@ function BlockListBlockProvider( props ) {
 		removeOutline,
 		isBlockMovingMode,
 		canInsertMovingBlock,
+		templateLock,
 		isEditingDisabled,
+		hasEditableOutline,
 		isTemporarilyEditingAsBlocks,
 		defaultClassName,
 		mayDisplayControls,