Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update: Move duplicate pattern and template part actions to the editor package #61879

Merged
merged 2 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/base-styles/_z-index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ $z-layers: (
// Should be above the popover (dropdown)
".reusable-blocks-menu-items__convert-modal": 1000001,
".patterns-menu-items__convert-modal": 1000001,
".edit-site-create-template-part-modal": 1000001,
".editor-create-template-part-modal": 1000001,
".block-editor-block-lock-modal": 1000001,
".block-editor-template-part__selection-modal": 1000001,
".block-editor-block-rename-modal": 1000001,
Expand Down
3 changes: 2 additions & 1 deletion packages/edit-site/src/components/add-new-pattern/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import {
} from '@wordpress/patterns';
import { store as noticesStore } from '@wordpress/notices';
import { store as coreStore } from '@wordpress/core-data';
import { privateApis as editorPrivateApis } from '@wordpress/editor';

/**
* Internal dependencies
*/
import CreateTemplatePartModal from '../create-template-part-modal';
import { unlock } from '../../lock-unlock';
import {
PATTERN_TYPES,
Expand All @@ -29,6 +29,7 @@ const { useHistory } = unlock( routerPrivateApis );
const { CreatePatternModal, useAddPatternCategory } = unlock(
editPatternsPrivateApis
);
const { CreateTemplatePartModal } = unlock( editorPrivateApis );

export default function AddNewPattern() {
const history = useHistory();
Expand Down

This file was deleted.

14 changes: 2 additions & 12 deletions packages/edit-site/src/components/page-patterns/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ import {
PATTERN_DEFAULT_CATEGORY,
OPERATOR_IS,
} from '../../utils/constants';
import {
duplicatePatternAction,
duplicateTemplatePartAction,
} from './dataviews-pattern-actions';
import usePatternSettings from './use-pattern-settings';
import { unlock } from '../../lock-unlock';
import usePatterns from './use-patterns';
Expand Down Expand Up @@ -361,15 +357,9 @@ export default function DataviewsPatterns() {

const actions = useMemo( () => {
if ( type === TEMPLATE_PART_POST_TYPE ) {
return [
editAction,
duplicateTemplatePartAction,
...templatePartActions,
].filter( Boolean );
return [ editAction, ...templatePartActions ].filter( Boolean );
}
return [ editAction, duplicatePatternAction, ...patternActions ].filter(
Boolean
);
return [ editAction, ...patternActions ].filter( Boolean );
}, [ editAction, type, templatePartActions, patternActions ] );
const onChangeView = useCallback(
( newView ) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ import { __ } from '@wordpress/i18n';
import { useState } from '@wordpress/element';
import { store as noticesStore } from '@wordpress/notices';
import { symbolFilled } from '@wordpress/icons';
import { privateApis as editorPrivateApis } from '@wordpress/editor';

/**
* Internal dependencies
*/
import CreateTemplatePartModal from '../create-template-part-modal';
import { unlock } from '../../lock-unlock';
import { store as editSiteStore } from '../../store';

const { CreateTemplatePartModal } = unlock( editorPrivateApis );

export default function ConvertToTemplatePart( { clientIds, blocks } ) {
const [ isModalOpen, setIsModalOpen ] = useState( false );
const { replaceBlocks } = useDispatch( blockEditorStore );
Expand Down
1 change: 0 additions & 1 deletion packages/edit-site/src/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
@import "./components/page-templates/style.scss";
@import "./components/table/style.scss";
@import "./components/editor/style.scss";
@import "./components/create-template-part-modal/style.scss";
@import "./components/welcome-guide/style.scss";
@import "./components/layout/style.scss";
@import "./components/save-hub/style.scss";
Expand Down
67 changes: 0 additions & 67 deletions packages/edit-site/src/utils/template-part-create.js
Original file line number Diff line number Diff line change
@@ -1,67 +0,0 @@
/**
* External dependencies
*/
import { paramCase as kebabCase } from 'change-case';

/**
* WordPress dependencies
*/
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';

/**
* Internal dependencies
*/
import { TEMPLATE_PART_POST_TYPE } from './constants';

export const useExistingTemplateParts = () => {
return useSelect(
( select ) =>
select( coreStore ).getEntityRecords(
'postType',
TEMPLATE_PART_POST_TYPE,
{
per_page: -1,
}
),
[]
);
};

/**
* Return a unique template part title based on
* the given title and existing template parts.
*
* @param {string} title The original template part title.
* @param {Object} templateParts The array of template part entities.
* @return {string} A unique template part title.
*/
export const getUniqueTemplatePartTitle = ( title, templateParts ) => {
const lowercaseTitle = title.toLowerCase();
const existingTitles = templateParts.map( ( templatePart ) =>
templatePart.title.rendered.toLowerCase()
);

if ( ! existingTitles.includes( lowercaseTitle ) ) {
return title;
}

let suffix = 2;
while ( existingTitles.includes( `${ lowercaseTitle } ${ suffix }` ) ) {
suffix++;
}

return `${ title } ${ suffix }`;
};

/**
* Get a valid slug for a template part.
* Currently template parts only allow latin chars.
* The fallback slug will receive suffix by default.
*
* @param {string} title The template part title.
* @return {string} A valid template part slug.
*/
export const getCleanTemplatePartSlug = ( title ) => {
return kebabCase( title ).replace( /[^\w-]+/g, '' ) || 'wp-custom-part';
};
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {
import { __ } from '@wordpress/i18n';
import { useState } from '@wordpress/element';
import { useInstanceId } from '@wordpress/compose';
import { store as editorStore } from '@wordpress/editor';
import { store as noticesStore } from '@wordpress/notices';
import { store as coreStore } from '@wordpress/core-data';
import { check } from '@wordpress/icons';
Expand All @@ -28,15 +27,16 @@ import { serialize } from '@wordpress/blocks';
/**
* Internal dependencies
*/
import { store as editorStore } from '../../store';
import {
TEMPLATE_PART_POST_TYPE,
TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
} from '../../utils/constants';
} from '../../store/constants';
import {
useExistingTemplateParts,
getUniqueTemplatePartTitle,
getCleanTemplatePartSlug,
} from '../../utils/template-part-create';
} from './utils';

export default function CreateTemplatePartModal( {
modalTitle,
Expand All @@ -52,7 +52,7 @@ export default function CreateTemplatePartModal( {
<Modal
title={ modalTitle || defaultModalTitle }
onRequestClose={ restProps.closeModal }
overlayClassName="edit-site-create-template-part-modal"
overlayClassName="editor-create-template-part-modal"
>
<CreateTemplatePartModalContents { ...restProps } />
</Modal>
Expand Down Expand Up @@ -142,13 +142,13 @@ export function CreateTemplatePartModalContents( {
/>
<BaseControl
label={ __( 'Area' ) }
id={ `edit-site-create-template-part-modal__area-selection-${ instanceId }` }
className="edit-site-create-template-part-modal__area-base-control"
id={ `editor-create-template-part-modal__area-selection-${ instanceId }` }
className="editor-create-template-part-modal__area-base-control"
>
<RadioGroup
label={ __( 'Area' ) }
className="edit-site-create-template-part-modal__area-radio-group"
id={ `edit-site-create-template-part-modal__area-selection-${ instanceId }` }
className="editor-create-template-part-modal__area-radio-group"
id={ `editor-create-template-part-modal__area-selection-${ instanceId }` }
onChange={ setArea }
checked={ area }
>
Expand All @@ -157,18 +157,18 @@ export function CreateTemplatePartModalContents( {
<Radio
key={ label }
value={ value }
className="edit-site-create-template-part-modal__area-radio"
className="editor-create-template-part-modal__area-radio"
>
<Flex align="start" justify="start">
<FlexItem>
<Icon icon={ icon } />
</FlexItem>
<FlexBlock className="edit-site-create-template-part-modal__option-label">
<FlexBlock className="editor-create-template-part-modal__option-label">
{ label }
<div>{ description }</div>
</FlexBlock>

<FlexItem className="edit-site-create-template-part-modal__checkbox">
<FlexItem className="editor-create-template-part-modal__checkbox">
{ area === value && (
<Icon icon={ check } />
) }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.edit-site-create-template-part-modal {
z-index: z-index(".edit-site-create-template-part-modal");
.editor-create-template-part-modal {
z-index: z-index(".editor-create-template-part-modal");

.components-modal__frame {
@include break-small {
Expand All @@ -8,12 +8,12 @@
}
}

.edit-site-create-template-part-modal__area-radio-group {
.editor-create-template-part-modal__area-radio-group {
width: 100%;
border: $border-width solid $gray-700;
border-radius: 2px;

.components-button.edit-site-create-template-part-modal__area-radio {
.components-button.editor-create-template-part-modal__area-radio {
display: block;
width: 100%;
height: 100%;
Expand Down Expand Up @@ -46,12 +46,12 @@
color: $gray-900;
cursor: auto;

.edit-site-create-template-part-modal__option-label div {
.editor-create-template-part-modal__option-label div {
color: $gray-600;
}
}

.edit-site-create-template-part-modal__option-label {
.editor-create-template-part-modal__option-label {
padding-top: $grid-unit-05;
white-space: normal;

Expand All @@ -61,7 +61,7 @@
}
}

.edit-site-create-template-part-modal__checkbox {
.editor-create-template-part-modal__checkbox {
margin-left: auto;
min-width: $grid-unit-30;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/**
* Internal dependencies
*/
import {
getUniqueTemplatePartTitle,
getCleanTemplatePartSlug,
} from '../template-part-create';
import { getUniqueTemplatePartTitle, getCleanTemplatePartSlug } from '../utils';

describe( 'getUniqueTemplatePartTitle', () => {
it( 'should return the title if it is unique', () => {
Expand Down
Loading
Loading