Merge pull request #5746 from wordpress-mobile/version-toolkit/gutenb…

…erg/perf/reduce-inner-blocks-tree-depth perf: Reduce inner blocks tree depth
wordpress-mobile · May 12, 2023 · b65e5a9 · b65e5a9
2 parents 3cc84ac + b13a458
commit b65e5a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/__device-tests__/gutenberg-editor-sanity-test-1-visual.test.js b/__device-tests__/gutenberg-editor-sanity-test-1-visual.test.js
@@ -63,7 +63,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 					.elementByAccessibilityId( 'Column Block. Row 1' )
 					.click();
 				const appenderButton = await editorPage.waitForElementToBeDisplayedByXPath(
-					'(//android.view.ViewGroup[@content-desc="block-list"])[2]/android.widget.Button'
+					'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[2]/android.view.ViewGroup/android.widget.Button/android.view.ViewGroup/android.view.ViewGroup'
 				);
 				await appenderButton.click();
 			} else {
@@ -123,7 +123,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 					.elementByAccessibilityId( 'Column Block. Row 1' )
 					.click();
 				const appenderButton = await editorPage.waitForElementToBeDisplayedByXPath(
-					'(//android.view.ViewGroup[@content-desc="block-list"])[2]/android.widget.Button'
+					'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[2]/android.view.ViewGroup/android.widget.Button/android.view.ViewGroup/android.view.ViewGroup'
 				);
 				await appenderButton.click();
 			} else {
@@ -197,7 +197,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 					.elementByAccessibilityId( 'Column Block. Row 1' )
 					.click();
 				const appenderButton = await editorPage.waitForElementToBeDisplayedByXPath(
-					'(//android.view.ViewGroup[@content-desc="block-list"])[2]/android.widget.Button'
+					'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[2]/android.view.ViewGroup/android.widget.Button/android.view.ViewGroup/android.view.ViewGroup'
 				);
 				await appenderButton.click();
 			} else {
@@ -231,6 +231,9 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 				.click()
 				.click();
 			await editorPage.waitForKeyboardToBeHidden();
+			// Android fails to display the keyboard at times, which can cause the
+			// above `waitForKeyboardToBeHidden` to finish prematurely.
+			await editorPage.driver.sleep( 1000 );
 
 			// Visual test check for nested content
 			screenshot = await takeScreenshot();

diff --git a/gutenberg b/gutenberg
+0 −63		packages/block-editor/src/components/block-list/block-list-compact.native.js
+153 −140		packages/block-editor/src/components/block-list/index.native.js
+2 −2		packages/block-editor/src/components/block-list/test/index.native.js
+1 −5		packages/block-editor/src/components/inner-blocks/index.native.js
+1 −1		packages/block-library/src/list-item/edit.native.js
+1 −1		packages/block-library/src/list/edit.js
+16 −1		packages/block-library/src/list/test/edit.native.js
+1 −1		packages/e2e-tests/specs/editor/plugins/iframed-inline-styles.test.js
+1 −2		packages/edit-site/src/components/sidebar-navigation-screen/style.scss
+5 −5		packages/react-native-editor/__device-tests__/pages/editor-page.js