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.

Sign up for GitHub

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

Block Library: Post Author: Refactor edit to use block context #22359

Merged
merged 3 commits into from
May 14, 2020
Merged

Block Library: Post Author: Refactor edit to use block context #22359

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3659ab
Block Library: Post Author: Refactor edit to use block context
aduth May 14, 2020
bfc1423
Block Library: Post Author: Use optional chaining for author property
aduth May 14, 2020
3c9b92f
Block LIbrary: Post Author: Define selector dependencies
aduth May 14, 2020
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/block-library/src/post-author/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
"type": "string"
}
},
"context": [ "postId" ]
"context": [ "postType", "postId" ]
}
108 changes: 43 additions & 65 deletions packages/block-library/src/post-author/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
import apiFetch from '@wordpress/api-fetch';
import { useRef, useState } from '@wordpress/element';
import { useEntityProp } from '@wordpress/core-data';
import { useRef } from '@wordpress/element';
import {
AlignmentToolbar,
BlockControls,
Expand All @@ -21,32 +19,39 @@ import {
withFontSizes,
} from '@wordpress/block-editor';
import { PanelBody, SelectControl, ToggleControl } from '@wordpress/components';
import { useSelect } from '@wordpress/data';
import { useSelect, useDispatch } from '@wordpress/data';
import { __ } from '@wordpress/i18n';

const DEFAULT_AVATAR_SIZE = 24;

async function getAuthorDetails( authorId, setAuthorDetails ) {
const authorDetails = await apiFetch( {
path: '/wp/v2/users/' + authorId + '?context=edit',
} );
setAuthorDetails( authorDetails );
}

function PostAuthorDisplay( {
postAuthor,
setPostAuthor,
authorDetails,
setAuthorDetails,
props,
function PostAuthorEdit( {
isSelected,
fontSize,
setFontSize,
context,
attributes,
setAttributes,
} ) {
const ref = useRef();
const { postType, postId } = context;

const { authorId, authorDetails, authors } = useSelect( ( select ) => {
const { getEditedEntityRecord, getUser, getAuthors } = select( 'core' );
const _authorId = getEditedEntityRecord(
'postType',
postType,
postId
)?.author;

return {
authorId: _authorId,
authorDetails: _authorId ? getUser( _authorId ) : null,
authors: getAuthors(),
};
} );
aduth marked this conversation as resolved.
Show resolved Hide resolved

const { authors } = useSelect( ( select ) => ( {
authors: select( 'core' ).getAuthors(),
} ) );
const { editEntityRecord } = useDispatch( 'core' );

const { isSelected, fontSize, setFontSize } = props;
const ref = useRef();
const {
TextColor,
BackgroundColor,
Expand All @@ -73,7 +78,7 @@ function PostAuthorDisplay( {
[ fontSize.size ]
);

const { align, showAvatar, showBio, byline } = props.attributes;
const { align, showAvatar, showBio, byline } = attributes;

const avatarSizes = [];
if ( authorDetails ) {
Expand All @@ -86,8 +91,8 @@ function PostAuthorDisplay( {
}

let avatarSize = DEFAULT_AVATAR_SIZE;
if ( !! props.attributes.avatarSize ) {
avatarSize = props.attributes.avatarSize;
if ( !! attributes.avatarSize ) {
avatarSize = attributes.avatarSize;
}

const blockClassNames = classnames( 'wp-block-post-author', {
Expand All @@ -103,32 +108,33 @@ function PostAuthorDisplay( {
<PanelBody title={ __( 'Author Settings' ) }>
<SelectControl
label={ __( 'Author' ) }
value={ postAuthor }
value={ authorId }
options={ authors.map( ( { id, name } ) => {
return {
value: id,
label: name,
};
} ) }
onChange={ ( newAuthorId ) => {
setPostAuthor( newAuthorId );
getAuthorDetails( newAuthorId, setAuthorDetails );
onChange={ ( nextAuthorId ) => {
editEntityRecord( 'postType', postType, postId, {
author: nextAuthorId,
} );
} }
/>
<ToggleControl
label={ __( 'Show avatar' ) }
checked={ showAvatar }
onChange={ () =>
props.setAttributes( { showAvatar: ! showAvatar } )
setAttributes( { showAvatar: ! showAvatar } )
}
/>
{ showAvatar && (
<SelectControl
label={ __( 'Avatar size' ) }
value={ props.attributes.avatarSize }
value={ attributes.avatarSize }
options={ avatarSizes }
onChange={ ( size ) => {
props.setAttributes( {
setAttributes( {
avatarSize: Number( size ),
} );
} }
Expand All @@ -138,7 +144,7 @@ function PostAuthorDisplay( {
label={ __( 'Show bio' ) }
checked={ showBio }
onChange={ () =>
props.setAttributes( { showBio: ! showBio } )
setAttributes( { showBio: ! showBio } )
}
/>
</PanelBody>
Expand All @@ -156,7 +162,7 @@ function PostAuthorDisplay( {
<AlignmentToolbar
value={ align }
onChange={ ( nextAlign ) => {
props.setAttributes( { align: nextAlign } );
setAttributes( { align: nextAlign } );
} }
/>
<BlockColorsStyleSelector
Expand Down Expand Up @@ -202,16 +208,16 @@ function PostAuthorDisplay( {
] }
value={ byline }
onChange={ ( value ) =>
props.setAttributes( { byline: value } )
setAttributes( { byline: value } )
}
/>
) }
<p className="wp-block-post-author__name">
{ authorDetails.name }
{ authorDetails?.name }
</p>
{ showBio && (
<p className={ 'wp-block-post-author__bio' }>
{ authorDetails.description }
{ authorDetails?.description }
</p>
) }
</div>
Expand All @@ -222,32 +228,4 @@ function PostAuthorDisplay( {
);
}

function PostAuthorEdit( props ) {
const [ postAuthor, setPostAuthor ] = useEntityProp(
'postType',
'post',
'author'
);

const [ authorDetails, setAuthorDetails ] = useState( false );

if ( ! postAuthor ) {
return 'Post Author Placeholder';
}

if ( ! authorDetails ) {
getAuthorDetails( postAuthor, setAuthorDetails );
}

return (
<PostAuthorDisplay
postAuthor={ postAuthor }
setPostAuthor={ setPostAuthor }
authorDetails={ authorDetails }
setAuthorDetails={ setAuthorDetails }
props={ props }
/>
);
}

export default withFontSizes( 'fontSize' )( PostAuthorEdit );