Skip to content

Widget Screen: Fix unsaved changes notification #31757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talldan merged 1 commit into from
May 21, 2021
Merged

Widget Screen: Fix unsaved changes notification #31757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions packages/edit-widgets/src/components/layout/unsaved-changes-warning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import { __ } from '@wordpress/i18n';
import { useEffect } from '@wordpress/element';
import { useSelect } from '@wordpress/data';

/**
* Internal dependencies
*/
import { store as editWidgetsStore } from '../../store';

/**
* Warns the user if there are unsaved changes before leaving the editor.
*
Expand All @@ -14,12 +19,11 @@ import { useSelect } from '@wordpress/data';
* @return {WPComponent} The component.
*/
export default function UnsavedChangesWarning() {
const getIsDirty = useSelect( ( select ) => {
return () => {
const { __experimentalGetDirtyEntityRecords } = select( 'core' );
const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
return dirtyEntityRecords.length > 0;
};
const isDirty = useSelect( ( select ) => {
const { getEditedWidgetAreas } = select( editWidgetsStore );
const editedWidgetAreas = getEditedWidgetAreas();

return editedWidgetAreas?.length > 0;
}, [] );

useEffect( () => {
Expand All @@ -31,11 +35,7 @@ export default function UnsavedChangesWarning() {
* @return {?string} Warning prompt message, if unsaved changes exist.
*/
const warnIfUnsavedChanges = ( event ) => {
// We need to call the selector directly in the listener to avoid race
// conditions with `BrowserURL` where `componentDidUpdate` gets the
// new value of `isEditedPostDirty` before this component does,
// causing this component to incorrectly think a trashed post is still dirty.
if ( getIsDirty() ) {
if ( isDirty ) {
event.returnValue = __(
'You have unsaved changes. If you proceed, they will be lost.'
);
Expand All @@ -48,7 +48,7 @@ export default function UnsavedChangesWarning() {
return () => {
window.removeEventListener( 'beforeunload', warnIfUnsavedChanges );
};
}, [ getIsDirty ] );
}, [ isDirty ] );

return null;
}