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

fix: Prevent unnecessary content changes clearing redo actions #19782

Merged

Conversation

dcalhoun
Copy link
Member

@dcalhoun dcalhoun commented Dec 13, 2023

Integrate WordPress/gutenberg#57028 fixing a regression in the editor's rich text experience.


To Test:

Smoke test the editor. Wider testing was performed in WordPress/gutenberg#57028.


Regression Notes

  1. Potential unintended areas of impact
    Regressions in the editor.
  2. What I did to test those areas of impact (or what existing automated tests I relied on)
    Tested the editor writing flow.
  3. What automated tests I added (or what prevented me from doing so)
    None, not applicable for a dependency version bump.

PR Submission Checklist:

  • I have completed the Regression Notes.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

UI Changes Testing Checklist:

  • Portrait and landscape orientations.
  • Light and dark modes.
  • Fonts: Larger, smaller and bold text.
  • High contrast.
  • Talkback.
  • Languages with large words or with letters/accents not frequently used in English.
  • Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
  • Large and small screen sizes. (Tablet and smaller phones)
  • Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Dec 13, 2023

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr19782-ff63029
Commitff63029
Direct Downloadjetpack-prototype-build-pr19782-ff63029.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Dec 13, 2023

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr19782-ff63029
Commitff63029
Direct Downloadwordpress-prototype-build-pr19782-ff63029.apk
Note: Google Login is not supported on these builds.

@dcalhoun dcalhoun force-pushed the fix/prevent-unnecessary-content-changes-clearing-redo-actions branch from d18d5f4 to ff63029 Compare December 14, 2023 15:24
@wpmobilebot
Copy link
Contributor

Found 1 violations:

The PR caused the following dependency changes:

 +--- project :libs:editor
-|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.110.0-alpha1
-|         +--- com.facebook.fresco:animated-gif:2.0.0
-|         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.4 (*)
-|         |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |    \--- com.facebook.fresco:animated-base:2.0.0
-|         |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0 (*)
-|         |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
-|         |         +--- com.facebook.fresco:animated-drawable:2.0.0
-|         |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
-|         |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0 (*)
-|         |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |         \--- com.parse.bolts:bolts-tasks:1.4.0
-|         +--- com.google.android.material:material:1.2.1 -> 1.9.0 (*)
-|         +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-6
-|         |    +--- com.google.android.exoplayer:exoplayer:2.13.3
-|         |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
-|         |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    |    |    \--- com.google.guava:guava:27.1-android
-|         |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
-|         |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
-|         |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
-|         |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-|         |    |         \--- androidx.media:media:1.2.1 (*)
-|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-|         |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
-|         |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
-|         |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.11.0 (*)
-|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.11.0 (*)
-|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-get-random-values:1.4.0
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-safe-area-context:4.6.3
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.9.10 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-screens:3.22.0
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.9.10 (*)
-|         |    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
-|         |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
-|         |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
-|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-|         |    +--- com.google.android.material:material:1.1.0 -> 1.9.0 (*)
-|         |    \--- androidx.core:core-ktx:1.5.0 -> 1.10.0 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-svg:13.9.0
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-webview:11.26.1
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
-|         |    \--- androidx.webkit:webkit:1.4.0 -> 1.7.0 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-masked-view:0.2.9
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-clipboard:1.11.2
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-fast-image:8.5.11
-|         |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1
-|         |    |    +--- com.github.bumptech.glide:gifdecoder:4.15.1
-|         |    |    |    \--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|         |    |    +--- com.github.bumptech.glide:disklrucache:4.15.1
-|         |    |    +--- com.github.bumptech.glide:annotations:4.15.1
-|         |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
-|         |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-|         |    |    +--- androidx.exifinterface:exifinterface:1.3.3 -> 1.3.6 (*)
-|         |    |    \--- androidx.tracing:tracing:1.0.0 -> 1.1.0 (*)
-|         |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
-|         |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1 (*)
-|         |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.11.0 (*)
-|         |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-reanimated:2.17.0
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-gesture-handler:2.10.2
-|         |    +--- org.wordpress-mobile.react-native-libraries.v3:react-native-reanimated:2.17.0
-|         |    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
-|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.9.10 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-linear-gradient:2.7.3
-|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.110.0-alpha1
-|         |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-|         |    +--- androidx.gridlayout:gridlayout:1.0.0
-|         |    |    +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
-|         |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
-|         |    +--- androidx.cardview:cardview:1.0.0 (*)
-|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
-|         |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-|         |    +--- org.wordpress:aztec:v1.9.0 (*)
-|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.9.0 (*)
-|         |    +--- org.wordpress.aztec:wordpress-comments:v1.9.0 (*)
-|         |    +--- org.wordpress.aztec:glide-loader:v1.9.0
-|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
-|         |    |    +--- org.wordpress:aztec:v1.9.0 (*)
-|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
+|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.110.0-alpha2 FAILED
 +--- org.wordpress:login:1.10.0
-|    \--- androidx.gridlayout:gridlayout:1.0.0 (*)
+|    \--- androidx.gridlayout:gridlayout:1.0.0
+|         +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
+|         \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
 +--- com.automattic:stories:2.4.0
-|    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1 (*)
+|    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1
+|         +--- com.github.bumptech.glide:gifdecoder:4.15.1
+|         |    \--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|         +--- com.github.bumptech.glide:disklrucache:4.15.1
+|         +--- com.github.bumptech.glide:annotations:4.15.1
+|         +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
+|         +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+|         +--- androidx.exifinterface:exifinterface:1.3.3 -> 1.3.6 (*)
+|         \--- androidx.tracing:tracing:1.0.0 -> 1.1.0 (*)
-\--- com.google.android.exoplayer:exoplayer:2.13.3 (*)
+\--- com.google.android.exoplayer:exoplayer:2.13.3
+     +--- com.google.android.exoplayer:exoplayer-core:2.13.3
+     |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
+     |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     |    |    \--- com.google.guava:guava:27.1-android
+     |    |         +--- com.google.guava:failureaccess:1.0.1
+     |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+     |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
+     |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+     +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
+     |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+     |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
+     |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+     +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
+     |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+     |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
+     |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+     |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+     \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
+          +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          \--- androidx.media:media:1.2.1 (*)

Please review and act accordingly

@dcalhoun dcalhoun marked this pull request as ready for review December 14, 2023 16:37
@dcalhoun dcalhoun added this to the 24.0 milestone Dec 14, 2023
Copy link
Contributor

@fluiddot fluiddot left a comment

Choose a reason for hiding this comment

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

LGTM 🎊 ! In addition to the testing I made in WordPress/gutenberg#57028 (review), I smoke tested the app and worked as expected.

@dcalhoun dcalhoun merged commit cecdbaf into trunk Dec 15, 2023
20 checks passed
@dcalhoun dcalhoun deleted the fix/prevent-unnecessary-content-changes-clearing-redo-actions branch December 15, 2023 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Gutenberg Editing and display of Gutenberg blocks. [Type] Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants