@wordpress/editor 12.10.0 → 12.11.0

package/src/components/local-autosave-monitor/index.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { once, uniqueId, omit } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -27,23 +22,30 @@ const requestIdleCallback = window.requestIdleCallback
 	? window.requestIdleCallback
 	: window.requestAnimationFrame;
 
+let hasStorageSupport;
+let uniqueId = 0;
+
 /**
  * Function which returns true if the current environment supports browser
  * sessionStorage, or false otherwise. The result of this function is cached and
  * reused in subsequent invocations.
  */
-const hasSessionStorageSupport = once( () => {
-	try {
-		// Private Browsing in Safari 10 and earlier will throw an error when
-		// attempting to set into sessionStorage. The test here is intentional in
-		// causing a thrown error as condition bailing from local autosave.
-		window.sessionStorage.setItem( '__wpEditorTestSessionStorage', '' );
-		window.sessionStorage.removeItem( '__wpEditorTestSessionStorage' );
-		return true;
-	} catch ( error ) {
-		return false;
+const hasSessionStorageSupport = () => {
+	if ( typeof hasStorageSupport === 'undefined' ) {
+		try {
+			// Private Browsing in Safari 10 and earlier will throw an error when
+			// attempting to set into sessionStorage. The test here is intentional in
+			// causing a thrown error as condition bailing from local autosave.
+			window.sessionStorage.setItem( '__wpEditorTestSessionStorage', '' );
+			window.sessionStorage.removeItem( '__wpEditorTestSessionStorage' );
+			hasStorageSupport = true;
+		} catch ( error ) {
+			hasStorageSupport = false;
+		}
 	}
-} );
+
+	return hasStorageSupport;
+};
 
 /**
  * Custom hook which manages the creation of a notice prompting the user to
@@ -98,7 +100,7 @@ function useAutosaveNotice() {
 			return;
 		}
 
-		const noticeId = uniqueId( 'wpEditorAutosaveRestore' );
+		const noticeId = `wpEditorAutosaveRestore${ ++uniqueId }`;
 		createWarningNotice(
 			__(
 				'The backup of this post in your browser is different from the version below.'
@@ -109,7 +111,11 @@ function useAutosaveNotice() {
 					{
 						label: __( 'Restore the backup' ),
 						onClick() {
-							editPost( omit( edits, [ 'content' ] ) );
+							const {
+								content: editsContent,
+								...editsWithoutContent
+							} = edits;
+							editPost( editsWithoutContent );
 							resetEditorBlocks( parse( edits.content ) );
 							removeNotice( noticeId );
 						},

package/src/components/page-attributes/parent.js

@@ -7,7 +7,6 @@ import {
 	debounce,
 	repeat,
 	find,
-	flatten,
 	deburr,
 } from 'lodash';
 
@@ -111,7 +110,7 @@ export function PageAttributesParent() {
 				return priorityA >= priorityB ? 1 : -1;
 			} );
 
-			return flatten( sortedNodes );
+			return sortedNodes.flat();
 		};
 
 		let tree = pageItems.map( ( item ) => ( {

package/src/components/post-publish-panel/maybe-category-panel.js

@@ -23,12 +23,15 @@ function MaybeCategoryPanel() {
 		const postType = select( editorStore ).getCurrentPostType();
 		const categoriesTaxonomy =
 			select( coreStore ).getTaxonomy( 'category' );
-		const defaultCategorySlug = 'uncategorized';
+		const defaultCategoryId = select( coreStore ).getEntityRecord(
+			'root',
+			'site'
+		)?.default_category;
 		const defaultCategory = select( coreStore ).getEntityRecords(
 			'taxonomy',
 			'category',
 			{
-				slug: defaultCategorySlug,
+				id: defaultCategoryId,
 			}
 		)?.[ 0 ];
 		const postTypeSupportsCategories =

package/src/components/post-publish-panel/test/__snapshots__/index.js.snap

@@ -184,7 +184,7 @@ exports[`PostPublishPanel should render the spinner if the post is being saved 1
   <div
     className="editor-post-publish-panel__content"
   >
-    <Spinner />
+    <ForwardRef(UnforwardedSpinner) />
   </div>
   <div
     className="editor-post-publish-panel__footer"

package/src/components/post-schedule/label.js

@@ -1,28 +1,122 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { format, __experimentalGetSettings } from '@wordpress/date';
-import { withSelect } from '@wordpress/data';
+import { __, _x, sprintf, isRTL } from '@wordpress/i18n';
+import { __experimentalGetSettings, getDate, dateI18n } from '@wordpress/date';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-export function PostScheduleLabel( { date, isFloating } ) {
-	const settings = __experimentalGetSettings();
-	return date && ! isFloating
-		? format(
-				`${ settings.formats.date } ${ settings.formats.time }`,
-				date
-		  )
-		: __( 'Immediately' );
+export default function PostScheduleLabel( props ) {
+	return usePostScheduleLabel( props );
 }
 
-export default withSelect( ( select ) => {
-	return {
-		date: select( editorStore ).getEditedPostAttribute( 'date' ),
-		isFloating: select( editorStore ).isEditedPostDateFloating(),
-	};
-} )( PostScheduleLabel );
+export function usePostScheduleLabel( { full } ) {
+	const { date, isFloating } = useSelect(
+		( select ) => ( {
+			date: select( editorStore ).getEditedPostAttribute( 'date' ),
+			isFloating: select( editorStore ).isEditedPostDateFloating(),
+		} ),
+		[]
+	);
+
+	return full
+		? getFullPostScheduleLabel( date )
+		: getPostScheduleLabel( date, { isFloating } );
+}
+
+export function getFullPostScheduleLabel( dateAttribute ) {
+	const date = getDate( dateAttribute );
+
+	const timezoneAbbreviation = getTimezoneAbbreviation();
+	const formattedDate = dateI18n(
+		// translators: If using a space between 'g:i' and 'a', use a non-breaking sapce.
+		_x( 'F j, Y g:i\xa0a', 'post schedule full date format' ),
+		date
+	);
+	return isRTL()
+		? `${ timezoneAbbreviation } ${ formattedDate }`
+		: `${ formattedDate } ${ timezoneAbbreviation }`;
+}
+
+export function getPostScheduleLabel(
+	dateAttribute,
+	{ isFloating = false, now = new Date() } = {}
+) {
+	if ( ! dateAttribute || isFloating ) {
+		return __( 'Immediately' );
+	}
+
+	// If the user timezone does not equal the site timezone then using words
+	// like 'tomorrow' is confusing, so show the full date.
+	if ( ! isTimezoneSameAsSiteTimezone( now ) ) {
+		return getFullPostScheduleLabel( dateAttribute );
+	}
+
+	const date = getDate( dateAttribute );
+
+	if ( isSameDay( date, now ) ) {
+		return sprintf(
+			// translators: %s: Time of day the post is scheduled for.
+			__( 'Today at %s' ),
+			// translators: If using a space between 'g:i' and 'a', use a non-breaking sapce.
+			dateI18n( _x( 'g:i\xa0a', 'post schedule time format' ), date )
+		);
+	}
+
+	const tomorrow = new Date( now );
+	tomorrow.setDate( tomorrow.getDate() + 1 );
+
+	if ( isSameDay( date, tomorrow ) ) {
+		return sprintf(
+			// translators: %s: Time of day the post is scheduled for.
+			__( 'Tomorrow at %s' ),
+			// translators: If using a space between 'g:i' and 'a', use a non-breaking sapce.
+			dateI18n( _x( 'g:i\xa0a', 'post schedule time format' ), date )
+		);
+	}
+
+	if ( date.getFullYear() === now.getFullYear() ) {
+		return dateI18n(
+			// translators: If using a space between 'g:i' and 'a', use a non-breaking sapce.
+			_x( 'F j g:i\xa0a', 'post schedule date format without year' ),
+			date
+		);
+	}
+
+	return dateI18n(
+		// translators: Use a non-breaking space between 'g:i' and 'a' if appropriate.
+		_x( 'F j, Y g:i\xa0a', 'post schedule full date format' ),
+		date
+	);
+}
+
+function getTimezoneAbbreviation() {
+	const { timezone } = __experimentalGetSettings();
+
+	if ( timezone.abbr && isNaN( Number( timezone.abbr ) ) ) {
+		return timezone.abbr;
+	}
+
+	const symbol = timezone.offset < 0 ? '' : '+';
+	return `UTC${ symbol }${ timezone.offset }`;
+}
+
+function isTimezoneSameAsSiteTimezone( date ) {
+	const { timezone } = __experimentalGetSettings();
+
+	const siteOffset = Number( timezone.offset );
+	const dateOffset = -1 * ( date.getTimezoneOffset() / 60 );
+	return siteOffset === dateOffset;
+}
+
+function isSameDay( left, right ) {
+	return (
+		left.getDate() === right.getDate() &&
+		left.getMonth() === right.getMonth() &&
+		left.getFullYear() === right.getFullYear()
+	);
+}

package/src/components/post-schedule/test/label.js

@@ -1,32 +1,144 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import { shallow } from 'enzyme';
+import { __experimentalGetSettings, setSettings } from '@wordpress/date';
 
 /**
  * Internal dependencies
  */
-import { PostScheduleLabel } from '../label';
+import { getFullPostScheduleLabel, getPostScheduleLabel } from '../label';
 
-describe( 'PostScheduleLabel', () => {
+describe( 'getFullPostScheduleLabel', () => {
+	it( 'should show a date', () => {
+		const label = getFullPostScheduleLabel( '2022-04-28T15:30:00' );
+		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm UTC+0' ); // Unused, for backwards compatibility.
+	} );
+
+	it( "should show site's timezone abbr", () => {
+		const settings = __experimentalGetSettings();
+
+		setSettings( {
+			...settings,
+			timezone: { offset: 10, string: 'Australia/Sydney', abbr: 'AEST' },
+		} );
+
+		const label = getFullPostScheduleLabel( '2022-04-28T15:30:00' );
+		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm AEST' );
+
+		setSettings( settings );
+	} );
+
+	it( "should show site's timezone offset", () => {
+		const settings = __experimentalGetSettings();
+
+		setSettings( {
+			...settings,
+			timezone: { offset: 10 },
+		} );
+
+		const label = getFullPostScheduleLabel( '2022-04-28T15:30:00' );
+		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm UTC+10' );
+
+		setSettings( settings );
+	} );
+} );
+
+describe( 'getPostScheduleLabel', () => {
 	it( 'should show the post will be published immediately if no publish date is set', () => {
-		const wrapper = shallow( <PostScheduleLabel date={ undefined } /> );
-		expect( wrapper.text() ).toBe( 'Immediately' );
+		const label = getPostScheduleLabel( undefined );
+		expect( label ).toBe( 'Immediately' );
 	} );
 
 	it( 'should show the post will be published immediately if it has a floating date', () => {
-		const date = '2018-09-17T01:23:45.678Z';
-		const wrapper = shallow(
-			<PostScheduleLabel date={ date } isFloating={ true } />
+		const label = getPostScheduleLabel( '2022-04-28T15:30:00', {
+			isFloating: true,
+		} );
+		expect( label ).toBe( 'Immediately' );
+	} );
+
+	it( "should show full date if user timezone does not equal site's timezone", () => {
+		const now = new Date( '2022-04-28T13:00:00.000Z' );
+		jest.spyOn( now, 'getTimezoneOffset' ).mockImplementationOnce(
+			() => 10 * -60 // UTC+10
 		);
-		expect( wrapper.text() ).toBe( 'Immediately' );
+
+		const label = getPostScheduleLabel( '2022-04-28T15:30:00', { now } );
+		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm UTC+0' );
 	} );
 
-	it( 'should show the scheduled publish date if a date has been set', () => {
-		const date = '2018-09-17T01:23:45.678Z';
-		const wrapper = shallow(
-			<PostScheduleLabel date={ date } isFloating={ false } />
+	it( "should show today if date is same day as now and user timezone equals site's timezone", () => {
+		const settings = __experimentalGetSettings();
+
+		setSettings( {
+			...settings,
+			timezone: { offset: 10 },
+		} );
+
+		const now = new Date( '2022-04-28T03:00:00.000Z' );
+		jest.spyOn( now, 'getTimezoneOffset' ).mockImplementationOnce(
+			() => 10 * -60 // UTC+10
 		);
-		expect( wrapper.text() ).not.toBe( 'Immediately' );
+
+		const label = getPostScheduleLabel( '2022-04-28T15:30:00', { now } );
+		expect( label ).toBe( 'Today at 3:30\xa0pm' );
+
+		setSettings( settings );
+	} );
+
+	it( "should show tomorrow if date is same day as now + 1 day and user timezone equals site's timezone", () => {
+		const settings = __experimentalGetSettings();
+
+		setSettings( {
+			...settings,
+			timezone: { offset: 10 },
+		} );
+
+		const now = new Date( '2022-04-28T03:00:00.000Z' );
+		jest.spyOn( now, 'getTimezoneOffset' ).mockImplementationOnce(
+			() => 10 * -60 // UTC+10
+		);
+
+		const label = getPostScheduleLabel( '2022-04-29T15:30:00', { now } );
+		expect( label ).toBe( 'Tomorrow at 3:30\xa0pm' );
+
+		setSettings( settings );
+	} );
+
+	it( "should hide year if date is same year as now and user timezone equals site's timezone", () => {
+		const settings = __experimentalGetSettings();
+
+		setSettings( {
+			...settings,
+			timezone: { offset: 10 },
+		} );
+
+		const now = new Date( '2022-04-28T03:00:00.000Z' );
+		jest.spyOn( now, 'getTimezoneOffset' ).mockImplementationOnce(
+			() => 10 * -60 // UTC+10
+		);
+
+		const label = getPostScheduleLabel( '2022-12-25T15:30:00', { now } );
+		expect( label ).toBe( 'December 25 3:30\xa0pm' );
+
+		setSettings( settings );
+	} );
+
+	it( "should show year if date is not same year as now and user timezone equals site's timezone", () => {
+		const settings = __experimentalGetSettings();
+
+		setSettings( {
+			...settings,
+			timezone: { offset: 10 },
+		} );
+
+		const now = new Date( '2022-04-28T03:00:00.000Z' );
+		jest.spyOn( now, 'getTimezoneOffset' ).mockImplementationOnce(
+			() => 10 * -60 // UTC+10
+		);
+
+		const label = getPostScheduleLabel( '2023-04-28T15:30:00', { now } );
+		expect( label ).toBe( 'April 28, 2023 3:30\xa0pm' );
+
+		setSettings( settings );
 	} );
 } );

package/src/components/post-taxonomies/flat-term-selector.js

@@ -55,11 +55,11 @@ const termNamesToIds = ( names, terms ) => {
 };
 
 // Tries to create a term or fetch it if it already exists.
-function findOrCreateTerm( termName, restBase ) {
+function findOrCreateTerm( termName, restBase, namespace ) {
 	const escapedTermName = escapeString( termName );
 
 	return apiFetch( {
-		path: `/wp/v2/${ restBase }`,
+		path: `/${ namespace }/${ restBase }`,
 		method: 'POST',
 		data: { name: escapedTermName },
 	} )
@@ -68,7 +68,7 @@ function findOrCreateTerm( termName, restBase ) {
 			if ( errorCode === 'term_exists' ) {
 				// If the terms exist, fetch it instead of creating a new one.
 				const addRequest = apiFetch( {
-					path: addQueryArgs( `/wp/v2/${ restBase }`, {
+					path: addQueryArgs( `/${ namespace }/${ restBase }`, {
 						...DEFAULT_QUERY,
 						search: escapedTermName,
 					} ),
@@ -224,9 +224,10 @@ function FlatTermSelector( { slug } ) {
 			return;
 		}
 
+		const namespace = taxonomy?.rest_namespace ?? 'wp/v2';
 		Promise.all(
 			newTermNames.map( ( termName ) =>
-				findOrCreateTerm( termName, taxonomy.rest_base )
+				findOrCreateTerm( termName, taxonomy.rest_base, namespace )
 			)
 		).then( ( newTerms ) => {
 			const newAvailableTerms = availableTerms.concat( newTerms );

package/src/components/post-title/style.scss

@@ -2,7 +2,7 @@
 	position: relative;
 
 	&.is-focus-mode {
-		opacity: 0.5;
+		opacity: 0.2;
 		transition: opacity 0.1s linear;
 		@include reduce-motion("transition");
 

package/src/components/post-visibility/index.js

@@ -68,7 +68,7 @@ export default function PostVisibility( { onClose } ) {
 	};
 
 	return (
-		<>
+		<div className="editor-post-visibility">
 			<InspectorPopoverHeader
 				title={ __( 'Visibility' ) }
 				help={ __( 'Control how this post is viewed.' ) }
@@ -128,7 +128,7 @@ export default function PostVisibility( { onClose } ) {
 			>
 				{ __( 'Would you like to privately publish this post now?' ) }
 			</ConfirmDialog>
-		</>
+		</div>
 	);
 }
 

package/src/components/provider/index.native.js

@@ -319,13 +319,7 @@ class NativeEditorProvider extends Component {
 	}
 
 	render() {
-		const {
-			children,
-			post, // eslint-disable-line no-unused-vars
-			capabilities,
-			settings,
-			...props
-		} = this.props;
+		const { children, post, capabilities, settings, ...props } = this.props;
 		const editorSettings = this.getEditorSettings( settings, capabilities );
 
 		return (

package/src/store/actions.js

@@ -250,10 +250,12 @@ export const trashPost =
 			.resolveSelect( coreStore )
 			.getPostType( postTypeSlug );
 		registry.dispatch( noticesStore ).removeNotice( TRASH_POST_NOTICE_ID );
+		const { rest_base: restBase, rest_namespace: restNamespace = 'wp/v2' } =
+			postType;
 		try {
 			const post = select.getCurrentPost();
 			await apiFetch( {
-				path: `/wp/v2/${ postType.rest_base }/${ post.id }`,
+				path: `/${ restNamespace }/${ restBase }/${ post.id }`,
 				method: 'DELETE',
 			} );
 

package/src/store/reducer.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { omit, keys, isEqual } from 'lodash';
+import { omit, isEqual } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -39,7 +39,7 @@ export function getPostRawValue( value ) {
  * @return {boolean} Whether the two objects have the same keys.
  */
 export function hasSameKeys( a, b ) {
-	return isEqual( keys( a ), keys( b ) );
+	return isEqual( Object.keys( a ), Object.keys( b ) );
 }
 
 /**

package/src/store/test/selectors.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { filter, without } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -227,7 +222,9 @@ describe( 'selectors', () => {
 	let cachedSelectors;
 
 	beforeAll( () => {
-		cachedSelectors = filter( selectors, ( selector ) => selector.clear );
+		cachedSelectors = Object.entries( selectors )
+			.filter( ( [ , selector ] ) => selector.clear )
+			.map( ( [ , selector ] ) => selector );
 	} );
 
 	beforeEach( () => {
@@ -1598,10 +1595,11 @@ describe( 'selectors', () => {
 		} );
 
 		it( 'should return true if title or excerpt have changed', () => {
-			for ( const variantField of [ 'title', 'excerpt' ] ) {
-				for ( const constantField of without(
-					[ 'title', 'excerpt' ],
-					variantField
+			const fields = [ 'title', 'excerpt' ];
+
+			for ( const variantField of fields ) {
+				for ( const constantField of fields.filter(
+					( f ) => ! f === variantField
 				) ) {
 					const state = {
 						editor: {