Release 1.41.1

.circleci/config.yml

@@ -266,6 +266,7 @@ workflows:
             branches:
               ignore:
                 - develop
+                - /^dependabot/submodules/.*/
       - ios-device-checks:
           name: Test iOS on Device - Full
           requires: [ "Optional UI Tests" ]
@@ -274,6 +275,18 @@ workflows:
           requires: [ "Optional UI Tests" ]
       - android-native-unit-tests:
           name: Android Native Unit Tests
+      - ios-device-checks:
+          name: Test iOS on Device - Full (Submodule Update)
+          post-to-slack: true
+          filters:
+            branches:
+              only: /^dependabot/submodules/.*/
+      - android-device-checks:
+          name: Test Android on Device - Full (Submodule Update)
+          post-to-slack: true
+          filters:
+            branches:
+              only: /^dependabot/submodules/.*/
 
   ui-tests-full-scheduled:
     jobs:

bundle/android/strings.xml

@@ -96,6 +96,8 @@
     <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:[email protected]\"&gt;[email protected]&lt;/a&gt;</string>
     <string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to save files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to upload files.\nPlease tap for options.</string>
     <!-- translators: accessibility text. %s: gallery caption. -->
     <string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
     <!-- translators: sample content for "About" page template

bundle/ios/GutenbergNativeTranslations.swift

