Merge pull request #6907 from wordpress-mobile/release/1.119.1

Release 1.119.1
wordpress-mobile · Jun 5, 2024 · 7191718 · 7191718
2 parents 1909eba + 526b0af
commit 7191718
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 37 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,6 +3,11 @@ Unreleased
 * [*] Prevent deleting content when backspacing in the first Paragraph block [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6894]
 * [internal] Adds new bridge functionality to set editor content [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6878]
 
+1.119.1
+---
+* [*] Image corrector - Check the path extension is a valid one [https://github.com/WordPress/gutenberg/pull/62190]
+* [*] Unsupported block - UI improvements [https://github.com/WordPress/gutenberg/pull/62240]
+
 1.119.0
 ---
 * [*] Cancel failed or in progress uploads if the media block is removed [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6841]

diff --git a/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js b/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js
@@ -326,7 +326,8 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 			expect( screenshot ).toMatchImageSnapshot();
 		} );
 
-		it( 'should display the block outline of a block inserted from the appender', async () => {
+		// Disabled until we fix the current regression with the inserter
+		it.skip( 'should display the block outline of a block inserted from the appender', async () => {
 			await editorPage.initializeEditor();
 
 			await editorPage.addNewBlock( blockNames.socialIcons );

diff --git a/__device-tests__/gutenberg-editor-unsupported-block-visual.test.js b/__device-tests__/gutenberg-editor-unsupported-block-visual.test.js
@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 const { isAndroid, toggleDarkMode } = e2eUtils;
-import { takeScreenshot } from './utils';
+import { takeScreenshot, takeScreenshotByElement } from './utils';
 
 describe( 'Gutenberg Editor Visual test for Unsupported Block', () => {
 	it( 'should show the empty placeholder for the selected/unselected state', async () => {
@@ -13,22 +13,11 @@ describe( 'Gutenberg Editor Visual test for Unsupported Block', () => {
 		const unsupportedBlock = await editorPage.getBlockAtPosition(
 			editorPage.blockNames.unsupported
 		);
-		await unsupportedBlock.click();
-		// Wait for the block to be selected
-		await editorPage.driver.pause( 500 );
 
 		// Visual test check
-		let screenshot = await takeScreenshot();
-		expect( screenshot ).toMatchImageSnapshot();
-
-		// Select title to unfocus the block
-		const titleElement = await editorPage.getTitleElement();
-		await titleElement.click();
-
-		await editorPage.dismissKeyboard();
-
-		// Visual test check
-		screenshot = await takeScreenshot();
+		const screenshot = await takeScreenshotByElement( unsupportedBlock, {
+			padding: 7,
+		} );
 		expect( screenshot ).toMatchImageSnapshot();
 	} );
 
@@ -42,28 +31,18 @@ describe( 'Gutenberg Editor Visual test for Unsupported Block', () => {
 		const unsupportedBlock = await editorPage.getBlockAtPosition(
 			editorPage.blockNames.unsupported
 		);
-		await unsupportedBlock.click();
-		// Wait for the block to be selected
-		await editorPage.driver.pause( 1000 );
 
 		// Visual test check
-		let screenshot = await takeScreenshot();
-		expect( screenshot ).toMatchImageSnapshot();
-
-		// Select title to unfocus the block
-		const titleElement = await editorPage.getTitleElement();
-		await titleElement.click();
-
-		await editorPage.dismissKeyboard();
-
-		// Visual test check
-		screenshot = await takeScreenshot();
+		const screenshot = await takeScreenshotByElement( unsupportedBlock, {
+			padding: 7,
+		} );
 		expect( screenshot ).toMatchImageSnapshot();
 
 		await toggleDarkMode( editorPage.driver, false );
 	} );
 
-	it( 'should be able to open the unsupported block web view editor', async () => {
+	// Disabled temporarily
+	it.skip( 'should be able to open the unsupported block web view editor', async () => {
 		await editorPage.initializeEditor( {
 			initialData: e2eTestData.unsupportedBlockHtml,
 		} );

diff --git a/...lock-should-be-able-to-open-the-unsupported-block-web-view-editor-1-android.png b/...lock-should-be-able-to-open-the-unsupported-block-web-view-editor-1-android.png
diff --git a/...ed-block-should-be-able-to-open-the-unsupported-block-web-view-editor-1-ios.png b/...ed-block-should-be-able-to-open-the-unsupported-block-web-view-editor-1-ios.png
diff --git a/...ould-show-the-empty-placeholder-for-the-selected-unselected-state-1-android.png b/...ould-show-the-empty-placeholder-for-the-selected-unselected-state-1-android.png
diff --git a/...k-should-show-the-empty-placeholder-for-the-selected-unselected-state-1-ios.png b/...k-should-show-the-empty-placeholder-for-the-selected-unselected-state-1-ios.png
diff --git a/...ould-show-the-empty-placeholder-for-the-selected-unselected-state-2-android.png b/...ould-show-the-empty-placeholder-for-the-selected-unselected-state-2-android.png
diff --git a/...k-should-show-the-empty-placeholder-for-the-selected-unselected-state-2-ios.png b/...k-should-show-the-empty-placeholder-for-the-selected-unselected-state-2-ios.png
diff --git a/...-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-1-android.png b/...-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-1-android.png
diff --git a/...-the-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-1-ios.png b/...-the-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-1-ios.png
diff --git a/...-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-2-android.png b/...-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-2-android.png
diff --git a/...-the-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-2-ios.png b/...-the-empty-placeholder-for-the-selected-unselected-state-in-dark-mode-2-ios.png
diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml
@@ -377,6 +377,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="gutenberg_native_tap_here_to_copy_post_text" tools:ignore="UnusedResources">Tap here to copy post text</string>
     <string name="gutenberg_native_tap_here_to_show_help" tools:ignore="UnusedResources">Tap here to show help</string>
     <string name="gutenberg_native_tap_here_to_show_more_details" tools:ignore="UnusedResources">Tap here to show more details.</string>
+    <string name="gutenberg_native_tap_to_edit" tools:ignore="UnusedResources">Tap to edit</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard" tools:ignore="UnusedResources">Tap to hide the keyboard</string>
     <string name="gutenberg_native_text_color" tools:ignore="UnusedResources">Text color</string>
     <string name="gutenberg_native_text_formatting_controls_are_located_within_the_toolbar_positione" tools:ignore="UnusedResources">Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block</string>

diff --git a/bundle/ios/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift
@@ -314,6 +314,7 @@ private func dummy() {
     _ = NSLocalizedString("Tap here to copy post text", comment: "")
     _ = NSLocalizedString("Tap here to show help", comment: "")
     _ = NSLocalizedString("Tap here to show more details.", comment: "")
+    _ = NSLocalizedString("Tap to edit", comment: "")
     _ = NSLocalizedString("Tap to hide the keyboard", comment: "")
     _ = NSLocalizedString("Text color", comment: "")
     _ = NSLocalizedString("Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block", comment: "")

diff --git a/gutenberg b/gutenberg
diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock
@@ -1104,7 +1104,7 @@ PODS:
     - React-RCTImage
   - RNSVG (14.0.0):
     - React-Core
-  - RNTAztecView (1.119.0):
+  - RNTAztecView (1.119.1):
     - React-Core
     - WordPress-Aztec-iOS (= 1.19.11)
   - SDWebImage (5.11.1):
@@ -1399,7 +1399,7 @@ SPEC CHECKSUMS:
   RNReanimated: f705119af7f77c961122a09adbfdf3dd38ce6a60
   RNScreens: d07e03170921286b65f07e7b2a3aa8300f61f2ec
   RNSVG: eb0b170443191e4a1af53b9bd17d1f2fbd1ba152
-  RNTAztecView: c0a124a24b01a96ceeac8c0dcdc461f2d06e13f2
+  RNTAztecView: 268a6489f223c3a91afa2ba5ee7bef82df900c69
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg-mobile",
-	"version": "1.119.0",
+	"version": "1.119.1",
 	"private": true,
 	"config": {
 		"jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",