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

Site Editor: Replace core/edit-site store name with store object #28695

Merged
merged 13 commits into from
Feb 4, 2021
5 changes: 3 additions & 2 deletions packages/edit-site/src/components/block-editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { DropZoneProvider, Popover } from '@wordpress/components';
import TemplatePartConverter from '../template-part-converter';
import NavigateToLink from '../navigate-to-link';
import { SidebarInspectorFill } from '../sidebar';
import { store as editSiteStore } from '../../store';

function Canvas( { body } ) {
useBlockSelectionClearer( body );
Expand All @@ -48,7 +49,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
getEditedPostType,
getPage,
__experimentalGetPreviewDeviceType,
} = select( 'core/edit-site' );
} = select( editSiteStore );
return {
settings: getSettings( setIsInserterOpen ),
templateType: getEditedPostType(),
Expand All @@ -62,7 +63,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
'postType',
templateType
);
const { setPage } = useDispatch( 'core/edit-site' );
const { setPage } = useDispatch( editSiteStore );

const resizedCanvasStyles = useResizeCanvas( deviceType, true );
const ref = useRef();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
getPresetVariable,
} from './utils';
import getGlobalStyles from './global-styles-renderer';
import { store as editSiteStore } from '../../store';

const EMPTY_CONTENT = { isGlobalStylesUserThemeJSON: true };
const EMPTY_CONTENT_STRING = JSON.stringify( EMPTY_CONTENT );
Expand Down Expand Up @@ -134,10 +135,10 @@ export default function GlobalStylesProvider( { children, baseStyles } ) {
const { blockTypes, settings } = useSelect( ( select ) => {
return {
blockTypes: select( blocksStore ).getBlockTypes(),
settings: select( 'core/edit-site' ).getSettings(),
settings: select( editSiteStore ).getSettings(),
};
} );
const { updateSettings } = useDispatch( 'core/edit-site' );
const { updateSettings } = useDispatch( editSiteStore );

const contexts = useMemo( () => getContexts( blockTypes ), [ blockTypes ] );

Expand Down
7 changes: 4 additions & 3 deletions packages/edit-site/src/components/editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import KeyboardShortcuts from '../keyboard-shortcuts';
import GlobalStylesProvider from './global-styles-provider';
import NavigationSidebar from '../navigation-sidebar';
import URLQueryController from '../url-query-controller';
import { store as editSiteStore } from '../../store';

const interfaceLabels = {
secondarySidebar: __( 'Block Library' ),
Expand All @@ -67,7 +68,7 @@ function Editor() {
getEditedPostId,
getPage,
isNavigationOpened,
} = select( 'core/edit-site' );
} = select( editSiteStore );
const postType = getEditedPostType();
const postId = getEditedPostId();

Expand All @@ -77,7 +78,7 @@ function Editor() {
isFullscreenActive: isFeatureActive( 'fullscreenMode' ),
sidebarIsOpened: !! select(
interfaceStore
).getActiveComplementaryArea( 'core/edit-site' ),
).getActiveComplementaryArea( editSiteStore ),
settings: getSettings(),
templateType: postType,
page: getPage(),
Expand All @@ -93,7 +94,7 @@ function Editor() {
};
}, [] );
const { updateEditorSettings } = useDispatch( 'core/editor' );
const { setPage, setIsInserterOpened } = useDispatch( 'core/edit-site' );
const { setPage, setIsInserterOpened } = useDispatch( editSiteStore );

// Keep the defaultTemplateTypes in the core/editor settings too,
// so that they can be selected with core/editor selectors in any editor.
Expand Down
6 changes: 5 additions & 1 deletion packages/edit-site/src/components/editor/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import { get, find, forEach, camelCase, isString } from 'lodash';
* WordPress dependencies
*/
import { useSelect } from '@wordpress/data';
/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../store';

/* Supporting data */
export const ALL_BLOCKS_NAME = 'defaults';
Expand Down Expand Up @@ -90,7 +94,7 @@ export const LINK_COLOR_DECLARATION = `a { color: var(${ LINK_COLOR }, #00e); }`

