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

Add home template details to inspector controls #61762

Merged
merged 4 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
121 changes: 121 additions & 0 deletions packages/editor/src/components/blog-title/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/**
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
import { debounce } from '@wordpress/compose';
import { useSelect, useDispatch } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import { decodeEntities } from '@wordpress/html-entities';
import {
Button,
Dropdown,
__experimentalInputControl as InputControl,
} from '@wordpress/components';
import { useState, useEffect, useMemo } from '@wordpress/element';
import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';

/**
* Internal dependencies
*/
import PostPanelRow from '../post-panel-row';

const EMPTY_OBJECT = {};

export default function BlogTitle() {
const { editEntityRecord } = useDispatch( coreStore );
const { postsPageTitle, postsPageId } = useSelect( ( select ) => {
const { getEntityRecord } = select( coreStore );
const siteSettings = getEntityRecord( 'root', 'site' );
const _postsPageRecord = siteSettings?.page_for_posts
? getEntityRecord(
'postType',
'page',
siteSettings?.page_for_posts
)
: EMPTY_OBJECT;
return {
postsPageId: _postsPageRecord?.id,
postsPageTitle: _postsPageRecord?.title?.rendered,
};
}, [] );
const [ postsPageTitleValue, setPostsPageTitleValue ] = useState( '' );
ntsekouras marked this conversation as resolved.
Show resolved Hide resolved

/*
* This hook serves to set the server-retrieved postsPageTitle
* value to local state.
*/
useEffect( () => {
setPostsPageTitleValue( postsPageTitle );
}, [ postsPageTitle ] );

// Use internal state instead of a ref to make sure that the component
// re-renders when the popover's anchor updates.
const [ popoverAnchor, setPopoverAnchor ] = useState( null );
// Memoize popoverProps to avoid returning a new object every time.
const popoverProps = useMemo(
() => ( {
// Anchor the popover to the middle of the entire row so that it doesn't
// move around when the label changes.
anchor: popoverAnchor,
placement: 'left-start',
offset: 36,
shift: true,
} ),
[ popoverAnchor ]
);

if ( ! postsPageId ) {
return null;
}

const setPostsPageTitle = ( newValue ) => {
setPostsPageTitleValue( newValue );
editEntityRecord( 'postType', 'page', postsPageId, {
title: newValue,
} );
};
const decodedTitle = decodeEntities( postsPageTitle );
return (
<PostPanelRow label={ __( 'Blog title' ) } ref={ setPopoverAnchor }>
<Dropdown
popoverProps={ popoverProps }
contentClassName="editor-blog-title-dropdown__content"
focusOnMount
renderToggle={ ( { isOpen, onToggle } ) => (
<Button
size="compact"
variant="tertiary"
aria-expanded={ isOpen }
aria-label={ sprintf(
// translators: %s: Current post link.
__( 'Change blog title: %s' ),
decodedTitle
) }
onClick={ onToggle }
>
{ decodedTitle }
</Button>
) }
renderContent={ ( { onClose } ) => (
<>
<InspectorPopoverHeader
title={ __( 'Blog title' ) }
onClose={ onClose }
/>
<InputControl
placeholder={ __( 'No Title' ) }
size={ '__unstable-large' }
value={ postsPageTitleValue }
onChange={ debounce( setPostsPageTitle, 300 ) }
label={ __( 'Blog title' ) }
help={ __(
'Set the Posts Page title. Appears in search results, and when the page is shared on social media.'
) }
hideLabelFromVision
/>
</>
) }
/>
</PostPanelRow>
);
}
4 changes: 4 additions & 0 deletions packages/editor/src/components/blog-title/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.editor-blog-title-dropdown__content .components-popover__content {
min-width: 320px;
padding: $grid-unit-20;
}
100 changes: 100 additions & 0 deletions packages/editor/src/components/posts-per-page/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { useSelect, useDispatch } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import {
Button,
Dropdown,
__experimentalNumberControl as NumberControl,
} from '@wordpress/components';
import { useState, useEffect, useMemo } from '@wordpress/element';
import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';

/**
* Internal dependencies
*/
import PostPanelRow from '../post-panel-row';

