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

Jump to bottom

Latest Post Block (Post Content Support) iteration #14627

Merged
merged 9 commits into from
May 2, 2019
Merged

Latest Post Block (Post Content Support) iteration #14627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
02aa367
Ran npm run test-e2e -- -u
Apr 9, 2019
ecf88bd
Revert "Ran npm run test-e2e -- -u"
Apr 10, 2019
832a916
Rename postsToShow to postCount
Apr 12, 2019
1940d4d
Rebased into master branch
Apr 12, 2019
c26986d
Remove redundant calls to updateAttribute and make changes in place u…
Apr 13, 2019
2928e03
Fix grid view CSS style error
Apr 16, 2019
c2b2d9f
Fixed editor 55 words error for post content case
Apr 21, 2019
2699ea4
Removed HTML tags from excerpt and only displaying text
Apr 24, 2019
6af0b8f
Changed constant name temp to excerptElement
AmartyaU Apr 30, 2019
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
100 changes: 74 additions & 26 deletions packages/block-library/src/latest-posts/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
import {
Component,
Fragment,
RawHTML,
} from '@wordpress/element';
import { Component, Fragment, RawHTML } from '@wordpress/element';
import {
PanelBody,
Placeholder,
Expand All @@ -20,6 +16,7 @@ import {
Spinner,
ToggleControl,
Toolbar,
RadioControl,
} from '@wordpress/components';
import apiFetch from '@wordpress/api-fetch';
import { addQueryArgs } from '@wordpress/url';
Expand All @@ -45,7 +42,6 @@ class LatestPostsEdit extends Component {
this.state = {
categoriesList: [],
};
this.toggleDisplayPostDate = this.toggleDisplayPostDate.bind( this );
}

componentDidMount() {
Expand All @@ -71,35 +67,59 @@ class LatestPostsEdit extends Component {
this.isStillMounted = false;
}

toggleDisplayPostDate() {
const { displayPostDate } = this.props.attributes;
const { setAttributes } = this.props;

setAttributes( { displayPostDate: ! displayPostDate } );
}

render() {
const { attributes, setAttributes, latestPosts } = this.props;
const { categoriesList } = this.state;
const { displayPostDate, postLayout, columns, order, orderBy, categories, postsToShow } = attributes;
const { displayPostContentRadio, displayPostContent, displayPostDate, postLayout, columns, order, orderBy, categories, postCount, excerptLength } = attributes;

const inspectorControls = (
<InspectorControls>
<PanelBody title={ __( 'Latest Posts Settings' ) }>
<PanelBody title={ __( 'Post Content Settings' ) }>
<ToggleControl
label={ __( 'Post Content' ) }
checked={ displayPostContent }
onChange={ ( value ) => setAttributes( { displayPostContent: value } ) }
/>
{ displayPostContent &&
<RadioControl
label="Show:"
selected={ displayPostContentRadio }
options={ [
{ label: 'Excerpt', value: 'excerpt' },
{ label: 'Full Post', value: 'full_post' },
] }
onChange={ ( value ) => setAttributes( { displayPostContentRadio: value } ) }
/>
}
{ displayPostContent && displayPostContentRadio === 'excerpt' &&
<RangeControl
label={ __( 'Max number of words in excerpt' ) }
value={ excerptLength }
onChange={ ( value ) => setAttributes( { excerptLength: value } ) }
min={ 10 }
max={ 100 }
/>
}
</PanelBody>

<PanelBody title={ __( 'Post Meta Settings' ) }>
<ToggleControl
label={ __( 'Display post date' ) }
checked={ displayPostDate }
onChange={ ( value ) => setAttributes( { displayPostDate: value } ) }
/>
</PanelBody>

<PanelBody title={ __( 'Sorting and Filtering' ) }>
<QueryControls
{ ...{ order, orderBy } }
numberOfItems={ postsToShow }
numberOfItems={ postCount }
categoriesList={ categoriesList }
selectedCategoryId={ categories }
onOrderChange={ ( value ) => setAttributes( { order: value } ) }
onOrderByChange={ ( value ) => setAttributes( { orderBy: value } ) }
onCategoryChange={ ( value ) => setAttributes( { categories: '' !== value ? value : undefined } ) }
onNumberOfItemsChange={ ( value ) => setAttributes( { postsToShow: value } ) }
/>
<ToggleControl
label={ __( 'Display post date' ) }
checked={ displayPostDate }
onChange={ this.toggleDisplayPostDate }
onNumberOfItemsChange={ ( value ) => setAttributes( { postCount: value } ) }
/>
{ postLayout === 'grid' &&
<RangeControl
Expand Down Expand Up @@ -134,8 +154,8 @@ class LatestPostsEdit extends Component {
}

// Removing posts from display should be instant.
const displayPosts = latestPosts.length > postsToShow ?
latestPosts.slice( 0, postsToShow ) :
const displayPosts = latestPosts.length > postCount ?
latestPosts.slice( 0, postCount ) :
latestPosts;

const layoutControls = [
Expand Down Expand Up @@ -163,13 +183,21 @@ class LatestPostsEdit extends Component {
</BlockControls>
<ul
className={ classnames( this.props.className, {
'wp-block-latest-posts__list': true,
'is-grid': postLayout === 'grid',
'has-dates': displayPostDate,
[ `columns-${ columns }` ]: postLayout === 'grid',
} ) }
>
{ displayPosts.map( ( post, i ) => {
const titleTrimmed = post.title.rendered.trim();
let excerpt = post.excerpt.rendered;
if ( post.excerpt.raw === '' ) {
excerpt = post.content.raw;
}
const excerptElement = document.createElement( 'div' );
excerptElement.innerHTML = excerpt;
excerpt = excerptElement.textContent || excerptElement.innerText || '';
return (
<li key={ i }>
<a href={ post.link } target="_blank" rel="noreferrer noopener">
Expand All @@ -186,6 +214,26 @@ class LatestPostsEdit extends Component {
{ dateI18n( dateFormat, post.date_gmt ) }
</time>
}
{ displayPostContent && displayPostContentRadio === 'excerpt' &&
<div className="wp-block-latest-posts__post-excerpt">
<RawHTML
key="html"
>
{ excerptLength < excerpt.trim().split( ' ' ).length ?
excerpt.trim().split( ' ', excerptLength ).join( ' ' ) + ' ... <a href=' + post.link + 'target="_blank" rel="noopener noreferrer">Read More</a>' :
excerpt.trim().split( ' ', excerptLength ).join( ' ' ) }
</RawHTML>
</div>
}
{ displayPostContent && displayPostContentRadio === 'full_post' &&
<div className="wp-block-latest-posts__post-full-content">
<RawHTML
key="html"
>
{ post.content.raw.trim() }
</RawHTML>
</div>
}
</li>
);
} ) }
Expand All @@ -196,13 +244,13 @@ class LatestPostsEdit extends Component {
}

export default withSelect( ( select, props ) => {
const { postsToShow, order, orderBy, categories } = props.attributes;
const { postCount, order, orderBy, categories } = props.attributes;
const { getEntityRecords } = select( 'core' );
const latestPostsQuery = pickBy( {
categories,
order,
orderby: orderBy,
per_page: postsToShow,
per_page: postCount,
}, ( value ) => ! isUndefined( value ) );
return {
latestPosts: getEntityRecords( 'postType', 'post', latestPostsQuery ),
Expand Down
70 changes: 59 additions & 11 deletions packages/block-library/src/latest-posts/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
function render_block_core_latest_posts( $attributes ) {
$args = array(
'posts_per_page' => $attributes['postsToShow'],
'posts_per_page' => $attributes['postCount'],
'post_status' => 'publish',
'order' => $attributes['order'],
'orderby' => $attributes['orderBy'],
Expand All @@ -29,6 +29,8 @@ function render_block_core_latest_posts( $attributes ) {

$list_items_markup = '';

$excerpt_length = $attributes['excerptLength'];

foreach ( $recent_posts as $post ) {
$title = get_the_title( $post );
if ( ! $title ) {
Expand All @@ -48,10 +50,44 @@ function render_block_core_latest_posts( $attributes ) {
);
}

if ( isset( $attributes['displayPostContent'] ) && $attributes['displayPostContent']
&& isset( $attributes['displayPostContentRadio'] ) && 'excerpt' == $attributes['displayPostContentRadio'] ) {
$post_excerpt = $post->post_excerpt;
if ( ! ( $post_excerpt ) ) {
$post_excerpt = $post->post_content;
}
$trimmed_excerpt = esc_html( wp_trim_words( $post_excerpt, $excerpt_length, ' &hellip; ' ) );

$list_items_markup .= sprintf(
'<div class="wp-block-latest-posts____post-excerpt">%1$s',
$trimmed_excerpt
);

if ( strpos( $trimmed_excerpt, ' &hellip; ' ) !== false ) {
$list_items_markup .= sprintf(
'<a href="%1$s">%2$s</a></div>',
esc_url( get_permalink( $post ) ),
__( 'Read More' )
);
} else {
$list_items_markup .= sprintf(
'</div>'
);
}
}

if ( isset( $attributes['displayPostContent'] ) && $attributes['displayPostContent']
&& isset( $attributes['displayPostContentRadio'] ) && 'full_post' == $attributes['displayPostContentRadio'] ) {
$list_items_markup .= sprintf(
'<div class="wp-block-latest-posts__post-full-content">%1$s</div>',
wp_kses_post( html_entity_decode( $post->post_content, ENT_QUOTES, get_option( 'blog_charset' ) ) )
);
}

$list_items_markup .= "</li>\n";
}

$class = 'wp-block-latest-posts';
$class = 'wp-block-latest-posts wp-block-latest-posts__list';
if ( isset( $attributes['align'] ) ) {
$class .= ' align' . $attributes['align'];
}
Expand Down Expand Up @@ -89,37 +125,49 @@ function register_block_core_latest_posts() {
'core/latest-posts',
array(
'attributes' => array(
'align' => array(
'align' => array(
'type' => 'string',
'enum' => array( 'left', 'center', 'right', 'wide', 'full' ),
),
'className' => array(
'className' => array(
'type' => 'string',
),
'categories' => array(
'categories' => array(
'type' => 'string',
),
'postsToShow' => array(
'postCount' => array(
draganescu marked this conversation as resolved.
Show resolved Hide resolved
'type' => 'number',
'default' => 5,
),
'displayPostDate' => array(
'displayPostContent' => array(
'type' => 'boolean',
'default' => false,
),
'displayPostContentRadio' => array(
'type' => 'string',
'default' => 'excerpt',
),
'excerptLength' => array(
'type' => 'number',
'default' => 55,
draganescu marked this conversation as resolved.
Show resolved Hide resolved
),
'displayPostDate' => array(
'type' => 'boolean',
'default' => false,
),
'postLayout' => array(
'postLayout' => array(
'type' => 'string',
'default' => 'list',
),
'columns' => array(
'columns' => array(
'type' => 'number',
'default' => 3,
),
'order' => array(
'order' => array(
'type' => 'string',
'default' => 'desc',
),
'orderBy' => array(
'orderBy' => array(
'type' => 'string',
'default' => 'date',
),
Expand Down
5 changes: 3 additions & 2 deletions packages/block-library/src/latest-posts/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
/*rtl:ignore*/
margin-left: 2em;
}
&.wp-block-latest-posts__list {
list-style: none;
}
&.is-grid {
display: flex;
flex-wrap: wrap;
padding: 0;
list-style: none;

li {
margin: 0 16px 16px 0;
Expand All @@ -33,4 +35,3 @@
color: $dark-gray-300;
font-size: $default-font-size;
}