Merge pull request #2762 from wordpress-mobile/try/jetpack-stories-bl…

…ock-hide Mobile stories block: hide behind feature flag
wordpress-mobile · Oct 30, 2020 · f6b14e4 · f6b14e4
2 parents 4259361 + a361b1d
commit f6b14e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/gutenberg b/gutenberg
diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js
@@ -2,6 +2,10 @@
  * Internal dependencies
  */
 import { JETPACK_DATA_PATH } from '../jetpack/extensions/shared/get-jetpack-data';
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
 
 // When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json
 const supportedJetpackBlocks = {
@@ -40,6 +44,17 @@ export default ( jetpackState ) => {
 
 	const jetpackData = setJetpackData( jetpackState );
 
+	const mediaFilesCollectionBlock = useSelect( ( select ) => {
+		return select( 'core/block-editor' ).getSettings( 'capabilities' ).mediaFilesCollectionBlock;
+	}, [] );
+
+
+	if ( mediaFilesCollectionBlock !== true ) {
+		useDispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] );
+	} else {
+		useDispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] );
+	}
+
 	if ( __DEV__ ) {
 		require( '../jetpack/extensions/editor' );
 	}
+5 −1		packages/edit-post/src/editor.native.js
+3 −0		packages/react-native-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt
+6 −5		packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift