Release v1.27.0

.eslintignore

@@ -4,3 +4,4 @@ symlinked-packages
 symlinked-packages-in-parent
 react-native-aztec
 bundle
+jetpack

.gitmodules

@@ -1,3 +1,8 @@
 [submodule "gutenberg"]
 	path = gutenberg
 	url = ../../WordPress/gutenberg.git
+	shallow = true
+[submodule "jetpack"]
+	path = jetpack
+	url = ../../Automattic/jetpack.git
+	shallow = true

RELEASE-NOTES.txt

@@ -1,3 +1,16 @@
+1.27.0
+------
+* Prefill caption for image blocks when available on the Media library
+* New block: Buttons. From now you’ll be able to add the individual Button block only inside the Buttons block
+* Fix bug where whitespaces at start of text blocks were being removed
+* Add support for upload options in Cover block
+* [Android] Floating toolbar, previously located above nested blocks, is now placed at the top of the screen
+* [iOS] Floating toolbar, previously located above nested blocks, is now placed at the bottom of the screen
+* Fix the icons in FloatingToolbar on RTL mode
+* [Android] Add alignment options for heading block
+* Fix Quote block so it visually reflects selected alignment
+* Fix bug where buttons in page templates were not rendering correctly on web
+
 1.26.0
 ------
 * [iOS] Disable ripple effect in all BottomSheet's controls.

RNTAztecView.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.xcconfig         = {'OTHER_LDFLAGS' => '-lxml2',
                         'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
   s.dependency         'React-Core'
-  s.dependency         'WordPress-Aztec-iOS', '~> 1.17.1'
+  s.dependency         'WordPress-Aztec-iOS', '~> 1.18.0'
 
 end

__device-tests__/gutenberg-editor-heading.test.js

@@ -48,7 +48,7 @@ describe( 'Gutenberg Editor tests', () => {
 		if ( isAndroid() ) {
 			await headingBlockElement.click();
 		}
-		await editorPage.sendTextToHeadingBlock( headingBlockElement, testData.heading );
+		await editorPage.sendTextToHeadingBlock( headingBlockElement, testData.heading, false );
 
 		await editorPage.addNewParagraphBlock();
 		let paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 2 );
@@ -60,7 +60,7 @@ describe( 'Gutenberg Editor tests', () => {
 
 		await editorPage.addNewHeadingBlock();
 		headingBlockElement = await editorPage.getHeadingBlockAtPosition( 4 );
-		await editorPage.sendTextToHeadingBlock( headingBlockElement, testData.heading );
+		await editorPage.sendTextToHeadingBlock( headingBlockElement, testData.heading, false );
 
 		await editorPage.addNewParagraphBlock();
 		paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 5 );

__device-tests__/gutenberg-editor-image.test.js

@@ -61,7 +61,7 @@ describe( 'Gutenberg Editor Image Block tests', () => {
 			imageBlock = await editorPage.getImageBlockAtPosition( 1 );
 			await imageBlock.click();
 			await swipeUp( driver, imageBlock );
-			await editorPage.enterCaptionToSelectedImageBlock( testData.imageCaption );
+			await editorPage.enterCaptionToSelectedImageBlock( testData.imageCaption, true );
 			await editorPage.dismissKeyboard();
 			imageBlock = await editorPage.getImageBlockAtPosition( 1 );
 			await imageBlock.click();

__device-tests__/helpers/utils.js

@@ -159,11 +159,28 @@ const typeString = async ( driver: wd.PromiseChainWebdriver, element: wd.Promise
 
 const typeStringIos = async ( driver: wd.PromiseChainWebdriver, element: wd.PromiseChainWebdriver.Element, str: string, clear: boolean ) => {
 	if ( clear ) {
-		await element.clear();
+		//await element.clear(); This was not working correctly on iOS so need a custom implementation
+		await clearTextBox( driver, element );
 	}
 	await element.type( str );
 };
 
+const clearTextBox = async ( driver: wd.PromiseChainWebdriver, element: wd.PromiseChainWebdriver.Element ) => {
+	await element.click();
+	let originalText = await element.text();
+	let text = originalText;
+	// We are double tapping on the text field and pressing backspace until all content is removed.
+	do {
+		originalText = await element.text();
+		const action = new wd.TouchAction( driver );
+		action.tap( { el: element, count: 2 } );
+		await action.perform();
+		await element.type( '\b' );
+		text = await element.text();
+		// We compare with the original content and not empty because text always return any hint set on the element.
+	} while ( originalText !== text );
+};
+
 const typeStringAndroid = async (
 	driver: wd.PromiseChainWebdriver,
 	element: wd.PromiseChainWebdriver.Element,

__device-tests__/pages/editor-page.js

@@ -401,7 +401,7 @@ export default class EditorPage {
 	}
 
 	async enterCaptionToSelectedImageBlock( caption: string, clear: boolean = true ) {
-		const imageBlockCaptionField = await this.driver.elementByXPath( '//XCUIElementTypeButton[@name="Image caption. Empty"]' );
+		const imageBlockCaptionField = await this.driver.elementByXPath( '//XCUIElementTypeButton[starts-with(@name, "Image caption.")]' );
 		await imageBlockCaptionField.click();
 		await typeString( this.driver, imageBlockCaptionField, caption, clear );
 	}

android/app/src/main/java/com/gutenberg/MainApplication.java

@@ -28,6 +28,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.ArrayList;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -56,6 +57,13 @@ public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCal
 
             @Override
             public void requestMediaPickFromMediaLibrary(MediaUploadCallback mediaUploadCallback, Boolean allowMultipleSelection, MediaType mediaType) {
+                List<RNMedia> rnMediaList = new ArrayList<>();
+                if (mediaType == MediaType.IMAGE) {
+                    rnMediaList.add(new Media(1, "https://cldup.com/cXyG__fTLN.jpg", "image", "Mountain" ));
+                } else if (mediaType == MediaType.VIDEO) {
+                    rnMediaList.add(new Media(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video", "Cloudup" ));
+                }
+                mediaUploadCallback.onUploadMediaFileSelected(rnMediaList);                
             }
 
 

android/app/src/main/java/com/gutenberg/Media.java

@@ -0,0 +1,65 @@
+package com.gutenberg;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaType;
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.RNMedia;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+
+import java.util.Locale;
+
+public class Media implements RNMedia {
+    private int mId;
+    private String mUrl;
+    private String mType;
+    private String mCaption;
+
+    public Media(int id, String url, String type, String caption) {
+        this.mId = id;
+        this.mUrl = url;
+        this.mType = type;
+        this.mCaption = caption;
+    }
+
+    public int getId() {
+        return mId;
+    }
+
+    public void setId(int id) {
+        this.mId = id;
+    }
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setUrl(String url) {
+        this.mUrl = url;
+    }
+
+    public String getType() {
+        return mType;
+    }
+
+    public void setType(String mediaType) {
+        this.mType = mediaType;
+    }
+
+    public String getCaption() {
+        return mCaption;
+    }
+
+    public void setCaption(String caption) {
+        this.mCaption = caption;
+    }
+
+    public WritableMap toMap() {
+        WritableMap map = new WritableNativeMap();
+        map.putInt("id", mId);
+        map.putString("url", mUrl);
+        map.putString("type", mType);
+        map.putString("caption", mCaption);
+        return map;
+    }
+}