Move Entities Saved States from Modal to Sidebar

packages/edit-post/src/components/layout/index.js

@@ -134,17 +134,16 @@ function Layout() {
 		isEntitiesSavedStatesOpen,
 		setIsEntitiesSavedStatesOpen,
 	] = useState( false );
-	const [
-		closeEntitiesCallback,
-		setCloseEntitiesCallback,
-	] = useState( () => () => {} );
+	const [ closeEntitiesCallback, setCloseEntitiesCallback ] = useState();
 	const openEntitiesSavedStates = useCallback(
 		() => setIsEntitiesSavedStatesOpen( true ),
 		[]
 	);
 	const closeEntitiesSavedStates = useCallback(
 		( callbackArg ) => {
-			closeEntitiesCallback( callbackArg );
+			if ( closeEntitiesCallback ) {
+				closeEntitiesCallback( callbackArg );
+			}
 			setIsEntitiesSavedStatesOpen( false );
 		},
 		[ closeEntitiesCallback ]

packages/editor/src/components/entities-saved-states/index.js

@@ -180,7 +180,9 @@ export default function EntitiesSavedStates( { isOpen, closePanel } ) {
 
 	// Explicitly define this with no argument passed.  Using `closePanel` on
 	// its own will use the event object in place of the expected saved entities.
-	const dismissPanel = useCallback( () => closePanel(), [] );
+	// Do NOT useCallback, it will skip the 'this' bound callback used in the
+	// closePanel function.
+	const dismissPanel = () => closePanel();
 
 	return isOpen ? (
 		<div className="entities-saved-states__panel">

packages/editor/src/components/post-publish-button/index.js

@@ -80,6 +80,8 @@ export class PostPublishButton extends Component {
 				entitiesSavedStatesCallback();
 			}
 		} );
+		// Clear the callback set for entities saved states.
+		this.props.setCloseEntitiesCallback();
 	}
 
 	render() {