Merge pull request #5889 from wordpress-mobile/move-undo-redo-buttons

Move Undo/Redo buttons
wordpress-mobile · Jul 11, 2023 · 059025a · 059025a
2 parents 6e5dfba + 1d9d8f1
commit 059025a
Show file tree

Hide file tree

Showing 48 changed files with 3,094 additions and 3,068 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,6 +2,7 @@ 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]
+* [**] Move the undo/redo buttons to the navigation bar [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5889]
 
 1.99.0
 ---

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/__device-tests__/utils.js b/__device-tests__/utils.js
@@ -19,13 +19,14 @@ export async function takeScreenshot(
 	const { withoutKeyboard, heightPercentage } = options;
 	const iPadDevice = process.env.IPAD;
 	const orientation = await editorPage.driver.getOrientation();
-	const statusBarHeightIOS = iPadDevice ? 48 : 94;
+	const isPortrait = orientation === 'PORTRAIT';
+	const statusBarHeightIPhone = isPortrait ? 94 : 0;
+	const statusBarHeightIOS = iPadDevice ? 48 : statusBarHeightIPhone;
 	const statusBarHeight = isAndroid() ? 100 : statusBarHeightIOS;
 	const screenshot = await editorPage.driver.takeScreenshot();
 	const portraitWidthSize = iPadDevice ? 768 : 320;
 	const landscapeWidthSize = iPadDevice ? 1024 : 640;
-	const widthSize =
-		orientation === 'PORTRAIT' ? portraitWidthSize : landscapeWidthSize;
+	const widthSize = isPortrait ? portraitWidthSize : landscapeWidthSize;
 
 	const base64Image = Buffer.from( screenshot, 'base64' );
 	const image = await jimp.read( base64Image );

diff --git a/bundle/ios/App.js b/bundle/ios/App.js
diff --git a/bundle/ios/App.js.map b/bundle/ios/App.js.map
diff --git a/gutenberg b/gutenberg
diff --git a/package-lock.json b/package-lock.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ 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]
+    * [**] Move the undo/redo buttons to the navigation bar [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5889]
 .99.0
     ---
@@ Expand Down @@