Disable Page Template picker if modal layout picker is available (#23872

) * Disable Page Template picker if modal layout picker is available * Short circuit checks for page template picker checks
WordPress · Jul 15, 2020 · 4ae9ab1 · 4ae9ab1
1 parent 3e2b49b
commit 4ae9ab1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...ages/block-editor/src/components/page-template-picker/with-page-template-picker.native.js b/...ages/block-editor/src/components/page-template-picker/with-page-template-picker.native.js
@@ -13,8 +13,15 @@ import {
 
 const __experimentalWithPageTemplatePicker = createHigherOrderComponent(
 	( WrappedComponent ) => ( props ) => {
-		const isTemplatePickerVisible = __experimentalUsePageTemplatePickerVisible();
-		const isTemplatePickerAvailable = __experimentalUsePageTemplatePickerAvailable();
+		const isTemplatePickerEnabled = ! (
+			props.capabilities.modalLayoutPicker ?? false
+		);
+		const isTemplatePickerVisible =
+			isTemplatePickerEnabled &&
+			__experimentalUsePageTemplatePickerVisible();
+		const isTemplatePickerAvailable =
+			isTemplatePickerEnabled &&
+			__experimentalUsePageTemplatePickerAvailable();
 
 		return (
 			<WrappedComponent

diff --git a/packages/edit-post/src/components/layout/index.native.js b/packages/edit-post/src/components/layout/index.native.js
@@ -20,6 +20,7 @@ import {
 	HTMLTextInput,
 	KeyboardAvoidingView,
 	NoticeList,
+	withSiteCapabilities,
 } from '@wordpress/components';
 import { AutosaveMonitor } from '@wordpress/editor';
 import { sendNativeEditorDidLayout } from '@wordpress/react-native-bridge';
@@ -181,5 +182,6 @@ export default compose( [
 		};
 	} ),
 	withPreferredColorScheme,
+	withSiteCapabilities,
 	__experimentalWithPageTemplatePicker,
 ] )( Layout );