@wordpress/editor 14.43.0 → 14.44.0

package/src/hooks/default-autocompleters.js

@@ -6,11 +6,11 @@ import { addFilter } from '@wordpress/hooks';
 /**
  * Internal dependencies
  */
-import { userAutocompleter } from '../components';
+import { linkAutocompleter, userAutocompleter } from '../components';
 
 function setDefaultCompleters( completers = [] ) {
 	// Provide copies so filters may directly modify them.
-	completers.push( { ...userAutocompleter } );
+	completers.push( { ...linkAutocompleter }, { ...userAutocompleter } );
 
 	return completers;
 }

package/src/hooks/test/default-autocompleters.js

@@ -7,11 +7,11 @@ import { applyFilters } from '@wordpress/hooks';
  * Internal dependencies
  */
 import '../default-autocompleters';
-import { userAutocompleter } from '../../components';
+import { linkAutocompleter, userAutocompleter } from '../../components';
 
 describe( 'default-autocompleters', () => {
 	const BLOCK_NAME = 'core/foo';
-	const defaultAutocompleters = [ userAutocompleter ];
+	const defaultAutocompleters = [ linkAutocompleter, userAutocompleter ];
 
 	it( 'provides default completers if none are provided', () => {
 		const result = applyFilters(

package/src/store/private-actions.js

@@ -688,12 +688,7 @@ export const restoreRevision =
 			sprintf(
 				/* translators: %s: Date and time of the revision. */
 				__( 'Restored to revision from %s.' ),
-				dateI18n(
-					getDateSettings().formats.datetime,
-					// Template revisions use the template REST API format, which
-					// exposes 'modified' instead of 'date'.
-					revisionKey === 'wp_id' ? revision.modified : revision.date
-				)
+				dateI18n( getDateSettings().formats.datetime, revision.date )
 			),
 			{
 				type: 'snackbar',

package/src/store/private-selectors.js

@@ -482,6 +482,8 @@ export const getPreviousRevision = createRegistrySelector(
 			{
 				per_page: -1,
 				context: 'edit',
+				orderby: 'date',
+				order: 'asc',
 				_fields: [
 					...new Set( [
 						'id',
@@ -501,25 +503,14 @@ export const getPreviousRevision = createRegistrySelector(
 			return null;
 		}
 
-		// Template revisions use the template REST API format, which exposes
-		// 'modified' instead of 'date'. Regular post revisions use 'date'.
-		const revisionDateField = revisionKey === 'wp_id' ? 'modified' : 'date';
-
-		// Sort by date ascending (oldest first).
-		const sortedRevisions = [ ...revisions ].sort(
-			( a, b ) =>
-				new Date( a[ revisionDateField ] ) -
-				new Date( b[ revisionDateField ] )
-		);
-
 		// Find current revision index.
-		const currentIndex = sortedRevisions.findIndex(
+		const currentIndex = revisions.findIndex(
 			( r ) => r[ revisionKey ] === currentRevisionId
 		);
 
 		// Return the previous revision (older one) if it exists.
 		if ( currentIndex > 0 ) {
-			return sortedRevisions[ currentIndex - 1 ];
+			return revisions[ currentIndex - 1 ];
 		}
 
 		return null;

package/src/store/reducer.js

@@ -449,13 +449,6 @@ export function revisionId( state = null, action ) {
 	return state;
 }
 
-/**
- * Reducer returning the currently selected note and its options.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- * @return {Object} Updated state.
- */
 /**
  * Reducer for whether the revision diff is shown.
  * Resets to true when entering/exiting revisions mode.
@@ -469,11 +462,19 @@ export function showRevisionDiff( state = true, action ) {
 		case 'SET_SHOW_REVISION_DIFF':
 			return action.showDiff;
 		case 'SET_CURRENT_REVISION_ID':
-			return true; // reset on enter/exit revisions
+			// Reset during the exit.
+			return ! action.revisionId ? true : state;
 	}
 	return state;
 }
 
+/**
+ * Reducer returning the currently selected note and its options.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ * @return {Object} Updated state.
+ */
 export function selectedNote( state = {}, action ) {
 	switch ( action.type ) {
 		case 'SELECT_NOTE':