export default function PostsPerPage() {
const { editEntityRecord } = useDispatch( coreStore );
const postsPerPage = useSelect( ( select ) => {
const { getEntityRecord } = select( coreStore );
const siteSettings = getEntityRecord( 'root', 'site' );
return siteSettings?.posts_per_page;
}, [] );
const [ postsCountValue, setPostsCountValue ] = useState( 1 );

/*
* This hook serves to set the server-retrieved postsPerPage
* value to local state.
*/
useEffect( () => {
setPostsCountValue( postsPerPage );
}, [ postsPerPage ] );

// Use internal state instead of a ref to make sure that the component
// re-renders when the popover's anchor updates.
const [ popoverAnchor, setPopoverAnchor ] = useState( null );
// Memoize popoverProps to avoid returning a new object every time.
const popoverProps = useMemo(
() => ( {
// Anchor the popover to the middle of the entire row so that it doesn't
// move around when the label changes.
anchor: popoverAnchor,
placement: 'left-start',
offset: 36,
shift: true,
} ),
[ popoverAnchor ]
);
const setPostsPerPage = ( newValue ) => {
setPostsCountValue( newValue );
editEntityRecord( 'root', 'site', undefined, {
posts_per_page: newValue,
} );
};
return (
<PostPanelRow label={ __( 'Posts per page' ) } ref={ setPopoverAnchor }>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This text wraps in two lines and I'm not sure how we can address that properly, since all labels have a width:30%. Should we apply some truncate rules to editor-post-panel__row-label in general?

It seems like we might have more similar use cases in the future, and it seems like a problem that could be happening already in different languages. --cc @WordPress/gutenberg-design

<Dropdown
popoverProps={ popoverProps }
contentClassName="editor-posts-per-page-dropdown__content"
focusOnMount
renderToggle={ ( { isOpen, onToggle } ) => (
<Button
size="compact"
variant="tertiary"
aria-expanded={ isOpen }
aria-label={ __( 'Change posts per page' ) }
onClick={ onToggle }
>
{ postsCountValue }
</Button>
) }
renderContent={ ( { onClose } ) => (
<>
<InspectorPopoverHeader
title={ __( 'Posts per page' ) }
onClose={ onClose }
/>
<NumberControl
placeholder={ 0 }
value={ postsCountValue }
size={ '__unstable-large' }
spinControls="custom"
step="1"
min="1"
onChange={ setPostsPerPage }
label={ __( 'Posts per page' ) }
help={ __(
'Set the default number of posts to display on blog pages, including categories and tags. Some templates may override this setting.'
) }
hideLabelFromVision
/>
</>
) }
/>
</PostPanelRow>
);
}
4 changes: 4 additions & 0 deletions packages/editor/src/components/posts-per-page/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.editor-posts-per-page-dropdown__content .components-popover__content {
min-width: 320px;
padding: $grid-unit-20;
}
4 changes: 3 additions & 1 deletion packages/editor/src/components/sidebar/post-summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
TEMPLATE_POST_TYPE,
} from '../../store/constants';
import TemplateAreas from '../template-areas';
import SiteSettingsPanel from '../site-settings-panel';

/**
* Module Constants
Expand Down Expand Up @@ -87,7 +88,8 @@ export default function PostSummary( { onActionPerformed } ) {
</VStack>
<PostStickyPanel />
<PostFormatPanel />
{ isTemplate && <TemplateAreas /> }
<SiteSettingsPanel />
<TemplateAreas />
{ fills }
{ ! isPattern &&
! isTemplate &&
Expand Down
133 changes: 133 additions & 0 deletions packages/editor/src/components/site-discussion/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { useSelect, useDispatch } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import {
Button,
Dropdown,
RadioControl,
__experimentalVStack as VStack,
__experimentalText as Text,
} from '@wordpress/components';
import { useState, useEffect, useMemo } from '@wordpress/element';
import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';

/**
* Internal dependencies
*/
import PostPanelRow from '../post-panel-row';

const COMMENT_OPTIONS = [
{
label: (
<>
{ __( 'Open' ) }
<Text variant="muted" size={ 12 }>
{ __( 'Visitors can add new comments and replies.' ) }
</Text>
</>
),
value: 'open',
},
{
label: (
<>
{ __( 'Closed' ) }
<Text variant="muted" size={ 12 }>
{ __( 'Visitors cannot add new comments or replies.' ) }
</Text>
<Text variant="muted" size={ 12 }>
{ __( 'Existing comments remain visible.' ) }
</Text>
</>
),
value: '',
},
];

export default function SiteDiscussion() {
const { editEntityRecord } = useDispatch( coreStore );
const allowCommentsOnNewPosts = useSelect( ( select ) => {
const { getEntityRecord } = select( coreStore );
const siteSettings = getEntityRecord( 'root', 'site' );
return siteSettings?.default_comment_status || '';
}, [] );
const [ commentsOnNewPostsValue, setCommentsOnNewPostsValue ] =
useState( '' );
/*
* This hook serves to set the server-retrieved allowCommentsOnNewPosts
* value to local state.
*/
useEffect( () => {
setCommentsOnNewPostsValue( allowCommentsOnNewPosts );
}, [ allowCommentsOnNewPosts ] );

// Use internal state instead of a ref to make sure that the component
// re-renders when the popover's anchor updates.
const [ popoverAnchor, setPopoverAnchor ] = useState( null );
// Memoize popoverProps to avoid returning a new object every time.
const popoverProps = useMemo(
() => ( {
// Anchor the popover to the middle of the entire row so that it doesn't
// move around when the label changes.
anchor: popoverAnchor,
placement: 'left-start',
offset: 36,
shift: true,
} ),
[ popoverAnchor ]
);
const setAllowCommentsOnNewPosts = ( newValue ) => {
setCommentsOnNewPostsValue( newValue );
editEntityRecord( 'root', 'site', undefined, {
default_comment_status: newValue ? 'open' : null,
} );
};
return (
<PostPanelRow label={ __( 'Discussion' ) } ref={ setPopoverAnchor }>
<Dropdown
popoverProps={ popoverProps }
contentClassName="editor-site-discussion-dropdown__content"
focusOnMount
renderToggle={ ( { isOpen, onToggle } ) => (
<Button
size="compact"
variant="tertiary"
aria-expanded={ isOpen }
aria-label={ __( 'Change discussion settings' ) }
onClick={ onToggle }
>
{ commentsOnNewPostsValue
? __( 'Comments open' )
: __( 'Comments closed' ) }
</Button>
) }
renderContent={ ( { onClose } ) => (
<>
<InspectorPopoverHeader
title={ __( 'Discussion' ) }
onClose={ onClose }
/>
<VStack spacing={ 3 }>
<Text>
{ __(
'Changes will apply to new posts only. Individual posts may override these settings.'
) }
</Text>
<RadioControl
className="editor-site-discussion__options"
hideLabelFromVision
label={ __( 'Comment status' ) }
options={ COMMENT_OPTIONS }
onChange={ setAllowCommentsOnNewPosts }
selected={ commentsOnNewPostsValue }
/>
</VStack>
</>
) }
/>
</PostPanelRow>
);
}
Loading
Loading