export function useEditorFeature( featurePath, blockName = ALL_BLOCKS_NAME ) {
const settings = useSelect( ( select ) => {
return select( 'core/edit-site' ).getSettings();
return select( editSiteStore ).getSettings();
} );
return (
get(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ import { __ } from '@wordpress/i18n';
import { check } from '@wordpress/icons';
import { speak } from '@wordpress/a11y';

/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../../store';

export default function FeatureToggle( {
feature,
label,
Expand All @@ -28,10 +33,10 @@ export default function FeatureToggle( {
};

const isActive = useSelect( ( select ) => {
return select( 'core/edit-site' ).isFeatureActive( feature );
return select( editSiteStore ).isFeatureActive( feature );
}, [] );

const { toggleFeature } = useDispatch( 'core/edit-site' );
const { toggleFeature } = useDispatch( editSiteStore );

return (
<MenuItem
Expand Down
5 changes: 3 additions & 2 deletions packages/edit-site/src/components/header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import UndoButton from './undo-redo/undo';
import RedoButton from './undo-redo/redo';
import DocumentActions from './document-actions';
import TemplateDetails from '../template-details';
import { store as editSiteStore } from '../../store';

export default function Header( { openEntitiesSavedStates } ) {
const {
Expand All @@ -39,7 +40,7 @@ export default function Header( { openEntitiesSavedStates } ) {
getEditedPostType,
getEditedPostId,
isInserterOpened,
} = select( 'core/edit-site' );
} = select( editSiteStore );
const { getEntityRecord } = select( 'core' );
const { __experimentalGetTemplateInfo: getTemplateInfo } = select(
'core/editor'
Expand All @@ -66,7 +67,7 @@ export default function Header( { openEntitiesSavedStates } ) {
const {
__experimentalSetPreviewDeviceType: setPreviewDeviceType,
setIsInserterOpened,
} = useDispatch( 'core/edit-site' );
} = useDispatch( editSiteStore );

const isLargeViewport = useViewportMatch( 'medium' );
const displayBlockToolbar =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { useSelect } from '@wordpress/data';
*/
import NavigationPanel from './navigation-panel';
import NavigationToggle from './navigation-toggle';
import { store as editSiteStore } from '../../store';

export const {
Fill: NavigationPanelPreviewFill,
Expand All @@ -17,7 +18,7 @@ export const {

export default function NavigationSidebar() {
const isNavigationOpen = useSelect( ( select ) => {
return select( 'core/edit-site' ).isNavigationOpened();
return select( editSiteStore ).isNavigationOpened();
} );

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import {
MENU_CONTENT_PAGES,
MENU_CONTENT_POSTS,
} from './constants';
import { store as editSiteStore } from '../../../store';

export default function ContentNavigation( { onActivateMenu } ) {
const [ activeMenu, setActiveMenu ] = useState( 'root' );

const page = useSelect(
( select ) => select( 'core/edit-site' ).getPage(),
( select ) => select( editSiteStore ).getPage(),
[]
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ import ContentNavigation from './content-navigation';
import TemplatesNavigation from './templates-navigation';
import { useSelect } from '@wordpress/data';
import { MENU_ROOT } from './constants';
import { store as editSiteStore } from '../../../store';

const NavigationPanel = ( { isOpen } ) => {
const [ contentActiveMenu, setContentActiveMenu ] = useState( MENU_ROOT );
const { templatesActiveMenu, siteTitle } = useSelect( ( select ) => {
const { getNavigationPanelActiveMenu } = select( 'core/edit-site' );
const { getNavigationPanelActiveMenu } = select( editSiteStore );
const { getEntityRecord } = select( 'core' );

const siteData =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { __ } from '@wordpress/i18n';
*/
import NavigationEntityItems from '../navigation-entity-items';
import { MENU_CONTENT_POSTS, MENU_ROOT } from '../constants';
import { store as editSiteStore } from '../../../../store';

export default function ContentPostsMenu() {
const showOnFront = useSelect(
Expand All @@ -22,7 +23,7 @@ export default function ContentPostsMenu() {
[]
);

const { setPage } = useDispatch( 'core/edit-site' );
const { setPage } = useDispatch( editSiteStore );

const onActivateFrontItem = () => {
setPage( {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import { useDispatch, useSelect } from '@wordpress/data';
import { __experimentalNavigationItem as NavigationItem } from '@wordpress/components';
import { getPathAndQueryString } from '@wordpress/url';

/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../../store';

const getEntityTitle = ( kind, entity ) =>
'taxonomy' === kind ? entity.name : entity?.title?.rendered;

Expand All @@ -14,7 +19,7 @@ export default function NavigationEntityItems( { kind, name, query = {} } ) {
[ kind, name, query ]
);

const { setPage } = useDispatch( 'core/edit-site' );
const { setPage } = useDispatch( editSiteStore );

if ( ! entities ) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Icon, plus } from '@wordpress/icons';
*/
import getClosestAvailableTemplate from '../../../utils/get-closest-available-template';
import { TEMPLATES_NEW_OPTIONS } from './constants';
import { store as editSiteStore } from '../../../store';

export default function NewTemplateDropdown() {
const { defaultTemplateTypes, templates } = useSelect( ( select ) => {
Expand All @@ -36,7 +37,7 @@ export default function NewTemplateDropdown() {
templates: templateEntities,
};
}, [] );
const { addTemplate } = useDispatch( 'core/edit-site' );
const { addTemplate } = useDispatch( editSiteStore );

const createTemplate = ( slug ) => {
const closestAvailableTemplate = getClosestAvailableTemplate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { __ } from '@wordpress/i18n';
*/
import TemplatePreview from './template-preview';
import { NavigationPanelPreviewFill } from '../index';
import { store as editSiteStore } from '../../../store';

export default function TemplateNavigationItem( { item } ) {
const { title, description } = useSelect(
Expand All @@ -26,7 +27,7 @@ export default function TemplateNavigationItem( { item } ) {
},
[]
);
const { setTemplate, setTemplatePart } = useDispatch( 'core/edit-site' );
const { setTemplate, setTemplatePart } = useDispatch( editSiteStore );
const [ isPreviewVisible, setIsPreviewVisible ] = useState( false );

if ( ! item ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ import TemplatesMenu from './menus/templates';
import TemplatePartsMenu from './menus/template-parts';
import MainDashboardButton from '../../main-dashboard-button';
import { MENU_ROOT, MENU_TEMPLATE_PARTS, MENU_TEMPLATES } from './constants';
import { store as editSiteStore } from '../../../store';

export default function TemplatesNavigation() {
const { postId, postType, activeMenu } = useSelect( ( select ) => {
const {
getEditedPostType,
getEditedPostId,
getNavigationPanelActiveMenu,
} = select( 'core/edit-site' );
} = select( editSiteStore );

return {
postId: getEditedPostId(),
Expand All @@ -33,7 +34,7 @@ export default function TemplatesNavigation() {
};
}, [] );

const { setNavigationPanelActiveMenu } = useDispatch( 'core/edit-site' );
const { setNavigationPanelActiveMenu } = useDispatch( editSiteStore );

return (
<Navigation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ import { Button, Icon } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { wordpress } from '@wordpress/icons';

/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../../store';

function NavigationToggle( { icon, isOpen } ) {
const { isActive, isRequestingSiteIcon, siteIconUrl } = useSelect(
( select ) => {
const { isFeatureActive } = select( 'core/edit-site' );
const { isFeatureActive } = select( editSiteStore );
const { getEntityRecord } = select( 'core' );
const { isResolving } = select( 'core/data' );
const siteData =
Expand All @@ -28,7 +33,7 @@ function NavigationToggle( { icon, isOpen } ) {
[]
);

const { setIsNavigationPanelOpened } = useDispatch( 'core/edit-site' );
const { setIsNavigationPanelOpened } = useDispatch( editSiteStore );

if ( ! isActive ) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useSelect } from '@wordpress/data';
* Internal dependencies
*/
import { useEditorFeature, ALL_BLOCKS_NAME } from '../editor/utils';
import { store as editSiteStore } from '../../store';

/**
* Shared reference to an empty array for cases where it is important to avoid
Expand All @@ -35,7 +36,7 @@ export default function ColorPalettePanel( {
const userColors = getSetting( contextName, 'color.palette' );
const immutableColorSlugs = useSelect(
( select ) => {
const baseStyles = select( 'core/edit-site' ).getSettings()
const baseStyles = select( editSiteStore ).getSettings()
.__experimentalGlobalStylesBaseStyles;
const basePalette =
get( baseStyles, [
Expand Down
3 changes: 2 additions & 1 deletion packages/edit-site/src/components/template-details/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ import { useDispatch, useSelect } from '@wordpress/data';
* Internal dependencies
*/
import { MENU_TEMPLATES } from '../navigation-sidebar/navigation-panel/constants';
import { store as editSiteStore } from '../../store';

export default function TemplateDetails( { template, onClose } ) {
const { title, description } = useSelect(
( select ) =>
select( 'core/editor' ).__experimentalGetTemplateInfo( template ),
[]
);
const { openNavigationPanelToMenu } = useDispatch( 'core/edit-site' );
const { openNavigationPanelToMenu } = useDispatch( editSiteStore );

if ( ! template ) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ import { useEffect } from '@wordpress/element';
import { useDispatch, useSelect } from '@wordpress/data';
import { getQueryArg, addQueryArgs, removeQueryArgs } from '@wordpress/url';

/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../store';

export default function URLQueryController() {
const { setTemplate, setTemplatePart, showHomepage, setPage } = useDispatch(
'core/edit-site'
editSiteStore
);

// Set correct entity on load.
Expand Down Expand Up @@ -48,7 +53,7 @@ export default function URLQueryController() {
function useCurrentPageContext() {
return useSelect( ( select ) => {
const { getEditedPostType, getEditedPostId, getPage } = select(
'core/edit-site'
editSiteStore
);

const page = getPage();
Expand Down
Loading