Memoize useSelect callbacks on the header toolbar items (#23337)

WordPress · Jun 20, 2020 · 9fae92f · 9fae92f
1 parent 5e0b80a
commit 9fae92f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/packages/editor/src/components/editor-history/redo.js b/packages/editor/src/components/editor-history/redo.js
@@ -9,8 +9,9 @@ import { redo as redoIcon } from '@wordpress/icons';
 import { forwardRef } from '@wordpress/element';
 
 function EditorHistoryRedo( props, ref ) {
-	const hasRedo = useSelect( ( select ) =>
-		select( 'core/editor' ).hasEditorRedo()
+	const hasRedo = useSelect(
+		( select ) => select( 'core/editor' ).hasEditorRedo(),
+		[]
 	);
 	const { redo } = useDispatch( 'core/editor' );
 	return (

diff --git a/packages/editor/src/components/editor-history/undo.js b/packages/editor/src/components/editor-history/undo.js
@@ -9,8 +9,9 @@ import { undo as undoIcon } from '@wordpress/icons';
 import { forwardRef } from '@wordpress/element';
 
 function EditorHistoryUndo( props, ref ) {
-	const hasUndo = useSelect( ( select ) =>
-		select( 'core/editor' ).hasEditorUndo()
+	const hasUndo = useSelect(
+		( select ) => select( 'core/editor' ).hasEditorUndo(),
+		[]
 	);
 	const { undo } = useDispatch( 'core/editor' );
 	return (

diff --git a/packages/editor/src/components/table-of-contents/index.js b/packages/editor/src/components/table-of-contents/index.js
@@ -14,7 +14,8 @@ import TableOfContentsPanel from './panel';
 
 function TableOfContents( { hasOutlineItemsDisabled, ...props }, ref ) {
 	const hasBlocks = useSelect(
-		( select ) => !! select( 'core/block-editor' ).getBlockCount()
+		( select ) => !! select( 'core/block-editor' ).getBlockCount(),
+		[]
 	);
 	return (
 		<Dropdown

diff --git a/packages/editor/src/components/table-of-contents/panel.js b/packages/editor/src/components/table-of-contents/panel.js
@@ -19,7 +19,8 @@ function TableOfContentsPanel( { hasOutlineItemsDisabled, onRequestClose } ) {
 				paragraphCount: getGlobalBlockCount( 'core/paragraph' ),
 				numberOfBlocks: getGlobalBlockCount(),
 			};
-		}
+		},
+		[]
 	);
 	return (
 		/*
-Original file line number
+Diff line change
@@ Expand Up @@
     				paragraphCount: getGlobalBlockCount( 'core/paragraph' ),
     				numberOfBlocks: getGlobalBlockCount(),
     			};
-    		}
+    		},
+    		[]
     	);
     	return (
     		/*
@@ Expand Down @@