Merge branch 'trunk' into rnmobile/release_1.78.1

# Conflicts: # packages/block-editor/src/components/media-upload/index.native.js # packages/block-editor/src/components/plain-text/index.native.js # packages/block-library/src/image/edit.native.js # packages/block-library/src/shortcode/edit.native.js # packages/block-library/src/shortcode/test/edit.native.js # packages/editor/src/components/editor-help/index.native.js # packages/react-native-aztec/package.json # packages/react-native-bridge/package.json # packages/react-native-editor/CHANGELOG.md # packages/react-native-editor/__device-tests__/[email protected] # packages/react-native-editor/__device-tests__/helpers/utils.js # packages/react-native-editor/__device-tests__/pages/editor-page.js # packages/react-native-editor/ios/Podfile.lock # packages/react-native-editor/package.json
WordPress · fluiddot · Jun 17, 2022 · May 11, 2022 · May 11, 2022 · May 11, 2022
commit eb2046e8ac5acfd2e136f5bf67ec6c612ffda97d
diff --git a/packages/block-editor/src/components/media-upload/index.native.js b/packages/block-editor/src/components/media-upload/index.native.js
@@ -127,7 +127,7 @@ export class MediaUpload extends Component {
 			id: URL_MEDIA_SOURCE,
 			value: URL_MEDIA_SOURCE,
 			label: __( 'Insert from URL' ),
-			types: [ MEDIA_TYPE_AUDIO, MEDIA_TYPE_IMAGE ],
+			types: [ MEDIA_TYPE_AUDIO, MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO ],
 			icon: globe,
 		};
 

