Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade React Native 0.71.11 - Android changes #5872

Merged
13 changes: 7 additions & 6 deletions __device-tests__/gutenberg-editor-sanity-test-1-visual.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const {
} = e2eUtils;
import { NESTED_COLUMNS_3_LEVELS } from './test-editor-data';

const ANDROID_COLUMN_APPENDER_BUTTON_XPATH =
Copy link
Contributor Author

@fluiddot fluiddot Jun 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't checked it further, but seems the native composition for Button has changed in the new version of RN or dependencies. I experienced something similar in Gutenberg with other elements (example).

'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup[2]/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.widget.Button';

describe( 'Gutenberg Editor - Test Suite 1', () => {
describe( 'Columns block', () => {
it( 'displays placeholders when unselected', async () => {
Expand Down Expand Up @@ -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_COLUMN_APPENDER_BUTTON_XPATH
);
await appenderButton.click();
} else {
Expand Down Expand Up @@ -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_COLUMN_APPENDER_BUTTON_XPATH
);
await appenderButton.click();
} else {
Expand Down Expand Up @@ -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_COLUMN_APPENDER_BUTTON_XPATH
);
await appenderButton.click();
} else {
Expand Down Expand Up @@ -249,9 +252,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
// Wait for the modal to open
await editorPage.driver.sleep( 3000 );

const cellId = isAndroid()
? 'Column 1. Width is 50 Percent (%)., double-tap to change unit'
: 'Column 1. Width is 50 Percent (%).';
const cellId = 'Column 1. Width is 50 Percent (%).';
Copy link
Contributor Author

@fluiddot fluiddot Jun 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to this change, the accessibility hint is no longer appended to the accessibility content description on Android.

const cell = await editorPage.driver.elementByAccessibilityId(
cellId
);
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 46 files
+2 −8 packages/react-native-aztec/android/build.gradle
+ packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.jar
+1 −1 packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.properties
+6 −0 packages/react-native-aztec/android/gradlew
+8 −6 packages/react-native-aztec/android/gradlew.bat
+6 −0 packages/react-native-bridge/android/build.gradle
+ packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.jar
+1 −1 packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.properties
+6 −0 packages/react-native-bridge/android/gradlew
+8 −6 packages/react-native-bridge/android/gradlew.bat
+7 −19 packages/react-native-bridge/android/react-native-bridge/build.gradle
+5 −1 packages/react-native-editor/__device-tests__/helpers/utils.js
+4 −8 packages/react-native-editor/__device-tests__/pages/editor-page.js
+0 −55 packages/react-native-editor/android/app/BUCK
+61 −211 packages/react-native-editor/android/app/build.gradle
+0 −19 packages/react-native-editor/android/app/build_defs.bzl
+16 −34 packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java
+4 −2 packages/react-native-editor/android/app/src/main/java/com/gutenberg/ReactNativeFlipper.java
+0 −116 ...t-native-editor/android/app/src/main/java/com/gutenberg/newarchitecture/MainApplicationReactNativeHost.java
+0 −36 ...ative-editor/android/app/src/main/java/com/gutenberg/newarchitecture/components/MainComponentsRegistry.java
+0 −48 ...roid/app/src/main/java/com/gutenberg/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
+0 −48 packages/react-native-editor/android/app/src/main/jni/Android.mk
+0 −24 packages/react-native-editor/android/app/src/main/jni/MainApplicationModuleProvider.cpp
+0 −16 packages/react-native-editor/android/app/src/main/jni/MainApplicationModuleProvider.h
+0 −45 packages/react-native-editor/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
+0 −38 packages/react-native-editor/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
+0 −61 packages/react-native-editor/android/app/src/main/jni/MainComponentsRegistry.cpp
+0 −32 packages/react-native-editor/android/app/src/main/jni/MainComponentsRegistry.h
+0 −11 packages/react-native-editor/android/app/src/main/jni/OnLoad.cpp
+18 −0 packages/react-native-editor/android/app/src/release/java/com/gutenberg/ReactNativeFlipper.java
+4 −20 packages/react-native-editor/android/build.gradle
+0 −1 packages/react-native-editor/android/gradle.properties
+ packages/react-native-editor/android/gradle/wrapper/gradle-wrapper.jar
+1 −1 packages/react-native-editor/android/gradle/wrapper/gradle-wrapper.properties
+6 −0 packages/react-native-editor/android/gradlew
+8 −6 packages/react-native-editor/android/gradlew.bat
+0 −6 packages/react-native-editor/android/settings.gradle
+0 −1 packages/react-native-editor/ios/.ruby-version
+1 −0 packages/react-native-editor/ios/.xcode.env
+18 −10 packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
+2 −2 packages/react-native-editor/ios/GutenbergDemo/Info.plist
+34 −4 packages/react-native-editor/ios/Podfile
+317 −279 packages/react-native-editor/ios/Podfile.lock
+2 −2 packages/react-native-editor/ios/gutenbergTests/Info.plist
+35 −0 patches/react-native-gradle-plugin+0.71.19.patch
+12 −0 patches/react-native-reanimated+2.17.0.patch