Merge branch 'refs/heads/develop' into add/smart-linking-backend

# Conflicts: # build/content-helper/editor-sidebar.asset.php # build/content-helper/editor-sidebar.js
Parsely · Jun 7, 2024 · 9a32cce · 9a32cce
2 parents 2e38a6a + b4e15ee
commit 9a32cce
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/build/content-helper/editor-sidebar.asset.php b/build/content-helper/editor-sidebar.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'f38166e3e6306a88038c');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '70fa2757325ff1587455');
diff --git a/build/content-helper/editor-sidebar.js b/build/content-helper/editor-sidebar.js
diff --git a/src/content-helper/editor-sidebar/smart-linking/review-modal/component-sidebar.tsx b/src/content-helper/editor-sidebar/smart-linking/review-modal/component-sidebar.tsx
@@ -45,6 +45,8 @@ export const ReviewModalSidebar = ( {
 				const activeItem = itemRefs.current[ activeIndex ];
 
 				if ( activeItem ) {
+					activeItem.focus();
+
 					if ( activeIndex === 0 ) {
 						sidebar.scrollTop = 0;
 						return;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'f38166e3e6306a88038c');
		<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '70fa2757325ff1587455');