diff --git a/packages/block-editor/src/components/plain-text/index.native.js b/packages/block-editor/src/components/plain-text/index.native.js
@@ -99,12 +99,8 @@ export default class PlainText extends Component {
 	}
 
 	render() {
-		const {
-			style,
-			__experimentalVersion,
-			onFocus,
-			...otherProps
-		} = this.props;
+		const { style, __experimentalVersion, onFocus, ...otherProps } =
+			this.props;
 		const textStyles = [
 			style || styles[ 'block-editor-plain-text' ],
 			this.getFontSize(),

diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
@@ -461,11 +461,8 @@ export class ImageEdit extends Component {
 	}
 
 	onSelectURL( newURL ) {
-		const {
-			createErrorNotice,
-			imageDefaultSize,
-			setAttributes,
-		} = this.props;
+		const { createErrorNotice, imageDefaultSize, setAttributes } =
+			this.props;
 
 		if ( isURL( newURL ) ) {
 			this.setState( {

diff --git a/packages/block-library/src/shortcode/edit.native.js b/packages/block-library/src/shortcode/edit.native.js
@@ -48,9 +48,10 @@ export function ShortcodeEdit( props ) {
 		shortcodeContainerStyle.paddingLeft +
 		shortcodeContainerStyle.paddingRight;
 
-	const onChange = useCallback( ( text ) => setAttributes( { text } ), [
-		setAttributes,
-	] );
+	const onChange = useCallback(
+		( text ) => setAttributes( { text } ),
+		[ setAttributes ]
+	);
 
 	return (
 		<View>

diff --git a/packages/block-library/src/shortcode/test/edit.native.js b/packages/block-library/src/shortcode/test/edit.native.js
@@ -28,11 +28,8 @@ afterAll( () => {
 
 describe( 'Shortcode block', () => {
 	it( 'inserts block', async () => {
-		const {
-			getByA11yLabel,
-			getByTestId,
-			getByText,
-		} = await initializeEditor();
+		const { getByA11yLabel, getByTestId, getByText } =
+			await initializeEditor();
 
 		fireEvent.press( getByA11yLabel( 'Add block' ) );
 

diff --git a/packages/editor/src/components/editor-help/index.native.js b/packages/editor/src/components/editor-help/index.native.js
@@ -130,9 +130,8 @@ function EditorHelpTopics( { close, isVisible, onClose } ) {
 														{ label, icon },
 														index
 													) => {
-														const labelSlug = kebabCase(
-															label
-														);
+														const labelSlug =
+															kebabCase( label );
 														const isLastItem =
 															index ===
 															HELP_TOPICS.length -

diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
@@ -11,6 +11,8 @@ For each user feature we should also add a importance categorization label  to i
 
 ## Unreleased
 
+-   [*] Add 'Insert from URL' option to Video block [#41493]
+
 ## 1.78.1
 
 -   [**] Re-introduce support for v1 of the Gallery block to the native version of the editor [#41533]
@@ -29,6 +31,14 @@ For each user feature we should also add a importance categorization label  to i
 -   [*] [a11y] Improve text read by screen readers for BottomSheetSelectControl [#41036]
 -   [*] Add 'Insert from URL' option to Image block [#40334]
 
+## 1.76.3
+
+-   [***] Fix crash on iOS related to JSI and Reanimated [#41482]
+
+## 1.76.2
+
+-   [*] Ensure post title gets focused when is notified from native side [#41371]
+
 ## 1.76.1
 
 -   [*] BlockList - Add internal onLayout from CellRendererComponent to BlockListItemCell [#41105]

diff --git a/packages/react-native-editor/__device-tests__/[email protected] b/packages/react-native-editor/__device-tests__/[email protected]
@@ -7,14 +7,7 @@ import testData from './helpers/test-data';
 
 describe( 'Gutenberg Editor Image Block tests', () => {
 	it( 'should be able to add an image block', async () => {
-		await editorPage.addNewBlock( blockNames.image );
-		await editorPage.closePicker();
-
-		const imageBlock = await editorPage.getBlockAtPosition(
-			blockNames.image
-		);
-
-		// Can only add image from media library on iOS
+		// iOS only test - Can only add image from media library on iOS
 		if ( ! isAndroid() ) {
 			await editorPage.addNewBlock( blockNames.image );
 			await editorPage.closePicker();

diff --git a/packages/react-native-editor/__device-tests__/helpers/utils.js b/packages/react-native-editor/__device-tests__/helpers/utils.js
@@ -321,10 +321,10 @@ const longPressMiddleOfElement = async ( driver, element ) => {
 
 	const x = location.x + size.width / 2;
 	const y = location.y + size.height / 2;
-	action.press( { x, y } );
-	// Setting to wait a bit longer because this is failing more frequently on the CI
-	action.wait( 5000 );
-	action.release();
+	const action = new wd.TouchAction( driver )
+		.longPress( { x, y } )
+		.wait( 5000 ) // Setting to wait a bit longer because this is failing more frequently on the CI
+		.release();
 	await action.perform();
 };
 
@@ -516,13 +516,15 @@ const waitForMediaLibrary = async ( driver ) => {
  * @param {string} driver
  * @param {string} elementLocator
  * @param {number} maxIteration - Default value is 25
+ * @param {string} elementToReturn - Options are allElements, lastElement, firstElement. Defaults to "firstElement"
  * @param {number} iteration - Default value is 0
  * @return {string} - Returns the first element found, empty string if not found
  */
 const waitForVisible = async (
 	driver,
 	elementLocator,
 	maxIteration = 25,
+	elementToReturn = 'firstElement',
 	iteration = 0
 ) => {
 	const timeout = 1000;
@@ -539,35 +541,47 @@ const waitForVisible = async (
 		await driver.sleep( timeout );
 	}
 
-	const element = await driver.elementsByXPath( elementLocator );
-	if ( element.length === 0 ) {
+	const elements = await driver.elementsByXPath( elementLocator );
+	if ( elements.length === 0 ) {
 		// if locator is not visible, try again
 		return waitForVisible(
 			driver,
 			elementLocator,
 			maxIteration,
+			elementToReturn,
 			iteration + 1
 		);
 	}
 
-	return element[ 0 ];
+	switch ( elementToReturn ) {
+		case 'allElements':
+			return elements;
+		case 'lastElement':
+			return elements[ elements.length - 1 ];
+		default:
+			// Default is to return first element
+			return elements[ 0 ];
+	}
 };
 
 /**
  * @param {string} driver
  * @param {string} elementLocator
  * @param {number} maxIteration - Default value is 25, can be adjusted to be less to wait for element to not be visible
+ * @param {string} elementToReturn - Options are allElements, lastElement, firstElement. Defaults to "firstElement"
  * @return {boolean} - Returns true if element is found, false otherwise
  */
 const isElementVisible = async (
 	driver,
 	elementLocator,
-	maxIteration = 25
+	maxIteration = 25,
+	elementToReturn = 'firstElement'
 ) => {
 	const element = await waitForVisible(
 		driver,
 		elementLocator,
-		maxIteration
+		maxIteration,
+		elementToReturn
 	);
 
 	// if there is no element, return false
@@ -582,12 +596,14 @@ const clickIfClickable = async (
 	driver,
 	elementLocator,
 	maxIteration = 25,
+	elementToReturn = 'firstElement',
 	iteration = 0
 ) => {
 	const element = await waitForVisible(
 		driver,
 		elementLocator,
 		maxIteration,
+		elementToReturn,
 		iteration
 	);
 
@@ -606,6 +622,7 @@ const clickIfClickable = async (
 			driver,
 			elementLocator,
 			maxIteration,
+			elementToReturn,
 			iteration + 1
 		);
 	}
@@ -618,17 +635,50 @@ const waitIfAndroid = async () => {
 	}
 };
 
+/**
+ * Content type definitions.
+ * Note: Android only supports plaintext.
+ *
+ * @typedef {"plaintext" | "image" | "url"} ClipboardContentType
+ */
+
+/**
+ * Helper to set content in the clipboard.
+ *
+ * @param {Object}               driver      Driver
+ * @param {string}               content     Content to set in the clipboard
+ * @param {ClipboardContentType} contentType Type of the content
+ */
+const setClipboard = async ( driver, content, contentType = 'plaintext' ) => {
+	const base64String = Buffer.from( content ).toString( 'base64' );
+	await driver.setClipboard( base64String, contentType );
+};
+
+/**
+ * Helper to clear the clipboard
+ *
+ * @param {Object}               driver      Driver
+ * @param {ClipboardContentType} contentType Type of the content
+ */
+const clearClipboard = async ( driver, contentType = 'plaintext' ) => {
+	await driver.setClipboard( '', contentType );
+};
+
 module.exports = {
 	backspace,
+	clearClipboard,
 	clickBeginningOfElement,
+	clickElementOutsideOfTextInput,
 	clickIfClickable,
 	clickMiddleOfElement,
 	doubleTap,
+	dragAndDropAfterElement,
 	isAndroid,
 	isEditorVisible,
 	isElementVisible,
 	isLocalEnvironment,
 	longPressMiddleOfElement,
+	setClipboard,
 	setupDriver,
 	stopDriver,
 	swipeDown,