-
{ isRichEditingEnabled && (
{ __( 'Editing code' ) }
diff --git a/packages/edit-post/src/components/visual-editor/index.js b/packages/edit-post/src/components/visual-editor/index.js
index 29e6e15da4579f..fe14ef05561134 100644
--- a/packages/edit-post/src/components/visual-editor/index.js
+++ b/packages/edit-post/src/components/visual-editor/index.js
@@ -6,11 +6,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- VisualEditorGlobalKeyboardShortcuts,
- PostTitle,
- store as editorStore,
-} from '@wordpress/editor';
+import { PostTitle, store as editorStore } from '@wordpress/editor';
import {
WritingFlow,
BlockList,
@@ -345,7 +341,6 @@ export default function VisualEditor( { styles } ) {
'is-template-mode': isTemplateMode,
} ) }
>
-
{
const {
isFeatureActive,
- __experimentalGetPreviewDeviceType,
isEditingTemplate,
getEditedPostTemplate,
getHiddenBlockTypes,
@@ -80,9 +79,7 @@ function Editor( { postId, postType, settings, initialEdits, ...props } ) {
const canEditTemplate = canUser( 'create', 'templates' );
return {
- hasFixedToolbar:
- isFeatureActive( 'fixedToolbar' ) ||
- __experimentalGetPreviewDeviceType() !== 'Desktop',
+ hasFixedToolbar: isFeatureActive( 'fixedToolbar' ),
focusMode: isFeatureActive( 'focusMode' ),
isDistractionFree: isFeatureActive( 'distractionFree' ),
hasInlineToolbar: isFeatureActive( 'inlineToolbar' ),
diff --git a/packages/edit-site/CHANGELOG.md b/packages/edit-site/CHANGELOG.md
index cc77bca0e7375c..734db396d059e7 100644
--- a/packages/edit-site/CHANGELOG.md
+++ b/packages/edit-site/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.15.0 (2023-07-20)
+
## 5.14.0 (2023-07-05)
## 5.13.0 (2023-06-23)
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index 06e52ed9fd53e7..b6778e46e57543 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/edit-site",
- "version": "5.14.0",
+ "version": "5.15.0",
"description": "Edit Site Page module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/src/components/add-new-pattern/index.js b/packages/edit-site/src/components/add-new-pattern/index.js
index 7a820558bc3acc..3879498834f42a 100644
--- a/packages/edit-site/src/components/add-new-pattern/index.js
+++ b/packages/edit-site/src/components/add-new-pattern/index.js
@@ -57,21 +57,26 @@ export default function AddNewPattern() {
setShowTemplatePartModal( false );
}
+ const controls = [
+ {
+ icon: symbol,
+ onClick: () => setShowPatternModal( true ),
+ title: __( 'Create pattern' ),
+ },
+ ];
+
+ if ( ! isTemplatePartsMode ) {
+ controls.push( {
+ icon: symbolFilled,
+ onClick: () => setShowTemplatePartModal( true ),
+ title: __( 'Create template part' ),
+ } );
+ }
+
return (
<>
setShowTemplatePartModal( true ),
- title: __( 'Create template part' ),
- },
- {
- icon: symbol,
- onClick: () => setShowPatternModal( true ),
- title: __( 'Create pattern' ),
- },
- ].filter( Boolean ) }
+ controls={ controls }
toggleProps={ {
as: SidebarButton,
} }
diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
index 3d5d05c35fa74e..d70a88e8215c02 100644
--- a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
+++ b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -11,6 +11,78 @@ import { store as editSiteStore } from '../../store';
import { unlock } from '../../lock-unlock';
import inserterMediaCategories from './inserter-media-categories';
+function useArchiveLabel( templateSlug ) {
+ const taxonomyMatches = templateSlug?.match(
+ /^(category|tag|taxonomy-([^-]+))$|^(((category|tag)|taxonomy-([^-]+))-(.+))$/
+ );
+ let taxonomy;
+ let term;
+ let isAuthor = false;
+ let authorSlug;
+ if ( taxonomyMatches ) {
+ // If is for a all taxonomies of a type
+ if ( taxonomyMatches[ 1 ] ) {
+ taxonomy = taxonomyMatches[ 2 ]
+ ? taxonomyMatches[ 2 ]
+ : taxonomyMatches[ 1 ];
+ }
+ // If is for a all taxonomies of a type
+ else if ( taxonomyMatches[ 3 ] ) {
+ taxonomy = taxonomyMatches[ 6 ]
+ ? taxonomyMatches[ 6 ]
+ : taxonomyMatches[ 4 ];
+ term = taxonomyMatches[ 7 ];
+ }
+ taxonomy = taxonomy === 'tag' ? 'post_tag' : taxonomy;
+
+ //getTaxonomy( 'category' );
+ //wp.data.select('core').getEntityRecords( 'taxonomy', 'category', {slug: 'newcat'} );
+ } else {
+ const authorMatches = templateSlug?.match( /^(author)$|^author-(.+)$/ );
+ if ( authorMatches ) {
+ isAuthor = true;
+ if ( authorMatches[ 2 ] ) {
+ authorSlug = authorMatches[ 2 ];
+ }
+ }
+ }
+ return useSelect(
+ ( select ) => {
+ const { getEntityRecords, getTaxonomy, getAuthors } =
+ select( coreStore );
+ let archiveTypeLabel;
+ let archiveNameLabel;
+ if ( taxonomy ) {
+ archiveTypeLabel =
+ getTaxonomy( taxonomy )?.labels?.singular_name;
+ }
+ if ( term ) {
+ const records = getEntityRecords( 'taxonomy', taxonomy, {
+ slug: term,
+ per_page: 1,
+ } );
+ if ( records && records[ 0 ] ) {
+ archiveNameLabel = records[ 0 ].name;
+ }
+ }
+ if ( isAuthor ) {
+ archiveTypeLabel = 'Author';
+ if ( authorSlug ) {
+ const authorRecords = getAuthors( { slug: authorSlug } );
+ if ( authorRecords && authorRecords[ 0 ] ) {
+ archiveNameLabel = authorRecords[ 0 ].name;
+ }
+ }
+ }
+ return {
+ archiveTypeLabel,
+ archiveNameLabel,
+ };
+ },
+ [ authorSlug, isAuthor, taxonomy, term ]
+ );
+}
+
export default function useSiteEditorSettings() {
const { setIsInserterOpened } = useDispatch( editSiteStore );
const { storedSettings, canvasMode, templateType } = useSelect(
@@ -34,14 +106,27 @@ export default function useSiteEditorSettings() {
storedSettings.__experimentalAdditionalBlockPatternCategories ?? // WP 6.0
storedSettings.__experimentalBlockPatternCategories; // WP 5.9
- const { restBlockPatterns, restBlockPatternCategories } = useSelect(
- ( select ) => ( {
- restBlockPatterns: select( coreStore ).getBlockPatterns(),
- restBlockPatternCategories:
- select( coreStore ).getBlockPatternCategories(),
- } ),
- []
- );
+ const { restBlockPatterns, restBlockPatternCategories, templateSlug } =
+ useSelect( ( select ) => {
+ const { getEditedPostType, getEditedPostId } =
+ select( editSiteStore );
+ const { getEditedEntityRecord } = select( coreStore );
+ const usedPostType = getEditedPostType();
+ const usedPostId = getEditedPostId();
+ const _record = getEditedEntityRecord(
+ 'postType',
+ usedPostType,
+ usedPostId
+ );
+ return {
+ restBlockPatterns: select( coreStore ).getBlockPatterns(),
+ restBlockPatternCategories:
+ select( coreStore ).getBlockPatternCategories(),
+ templateSlug: _record.slug,
+ };
+ }, [] );
+ const archiveLabels = useArchiveLabel( templateSlug );
+
const blockPatterns = useMemo(
() =>
[
@@ -87,6 +172,15 @@ export default function useSiteEditorSettings() {
__experimentalBlockPatterns: blockPatterns,
__experimentalBlockPatternCategories: blockPatternCategories,
focusMode: canvasMode === 'view' && focusMode ? false : focusMode,
+ __experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
+ __experimentalArchiveTitleNameLabel: archiveLabels.archiveNameLabel,
};
- }, [ storedSettings, blockPatterns, blockPatternCategories, canvasMode ] );
+ }, [
+ storedSettings,
+ blockPatterns,
+ blockPatternCategories,
+ canvasMode,
+ archiveLabels.archiveTypeLabel,
+ archiveLabels.archiveNameLabel,
+ ] );
}
diff --git a/packages/edit-site/src/components/code-editor/code-editor-text-area.js b/packages/edit-site/src/components/code-editor/code-editor-text-area.js
deleted file mode 100644
index 1a907ca8e59f68..00000000000000
--- a/packages/edit-site/src/components/code-editor/code-editor-text-area.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * External dependencies
- */
-import Textarea from 'react-autosize-textarea';
-
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useEffect, useState, useRef } from '@wordpress/element';
-import { useInstanceId } from '@wordpress/compose';
-import { VisuallyHidden } from '@wordpress/components';
-
-export default function CodeEditorTextArea( { value, onChange, onInput } ) {
- const [ stateValue, setStateValue ] = useState( value );
- const [ isDirty, setIsDirty ] = useState( false );
- const instanceId = useInstanceId( CodeEditorTextArea );
- const valueRef = useRef();
-
- if ( ! isDirty && stateValue !== value ) {
- setStateValue( value );
- }
-
- /**
- * Handles a textarea change event to notify the onChange prop callback and
- * reflect the new value in the component's own state. This marks the start
- * of the user's edits, if not already changed, preventing future props
- * changes to value from replacing the rendered value. This is expected to
- * be followed by a reset to dirty state via `stopEditing`.
- *
- * @see stopEditing
- *
- * @param {Event} event Change event.
- */
- const onChangeHandler = ( event ) => {
- const newValue = event.target.value;
- onInput( newValue );
- setStateValue( newValue );
- setIsDirty( true );
- valueRef.current = newValue;
- };
-
- /**
- * Function called when the user has completed their edits, responsible for
- * ensuring that changes, if made, are surfaced to the onPersist prop
- * callback and resetting dirty state.
- */
- const stopEditing = () => {
- if ( isDirty ) {
- onChange( stateValue );
- setIsDirty( false );
- }
- };
-
- // Ensure changes aren't lost when component unmounts.
- useEffect( () => {
- return () => {
- if ( valueRef.current ) {
- onChange( valueRef.current );
- }
- };
- }, [] );
-
- return (
- <>
-
- { __( 'Type text or HTML' ) }
-
-
-
- );
-}
diff --git a/packages/edit-site/src/components/code-editor/index.js b/packages/edit-site/src/components/code-editor/index.js
index 178ff2e5f7099c..1fb4a5b7cd6bfd 100644
--- a/packages/edit-site/src/components/code-editor/index.js
+++ b/packages/edit-site/src/components/code-editor/index.js
@@ -1,50 +1,56 @@
+/**
+ * External dependencies
+ */
+import Textarea from 'react-autosize-textarea';
+
/**
* WordPress dependencies
*/
-import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
-import { useEntityBlockEditor, useEntityProp } from '@wordpress/core-data';
+import { __unstableSerializeAndClean } from '@wordpress/blocks';
+import { store as coreStore } from '@wordpress/core-data';
import { useSelect, useDispatch } from '@wordpress/data';
import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
import { __ } from '@wordpress/i18n';
-import { Button } from '@wordpress/components';
+import { Button, VisuallyHidden } from '@wordpress/components';
+import { useMemo } from '@wordpress/element';
+import { useInstanceId } from '@wordpress/compose';
/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../store';
-import CodeEditorTextArea from './code-editor-text-area';
export default function CodeEditor() {
- const { templateType, shortcut } = useSelect( ( select ) => {
- const { getEditedPostType } = select( editSiteStore );
+ const instanceId = useInstanceId( CodeEditor );
+ const { shortcut, content, blocks, type, id } = useSelect( ( select ) => {
+ const { getEditedEntityRecord } = select( coreStore );
+ const { getEditedPostType, getEditedPostId } = select( editSiteStore );
const { getShortcutRepresentation } = select( keyboardShortcutsStore );
+ const _type = getEditedPostType();
+ const _id = getEditedPostId();
+ const editedRecord = getEditedEntityRecord( 'postType', _type, _id );
+
return {
- templateType: getEditedPostType(),
shortcut: getShortcutRepresentation( 'core/edit-site/toggle-mode' ),
+ content: editedRecord?.content,
+ blocks: editedRecord?.blocks,
+ type: _type,
+ id: _id,
};
}, [] );
- const [ contentStructure, setContent ] = useEntityProp(
- 'postType',
- templateType,
- 'content'
- );
- const [ blocks, , onChange ] = useEntityBlockEditor(
- 'postType',
- templateType
- );
-
+ const { editEntityRecord } = useDispatch( coreStore );
// Replicates the logic found in getEditedPostContent().
- let content;
- if ( contentStructure instanceof Function ) {
- content = contentStructure( { blocks } );
- } else if ( blocks ) {
- // If we have parsed blocks already, they should be our source of truth.
- // Parsing applies block deprecations and legacy block conversions that
- // unparsed content will not have.
- content = __unstableSerializeAndClean( blocks );
- } else {
- content = contentStructure;
- }
+ const realContent = useMemo( () => {
+ if ( content instanceof Function ) {
+ return content( { blocks } );
+ } else if ( blocks ) {
+ // If we have parsed blocks already, they should be our source of truth.
+ // Parsing applies block deprecations and legacy block conversions that
+ // unparsed content will not have.
+ return __unstableSerializeAndClean( blocks );
+ }
+ return content;
+ }, [ content, blocks ] );
const { switchEditorMode } = useDispatch( editSiteStore );
return (
@@ -60,14 +66,26 @@ export default function CodeEditor() {
- {
- onChange( parse( newContent ), {
+
+ { __( 'Type text or HTML' ) }
+
+