wordpress-mobile · geriux · Jul 7, 2023 · Jul 7, 2023 · Jul 7, 2023 · Jul 7, 2023
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,11 +1,12 @@
 Unreleased
 ---
+* [**] Add media inserter buttons to editor toolbar [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5900]
+* [**] Update native BlockOutline component styles to remove blue border from blocks [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5833]
 
 1.99.0
 ---
 * [*] Rename "Reusable blocks" to "Synced patterns", aligning with the web editor. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5885]
 * [**] Fix a crash related to Reanimated when closing the editor [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5938]
-* [**] Add media inserter buttons to editor toolbar [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5900]
 
 1.98.1
 ---

diff --git a/__device-tests__/gutenberg-editor-sanity-test-1-visual.test.js b/__device-tests__/gutenberg-editor-sanity-test-1-visual.test.js
@@ -46,6 +46,9 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 				blockNames.columns
 			);
 			await columnsBlock.click();
+
+			// Navigate upwards in block hierarchy
+			await editorPage.moveBlockSelectionUp( { toRoot: true } );
 			await editorPage.removeBlock();
 		} );
 
@@ -64,7 +67,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 					.elementByAccessibilityId( 'Column Block. Row 1' )
 					.click();
 				const appenderButton = await editorPage.waitForElementToBeDisplayedByXPath(
-					'//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'
+					'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[1]/android.view.ViewGroup/android.widget.Button/android.view.ViewGroup/android.view.ViewGroup'
 				);
 				await appenderButton.click();
 			} else {
@@ -121,7 +124,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 					.elementByAccessibilityId( 'Column Block. Row 1' )
 					.click();
 				const appenderButton = await editorPage.waitForElementToBeDisplayedByXPath(
-					'//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'
+					'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[1]/android.view.ViewGroup/android.widget.Button/android.view.ViewGroup/android.view.ViewGroup'
 				);
 				await appenderButton.click();
 			} else {
@@ -191,7 +194,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 					.elementByAccessibilityId( 'Column Block. Row 1' )
 					.click();
 				const appenderButton = await editorPage.waitForElementToBeDisplayedByXPath(
-					'//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'
+					'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[1]/android.view.ViewGroup/android.widget.Button/android.view.ViewGroup/android.view.ViewGroup'
 				);
 				await appenderButton.click();
 			} else {

diff --git a/__device-tests__/gutenberg-editor-sanity-test-4-visual.test.js b/__device-tests__/gutenberg-editor-sanity-test-4-visual.test.js
@@ -179,7 +179,11 @@ describe( 'Gutenberg Editor - Test Suite 4', () => {
 			const screenshot = await takeScreenshot();
 			expect( screenshot ).toMatchImageSnapshot();
 
-			await firstButtonTextInput.click();
+			const buttonsBlock = await editorPage.getBlockAtPosition(
+				blockNames.buttons
+			);
+			buttonsBlock.click();
+
 			// Navigate upwards to select parent block
 			await editorPage.moveBlockSelectionUp();
 

diff --git a/...st-for-gallery-block-should-be-able-to-render-a-gallery-correctly-1-android.png b/...st-for-gallery-block-should-be-able-to-render-a-gallery-correctly-1-android.png
diff --git a/...l-test-for-gallery-block-should-be-able-to-render-a-gallery-correctly-1-ios.png b/...l-test-for-gallery-block-should-be-able-to-render-a-gallery-correctly-1-ios.png
diff --git a/...-gallery-block-should-be-able-to-render-the-placeholder-correctly-1-android.png b/...-gallery-block-should-be-able-to-render-the-placeholder-correctly-1-android.png
diff --git a/...-for-gallery-block-should-be-able-to-render-the-placeholder-correctly-1-ios.png b/...-for-gallery-block-should-be-able-to-render-the-placeholder-correctly-1-ios.png
diff --git a/...-block-should-show-the-empty-placeholder-for-the-unselected-state-1-android.png b/...-block-should-show-the-empty-placeholder-for-the-unselected-state-1-android.png
diff --git a/...roup-block-should-show-the-empty-placeholder-for-the-unselected-state-1-ios.png b/...roup-block-should-show-the-empty-placeholder-for-the-unselected-state-1-ios.png
diff --git a/...outs-should-show-the-right-columns-placeholders-and-alignments-case-1-1-ios.png b/...outs-should-show-the-right-columns-placeholders-and-alignments-case-1-1-ios.png
diff --git a/...outs-should-show-the-right-columns-placeholders-and-alignments-case-1-2-ios.png b/...outs-should-show-the-right-columns-placeholders-and-alignments-case-1-2-ios.png
diff --git a/...outs-should-show-the-right-columns-placeholders-and-alignments-case-2-1-ios.png b/...outs-should-show-the-right-columns-placeholders-and-alignments-case-2-1-ios.png
diff --git a/...outs-should-show-the-right-columns-placeholders-and-alignments-case-2-2-ios.png b/...outs-should-show-the-right-columns-placeholders-and-alignments-case-2-2-ios.png
diff --git a/...st-suite-1-columns-block-allows-deep-nesting-to-at-least-3-levels-1-android.png b/...st-suite-1-columns-block-allows-deep-nesting-to-at-least-3-levels-1-android.png
diff --git a/...r-test-suite-1-columns-block-allows-deep-nesting-to-at-least-3-levels-1-ios.png b/...r-test-suite-1-columns-block-allows-deep-nesting-to-at-least-3-levels-1-ios.png
diff --git a/...s-block-displays-correctly-in-portrait-and-landscape-orientations-1-android.png b/...s-block-displays-correctly-in-portrait-and-landscape-orientations-1-android.png
diff --git a/...lumns-block-displays-correctly-in-portrait-and-landscape-orientations-1-ios.png b/...lumns-block-displays-correctly-in-portrait-and-landscape-orientations-1-ios.png
diff --git a/...s-block-displays-correctly-in-portrait-and-landscape-orientations-2-android.png b/...s-block-displays-correctly-in-portrait-and-landscape-orientations-2-android.png
diff --git a/...lumns-block-displays-correctly-in-portrait-and-landscape-orientations-2-ios.png b/...lumns-block-displays-correctly-in-portrait-and-landscape-orientations-2-ios.png
diff --git a/...-test-suite-1-columns-block-displays-placeholders-when-unselected-1-android.png b/...-test-suite-1-columns-block-displays-placeholders-when-unselected-1-android.png
diff --git a/...itor-test-suite-1-columns-block-displays-placeholders-when-unselected-1-ios.png b/...itor-test-suite-1-columns-block-displays-placeholders-when-unselected-1-ios.png
diff --git a/...-test-suite-1-columns-block-displays-placeholders-when-unselected-2-android.png b/...-test-suite-1-columns-block-displays-placeholders-when-unselected-2-android.png
diff --git a/...itor-test-suite-1-columns-block-displays-placeholders-when-unselected-2-ios.png b/...itor-test-suite-1-columns-block-displays-placeholders-when-unselected-2-ios.png
diff --git a/...columns-block-displays-with-correct-colors-with-dark-mode-enabled-1-android.png b/...columns-block-displays-with-correct-colors-with-dark-mode-enabled-1-android.png
diff --git a/...e-1-columns-block-displays-with-correct-colors-with-dark-mode-enabled-1-ios.png b/...e-1-columns-block-displays-with-correct-colors-with-dark-mode-enabled-1-ios.png
diff --git a/...columns-block-displays-with-correct-colors-with-dark-mode-enabled-2-android.png b/...columns-block-displays-with-correct-colors-with-dark-mode-enabled-2-android.png
diff --git a/...e-1-columns-block-displays-with-correct-colors-with-dark-mode-enabled-2-ios.png b/...e-1-columns-block-displays-with-correct-colors-with-dark-mode-enabled-2-ios.png
diff --git a/...te-1-columns-block-mover-buttons-display-in-the-correct-positions-1-android.png b/...te-1-columns-block-mover-buttons-display-in-the-correct-positions-1-android.png
diff --git a/...-suite-1-columns-block-mover-buttons-display-in-the-correct-positions-1-ios.png b/...-suite-1-columns-block-mover-buttons-display-in-the-correct-positions-1-ios.png
diff --git a/...te-1-columns-block-mover-buttons-display-in-the-correct-positions-2-android.png b/...te-1-columns-block-mover-buttons-display-in-the-correct-positions-2-android.png
diff --git a/...-suite-1-columns-block-mover-buttons-display-in-the-correct-positions-2-ios.png b/...-suite-1-columns-block-mover-buttons-display-in-the-correct-positions-2-ios.png
diff --git a/...1-columns-block-sliders-display-proportionate-fill-level-previews-1-android.png b/...1-columns-block-sliders-display-proportionate-fill-level-previews-1-android.png
diff --git a/...ite-1-columns-block-sliders-display-proportionate-fill-level-previews-1-ios.png b/...ite-1-columns-block-sliders-display-proportionate-fill-level-previews-1-ios.png
diff --git a/...4-buttons-block-check-if-selection-caret-color-matches-font-color-1-android.png b/...4-buttons-block-check-if-selection-caret-color-matches-font-color-1-android.png
diff --git a/...ite-4-buttons-block-check-if-selection-caret-color-matches-font-color-1-ios.png b/...ite-4-buttons-block-check-if-selection-caret-color-matches-font-color-1-ios.png
diff --git a/...t-js-gutenberg-editor-test-suite-4-buttons-block-edit-text-styles-1-android.png b/...t-js-gutenberg-editor-test-suite-4-buttons-block-edit-text-styles-1-android.png
diff --git a/...-test-js-gutenberg-editor-test-suite-4-buttons-block-edit-text-styles-1-ios.png b/...-test-js-gutenberg-editor-test-suite-4-buttons-block-edit-text-styles-1-ios.png
diff --git a/...est-suite-4-buttons-block-render-custom-text-and-background-color-1-android.png b/...est-suite-4-buttons-block-render-custom-text-and-background-color-1-android.png
diff --git a/...or-test-suite-4-buttons-block-render-custom-text-and-background-color-1-ios.png b/...or-test-suite-4-buttons-block-render-custom-text-and-background-color-1-ios.png
diff --git a/...ditor-test-suite-4-buttons-block-render-gradient-background-color-1-android.png b/...ditor-test-suite-4-buttons-block-render-gradient-background-color-1-android.png
diff --git a/...rg-editor-test-suite-4-buttons-block-render-gradient-background-color-1-ios.png b/...rg-editor-test-suite-4-buttons-block-render-gradient-background-color-1-ios.png
diff --git a/...uite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-1-android.png b/...uite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-1-android.png
diff --git a/...st-suite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-1-ios.png b/...st-suite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-1-ios.png
diff --git a/...uite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-2-android.png b/...uite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-2-android.png
diff --git a/...st-suite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-2-ios.png b/...st-suite-4-spacer-block-spacer-in-horizontal-layout-works-as-expected-2-ios.png
diff --git a/gutenberg b/gutenberg
+1 −1		.github/workflows/unit-test.yml
+1 −1		.gitignore
+2 −2		docs/contributors/code/react-native/getting-started-react-native.md
+1 −1		docs/contributors/code/react-native/osx-setup-guide.md
+1 −1		docs/contributors/code/testing-overview.md
+10 −1		lib/compat/wordpress-6.3/class-gutenberg-navigation-fallback.php
+1 −1		lib/compat/wordpress-6.3/theme-previews.php
+6 −0		package.json
+26 −9		packages/block-editor/src/components/block-edit/edit.js
+1 −1		packages/block-editor/src/components/block-edit/test/edit.js
+0 −58		packages/block-editor/src/components/block-list/block-outline.native.js
+1 −10		packages/block-editor/src/components/block-list/block.native.js
+0 −49		packages/block-editor/src/components/block-list/block.native.scss
+3 −3		packages/block-editor/src/components/block-list/style.native.scss
+2 −2		packages/block-editor/src/components/list-view/use-list-view-client-ids.js
+3 −6		packages/block-editor/src/store/private-selectors.js
+5 −5		packages/block-editor/src/store/test/private-selectors.js
+11 −2		packages/block-editor/src/utils/object.js
+36 −0		packages/block-editor/src/utils/test/object.js
+4 −10		packages/block-library/src/column/edit.native.js
+0 −4		packages/block-library/src/column/editor.native.scss
+5 −2		packages/block-library/src/comment-template/index.php
+4 −2		packages/block-library/src/post-template/index.php
+16 −0		packages/core-data/src/actions.js
+2 −0		packages/core-data/src/utils/set-nested-value.js
+1 −1		packages/e2e-test-utils-playwright/src/admin/visit-admin-page.ts
+1 −1		packages/e2e-test-utils/src/create-reusable-block.js
+1 −1		packages/e2e-tests/specs/editor/various/reusable-blocks.test.js
+3 −2		packages/edit-post/src/components/header/header-toolbar/index.js
+1 −17		packages/edit-post/src/components/visual-editor/header.native.js
+0 −18		packages/edit-post/src/components/visual-editor/style.native.scss
+32 −8		packages/edit-post/src/plugins/index.js
+5 −1		packages/edit-site/src/components/block-editor/constants.js
+1 −1		packages/edit-site/src/components/block-editor/editor-canvas.js
+14 −0		packages/edit-site/src/components/canvas-spinner/style.scss
+5 −2		packages/edit-site/src/components/create-pattern-modal/index.js
+11 −7		packages/edit-site/src/components/header-edit-mode/index.js
+0 −5		packages/edit-site/src/components/page-content-focus-manager/constants.js
+12 −3		packages/edit-site/src/components/page-content-focus-manager/disable-non-page-content-blocks.js
+196 −0		packages/edit-site/src/components/page-patterns/duplicate-menu-item.js
+99 −57		packages/edit-site/src/components/page-patterns/grid-item.js
+115 −0		packages/edit-site/src/components/page-patterns/rename-menu-item.js
+4 −0		packages/edit-site/src/components/page-patterns/style.scss
+4 −8		packages/edit-site/src/components/page-patterns/use-patterns.js
+7 −5		packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-content.js
+44 −40		packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
+36 −0		packages/edit-site/src/components/sidebar-navigation-screen-main/template-part-hint.js
+15 −5		packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js
+84 −74		packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
+26 −1		packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
+31 −9		packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js
+14 −0		packages/edit-site/src/components/sidebar-navigation-screen/style.scss
+9 −4		packages/edit-site/src/components/template-actions/rename-menu-item.js
+55 −4		packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
+5 −5		packages/editor/src/components/post-title/style.native.scss
+2 −1		packages/react-native-editor/CHANGELOG.md
+3 −3		packages/react-native-editor/__device-tests__/[email protected]
+0 −6		packages/react-native-editor/package.json
+13 −3		packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js
+35 −24		packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js
+1 −1		phpcs.xml.dist
+18 −1		phpunit/class-gutenberg-navigation-fallback-gutenberg-test.php
+30 −17		test/native/jest.config.js