Fix gallery block undo issue (#26377)

* Mark change in attributes when gallery mounts as not persistant * Fix typo
WordPress · Oct 27, 2020 · 0c1a67e · 0c1a67e
1 parent d63edd8
commit 0c1a67e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
@@ -861,7 +861,7 @@ export function __unstableSaveReusableBlock( id, updatedId ) {
 }
 
 /**
- * Returns an action object used in signalling that the last block change should be marked explicitely as persistent.
+ * Returns an action object used in signalling that the last block change should be marked explicitly as persistent.
  *
  * @return {Object} Action object.
  */

diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
@@ -29,7 +29,7 @@ import { MediaPlaceholder, InspectorControls } from '@wordpress/block-editor';
 import { Platform, useEffect, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
-import { withSelect } from '@wordpress/data';
+import { useDispatch, withSelect } from '@wordpress/data';
 import { withViewportMatch } from '@wordpress/viewport';
 
 /**
@@ -85,6 +85,9 @@ function GalleryEdit( props ) {
 	} = attributes;
 	const [ selectedImage, setSelectedImage ] = useState();
 	const [ attachmentCaptions, setAttachmentCaptions ] = useState();
+	const { __unstableMarkNextChangeAsNotPersistent } = useDispatch(
+		'core/block-editor'
+	);
 
 	function setAttributes( newAttrs ) {
 		if ( newAttrs.ids ) {
@@ -305,6 +308,7 @@ function GalleryEdit( props ) {
 		// linkTo attribute must be saved so blocks don't break when changing
 		// image_default_link_type in options.php
 		if ( ! linkTo ) {
+			__unstableMarkNextChangeAsNotPersistent();
 			setAttributes( {
 				linkTo:
 					window?.wp?.media?.view?.settings?.defaultProps?.link ||
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     /**
-     * Returns an action object used in signalling that the last block change should be marked explicitely as persistent.
+     * Returns an action object used in signalling that the last block change should be marked explicitly as persistent.
      *
      * @return {Object} Action object.
      */
@@ Expand Down @@