Remove feature flag for mobile page templates (#20718)

* Enable page templates on production builds * Remove mobileEnablePageTemplates from docs * Fix contact emoji * Update spacer height on services template * Remove old documentation for the feature flag * Remove unused variable
WordPress · Mar 13, 2020 · f8421c4 · f8421c4
1 parent 4793696
commit f8421c4
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
@@ -420,7 +420,6 @@ _Properties_
 -   _\_\_experimentalBlockDirectory_ `boolean`: Whether the user has enabled the Block Directory
 -   _\_\_experimentalEnableFullSiteEditing_ `boolean`: Whether the user has enabled Full Site Editing
 -   _\_\_experimentalEnableFullSiteEditingDemo_ `boolean`: Whether the user has enabled Full Site Editing Demo Templates
--   _\_\_mobileEnablePageTemplates_ `boolean`: Whether the user has enabled the Page Templates
 
 <a name="SkipToSelectedBlock" href="#SkipToSelectedBlock">#</a> **SkipToSelectedBlock**
 

diff --git a/packages/block-editor/src/components/page-template-picker/templates/contact.native.js b/packages/block-editor/src/components/page-template-picker/templates/contact.native.js
@@ -7,7 +7,7 @@ const Contact = {
 	// translators: title for "Contact" page template
 	name: __( 'Contact' ),
 	key: 'contact',
-	icon: '✉',
+	icon: '✉️',
 	content: [
 		{
 			name: 'core/paragraph',

diff --git a/packages/block-editor/src/components/page-template-picker/templates/services.native.js b/packages/block-editor/src/components/page-template-picker/templates/services.native.js
@@ -116,7 +116,7 @@ const Services = {
 		{
 			name: 'core/spacer',
 			attributes: {
-				height: 40,
+				height: 24,
 			},
 		},
 		{

diff --git a/...ages/block-editor/src/components/page-template-picker/use-page-template-picker-visible.js b/...ages/block-editor/src/components/page-template-picker/use-page-template-picker-visible.js
@@ -8,12 +8,7 @@ const __experimentalUsePageTemplatePickerVisible = () => {
 	return useSelect( ( select ) => {
 		const { getCurrentPostType } = select( 'core/editor' );
 
-		const { getBlockOrder, getBlock, getSettings } = select(
-			'core/block-editor'
-		);
-
-		const isPageTemplatesEnabled = getSettings()
-			.__mobileEnablePageTemplates;
+		const { getBlockOrder, getBlock } = select( 'core/block-editor' );
 
 		const blocks = getBlockOrder();
 		const isEmptyBlockList = blocks.length === 0;
@@ -23,7 +18,7 @@ const __experimentalUsePageTemplatePickerVisible = () => {
 		const isEmptyContent = isEmptyBlockList || isOnlyUnmodifiedDefault;
 		const isPage = getCurrentPostType() === 'page';
 
-		return isPageTemplatesEnabled && isEmptyContent && isPage;
+		return isEmptyContent && isPage;
 	}, [] );
 };
 

diff --git a/packages/block-editor/src/store/defaults.js b/packages/block-editor/src/store/defaults.js
@@ -33,7 +33,6 @@ export const PREFERENCES_DEFAULTS = {
  * @property {boolean} __experimentalBlockDirectory Whether the user has enabled the Block Directory
  * @property {boolean} __experimentalEnableFullSiteEditing Whether the user has enabled Full Site Editing
  * @property {boolean} __experimentalEnableFullSiteEditingDemo Whether the user has enabled Full Site Editing Demo Templates
- * @property {boolean} __mobileEnablePageTemplates Whether the user has enabled the Page Templates
  */
 export const SETTINGS_DEFAULTS = {
 	alignWide: false,

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -118,7 +118,6 @@ class EditorProvider extends Component {
 				'__experimentalBlockDirectory',
 				'__experimentalEnableFullSiteEditing',
 				'__experimentalEnableFullSiteEditingDemo',
-				'__mobileEnablePageTemplates',
 				'__experimentalGlobalStylesUserEntityId',
 				'__experimentalGlobalStylesBase',
 				'gradients',