[RNMobile] Implement recovery option for invalid blocks #41988
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With this commit, the "attemptBlockRecovery" function is implemented, based on the web's version of the function shown here: https://github.com/WordPress/gutenberg/blob/286e6be2b13fc6ab2059b66d5c79728d811562ee/packages/block-editor/src/components/block-list/block-invalid-warning.js#L122-L124
|
Size Change: +50 B (0%) Total Size: 1.25 MB
ℹ️ View Unchanged
|
SiobhyB
changed the title
SiobhyB
added
Mobile App - Automation
|
@SiobhyB 👋 The code changes look good! I started reviewing this locally but ran into what seems like this issue with the Jetpack sass files. I'm curious if you think it might be an expected issue here, or something just related to my local setup that I need to update. Going to continue to review once I get around it, however. |
|
@derekblank, thank you for taking a look! For the error: I wonder if it may be related to the fact the submodule reference was recently updated in Gutenberg Mobile. Does running |
geriux
approved these changes
Jul 1, 2022
@SiobhyB Yep, that was the issue -- thank you! |
derekblank
approved these changes
Jul 4, 2022
4 tasks
dcalhoun
pushed a commit
that referenced
this pull request
Jul 7, 2022
If a block's validation fails within the mobile app, users are shown an error but not provided with any options for recovering the block. This PR introduces an option for users to attempt block recovery. They'll be prompted to tap on a block if they wish to attempt recovery.
dcalhoun
added a commit
that referenced
this pull request
Jul 8, 2022
* Release script: Update react-native-editor version to 1.76.0 * Release script: Update with changes from 'npm run core preios' * Update Changelog * Release script: Update react-native-editor version to 1.76.1 * Release script: Update with changes from 'npm run core preios' * [Mobile] - BlockList - Add internal onLayout from CellRendererComponent to BlockListItemCell (#41105) * Mobile - BlockList - Pass FlatList internal onLayout through CellRendererComponent * Mobile - Update onLayout naming for BlockListItemCell * [Mobile] - Fix Drag & Drop Chip positioning issue with RTL languages (#41053) * Mobile - Fix - Drag & drop chip issue with RTL languages * Mobile - BlockDraggable - Rename maxWidth variable to contentWidth * Mobile - BlockDraggable - Add custom exiting animation that uses the same functionality as ZoomOutEasyDown but customizing the translateX value taking into account RTL languages. * [RNMobile] Add drag & drop help guide in Help & Support screen (#40961) * Add drag & drop help guide * Update content of help screen related to moving blocks * Update drand-and-drop images * Update styles of heading component of help screen * Add HelpDetailBadge component This component will be rendered in `HelpDetailSectionHeadingText` component via the `badge` prop. * Add NEW badge to move blocks help section * Optimize drag-and-drop images * Add move-blocks icon to Help & Support screen * Update react-native-editor changelog * Add HelpSectionTitle component * Prevent rendering separator on last help topic item * [RNMobile] Fix drag mode not being enabled when long-pressing over Shortcode block (#41155) * Add prop for disabling suggestions button * Use allowed formats in format types calculation * Add RichText version to PlainText component * Use experimental version of PlainText in Shortcode block * Add disableAutocorrection prop to RichText * Disable autocorrection in Shortcode block * Update PlainText props in Shortcode block * Use pre as tagName in PlainText * Rename replaceLineBreaks function * Update shortcode block unit tests * Prevent text input focus when selecting Shortcode block * Force text color in Shortcode block * Remove tagName prop from PlainText component * Mobile - Update changelog * Translate NEW badge in Move blocks help screen * Release script: Update react-native-editor version to 1.77.0 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Improve text read by screen readers for BottomSheetSelectControl (#41036) Improves the text that's read by screen readers by the BottomSheetSelectControl component, adding extra context and making its purpose clearer. * [RNMobile] Add 'Insert from URL' option to Image block (#40334) * Add 'Insert from URL' option to Video and Image blocks * Update code style from linting * Improve test cases for Media Upload capture options * Fix whitespace issue * Update Media Upload option tests to be asynchronous * Update native image block to use correct image URL * Add error handling for invalid URLs to native Image block * Clear invalid URL error on Image URL success * Fix synchronicity of Media Upload option tests * Add check for URL handler to native Image block picker options * Update code style * Remove Video block from urlSource options Why: to be introduced in a later PR * Remove URL option from Video block for Media Upload test * Use Notice snackbar for native Image block error handling * Update Image/Media Upload code style and helpers * Use getImage to determine if URL is a valid image within Image block * Add loading indicator and isURL check to native Image block URL behavior * Add loading indicator to native Image block media placeholder * Fix whitespace issue in native Image block code style * Reuse native Image block loading indicator * Use undefined dimension attributes for the native Image block URL behavior Co-authored-by: Derek Blank <[email protected]> * [RNMobile] - E2E Simplify heading and lists blocks functions (#40670) * update tests using paragraph, heading and list blocks * fix slash inserter tests to work in ci * lint fixes * wait for ordered list to appear * lint fixes * extra click only on local env * wait to get backspace click reflected * re-add extra click only for local env * add wait to wait for backspace key to be reflected * lint fixes * break function, set position to get list block * lint fixes * use correct params, update function name * lint fixes * make maxIteration a parameter for isElementVisible * update xpath for list block * utilize waitForVisible for isElementVisible * lint fixes * add wait to getNumberOfParagraphBlocks and update xpath for android list block * update edit text xpath to be read from any level Co-authored-by: jos <[email protected]> * Add ruby version file (#41013) Use same version of ruby that is used on WP iOS * [RNMobile] Improvements to Getting Started Guides (#40964) * Update with copy from Gutenberg Mobile Gutenberg Mobile's readme had some copy in the troubleshooting section that wasn't included in Gutenberg's how-to: https://github.com/wordpress-mobile/gutenberg-mobile/edit/trunk/README.md This commit fixes that issue by updating Gutenberg's how-to with the latest from Gutenberg Mobile. * Tweak wording, update inconsistent capitalisation * Tweaks to copy and formatting With this commit, I've tidied up some of the copy, attempting to make the instructions as concise and helpful as possible. I've also set the images to the same width to tidy up the overall look of the document (the images will appear small on mobile devices, but can be tapped on to get the full image). * Set all images to fixed width, for consistency * Rearrange sections to improve overall flow - The "Unit Tests" is moved towards the bottom of the document, so that's it's closer to the instructions for integration tests. the document flows as follows: - The steps for installing Xcode are moved under the "iOS" section. - The overall flow of the document has been updated to the following: Clone Gutenberg > iOS > Android > Tests * Add details about recommended JDK * Add details about Cocoapods * Refine instructions for installing Cocoapods * Note `ffi` may already be installed Some versions of Ruby may not require the `ffi` to be manually installed, which is noted with this commit. * update expected html for file block (#41300) Co-authored-by: jos <[email protected]> * Add waitForVisible() to all blocks (#41126) * add waits to all block - 1st try * fix failing tests * correct if else condition * fix failing cover block test * update spaces * update to use new click helper * wait for blocks to be visible first in getFirstBlock and getLastBlock * remove length as a parameter * update timing for long press since it's failing intermittently in ci * remove deleted param, revert space changes * remove redundant code * exit function once condition is met * increse wait time for long press * remove unneccesary condition, update message, return click value Co-authored-by: jos <[email protected]> * Update CHANGELOG * Revert "update expected html for file block (#41300)" This reverts commit a046a61. * [RNMobile] Ensure post title gets focused when is notified from native side (#41371) * Release script: Update react-native-editor version to 1.77.1 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Bump `react-native-reanimated` version to `2.4.1-wp-3` (#41482) * Update react-native-editor changelog * Release script: Update react-native-editor version to 1.78.0 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Bump `react-native-gesture-handler` to version `2.3.2` (#41337) * Update react-native-editor changelog * Release script: Update react-native-editor version to 1.78.1 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Gallery block: Re-introduce `v1` (#41533) * Fix isGalleryV2Enabled calculation for the native version * Update comment in isGalleryV2Enabled function Co-authored-by: David Calhoun <[email protected]> Co-authored-by: David Calhoun <[email protected]> * [RNMobile] Fix missing translations for locales that include region (only on Android) (#41685) * Update CHANGELOG * Release script: Update react-native-editor version to 1.79.0 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Add integration tests to cover Drag & Drop functionality (#41364) * Add testID prop to Draggable components * Add unit tests for Draggable component * Set draggingId shared value before enable dragging This change is required for testing, otherwise the dragging id is not passed when the dragging gesture begins. * Mock generateHapticFeedback function * Add testID to draggable chip component * Add testID to BlockDraggable component * Add test helpers for BlockDraggable component Additionally, helpers related to fake timers have been added and updated in the global helpers file. * Add drag and drop integration tests * Update react-native-aztec mock to use AztecInputState * [Mobile] - Add E2E tests for the Drag & Drop blocks feature (#41368) * Mobile - Add E2E tests for the Drag & Drop blocks feature * Update longPress action * Use clickIfClickable * Use longPress instead of press * Fix clipboard typo * Add setClipboard and clearClipboard helpers * Mobile - Skip some of the Drag & Drop E2E on iOS (#41529) * Mobile - Skip some of the Drag & Drop E2E on iOS * Replace if condition to use onlyOnAndroid wrapper instead * where it can change to use clickIfClickable(), add new param for waitForVisible() to control return value (#41367) Co-authored-by: jos <[email protected]> * [RNMobile] Add 'Insert from URL' option to Video block (#41493) * Add onSelectURL function to mobile Video block edit * Add notices store to mobile Video block * Display Insert from URL in Video block media options menu * Allow native video block to use Embed block for embeddable URLs * Update native Video block src onSelectURL attribute * Update CHANGELOG * Upgrade Aztec to v1.5.9 (#41828) * fix: Image block preserves alt text from media library (#41839) * fix: Image block preserves alt text from media library When the alt text for a media item is present in the media library, that value should be copied into the Image block when inserted. This behavior avoids the need to re-enter the alt text for each image inserted into the post content. * fix: Allow Media with and without alt text Previous code required an alt text value, which broken existing code. This overrides the method to support both contexts. It also updates existing code to use the same method of generating media throughout the source. * test: Update alt text for demo editor test data Consistently setting the alt text for all platforms will likely help avoid confusion. * test: Update outdated test fixture data The demo editor now returns an alt text for the test image media. * docs: Update changelog * [RNMobile] Implement recovery option for invalid blocks (#41988) If a block's validation fails within the mobile app, users are shown an error but not provided with any options for recovering the block. This PR introduces an option for users to attempt block recovery. They'll be prompted to tap on a block if they wish to attempt recovery. * docs: Update change log * [RNMobile] Upgrades Gradle to 7.4.2 & Android Gradle Plugin to 7.2.1 (#42136) * Update Gradle to 7.4.1 * Update AGP to 7.2.1 * Update Aztec-Android version to v1.6.0 (#42243) Co-authored-by: jhnstn <[email protected]> Co-authored-by: Gerardo <[email protected]> Co-authored-by: Carlos Garcia <[email protected]> Co-authored-by: Siobhan <[email protected]> Co-authored-by: Derek Blank <[email protected]> Co-authored-by: Derek Blank <[email protected]> Co-authored-by: Jos <[email protected]> Co-authored-by: jos <[email protected]> Co-authored-by: Jason Johnston <[email protected]> Co-authored-by: Oguz Kocer <[email protected]>
dcalhoun
added a commit
that referenced
this pull request
Jul 20, 2022
* Release script: Update react-native-editor version to 1.76.0 * Release script: Update with changes from 'npm run core preios' * Update Changelog * Release script: Update react-native-editor version to 1.76.1 * Release script: Update with changes from 'npm run core preios' * [Mobile] - BlockList - Add internal onLayout from CellRendererComponent to BlockListItemCell (#41105) * Mobile - BlockList - Pass FlatList internal onLayout through CellRendererComponent * Mobile - Update onLayout naming for BlockListItemCell * [Mobile] - Fix Drag & Drop Chip positioning issue with RTL languages (#41053) * Mobile - Fix - Drag & drop chip issue with RTL languages * Mobile - BlockDraggable - Rename maxWidth variable to contentWidth * Mobile - BlockDraggable - Add custom exiting animation that uses the same functionality as ZoomOutEasyDown but customizing the translateX value taking into account RTL languages. * [RNMobile] Add drag & drop help guide in Help & Support screen (#40961) * Add drag & drop help guide * Update content of help screen related to moving blocks * Update drand-and-drop images * Update styles of heading component of help screen * Add HelpDetailBadge component This component will be rendered in `HelpDetailSectionHeadingText` component via the `badge` prop. * Add NEW badge to move blocks help section * Optimize drag-and-drop images * Add move-blocks icon to Help & Support screen * Update react-native-editor changelog * Add HelpSectionTitle component * Prevent rendering separator on last help topic item * [RNMobile] Fix drag mode not being enabled when long-pressing over Shortcode block (#41155) * Add prop for disabling suggestions button * Use allowed formats in format types calculation * Add RichText version to PlainText component * Use experimental version of PlainText in Shortcode block * Add disableAutocorrection prop to RichText * Disable autocorrection in Shortcode block * Update PlainText props in Shortcode block * Use pre as tagName in PlainText * Rename replaceLineBreaks function * Update shortcode block unit tests * Prevent text input focus when selecting Shortcode block * Force text color in Shortcode block * Remove tagName prop from PlainText component * Mobile - Update changelog * Translate NEW badge in Move blocks help screen * Release script: Update react-native-editor version to 1.77.0 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Improve text read by screen readers for BottomSheetSelectControl (#41036) Improves the text that's read by screen readers by the BottomSheetSelectControl component, adding extra context and making its purpose clearer. * [RNMobile] Add 'Insert from URL' option to Image block (#40334) * Add 'Insert from URL' option to Video and Image blocks * Update code style from linting * Improve test cases for Media Upload capture options * Fix whitespace issue * Update Media Upload option tests to be asynchronous * Update native image block to use correct image URL * Add error handling for invalid URLs to native Image block * Clear invalid URL error on Image URL success * Fix synchronicity of Media Upload option tests * Add check for URL handler to native Image block picker options * Update code style * Remove Video block from urlSource options Why: to be introduced in a later PR * Remove URL option from Video block for Media Upload test * Use Notice snackbar for native Image block error handling * Update Image/Media Upload code style and helpers * Use getImage to determine if URL is a valid image within Image block * Add loading indicator and isURL check to native Image block URL behavior * Add loading indicator to native Image block media placeholder * Fix whitespace issue in native Image block code style * Reuse native Image block loading indicator * Use undefined dimension attributes for the native Image block URL behavior Co-authored-by: Derek Blank <[email protected]> * [RNMobile] - E2E Simplify heading and lists blocks functions (#40670) * update tests using paragraph, heading and list blocks * fix slash inserter tests to work in ci * lint fixes * wait for ordered list to appear * lint fixes * extra click only on local env * wait to get backspace click reflected * re-add extra click only for local env * add wait to wait for backspace key to be reflected * lint fixes * break function, set position to get list block * lint fixes * use correct params, update function name * lint fixes * make maxIteration a parameter for isElementVisible * update xpath for list block * utilize waitForVisible for isElementVisible * lint fixes * add wait to getNumberOfParagraphBlocks and update xpath for android list block * update edit text xpath to be read from any level Co-authored-by: jos <[email protected]> * Add ruby version file (#41013) Use same version of ruby that is used on WP iOS * [RNMobile] Improvements to Getting Started Guides (#40964) * Update with copy from Gutenberg Mobile Gutenberg Mobile's readme had some copy in the troubleshooting section that wasn't included in Gutenberg's how-to: https://github.com/wordpress-mobile/gutenberg-mobile/edit/trunk/README.md This commit fixes that issue by updating Gutenberg's how-to with the latest from Gutenberg Mobile. * Tweak wording, update inconsistent capitalisation * Tweaks to copy and formatting With this commit, I've tidied up some of the copy, attempting to make the instructions as concise and helpful as possible. I've also set the images to the same width to tidy up the overall look of the document (the images will appear small on mobile devices, but can be tapped on to get the full image). * Set all images to fixed width, for consistency * Rearrange sections to improve overall flow - The "Unit Tests" is moved towards the bottom of the document, so that's it's closer to the instructions for integration tests. the document flows as follows: - The steps for installing Xcode are moved under the "iOS" section. - The overall flow of the document has been updated to the following: Clone Gutenberg > iOS > Android > Tests * Add details about recommended JDK * Add details about Cocoapods * Refine instructions for installing Cocoapods * Note `ffi` may already be installed Some versions of Ruby may not require the `ffi` to be manually installed, which is noted with this commit. * update expected html for file block (#41300) Co-authored-by: jos <[email protected]> * Add waitForVisible() to all blocks (#41126) * add waits to all block - 1st try * fix failing tests * correct if else condition * fix failing cover block test * update spaces * update to use new click helper * wait for blocks to be visible first in getFirstBlock and getLastBlock * remove length as a parameter * update timing for long press since it's failing intermittently in ci * remove deleted param, revert space changes * remove redundant code * exit function once condition is met * increse wait time for long press * remove unneccesary condition, update message, return click value Co-authored-by: jos <[email protected]> * Update CHANGELOG * Revert "update expected html for file block (#41300)" This reverts commit a046a61. * [RNMobile] Ensure post title gets focused when is notified from native side (#41371) * Release script: Update react-native-editor version to 1.77.1 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Bump `react-native-reanimated` version to `2.4.1-wp-3` (#41482) * Update react-native-editor changelog * Release script: Update react-native-editor version to 1.78.0 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Bump `react-native-gesture-handler` to version `2.3.2` (#41337) * Update react-native-editor changelog * Release script: Update react-native-editor version to 1.78.1 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Gallery block: Re-introduce `v1` (#41533) * Fix isGalleryV2Enabled calculation for the native version * Update comment in isGalleryV2Enabled function Co-authored-by: David Calhoun <[email protected]> Co-authored-by: David Calhoun <[email protected]> * [RNMobile] Fix missing translations for locales that include region (only on Android) (#41685) * Update CHANGELOG * Release script: Update react-native-editor version to 1.79.0 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Add integration tests to cover Drag & Drop functionality (#41364) * Add testID prop to Draggable components * Add unit tests for Draggable component * Set draggingId shared value before enable dragging This change is required for testing, otherwise the dragging id is not passed when the dragging gesture begins. * Mock generateHapticFeedback function * Add testID to draggable chip component * Add testID to BlockDraggable component * Add test helpers for BlockDraggable component Additionally, helpers related to fake timers have been added and updated in the global helpers file. * Add drag and drop integration tests * Update react-native-aztec mock to use AztecInputState * [Mobile] - Add E2E tests for the Drag & Drop blocks feature (#41368) * Mobile - Add E2E tests for the Drag & Drop blocks feature * Update longPress action * Use clickIfClickable * Use longPress instead of press * Fix clipboard typo * Add setClipboard and clearClipboard helpers * Mobile - Skip some of the Drag & Drop E2E on iOS (#41529) * Mobile - Skip some of the Drag & Drop E2E on iOS * Replace if condition to use onlyOnAndroid wrapper instead * where it can change to use clickIfClickable(), add new param for waitForVisible() to control return value (#41367) Co-authored-by: jos <[email protected]> * [RNMobile] Add 'Insert from URL' option to Video block (#41493) * Add onSelectURL function to mobile Video block edit * Add notices store to mobile Video block * Display Insert from URL in Video block media options menu * Allow native video block to use Embed block for embeddable URLs * Update native Video block src onSelectURL attribute * Update CHANGELOG * Upgrade Aztec to v1.5.9 (#41828) * fix: Image block preserves alt text from media library (#41839) * fix: Image block preserves alt text from media library When the alt text for a media item is present in the media library, that value should be copied into the Image block when inserted. This behavior avoids the need to re-enter the alt text for each image inserted into the post content. * fix: Allow Media with and without alt text Previous code required an alt text value, which broken existing code. This overrides the method to support both contexts. It also updates existing code to use the same method of generating media throughout the source. * test: Update alt text for demo editor test data Consistently setting the alt text for all platforms will likely help avoid confusion. * test: Update outdated test fixture data The demo editor now returns an alt text for the test image media. * docs: Update changelog * [RNMobile] Implement recovery option for invalid blocks (#41988) If a block's validation fails within the mobile app, users are shown an error but not provided with any options for recovering the block. This PR introduces an option for users to attempt block recovery. They'll be prompted to tap on a block if they wish to attempt recovery. * docs: Update change log * [RNMobile] Upgrades Gradle to 7.4.2 & Android Gradle Plugin to 7.2.1 (#42136) * Update Gradle to 7.4.1 * Update AGP to 7.2.1 * Update Aztec-Android version to v1.6.0 (#42243) * Release script: Update react-native-editor version to 1.79.1 * Release script: Update with changes from 'npm run core preios' * fix: Workaround Android 12 webview crash (#42517) * fix: Workaround Android 12 webview crash A crash occurred due to combining webviews with Android 12's new scroll overflow behavior. Applying `opacity: 0.99` prevents the crash from occurring. This change should be viewed as a temporary fix while we await a more appropriate solution for the `react-native-webview` library. react-native-webview/react-native-webview#1915 (comment) * docs: Add change log entry Co-authored-by: jhnstn <[email protected]> Co-authored-by: Gerardo <[email protected]> Co-authored-by: Carlos Garcia <[email protected]> Co-authored-by: Siobhan <[email protected]> Co-authored-by: Derek Blank <[email protected]> Co-authored-by: Derek Blank <[email protected]> Co-authored-by: Jos <[email protected]> Co-authored-by: jos <[email protected]> Co-authored-by: Jason Johnston <[email protected]> Co-authored-by: Oguz Kocer <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related PRs:
gutenberg-mobile: [RNMobile] Implement recovery option for invalid blocks wordpress-mobile/gutenberg-mobile#4996What?
If a block's validation fails within the mobile app, users are shown an error but not provided with any options for recovering the block. This PR introduces an option for users to attempt block recovery. They'll be prompted to tap on a block if they wish to attempt recovery.
Why?
The option to attempt block recovery already exists on the web, as shown in the following screenshot:
This PR, therefore, brings the native behaviour more inline with the web. In doing so, it will provide users with an option to recover content and the look/feel of their content, without them needing to manually re-add blocks/content.
How?
The
attemptBlockRecoveryfunction has been implemented following the same patterns found in web's version of the function here:gutenberg/packages/block-editor/src/components/block-list/block-invalid-warning.js
Lines 122 to 124 in 286e6be
Testing Instructions
wp-block-xxxclass name from the block's HTML.Screenshots or screencast
The following recording shows what happens before and after tapping the updated error message:
Simulator.Screen.Recording.-.iPhone.13.-.2022-06-27.at.23.19.53.mp4