From 4ae9ab1269af7b08796ea6a512f7a5aabd3ed6c1 Mon Sep 17 00:00:00 2001
From: Chip <chip.snyder3@gmail.com>
Date: Wed, 15 Jul 2020 10:58:50 -0400
Subject: [PATCH] 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
---
 .../with-page-template-picker.native.js               | 11 +++++++++--
 .../edit-post/src/components/layout/index.native.js   |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/page-template-picker/with-page-template-picker.native.js b/packages/block-editor/src/components/page-template-picker/with-page-template-picker.native.js
index 121bd46db9ce1..712647ee41599 100644
--- a/packages/block-editor/src/components/page-template-picker/with-page-template-picker.native.js
+++ b/packages/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
index d0548d9696ece..1eaaa479c9ffd 100644
--- 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 );