Merge branch 'trunk' into patterns/classic-theme-bc

packages/edit-site/lib/unbrotli.js

@@ -332,12 +332,11 @@
 						0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
 						1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
 						0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-						1, 0, 1, 0, 1, 0, 1, /* UTF8 lead byte range. */
+						1, 0, 1, 0, 1, 0, 1 /* UTF8 lead byte range. */, 2, 3,
 						2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
 						3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
 						2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
-						3, 2, 3, 2, 3, 2, 3,
-						/* CONTEXT_UTF8 second last byte. */
+						3, 2, 3, 2, 3, /* CONTEXT_UTF8 second last byte. */
 						/* ASCII range. */
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
@@ -351,11 +350,10 @@
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, /* UTF8 lead byte range. */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2,
+						0, 0, 0, 0 /* UTF8 lead byte range. */, 0, 0, 0, 0, 0,
+						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2,
 						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						/* CONTEXT_SIGNED, second last byte. */
+						2, 2, 2, 2, 2, /* CONTEXT_SIGNED, second last byte. */
 						0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
 						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -447,9 +445,8 @@
 
 					exports.lookupOffsets = new Uint16Array( [
 						/* CONTEXT_LSB6 */
-						1024, 1536, /* CONTEXT_MSB6 */
-						1280, 1536, /* CONTEXT_UTF8 */
-						0, 256, /* CONTEXT_SIGNED */
+						1024, 1536 /* CONTEXT_MSB6 */, 1280,
+						1536 /* CONTEXT_UTF8 */, 0, 256 /* CONTEXT_SIGNED */,
 						768, 512,
 					] );
 				},

packages/edit-site/src/components/add-new-pattern/index.js

@@ -7,15 +7,25 @@ import { __, sprintf } from '@wordpress/i18n';
 import { plus, symbol, symbolFilled } from '@wordpress/icons';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
+import {
+	privateApis as editPatternsPrivateApis,
+	store as patternsStore,
+} from '@wordpress/patterns';
 import { store as coreStore } from '@wordpress/core-data';
+import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
  */
 import CreateTemplatePartModal from '../create-template-part-modal';
 import SidebarButton from '../sidebar-button';
 import { unlock } from '../../lock-unlock';
+import {
+	PATTERN_TYPES,
+	PATTERN_DEFAULT_CATEGORY,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../utils/constants';
+import usePatternCategories from '../sidebar-navigation-screen-patterns/use-pattern-categories';
 
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 const { CreatePatternModal } = unlock( editPatternsPrivateApis );

packages/edit-site/src/store/private-actions.js

@@ -50,6 +50,25 @@ export const setEditorCanvasContainerView =
 		} );
 	};
 
+/**
+ * Sets the type of page content focus. Can be one of:
+ *
+ * - `'disableTemplate'`: Disable the blocks belonging to the page's template.
+ * - `'hideTemplate'`: Hide the blocks belonging to the page's template.
+ *
+ * @param {'disableTemplate'|'hideTemplate'} pageContentFocusType The type of page content focus.
+ *
+ * @return {Object} Action object.
+ */
+export const setPageContentFocusType =
+	( pageContentFocusType ) =>
+	( { dispatch } ) => {
+		dispatch( {
+			type: 'SET_PAGE_CONTENT_FOCUS_TYPE',
+			pageContentFocusType,
+		} );
+	};
+
 /**
  * Action that set the Patterns page has been accessed.
  *

packages/edit-site/src/store/private-selectors.js

@@ -25,6 +25,23 @@ export function getEditorCanvasContainerView( state ) {
 	return state.editorCanvasContainerView;
 }
 
+/**
+ * Returns the type of the current page content focus, or null if there is no
+ * page content focus.
+ *
+ * Possible values are:
+ *
+ * - `'disableTemplate'`: Disable the blocks belonging to the page's template.
+ * - `'hideTemplate'`: Hide the blocks belonging to the page's template.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {'disableTemplate'|'hideTemplate'|null} Type of the current page content focus.
+ */
+export function getPageContentFocusType( state ) {
+	return hasPageContentFocus( state ) ? state.pageContentFocusType : null;
+}
+
 /**
  * Returns whether the Patterns page was accessed or not.
  *

packages/edit-site/src/store/reducer.js

@@ -177,6 +177,23 @@ export function hasPageContentFocus( state = false, action ) {
 	return state;
 }
 
+/**
+ * Reducer used to track the type of page content focus.
+ *
+ * @param {string} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {string} Updated state.
+ */
+export function pageContentFocusType( state = 'disableTemplate', action ) {
+	switch ( action.type ) {
+		case 'SET_PAGE_CONTENT_FOCUS_TYPE':
+			return action.pageContentFocusType;
+	}
+
+	return state;
+}
+
 /**
  * Reducer used to track whether the Patterns page was accessed or not.
  *
@@ -204,5 +221,6 @@ export default combineReducers( {
 	canvasMode,
 	editorCanvasContainerView,
 	hasPageContentFocus,
+	pageContentFocusType,
 	didAccessPatternsPage,
 } );