@@ -78,6 +78,8 @@ private func dummy() {
     _ = NSLocalizedString("Email me: <a href=\"mailto:[email protected]\">[email protected]</a>", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Excerpt length (words)", comment: "")
     _ = NSLocalizedString("Failed to insert media.\nPlease tap for options.", comment: "")
+    _ = NSLocalizedString("Failed to save files.\nPlease tap for options.", comment: "")
+    _ = NSLocalizedString("Failed to upload files.\nPlease tap for options.", comment: "")
     _ = NSLocalizedString("Gallery caption. %s", comment: "translators: accessibility text. %s: gallery caption.")
     _ = NSLocalizedString("Get in Touch", comment: "translators: sample content for \"About\" page template\ntranslators: sample content for \"Contact\" page template\ntranslators: sample content for \"Portfolio\" page template\ntranslators: sample content for \"Services\" page template\ntranslators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Gradient Type", comment: "")

bundle/ios/assets/jetpack/extensions/index.json

@@ -0,0 +1,71 @@
+{
+	"production": [
+		"business-hours",
+		"button",
+		"calendly",
+		"contact-form",
+		"contact-info",
+		"donations",
+		"eventbrite",
+		"gathering-tweetstorms",
+		"gif",
+		"google-calendar",
+		"image-compare",
+		"instagram-gallery",
+		"likes",
+		"mailchimp",
+		"map",
+		"markdown",
+		"opentable",
+		"pinterest",
+		"podcast-player",
+		"publicize",
+		"rating-star",
+		"recurring-payments",
+		"related-posts",
+		"repeat-visitor",
+		"revue",
+		"send-a-message",
+		"send-a-message/whatsapp-button",
+		"sharing",
+		"shortlinks",
+		"simple-payments",
+		"slideshow",
+		"social-previews",
+		"story",
+		"subscriptions",
+		"tiled-gallery",
+		"videopress",
+		"wordads"
+	],
+	"beta": [ "amazon" ],
+	"experimental": [ "seo" ],
+	"no-post-editor": [
+		"business-hours",
+		"button",
+		"calendly",
+		"contact-form",
+		"contact-info",
+		"donations",
+		"eventbrite",
+		"gif",
+		"google-calendar",
+		"instagram-gallery",
+		"mailchimp",
+		"map",
+		"markdown",
+		"opentable",
+		"pinterest",
+		"rating-star",
+		"recurring-payments",
+		"related-posts",
+		"repeat-visitor",
+		"revue",
+		"simple-payments",
+		"slideshow",
+		"subscriptions",
+		"tiled-gallery",
+		"videopress",
+		"wordads"
+	]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.41.0",
+  "version": "1.41.1",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

src/index.js

@@ -14,9 +14,12 @@ import correctTextFontWeight from './text-font-weight-correct';
 import setupJetpackEditor from './jetpack-editor-setup';
 import initialHtml from './initial-html';
 
-addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => {
+addAction( 'native.pre-render', 'gutenberg-mobile', () => {
 	require( './strings-overrides' );
 	correctTextFontWeight();
+} );
+
+addAction( 'native.render', 'gutenberg-mobile', ( props ) => {
 	setupJetpackEditor(
 		props.jetpackState || { blogId: 1, isJetpackActive: true }
 	);

src/initial-html.js

@@ -12,4 +12,16 @@ export default `
 <div class="wp-block-jetpack-address"><div class="jetpack-address__address jetpack-address__address1">Random Street</div></div>
 <!-- /wp:jetpack/address --></div>
 <!-- /wp:jetpack/contact-info -->
+
+<!-- wp:jetpack/story {"mediaFiles":[{"alt":"","caption":"","id":320,"link":"https://cldup.com/n48GTQmw7s.jpg","mime":"image/jpeg","type":"image","url":"https://cldup.com/n48GTQmw7s.jpg"},{"alt":"","caption":"","id":321,"link":"https://cldup.com/u2kdydrlQv.jpg","mime":"image/jpeg","type":"image","url":"https://cldup.com/u2kdydrlQv.jpg"},{"alt":"","caption":"","id":319,"link":"https://cldup.com/fi7gqyUrbL.jpg","mime":"image/jpeg","type":"image","url":"https://cldup.com/fi7gqyUrbL.jpg"}]} -->
+<div class="wp-block-jetpack-story wp-story"></div>
+<!-- /wp:jetpack/story -->
+
+<!-- wp:jetpack/story -->
+<div class="wp-block-jetpack-story wp-story"></div>
+<!-- /wp:jetpack/story -->
+
+<!-- wp:jetpack/story {"mediaFiles":[]}} -->
+<div class="wp-block-jetpack-story wp-story"></div>
+<!-- /wp:jetpack/story -->
 `;

src/jetpack-editor-setup.js

@@ -2,10 +2,17 @@
  * Internal dependencies
  */
 import { JETPACK_DATA_PATH } from '../jetpack/extensions/shared/get-jetpack-data';
+/**
+ * WordPress dependencies
+ */
+import { dispatch, select } from '@wordpress/data';
 
 // When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json
 const supportedJetpackBlocks = {
 	'contact-info': {
+		available: __DEV__,
+	},
+	story: {
 		available: true,
 	},
 };
@@ -37,9 +44,27 @@ export default ( jetpackState ) => {
 
 	const jetpackData = setJetpackData( jetpackState );
 
-	if ( __DEV__ ) {
-		require( '../jetpack/extensions/editor' );
-	}
+	// Note on the use of setTimeout() here:
+	// We observed the settings may not be ready exactly when the native.render hooks get run but rather
+	// right after that execution cycle (because state hasn't changed yet). Hence, we're only checking for
+	// the actual settings to be loaded by using setTimeout without a delay parameter. This ensures the
+	// settings are loaded onto the store and we can use the core/block-editor selector by the time we do
+	// the actual check.
+
+	// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
+	setTimeout( () => {
+		const mediaFilesCollectionBlock = select(
+			'core/block-editor'
+		).getSettings( 'capabilities' ).mediaFilesCollectionBlock;
+
+		if ( mediaFilesCollectionBlock !== true ) {
+			dispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] );
+		} else {
+			dispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] );
+		}
+	} );
+
+	require( '../jetpack/extensions/editor' );
 
 	return jetpackData;
 };

src/test/index.js

@@ -3,7 +3,7 @@ describe( 'Test Jetpack blocks', () => {
 		const mockRegisterBlockCollection = jest.fn();
 		jest.mock( '@wordpress/blocks', () => {
 			return {
-				getCategories: () => [],
+				getCategories: () => [ { slug: 'media' } ],
 				setCategories: jest.fn(),
 				registerBlockCollection: mockRegisterBlockCollection,
 			};
@@ -12,6 +12,9 @@ describe( 'Test Jetpack blocks', () => {
 			'../../jetpack/extensions/blocks/contact-info/editor.js',
 			() => jest.fn()
 		);
+		jest.mock( '../../jetpack/extensions/blocks/story/editor.js', () =>
+			jest.fn()
+		);
 
 		const setupJetpackEditor = require( '../jetpack-editor-setup' ).default;
 		setupJetpackEditor( { blogId: 1, isJetpackActive: true } );