From d10894428a7e6a77f35d2dc6061f1634602da686 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Thu, 23 May 2024 10:56:16 -0400 Subject: [PATCH 01/11] Release script: Update react-native-editor version to 1.119.0 --- packages/react-native-aztec/package.json | 2 +- packages/react-native-bridge/package.json | 2 +- packages/react-native-editor/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json index ac47ae64e0814..62c77fbbe3615 100644 --- a/packages/react-native-aztec/package.json +++ b/packages/react-native-aztec/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-aztec", - "version": "1.118.0", + "version": "1.119.0", "description": "Aztec view for react-native.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json index 7fd9dff7a0f6b..e21dad5ace769 100644 --- a/packages/react-native-bridge/package.json +++ b/packages/react-native-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-bridge", - "version": "1.118.0", + "version": "1.119.0", "description": "Native bridge library used to integrate the block editor into a native App.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index 16988d1c5cbcd..a66ffecceca0e 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-editor", - "version": "1.118.0", + "version": "1.119.0", "description": "Mobile WordPress gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", From 557e69ef44c2a77e644a7987cfe2b0c27f1869f3 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Thu, 23 May 2024 10:56:16 -0400 Subject: [PATCH 02/11] Release script: Update CHANGELOG for version 1.119.0 --- packages/react-native-editor/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index 7e3fc89ddbd6f..1775a02cf5600 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -10,6 +10,8 @@ For each user feature we should also add a importance categorization label to i --> ## Unreleased + +## 1.119.0 - [internal] Remove circular dependencies within the components package [#61102] - [internal] Upgrade target sdk version to Android API 34 [#61727] From 94831779dbdf708a1f67fc47cfbd0232c241b444 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Thu, 23 May 2024 10:58:20 -0400 Subject: [PATCH 03/11] Release script: Update podfile --- package-lock.json | 6 +++--- packages/react-native-editor/ios/Podfile.lock | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc56a316a4f1f..e3647a174b5cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55042,7 +55042,7 @@ }, "packages/react-native-aztec": { "name": "@wordpress/react-native-aztec", - "version": "1.118.0", + "version": "1.119.0", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/element": "file:../element", @@ -55055,7 +55055,7 @@ }, "packages/react-native-bridge": { "name": "@wordpress/react-native-bridge", - "version": "1.118.0", + "version": "1.119.0", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/react-native-aztec": "file:../react-native-aztec" @@ -55066,7 +55066,7 @@ }, "packages/react-native-editor": { "name": "@wordpress/react-native-editor", - "version": "1.118.0", + "version": "1.119.0", "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index 9abe99edd33f1..896262f752f0c 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -13,7 +13,7 @@ PODS: - ReactCommon/turbomodule/core (= 0.73.3) - fmt (6.2.1) - glog (0.3.5) - - Gutenberg (1.118.0): + - Gutenberg (1.119.0): - React-Core (= 0.73.3) - React-CoreModules (= 0.73.3) - React-RCTImage (= 0.73.3) @@ -912,10 +912,10 @@ PODS: - React-Core - react-native-slider (3.0.2-wp-4): - React-Core - - react-native-video (5.2.0-wp-6): + - react-native-video (5.2.0-wp-7): - React-Core - - react-native-video/Video (= 5.2.0-wp-6) - - react-native-video/Video (5.2.0-wp-6): + - react-native-video/Video (= 5.2.0-wp-7) + - react-native-video/Video (5.2.0-wp-7): - React-Core - react-native-webview (13.6.1): - React-Core @@ -1109,7 +1109,7 @@ PODS: - React-Core - RNSVG (14.0.0): - React-Core - - RNTAztecView (1.118.0): + - RNTAztecView (1.119.0): - React-Core - WordPress-Aztec-iOS (= 1.19.11) - SDWebImage (5.11.1): @@ -1343,7 +1343,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 73b3972e2bd20b3235ff2014f06a3d3af675ed29 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 - Gutenberg: c0094e0fdfa895be7ad038dbb7b42dc0d21074cf + Gutenberg: 8f5a5b16c987c6532add8413cb3411f583f43b69 hermes-engine: 5420539d016f368cd27e008f65f777abd6098c56 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c @@ -1373,7 +1373,7 @@ SPEC CHECKSUMS: react-native-safe-area: c9cf765aa2dd96159476a99633e7d462ce5bb94f react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89 react-native-slider: dff0d8a46f368a8d1bacd8638570d75b9b0be400 - react-native-video: 6dee623307ed9d04d1be2de87494f9a0fa2041d1 + react-native-video: 6768bf960f45c24bf75d2ba68d433d3ae3829a8e react-native-webview: 02e4beee6b2b2b7391ee1c565788b8f8d6df9d05 React-nativeconfig: 4662ac75a0a77789c9ed896ed77baa1a25cdf006 React-NativeModulesApple: 92bc296f2ae166d10cb4d6a05498c80bf4ef9fa2 @@ -1402,7 +1402,7 @@ SPEC CHECKSUMS: RNReanimated: 6936b41d8afb97175e7c0ab40425b53103f71046 RNScreens: 2b73f5eb2ac5d94fbd61fa4be0bfebd345716825 RNSVG: 255767813dac22db1ec2062c8b7e7b856d4e5ae6 - RNTAztecView: caf0e76a80867970eaa182cf9bf2d5b3c89285c5 + RNTAztecView: c0a124a24b01a96ceeac8c0dcdc461f2d06e13f2 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 From 3a7fc356b7ea67e57688b9336540f31d20ffd827 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Tue, 4 Jun 2024 12:29:10 +0200 Subject: [PATCH 04/11] [Mobile] - Image corrector - Check the path extension is a valid one (#62190) * Mobile - Image corrector - Check the path extension is a valid one * [Mobile] - Image corrector- Expand comment explaining the filtering for file: media paths * Integration Test helpers - Expand pasteIntoRichText to support passing files as a parameter * Mobile Editor Tests - Add new tests related to pasting HTML content with local image paths * Update snapshot --- .../raw-handling/image-corrector.native.js | 5 ++- .../test/__snapshots__/editor.native.js.snap | 12 +++++++ packages/edit-post/src/test/editor.native.js | 34 +++++++++++++++++++ .../rich-text-paste.js | 13 +++---- 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/packages/blocks/src/api/raw-handling/image-corrector.native.js b/packages/blocks/src/api/raw-handling/image-corrector.native.js index c6a9288ede2d3..550c2e0e6e153 100644 --- a/packages/blocks/src/api/raw-handling/image-corrector.native.js +++ b/packages/blocks/src/api/raw-handling/image-corrector.native.js @@ -10,7 +10,10 @@ export default function imageCorrector( node ) { return; } - if ( node.src.indexOf( 'file:' ) === 0 ) { + // For local files makes sure the path doesn't end with an invalid extension. + // This scenario often happens with content from MS Word and similar text apps. + // We still need to support local files pasted from the users Media library. + if ( node.src.startsWith( 'file:' ) && node.src.slice( -1 ) === '/' ) { node.setAttribute( 'src', '' ); } diff --git a/packages/edit-post/src/test/__snapshots__/editor.native.js.snap b/packages/edit-post/src/test/__snapshots__/editor.native.js.snap index 8b820cd38f11b..44300d7db982f 100644 --- a/packages/edit-post/src/test/__snapshots__/editor.native.js.snap +++ b/packages/edit-post/src/test/__snapshots__/editor.native.js.snap @@ -1,5 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`Editor adds empty image block when pasting unsupported HTML local image path 1`] = ` +" +
+" +`; + +exports[`Editor adds image block when pasting HTML local image path 1`] = ` +" +
+" +`; + exports[`Editor appends media correctly for allowed types 1`] = ` "
diff --git a/packages/edit-post/src/test/editor.native.js b/packages/edit-post/src/test/editor.native.js index 0de2c528b2452..57568f0096695 100644 --- a/packages/edit-post/src/test/editor.native.js +++ b/packages/edit-post/src/test/editor.native.js @@ -8,8 +8,10 @@ import { getBlock, getEditorHtml, initializeEditor, + pasteIntoRichText, screen, setupCoreBlocks, + within, } from 'test/helpers'; import { BackHandler } from 'react-native'; @@ -91,6 +93,38 @@ describe( 'Editor', () => { } ); } ); + it( 'adds empty image block when pasting unsupported HTML local image path', async () => { + await initializeEditor(); + await addBlock( screen, 'Paragraph' ); + + const paragraphBlock = getBlock( screen, 'Paragraph' ); + fireEvent.press( paragraphBlock ); + const paragraphTextInput = + within( paragraphBlock ).getByPlaceholderText( 'Start writing…' ); + + pasteIntoRichText( paragraphTextInput, { + text: '
', + } ); + + expect( getEditorHtml() ).toMatchSnapshot(); + } ); + + it( 'adds image block when pasting HTML local image path', async () => { + await initializeEditor(); + await addBlock( screen, 'Paragraph' ); + + const paragraphBlock = getBlock( screen, 'Paragraph' ); + fireEvent.press( paragraphBlock ); + const paragraphTextInput = + within( paragraphBlock ).getByPlaceholderText( 'Start writing…' ); + + pasteIntoRichText( paragraphTextInput, { + files: [ 'file:///path/to/file.png' ], + } ); + + expect( getEditorHtml() ).toMatchSnapshot(); + } ); + it( 'appends media correctly for allowed types', async () => { // Arrange requestMediaImport diff --git a/test/native/integration-test-helpers/rich-text-paste.js b/test/native/integration-test-helpers/rich-text-paste.js index d2c01ed2fb5a7..6d447181e0b8d 100644 --- a/test/native/integration-test-helpers/rich-text-paste.js +++ b/test/native/integration-test-helpers/rich-text-paste.js @@ -6,19 +6,20 @@ import { fireEvent } from '@testing-library/react-native'; /** * Paste content into a RichText component. * - * @param {import('react-test-renderer').ReactTestInstance} richText RichText test instance. - * @param {Object} content Content to paste. - * @param {string} content.text Text format of the content. - * @param {string} [content.html] HTML format of the content. If not provided, text format will be used. + * @param {import('react-test-renderer').ReactTestInstance} richText RichText test instance. + * @param {Object} content Content to paste. + * @param {string} content.text Text format of the content. + * @param {string} [content.html] HTML format of the content. If not provided, text format will be used. + * @param {string} [content.files] Files array to add to the editor. */ -export const pasteIntoRichText = ( richText, { text, html } ) => { +export const pasteIntoRichText = ( richText, { text, html, files = [] } ) => { fireEvent( richText, 'focus' ); fireEvent( richText, 'paste', { preventDefault: jest.fn(), nativeEvent: { eventCount: 1, target: undefined, - files: [], + files, pastedHtml: html || text, pastedText: text, }, From 547f3a46234819b5e39866d7545ae06418efb555 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Tue, 4 Jun 2024 12:12:41 +0200 Subject: [PATCH 05/11] [Mobile] - Unsupported block - UI improvements (#62240) * Mobile - Unsupported block editor - Update editor style overrides * Mobile - Unsupported block - Update UI to show Tap to edit for unsupported blocks, simplifying the flow to open the Unsupported block editor * Fix unsupported block condition * Update snapshot * Fix condition for the help icon --- .../block-library/src/missing/edit.native.js | 50 +++++-- .../test/__snapshots__/edit.native.js.snap | 136 ++++++++++-------- .../editor-style-overrides.css | 27 +++- 3 files changed, 141 insertions(+), 72 deletions(-) diff --git a/packages/block-library/src/missing/edit.native.js b/packages/block-library/src/missing/edit.native.js index a6164f590ca21..c60ea756eae5f 100644 --- a/packages/block-library/src/missing/edit.native.js +++ b/packages/block-library/src/missing/edit.native.js @@ -1,12 +1,7 @@ /** * External dependencies */ -import { - View, - Text, - TouchableWithoutFeedback, - TouchableOpacity, -} from 'react-native'; +import { View, Text, TouchableOpacity } from 'react-native'; /** * WordPress dependencies @@ -25,6 +20,7 @@ import { store as blockEditorStore, } from '@wordpress/block-editor'; import { store as noticesStore } from '@wordpress/notices'; +import { requestUnsupportedBlockFallback } from '@wordpress/react-native-bridge'; /** * Internal dependencies @@ -48,11 +44,38 @@ export class UnsupportedBlockEdit extends Component { } toggleSheet() { + const { attributes, block, clientId } = this.props; + const { originalName } = attributes; + const title = this.getTitle(); + const blockContent = serialize( block ? [ block ] : [] ); + + if ( this.canEditUnsupportedBlock() ) { + requestUnsupportedBlockFallback( + blockContent, + clientId, + originalName, + title + ); + return; + } + this.setState( { showHelp: ! this.state.showHelp, } ); } + canEditUnsupportedBlock() { + const { + canEnableUnsupportedBlockEditor, + isUnsupportedBlockEditorSupported, + } = this.props; + + return ( + ! canEnableUnsupportedBlockEditor && + isUnsupportedBlockEditorSupported + ); + } + closeSheet() { this.setState( { showHelp: false, @@ -186,7 +209,11 @@ export class UnsupportedBlockEdit extends Component { ); const subtitle = ( - { __( 'Unsupported' ) } + + { this.canEditUnsupportedBlock() + ? __( 'Tap to edit' ) + : __( 'Unsupported' ) } + ); const icon = blockType @@ -198,8 +225,8 @@ export class UnsupportedBlockEdit extends Component { ); const iconClassName = 'unsupported-icon' + '-' + preferredColorScheme; return ( - - { this.renderHelpIcon() } + { ! this.canEditUnsupportedBlock() && + this.renderHelpIcon() } - + ); } } diff --git a/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap index 245410a5c5d57..2ac371120be4b 100644 --- a/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap +++ b/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap @@ -9,12 +9,21 @@ exports[`Missing block renders without crashing 1`] = ` { "busy": undefined, "checked": undefined, - "disabled": true, + "disabled": undefined, "expanded": undefined, "selected": undefined, } } + accessibilityValue={ + { + "max": undefined, + "min": undefined, + "now": undefined, + "text": undefined, + } + } accessible={true} + collapsable={false} focusable={true} onClick={[Function]} onResponderGrant={[Function]} @@ -23,72 +32,79 @@ exports[`Missing block renders without crashing 1`] = ` onResponderTerminate={[Function]} onResponderTerminationRequest={[Function]} onStartShouldSetResponder={[Function]} + style={ + { + "opacity": 1, + } + } > - + - - Path - - - - - Path - + + Path + + + + + Path + + + missing/block/title + + - missing/block/title + Unsupported - - Unsupported - `; diff --git a/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css b/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css index 484cdfebfbd9b..46782e944d0c3 100644 --- a/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css +++ b/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css @@ -3,8 +3,28 @@ display: none; } +/* Remove header toolbar */ +.editor-header__toolbar { + display: none; +} + +/* Hide all children of editor-header__settings */ +.editor-header__settings > * { + display: none; +} + +/* Show only the interface-pinned-items container */ +.editor-header__settings > .interface-pinned-items { + display: block; +} + +.components-button.editor-post-publish-panel__toggle.is-primary{ + display: none; +} + /* Remove default block appender at the end of the post */ -.block-list-appender { +.block-list-appender, .block-list-appender__toggle, +.block-editor-inserter, .components-autocomplete__popover { display: none; } @@ -18,6 +38,11 @@ display: none; } +/* Remove block inserter popover */ +.block-editor-block-popover { + display: none; +} + /* Right align post header children as we will only display one child */ .edit-post-header { justify-content: flex-end; From fb3267aa66c16bfd58cf687aa35a0e3a61de9dd8 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 4 Jun 2024 12:42:47 +0200 Subject: [PATCH 06/11] Release script: Update react-native-editor version to 1.119.1 --- packages/react-native-aztec/package.json | 2 +- packages/react-native-bridge/package.json | 2 +- packages/react-native-editor/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json index 62c77fbbe3615..da46b86f0544c 100644 --- a/packages/react-native-aztec/package.json +++ b/packages/react-native-aztec/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-aztec", - "version": "1.119.0", + "version": "1.119.1", "description": "Aztec view for react-native.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json index e21dad5ace769..f27940f7ab4f5 100644 --- a/packages/react-native-bridge/package.json +++ b/packages/react-native-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-bridge", - "version": "1.119.0", + "version": "1.119.1", "description": "Native bridge library used to integrate the block editor into a native App.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index a66ffecceca0e..6daa281a34177 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-editor", - "version": "1.119.0", + "version": "1.119.1", "description": "Mobile WordPress gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", From 48e03cac4a28df9aad8af7a7b5c705a0b7116bb0 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 4 Jun 2024 12:51:30 +0200 Subject: [PATCH 07/11] Release script: Update CHANGELOG for version 1.119.1 --- packages/react-native-editor/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index 1775a02cf5600..7d6cd5a613e55 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -11,6 +11,10 @@ For each user feature we should also add a importance categorization label to i ## Unreleased +## 1.119.1 +- [*] Image corrector - Check the path extension is a valid one [#62190] +- [*] Unsupported block - UI improvements [#62240] + ## 1.119.0 - [internal] Remove circular dependencies within the components package [#61102] - [internal] Upgrade target sdk version to Android API 34 [#61727] From 9786c57671bbced6cedeb2807e4e2115655233f1 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 4 Jun 2024 12:54:02 +0200 Subject: [PATCH 08/11] Release script: Update podfile --- package-lock.json | 6 +++--- packages/react-native-editor/ios/Podfile.lock | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3647a174b5cd..b4f4ae19afec6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55042,7 +55042,7 @@ }, "packages/react-native-aztec": { "name": "@wordpress/react-native-aztec", - "version": "1.119.0", + "version": "1.119.1", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/element": "file:../element", @@ -55055,7 +55055,7 @@ }, "packages/react-native-bridge": { "name": "@wordpress/react-native-bridge", - "version": "1.119.0", + "version": "1.119.1", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/react-native-aztec": "file:../react-native-aztec" @@ -55066,7 +55066,7 @@ }, "packages/react-native-editor": { "name": "@wordpress/react-native-editor", - "version": "1.119.0", + "version": "1.119.1", "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index 896262f752f0c..86405ca4eacfc 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -13,7 +13,7 @@ PODS: - ReactCommon/turbomodule/core (= 0.73.3) - fmt (6.2.1) - glog (0.3.5) - - Gutenberg (1.119.0): + - Gutenberg (1.119.1): - React-Core (= 0.73.3) - React-CoreModules (= 0.73.3) - React-RCTImage (= 0.73.3) @@ -1109,7 +1109,7 @@ PODS: - React-Core - 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): @@ -1343,7 +1343,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 73b3972e2bd20b3235ff2014f06a3d3af675ed29 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 - Gutenberg: 8f5a5b16c987c6532add8413cb3411f583f43b69 + Gutenberg: be04e16bda9f59460f938d9c3f1248778df0368f hermes-engine: 5420539d016f368cd27e008f65f777abd6098c56 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c @@ -1402,7 +1402,7 @@ SPEC CHECKSUMS: RNReanimated: 6936b41d8afb97175e7c0ab40425b53103f71046 RNScreens: 2b73f5eb2ac5d94fbd61fa4be0bfebd345716825 RNSVG: 255767813dac22db1ec2062c8b7e7b856d4e5ae6 - RNTAztecView: c0a124a24b01a96ceeac8c0dcdc461f2d06e13f2 + RNTAztecView: 268a6489f223c3a91afa2ba5ee7bef82df900c69 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 From 6a5d15a3e829faa7d8a4966a418ee15dd3534f90 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 4 Jun 2024 17:24:35 +0200 Subject: [PATCH 09/11] Update Unsupported Block Editor condition and reverts the functionality to select the block first before opening the editor. --- packages/block-library/src/missing/edit.native.js | 8 ++++++-- .../src/missing/test/__snapshots__/edit.native.js.snap | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/missing/edit.native.js b/packages/block-library/src/missing/edit.native.js index c60ea756eae5f..0d7c51f1f94a9 100644 --- a/packages/block-library/src/missing/edit.native.js +++ b/packages/block-library/src/missing/edit.native.js @@ -67,12 +67,14 @@ export class UnsupportedBlockEdit extends Component { canEditUnsupportedBlock() { const { canEnableUnsupportedBlockEditor, + isEditableInUnsupportedBlockEditor, isUnsupportedBlockEditorSupported, } = this.props; return ( ! canEnableUnsupportedBlockEditor && - isUnsupportedBlockEditorSupported + isUnsupportedBlockEditorSupported && + isEditableInUnsupportedBlockEditor ); } @@ -194,7 +196,8 @@ export class UnsupportedBlockEdit extends Component { render() { const { originalName } = this.props.attributes; - const { getStylesFromColorScheme, preferredColorScheme } = this.props; + const { isSelected, getStylesFromColorScheme, preferredColorScheme } = + this.props; const blockType = coreBlocks[ originalName ]; const title = this.getTitle(); @@ -226,6 +229,7 @@ export class UnsupportedBlockEdit extends Component { const iconClassName = 'unsupported-icon' + '-' + preferredColorScheme; return ( Date: Tue, 4 Jun 2024 22:06:52 +0200 Subject: [PATCH 10/11] Update snapshot --- .../src/missing/test/__snapshots__/edit.native.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap index 2ac371120be4b..be91af9e58cc7 100644 --- a/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap +++ b/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap @@ -9,7 +9,7 @@ exports[`Missing block renders without crashing 1`] = ` { "busy": undefined, "checked": undefined, - "disabled": undefined, + "disabled": true, "expanded": undefined, "selected": undefined, } From 7c28016258ee418d3cd1f8ae4a3c239a35c52cf6 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 4 Jun 2024 22:16:14 +0200 Subject: [PATCH 11/11] Update package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index a8d34b4cac84a..28c218713b567 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55127,7 +55127,7 @@ }, "packages/react-native-aztec": { "name": "@wordpress/react-native-aztec", - "version": "1.119.0", + "version": "1.119.1", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/element": "file:../element",