[RNMobile] Fix crash when using the delete key to remove a single button#51435
Merged
derekblank merged 5 commits intotrunkfrom Jun 16, 2023
Merged
[RNMobile] Fix crash when using the delete key to remove a single button#51435derekblank merged 5 commits intotrunkfrom
derekblank merged 5 commits intotrunkfrom
Conversation
derekblank
added
Mobile App - i.e. Android or iOS
|
Size Change: +3.97 kB (0%) Total Size: 1.4 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in 2e4fa04. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5284647482
|
geriux
reviewed
Jun 13, 2023
| const { onDeleteBlock, onReplace } = props; | ||
|
|
||
| if ( numOfButtons === 1 ) { | ||
| if ( numOfButtons === 1 && onDeleteBlock ) { |
Member
There was a problem hiding this comment.
It looks like we missed passing this prop in a recent refactor, this onDeleteBlock prop should be added here.
Member
Author
There was a problem hiding this comment.
Can confirm that passing the onDeleteBlock as a prop in block.native.js resolves the issue. 👍 I've updated and removed this boolean check.
geriux
reviewed
Jun 13, 2023
|
|
||
| expect( getEditorHtml() ).toMatchSnapshot(); | ||
|
|
||
| const component = getTestComponentWithContent(); |
Member
There was a problem hiding this comment.
I think once we update the missing prop as mentioned here we can just check for the editor's HTML snapshot. Since deleting the last Button block will remove the block completely, what do you think?
Member
Author
There was a problem hiding this comment.
Updated after moving the onDeleteBlock prop to block.native.js.
fluiddot
reviewed
Jun 13, 2023
fluiddot
reviewed
Jun 13, 2023
packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
Outdated
Show resolved
Hide resolved
packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
Outdated
Show resolved
Hide resolved
derekblank
added
Mobile App - Automation
dcalhoun
approved these changes
Jun 15, 2023
Member
dcalhoun
left a comment
dcalhoun
left a comment
There was a problem hiding this comment.
Test plan succeeded for me on an iPhone 14 Pro simulator. Thank you for fixing this!
I left one non-blocking comment to consider.
Comment on lines
+245
to
+255
| // Trigger inner blocks layout | ||
| const innerBlockListWrapper = await within( | ||
| buttonsBlock | ||
| ).findByTestId( 'block-list-wrapper' ); | ||
| fireEvent( innerBlockListWrapper, 'layout', { | ||
| nativeEvent: { | ||
| layout: { | ||
| width: 300, | ||
| }, | ||
| }, | ||
| } ); |
Member
There was a problem hiding this comment.
We now have a triggerBlockListLayout test helper to perform this frequently required action for inner blocks. It may be beneficial to use the helper for the sake of consistency and conciseness. WDYT?
diff --git a/packages/block-library/src/buttons/test/edit.native.js b/packages/block-library/src/buttons/test/edit.native.js
index fc666d97bf..a586ec2b46 100644
--- a/packages/block-library/src/buttons/test/edit.native.js
+++ b/packages/block-library/src/buttons/test/edit.native.js
@@ -242,17 +242,7 @@ describe( 'Buttons block', () => {
// Get block
const buttonsBlock = await getBlock( screen, 'Buttons' );
- // Trigger inner blocks layout
- const innerBlockListWrapper = await within(
- buttonsBlock
- ).findByTestId( 'block-list-wrapper' );
- fireEvent( innerBlockListWrapper, 'layout', {
- nativeEvent: {
- layout: {
- width: 300,
- },
- },
- } );
+ triggerBlockListLayout( buttonsBlock );
// Get inner button block
const buttonBlock = await getBlock( screen, 'Button' );
Member
Author
There was a problem hiding this comment.
Great suggestion. We have a lot of helpers. 😅 I've updated. 👍
fluiddot
pushed a commit
that referenced
this pull request
Jun 16, 2023
…ton (#51435) * Fix crash when using the delete key to remove a single button * Add onDeleteBlock prop to block.native.js * Update button edit.native.js snapshots * Update button delete test to focus button input * Update button test to use triggerBlockListLayout
This was referenced Jun 16, 2023
fluiddot
added a commit
that referenced
this pull request
Jun 16, 2023
* Release script: Update react-native-editor version to 1.97.0 * Release script: Update with changes from 'npm run core preios' * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md Fix white space * Release script: Update react-native-editor version to 1.97.1 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Fix crash when using the delete key to remove a single button (#51435) * Fix crash when using the delete key to remove a single button * Add onDeleteBlock prop to block.native.js * Update button edit.native.js snapshots * Update button delete test to focus button input * Update button test to use triggerBlockListLayout * [RNMobile] Ensure text input field is not editable when Bottom sheet cell is disabled (#51567) * Update `react-native-editor` changelog --------- Co-authored-by: jhnstn <jhnstn@pm.me> Co-authored-by: Jason Johnston <jhnstn@users.noreply.github.com> Co-authored-by: Derek Blank <derekpblank@gmail.com>
sethrubenstein
pushed a commit
to pewresearch/gutenberg
that referenced
this pull request
Jul 13, 2023
…ton (WordPress#51435) * Fix crash when using the delete key to remove a single button * Add onDeleteBlock prop to block.native.js * Update button edit.native.js snapshots * Update button delete test to focus button input * Update button test to use triggerBlockListLayout
sethrubenstein
pushed a commit
to pewresearch/gutenberg
that referenced
this pull request
Jul 13, 2023
* Release script: Update react-native-editor version to 1.97.0 * Release script: Update with changes from 'npm run core preios' * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md Fix white space * Release script: Update react-native-editor version to 1.97.1 * Release script: Update with changes from 'npm run core preios' * [RNMobile] Fix crash when using the delete key to remove a single button (WordPress#51435) * Fix crash when using the delete key to remove a single button * Add onDeleteBlock prop to block.native.js * Update button edit.native.js snapshots * Update button delete test to focus button input * Update button test to use triggerBlockListLayout * [RNMobile] Ensure text input field is not editable when Bottom sheet cell is disabled (WordPress#51567) * Update `react-native-editor` changelog --------- Co-authored-by: jhnstn <jhnstn@pm.me> Co-authored-by: Jason Johnston <jhnstn@users.noreply.github.com> Co-authored-by: Derek Blank <derekpblank@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What?
Fixes a crash when using the delete key to remove a single button:
Why?
After typing text into a button and using the delete key to remove the text, it should also be possible to remove the button itself using the delete key. Currently, using the delete key to remove a button results in a fatal exception. This occurs when the
onDeleteBlockis sent asundefinedto this code block:gutenberg/packages/block-library/src/button/edit.native.js
Lines 327 to 335 in c402cde
How?
Adds missing
onDeleteBlockprop toblock.native.js. Adds test to check the button removal with the delete key (in addition to the existing test to use the "Remove Block" menu option).Testing Instructions
Screenshots or screencast
Button.Block.-.Before.mov
Button.Block.-.After.mov