@wordpress/block-editor 11.6.0 → 11.8.0

package/build-style/style-rtl.css

@@ -158,7 +158,8 @@
 .block-editor-block-inspector .components-base-control:last-child {
   margin-bottom: 8px;
 }
-.block-editor-block-inspector .components-focal-point-picker-control .components-base-control {
+.block-editor-block-inspector .components-focal-point-picker-control .components-base-control,
+.block-editor-block-inspector .components-query-controls .components-base-control {
   margin-bottom: 0;
 }
 .block-editor-block-inspector .components-panel__body {
@@ -1342,15 +1343,15 @@
 .block-editor-tools-panel-color-gradient-settings__item {
   padding: 0;
   max-width: 100%;
-  border-right: 1px solid rgba(0, 0, 0, 0.1);
-  border-left: 1px solid rgba(0, 0, 0, 0.1);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  border-right: 1px solid #ddd;
+  border-left: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
 }
 .block-editor-tools-panel-color-gradient-settings__item.first {
   margin-top: 24px;
   border-top-right-radius: 2px;
   border-top-left-radius: 2px;
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  border-top: 1px solid #ddd;
 }
 .block-editor-tools-panel-color-gradient-settings__item.last {
   border-bottom-right-radius: 2px;
@@ -1435,6 +1436,44 @@
   text-transform: capitalize;
 }
 
+.block-editor-global-styles-effects-panel__toggle-icon {
+  fill: currentColor;
+}
+
+.block-editor-global-styles-effects-panel__shadow-popover-container {
+  width: 230px;
+}
+
+.block-editor-global-styles-effects-panel__shadow-dropdown {
+  display: block;
+  padding: 0;
+}
+.block-editor-global-styles-effects-panel__shadow-dropdown > button {
+  width: 100%;
+  padding: 8px;
+}
+.block-editor-global-styles-effects-panel__shadow-dropdown > button.is-open {
+  background-color: #f0f0f0;
+}
+
+.block-editor-global-styles-effects-panel__shadow-indicator-wrapper {
+  padding: 6px;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.block-editor-global-styles-effects-panel__shadow-indicator {
+  color: #2f2f2f;
+  border: #e0e0e0 1px solid;
+  border-radius: 2px;
+  cursor: pointer;
+  padding: 0;
+  height: 24px;
+  width: 24px;
+}
+
 .block-editor-height-control {
   border: 0;
   margin: 0;
@@ -2454,7 +2493,9 @@
 }
 .block-editor-list-view-drop-indicator .block-editor-list-view-drop-indicator__line {
   background: var(--wp-admin-theme-color);
-  height: 1px;
+  height: 6px;
+  border: 1px solid #fff;
+  border-radius: 4px;
 }
 
 .block-editor-list-view-placeholder {
@@ -2463,6 +2504,24 @@
   height: 36px;
 }
 
+.list-view-appender .block-editor-inserter__toggle {
+  background-color: #1e1e1e;
+  color: #fff;
+  margin: 8px 24px 0 0;
+  border-radius: 2px;
+  height: 24px;
+  min-width: 24px;
+  padding: 0;
+}
+.list-view-appender .block-editor-inserter__toggle:hover, .list-view-appender .block-editor-inserter__toggle:focus {
+  background: var(--wp-admin-theme-color);
+  color: #fff;
+}
+
+.list-view-appender__description {
+  display: none;
+}
+
 .modal-open .block-editor-media-replace-flow__options {
   display: none;
 }
@@ -2472,12 +2531,14 @@
 }
 
 .block-editor-media-flow__url-input {
-  border-top: 1px solid #1e1e1e;
-  margin-top: 8px;
   margin-left: -8px;
   margin-right: -8px;
   padding: 16px;
 }
+.block-editor-media-flow__url-input.has-siblings {
+  border-top: 1px solid #1e1e1e;
+  margin-top: 8px;
+}
 .block-editor-media-flow__url-input .block-editor-media-replace-flow__image-url-label {
   display: block;
   top: 16px;
@@ -3941,7 +4002,7 @@
   display: grid;
   grid-template-columns: auto 1fr auto;
   align-items: center;
-  grid-template-rows: 16px auto;
+  grid-template-rows: 24px auto;
 }
 
 .component-spacing-sizes-control {
@@ -3957,7 +4018,7 @@
   align-self: center;
 }
 .component-spacing-sizes-control .components-base-control__label {
-  margin-bottom: 0;
+  margin-bottom: 8px;
   height: 16px;
 }
 .component-spacing-sizes-control .components-spacing-sizes-control__side-labels {
@@ -3986,6 +4047,7 @@
   grid-row: 1/1;
   align-self: center;
   margin-right: 4px;
+  margin-bottom: 8px;
 }
 .component-spacing-sizes-control .components-spacing-sizes-control__custom-toggle-all {
   grid-column: 2/2;
@@ -4011,26 +4073,25 @@
 .component-spacing-sizes-control .components-spacing-sizes-control__custom-value-range {
   grid-column: span 2;
   margin-right: 16px;
-  margin-top: 8px;
 }
-.component-spacing-sizes-control .components-spacing-sizes-control__custom-value-input {
+.component-spacing-sizes-control .components-base-control.components-spacing-sizes-control__custom-value-input {
   width: 124px;
-  margin-top: 8px;
   grid-column: 1;
+  margin-bottom: 0;
 }
-.component-spacing-sizes-control .components-range-control {
+.component-spacing-sizes-control .components-base-control.components-range-control {
   height: 40px;
   /* Vertically center the RangeControl until it has true 40px height. */
   display: flex;
   align-items: center;
+  margin-bottom: 0;
 }
-.component-spacing-sizes-control .components-range-control > .components-base-control__field {
+.component-spacing-sizes-control .components-base-control.components-range-control > .components-base-control__field {
   /* Fixes RangeControl contents when the outer wrapper is flex */
   flex: 1;
 }
 .component-spacing-sizes-control .components-spacing-sizes-control__range-control {
   grid-column: span 3;
-  margin-top: 8px;
 }
 .component-spacing-sizes-control .components-range-control__mark {
   height: 4px;

package/build-style/style.css

@@ -158,7 +158,8 @@
 .block-editor-block-inspector .components-base-control:last-child {
   margin-bottom: 8px;
 }
-.block-editor-block-inspector .components-focal-point-picker-control .components-base-control {
+.block-editor-block-inspector .components-focal-point-picker-control .components-base-control,
+.block-editor-block-inspector .components-query-controls .components-base-control {
   margin-bottom: 0;
 }
 .block-editor-block-inspector .components-panel__body {
@@ -1342,15 +1343,15 @@
 .block-editor-tools-panel-color-gradient-settings__item {
   padding: 0;
   max-width: 100%;
-  border-left: 1px solid rgba(0, 0, 0, 0.1);
-  border-right: 1px solid rgba(0, 0, 0, 0.1);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  border-left: 1px solid #ddd;
+  border-right: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
 }
 .block-editor-tools-panel-color-gradient-settings__item.first {
   margin-top: 24px;
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  border-top: 1px solid #ddd;
 }
 .block-editor-tools-panel-color-gradient-settings__item.last {
   border-bottom-left-radius: 2px;
@@ -1435,6 +1436,44 @@
   text-transform: capitalize;
 }
 
+.block-editor-global-styles-effects-panel__toggle-icon {
+  fill: currentColor;
+}
+
+.block-editor-global-styles-effects-panel__shadow-popover-container {
+  width: 230px;
+}
+
+.block-editor-global-styles-effects-panel__shadow-dropdown {
+  display: block;
+  padding: 0;
+}
+.block-editor-global-styles-effects-panel__shadow-dropdown > button {
+  width: 100%;
+  padding: 8px;
+}
+.block-editor-global-styles-effects-panel__shadow-dropdown > button.is-open {
+  background-color: #f0f0f0;
+}
+
+.block-editor-global-styles-effects-panel__shadow-indicator-wrapper {
+  padding: 6px;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.block-editor-global-styles-effects-panel__shadow-indicator {
+  color: #2f2f2f;
+  border: #e0e0e0 1px solid;
+  border-radius: 2px;
+  cursor: pointer;
+  padding: 0;
+  height: 24px;
+  width: 24px;
+}
+
 .block-editor-height-control {
   border: 0;
   margin: 0;
@@ -2454,7 +2493,9 @@
 }
 .block-editor-list-view-drop-indicator .block-editor-list-view-drop-indicator__line {
   background: var(--wp-admin-theme-color);
-  height: 1px;
+  height: 6px;
+  border: 1px solid #fff;
+  border-radius: 4px;
 }
 
 .block-editor-list-view-placeholder {
@@ -2463,6 +2504,24 @@
   height: 36px;
 }
 
+.list-view-appender .block-editor-inserter__toggle {
+  background-color: #1e1e1e;
+  color: #fff;
+  margin: 8px 0 0 24px;
+  border-radius: 2px;
+  height: 24px;
+  min-width: 24px;
+  padding: 0;
+}
+.list-view-appender .block-editor-inserter__toggle:hover, .list-view-appender .block-editor-inserter__toggle:focus {
+  background: var(--wp-admin-theme-color);
+  color: #fff;
+}
+
+.list-view-appender__description {
+  display: none;
+}
+
 .modal-open .block-editor-media-replace-flow__options {
   display: none;
 }
@@ -2472,12 +2531,14 @@
 }
 
 .block-editor-media-flow__url-input {
-  border-top: 1px solid #1e1e1e;
-  margin-top: 8px;
   margin-right: -8px;
   margin-left: -8px;
   padding: 16px;
 }
+.block-editor-media-flow__url-input.has-siblings {
+  border-top: 1px solid #1e1e1e;
+  margin-top: 8px;
+}
 .block-editor-media-flow__url-input .block-editor-media-replace-flow__image-url-label {
   display: block;
   top: 16px;
@@ -3941,7 +4002,7 @@
   display: grid;
   grid-template-columns: auto 1fr auto;
   align-items: center;
-  grid-template-rows: 16px auto;
+  grid-template-rows: 24px auto;
 }
 
 .component-spacing-sizes-control {
@@ -3957,7 +4018,7 @@
   align-self: center;
 }
 .component-spacing-sizes-control .components-base-control__label {
-  margin-bottom: 0;
+  margin-bottom: 8px;
   height: 16px;
 }
 .component-spacing-sizes-control .components-spacing-sizes-control__side-labels {
@@ -3986,6 +4047,7 @@
   grid-row: 1/1;
   align-self: center;
   margin-left: 4px;
+  margin-bottom: 8px;
 }
 .component-spacing-sizes-control .components-spacing-sizes-control__custom-toggle-all {
   grid-column: 2/2;
@@ -4011,26 +4073,25 @@
 .component-spacing-sizes-control .components-spacing-sizes-control__custom-value-range {
   grid-column: span 2;
   margin-left: 16px;
-  margin-top: 8px;
 }
-.component-spacing-sizes-control .components-spacing-sizes-control__custom-value-input {
+.component-spacing-sizes-control .components-base-control.components-spacing-sizes-control__custom-value-input {
   width: 124px;
-  margin-top: 8px;
   grid-column: 1;
+  margin-bottom: 0;
 }
-.component-spacing-sizes-control .components-range-control {
+.component-spacing-sizes-control .components-base-control.components-range-control {
   height: 40px;
   /* Vertically center the RangeControl until it has true 40px height. */
   display: flex;
   align-items: center;
+  margin-bottom: 0;
 }
-.component-spacing-sizes-control .components-range-control > .components-base-control__field {
+.component-spacing-sizes-control .components-base-control.components-range-control > .components-base-control__field {
   /* Fixes RangeControl contents when the outer wrapper is flex */
   flex: 1;
 }
 .component-spacing-sizes-control .components-spacing-sizes-control__range-control {
   grid-column: span 3;
-  margin-top: 8px;
 }
 .component-spacing-sizes-control .components-range-control__mark {
   height: 4px;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "11.6.0",
+	"version": "11.8.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -33,35 +33,35 @@
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^3.29.0",
-		"@wordpress/api-fetch": "^6.26.0",
-		"@wordpress/blob": "^3.29.0",
-		"@wordpress/blocks": "^12.6.0",
-		"@wordpress/components": "^23.6.0",
-		"@wordpress/compose": "^6.6.0",
-		"@wordpress/data": "^8.6.0",
-		"@wordpress/date": "^4.29.0",
-		"@wordpress/deprecated": "^3.29.0",
-		"@wordpress/dom": "^3.29.0",
-		"@wordpress/element": "^5.6.0",
-		"@wordpress/escape-html": "^2.29.0",
-		"@wordpress/hooks": "^3.29.0",
-		"@wordpress/html-entities": "^3.29.0",
-		"@wordpress/i18n": "^4.29.0",
-		"@wordpress/icons": "^9.20.0",
-		"@wordpress/is-shallow-equal": "^4.29.0",
-		"@wordpress/keyboard-shortcuts": "^4.6.0",
-		"@wordpress/keycodes": "^3.29.0",
-		"@wordpress/notices": "^3.29.0",
-		"@wordpress/preferences": "^3.6.0",
-		"@wordpress/private-apis": "^0.11.0",
-		"@wordpress/rich-text": "^6.6.0",
-		"@wordpress/shortcode": "^3.29.0",
-		"@wordpress/style-engine": "^1.12.0",
-		"@wordpress/token-list": "^2.29.0",
-		"@wordpress/url": "^3.30.0",
-		"@wordpress/warning": "^2.29.0",
-		"@wordpress/wordcount": "^3.29.0",
+		"@wordpress/a11y": "^3.31.0",
+		"@wordpress/api-fetch": "^6.28.0",
+		"@wordpress/blob": "^3.31.0",
+		"@wordpress/blocks": "^12.8.0",
+		"@wordpress/components": "^23.8.0",
+		"@wordpress/compose": "^6.8.0",
+		"@wordpress/data": "^9.1.0",
+		"@wordpress/date": "^4.31.0",
+		"@wordpress/deprecated": "^3.31.0",
+		"@wordpress/dom": "^3.31.0",
+		"@wordpress/element": "^5.8.0",
+		"@wordpress/escape-html": "^2.31.0",
+		"@wordpress/hooks": "^3.31.0",
+		"@wordpress/html-entities": "^3.31.0",
+		"@wordpress/i18n": "^4.31.0",
+		"@wordpress/icons": "^9.22.0",
+		"@wordpress/is-shallow-equal": "^4.31.0",
+		"@wordpress/keyboard-shortcuts": "^4.8.0",
+		"@wordpress/keycodes": "^3.31.0",
+		"@wordpress/notices": "^3.31.0",
+		"@wordpress/preferences": "^3.8.0",
+		"@wordpress/private-apis": "^0.13.0",
+		"@wordpress/rich-text": "^6.8.0",
+		"@wordpress/shortcode": "^3.31.0",
+		"@wordpress/style-engine": "^1.14.0",
+		"@wordpress/token-list": "^2.31.0",
+		"@wordpress/url": "^3.32.0",
+		"@wordpress/warning": "^2.31.0",
+		"@wordpress/wordcount": "^3.31.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.7.0",
@@ -83,5 +83,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9534a7b3bbf07c1d40b94fdb7a3d091f297bfb06"
+	"gitHead": "d61700b9f1c72ba0b030fc815ef1685b4f4031ec"
 }

package/src/components/block-draggable/content.scss

@@ -1,5 +1,5 @@
 // This creates a "slot" where the block you're dragging appeared.
-// We use !important as one of the rules are meant to be overriden.
+// We use !important as one of the rules are meant to be overridden.
 .block-editor-block-list__layout .is-dragging {
 	background-color: currentColor !important;
 	opacity: 0.05 !important;

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

@@ -18,10 +18,12 @@
 		}
 	}
 
-	// Reset unexpected margin-bottom from being applied to the `BaseControl`
-	// component of the `FocalPointPicker` component.
-	.components-focal-point-picker-control .components-base-control {
-		margin-bottom: 0;
+	// Reset unwanted margin-bottom from being applied to BaseControls within certain components.
+	.components-focal-point-picker-control,
+	.components-query-controls {
+		.components-base-control {
+			margin-bottom: 0;
+		}
 	}
 
 	.components-panel__body {

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

@@ -59,7 +59,7 @@ function BlockHTML( { clientId } ) {
 
 		// Ensure the state is updated if we reset so it displays the default content.
 		if ( ! html ) {
-			setHtml( { content } );
+			setHtml( content );
 		}
 	};
 

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

@@ -215,7 +215,7 @@ class BlockListBlock extends Component {
 			order + 1
 		);
 		const { isFullWidth, isContainerRelated } = alignmentHelpers;
-		const accessible = ! ( isSelected || isInnerBlockSelected );
+		const isFocused = isSelected || isInnerBlockSelected;
 		const screenWidth = Math.floor( Dimensions.get( 'window' ).width );
 		const isScreenWidthEqual = blockWidth === screenWidth;
 		const isScreenWidthWider = blockWidth < screenWidth;
@@ -224,8 +224,9 @@ class BlockListBlock extends Component {
 		return (
 			<TouchableWithoutFeedback
 				onPress={ this.onFocus }
-				accessible={ accessible }
+				accessible={ ! isFocused }
 				accessibilityRole={ 'button' }
+				disabled={ isFocused }
 			>
 				<View
 					style={ { flex: 1 } }

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

@@ -6,7 +6,7 @@ import { View, Platform, TouchableWithoutFeedback } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { Component, createContext } from '@wordpress/element';
+import { Component } from '@wordpress/element';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose, withPreferredColorScheme } from '@wordpress/compose';
 import { createBlock } from '@wordpress/blocks';
@@ -33,7 +33,6 @@ import {
 import { BlockDraggableWrapper } from '../block-draggable';
 import { store as blockEditorStore } from '../../store';
 
-export const OnCaretVerticalPositionChange = createContext();
 const identity = ( x ) => x;
 
 const stylesMemo = {};
@@ -70,8 +69,6 @@ export class BlockList extends Component {
 		};
 		this.renderItem = this.renderItem.bind( this );
 		this.renderBlockListFooter = this.renderBlockListFooter.bind( this );
-		this.onCaretVerticalPositionChange =
-			this.onCaretVerticalPositionChange.bind( this );
 		this.scrollViewInnerRef = this.scrollViewInnerRef.bind( this );
 		this.addBlockToEndOfPost = this.addBlockToEndOfPost.bind( this );
 		this.shouldFlatListPreventAutomaticScroll =
@@ -94,15 +91,6 @@ export class BlockList extends Component {
 		this.props.insertBlock( newBlock, this.props.blockCount );
 	}
 
-	onCaretVerticalPositionChange( targetId, caretY, previousCaretY ) {
-		KeyboardAwareFlatList.handleCaretVerticalPositionChange(
-			this.scrollViewRef,
-			targetId,
-			caretY,
-			previousCaretY
-		);
-	}
-
 	scrollViewInnerRef( ref ) {
 		this.scrollViewRef = ref;
 	}
@@ -209,13 +197,7 @@ export class BlockList extends Component {
 			</BlockListConsumer>
 		);
 
-		return (
-			<OnCaretVerticalPositionChange.Provider
-				value={ this.onCaretVerticalPositionChange }
-			>
-				{ blockList }
-			</OnCaretVerticalPositionChange.Provider>
-		);
+		return blockList;
 	}
 
 	renderList( extraProps = {} ) {
@@ -237,8 +219,7 @@ export class BlockList extends Component {
 		} = this.props;
 		const { parentScrollRef, onScroll } = extraProps;
 
-		const { blockToolbar, blockBorder, headerToolbar, floatingToolbar } =
-			styles;
+		const { blockToolbar, headerToolbar, floatingToolbar } = styles;
 
 		const containerStyle = {
 			flex: isRootList ? 1 : 0,
@@ -250,6 +231,15 @@ export class BlockList extends Component {
 		const isContentStretch = contentResizeMode === 'stretch';
 		const isMultiBlocks = blockClientIds.length > 1;
 		const { isWider } = alignmentHelpers;
+		const extraScrollHeight =
+			headerToolbar.height +
+			blockToolbar.height +
+			( isFloatingToolbarVisible ? floatingToolbar.height : 0 );
+
+		const scrollViewStyle = [
+			{ flex: isRootList ? 1 : 0 },
+			! isRootList && styles.overflowVisible,
+		];
 
 		return (
 			<View
@@ -263,24 +253,12 @@ export class BlockList extends Component {
 						? { removeClippedSubviews: false }
 						: {} ) } // Disable clipping on Android to fix focus losing. See https://github.com/wordpress-mobile/gutenberg-mobile/pull/741#issuecomment-472746541
 					accessibilityLabel="block-list"
-					autoScroll={ this.props.autoScroll }
 					innerRef={ ( ref ) => {
 						this.scrollViewInnerRef( parentScrollRef || ref );
 					} }
-					extraScrollHeight={
-						blockToolbar.height + blockBorder.width
-					}
-					inputAccessoryViewHeight={
-						headerToolbar.height +
-						( isFloatingToolbarVisible
-							? floatingToolbar.height
-							: 0 )
-					}
+					extraScrollHeight={ extraScrollHeight }
 					keyboardShouldPersistTaps="always"
-					scrollViewStyle={ [
-						{ flex: isRootList ? 1 : 0 },
-						! isRootList && styles.overflowVisible,
-					] }
+					scrollViewStyle={ scrollViewStyle }
 					extraData={ this.getExtraData() }
 					scrollEnabled={ isRootList }
 					contentContainerStyle={ [
@@ -407,6 +385,7 @@ export default compose( [
 		( select, { rootClientId, orientation, filterInnerBlocks } ) => {
 			const {
 				getBlockCount,
+				getBlockHierarchyRootClientId,
 				getBlockOrder,
 				getSelectedBlockClientId,
 				isBlockInsertionPointVisible,
@@ -427,10 +406,12 @@ export default compose( [
 			const isReadOnly = getSettings().readOnly;
 
 			const blockCount = getBlockCount();
-			const hasRootInnerBlocks = !! blockCount;
+			const rootBlockId = getBlockHierarchyRootClientId(
+				selectedBlockClientId
+			);
 
 			const isFloatingToolbarVisible =
-				!! selectedBlockClientId && hasRootInnerBlocks;
+				!! selectedBlockClientId && !! getBlockCount( rootBlockId );
 			const isRTL = getSettings().isRTL;
 
 			return {

package/src/components/block-list/use-in-between-inserter.js

@@ -4,6 +4,7 @@
 import { useRefEffect } from '@wordpress/compose';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useContext } from '@wordpress/element';
+import { isRTL } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -93,7 +94,9 @@ export function useInBetweenInserter() {
 							blockElRect.top > offsetTop ) ||
 						( blockEl.classList.contains( 'wp-block' ) &&
 							orientation === 'horizontal' &&
-							blockElRect.left > offsetLeft )
+							( isRTL()
+								? blockElRect.right < offsetLeft
+								: blockElRect.left > offsetLeft ) )
 					);
 				} );
 

package/src/components/block-popover/inbetween.js

@@ -106,16 +106,7 @@ function BlockPopoverInbetween( {
 						nextRect && previousRect
 							? nextRect.top - previousRect.bottom
 							: 0;
-
-					if ( isRTL() ) {
-						// vertical, rtl
-						left = previousRect
-							? previousRect.right
-							: nextRect.right;
-					} else {
-						// vertical, ltr
-						left = previousRect ? previousRect.left : nextRect.left;
-					}
+					left = previousRect ? previousRect.left : nextRect.left;
 				} else {
 					top = previousRect ? previousRect.top : nextRect.top;
 					height = previousRect
@@ -124,9 +115,7 @@ function BlockPopoverInbetween( {
 
 					if ( isRTL() ) {
 						// non vertical, rtl
-						left = previousRect
-							? previousRect.left
-							: nextRect.right;
+						left = nextRect ? nextRect.right : previousRect.left;
 						width =
 							previousRect && nextRect
 								? previousRect.left - nextRect.right