Post Schedule: show post events

packages/components/src/date-time/date.js

@@ -2,29 +2,88 @@
  * External dependencies
  */
 import moment from 'moment';
+import classnames from 'classnames';
+
 // react-dates doesn't tree-shake correctly, so we import from the individual
 // component here, to avoid including too much of the library
 import DayPickerSingleDateController from 'react-dates/lib/components/DayPickerSingleDateController';
 
 /**
  * WordPress dependencies
  */
-import { Component, createRef } from '@wordpress/element';
-import { isRTL } from '@wordpress/i18n';
+import { Component, createRef, useEffect, useRef } from '@wordpress/element';
+import { isRTL, _n, sprintf } from '@wordpress/i18n';
 
 /**
  * Module Constants
  */
 const TIMEZONELESS_FORMAT = 'YYYY-MM-DDTHH:mm:ss';
+const ARIAL_LABEL_TIME_FORMAT = 'dddd, LL';
+
+function DatePickerDay( { day, events = [] } ) {
+	const ref = useRef();
+
+	/*
+	 * a11y hack to make the `There is/are n events` string
+	 * available speaking for readers,
+	 * re-defining the aria-label attribute.
+	 * This attribute is handled by the react-dates component.
+	 */
+	useEffect( () => {
+		// Bail when no parent node.
+		if ( ! ref?.current?.parentNode ) {
+			return;
+		}
+
+		const { parentNode } = ref.current;
+		const dayAriaLabel = moment( day ).format( ARIAL_LABEL_TIME_FORMAT );
+
+		if ( ! events.length ) {
+			// Set aria-label without event description.
+			parentNode.setAttribute( 'aria-label', dayAriaLabel );
+			return;
+		}
+
+		const dayWithEventsDescription = sprintf(
+			// translators: 1: Calendar day format, 2: Calendar event number.
+			_n(
+				'%1$s. There is %2$d event.',
+				'%1$s. There are %2$d events.',
+				events.length
+			),
+			dayAriaLabel,
+			events.length
+		);
+
+		parentNode.setAttribute( 'aria-label', dayWithEventsDescription );
+	}, [ ref, events.length ] );
+
+	return (
+		<div
+			ref={ ref }
+			className={ classnames( 'components-datetime__date__day', {
+				'has-events': events?.length,
+			} ) }
+		>
+			{ day.format( 'D' ) }
+		</div>
+	);
+}
 
 class DatePicker extends Component {
 	constructor() {
 		super( ...arguments );
 
 		this.onChangeMoment = this.onChangeMoment.bind( this );
 		this.nodeRef = createRef();
-		this.keepFocusInside = this.keepFocusInside.bind( this );
-		this.isDayHighlighted = this.isDayHighlighted.bind( this );
+		this.onMonthPreviewedHandler = this.onMonthPreviewedHandler.bind(
+			this
+		);
+	}
+
+	onMonthPreviewedHandler( newMonthDate ) {
+		this.props?.onMonthPreviewed( newMonthDate.toISOString() );
+		this.keepFocusInside();
 	}
 
 	/*
@@ -89,19 +148,13 @@ class DatePicker extends Component {
 		return currentDate ? moment( currentDate ) : moment();
 	}
 
-	// todo change reference to `isDayHighlighted` every time, `events` prop change
-	isDayHighlighted( date ) {
-		// Do not highlight when no events.
+	getEventsPerDay( day ) {
 		if ( ! this.props.events?.length ) {
-			return false;
-		}
-		if ( this.props.onMonthPreviewed ) {
-			this.props.onMonthPreviewed( date.toDate() );
+			return [];
 		}
 
-		// Compare date against highlighted events.
-		return this.props.events.some( ( highlighted ) =>
-			date.isSame( highlighted.date, 'day' )
+		return this.props.events.filter( ( eventDay ) =>
+			day.isSame( eventDay.date, 'day' )
 		);
 	}
 
@@ -126,13 +179,19 @@ class DatePicker extends Component {
 					onDateChange={ this.onChangeMoment }
 					transitionDuration={ 0 }
 					weekDayFormat="ddd"
+					dayAriaLabelFormat={ ARIAL_LABEL_TIME_FORMAT }
 					isRTL={ isRTL() }
 					isOutsideRange={ ( date ) => {
 						return isInvalidDate && isInvalidDate( date.toDate() );
 					} }
-					isDayHighlighted={ this.isDayHighlighted }
-					onPrevMonthClick={ this.keepFocusInside }
-					onNextMonthClick={ this.keepFocusInside }
+					onPrevMonthClick={ this.onMonthPreviewedHandler }
+					onNextMonthClick={ this.onMonthPreviewedHandler }
+					renderDayContents={ ( day ) => (
+						<DatePickerDay
+							day={ day }
+							events={ this.getEventsPerDay( day ) }
+						/>
+					) }
 				/>
 			</div>
 		);

packages/components/src/date-time/index.js

@@ -4,6 +4,7 @@
 // Needed to initialise the default datepicker styles.
 // See: https://github.com/airbnb/react-dates#initialize
 import 'react-dates/initialize';
+import { noop } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -25,7 +26,7 @@ function DateTimePicker(
 		currentDate,
 		is12Hour,
 		isInvalidDate,
-		onMonthPreviewed,
+		onMonthPreviewed = noop,
 		onChange,
 		events,
 	},
@@ -52,8 +53,8 @@ function DateTimePicker(
 						currentDate={ currentDate }
 						onChange={ onChange }
 						isInvalidDate={ isInvalidDate }
-						onMonthPreviewed={ onMonthPreviewed }
 						events={ events }
+						onMonthPreviewed={ onMonthPreviewed }
 					/>
 				</>
 			) }

packages/components/src/date-time/style.scss

@@ -111,6 +111,31 @@
 	}
 }
 
+.components-datetime__date .CalendarDay .components-datetime__date__day {
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-content: center;
+	flex-direction: column;
+	position: relative;
+
+	&.has-events::before {
+		content: " ";
+		width: 4px;
+		height: 4px;
+		border-radius: 2px;
+		position: absolute;
+		left: 50%;
+		margin-left: -2px;
+		bottom: 0;
+		background-color: $white;
+	}
+}
+
+.components-datetime__date .CalendarDay:not(.CalendarDay__selected) .components-datetime__date__day.has-events::before {
+	background: var(--wp-admin-theme-color);
+}
+
 .components-datetime__time {
 	padding-bottom: $grid-unit-20;
 

packages/e2e-tests/specs/editor/various/post-visibility.test.js

@@ -51,7 +51,7 @@ describe( 'Post visibility', () => {
 		);
 		await (
 			await page.$x(
-				'//td[contains(concat(" ", @class, " "), " CalendarDay ")][text() = "15"]'
+				'//td[contains(concat(" ", @class, " "), " CalendarDay ")]/div[contains(concat(" ", @class, " "), " components-datetime__date__day ")][text() = "15"]'
 			)
 		 )[ 0 ].click();
 

packages/editor/src/components/post-schedule/index.js

@@ -2,14 +2,68 @@
  * WordPress dependencies
  */
 import { __experimentalGetSettings } from '@wordpress/date';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { DateTimePicker } from '@wordpress/components';
-import { useRef } from '@wordpress/element';
+import { useRef, useState, useMemo } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+
+function getDayOfTheMonth( date = new Date(), firstDay = true ) {
+	const d = new Date( date );
+	return new Date(
+		d.getFullYear(),
+		d.getMonth() + ( firstDay ? 0 : 1 ),
+		firstDay ? 1 : 0
+	).toISOString();
+}
+
+export default function PostSchedule() {
+	const { postDate, postType } = useSelect(
+		( select ) => ( {
+			postDate: select( editorStore ).getEditedPostAttribute( 'date' ),
+			postType: select( editorStore ).getCurrentPostType(),
+		} ),
+		[]
+	);
+
+	const { editPost } = useDispatch( editorStore );
+	const onUpdateDate = ( date ) => editPost( { date } );
+
+	const [ previewedMonth, setPreviewedMonth ] = useState(
+		getDayOfTheMonth( postDate )
+	);
+
+	// Pick up published and schduled site posts.
+	const eventsByPostType = useSelect(
+		( select ) =>
+			select( coreStore ).getEntityRecords( 'postType', postType, {
+				status: 'publish,future',
+				after: getDayOfTheMonth( previewedMonth ),
+				before: getDayOfTheMonth( previewedMonth, false ),
+				exclude: [ select( editorStore ).getCurrentPostId() ],
+			} ),
+		[ previewedMonth, postType ]
+	);
+
+	const events = useMemo(
+		() =>
+			( eventsByPostType || [] ).map(
+				( { title, type, date: eventDate } ) => ( {
+					title: title?.raw,
+					type,
+					date: new Date( eventDate ),
+				} )
+			),
+		[ eventsByPostType ]
+	);
 
-export function PostSchedule( { date, onUpdateDate } ) {
 	const ref = useRef();
 	const settings = __experimentalGetSettings();
+
 	// To know if the current timezone is a 12 hour time with look for "a" in the time format
 	// We also make sure this a is not escaped by a "/"
 	const is12HourTime = /a(?!\\)/i.test(
@@ -30,24 +84,11 @@ export function PostSchedule( { date, onUpdateDate } ) {
 	return (
 		<DateTimePicker
 			ref={ ref }
-			currentDate={ date }
+			currentDate={ postDate }
 			onChange={ onChange }
 			is12Hour={ is12HourTime }
+			events={ events }
+			onMonthPreviewed={ setPreviewedMonth }
 		/>
 	);
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		return {
-			date: select( 'core/editor' ).getEditedPostAttribute( 'date' ),
-		};
-	} ),
-	withDispatch( ( dispatch ) => {
-		return {
-			onUpdateDate( date ) {
-				dispatch( 'core/editor' ).editPost( { date } );
-			},
-		};
-	} ),
-] )( PostSchedule );