Skip to content
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

Edit Site: Add a loading timeout #51049

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Edit Site: Add a loading timeout #51049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5447fd9
Edit Site: Add a loading timeout
tyxla May 29, 2023
e6cd944
Set maximum loading time to 10s
tyxla May 31, 2023
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
21 changes: 21 additions & 0 deletions packages/edit-site/src/components/layout/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { store as coreStore } from '@wordpress/core-data';
*/
import useEditedEntityRecord from '../use-edited-entity-record';

const MAX_LOADING_TIME = 10000; // 10 seconds

export function useIsSiteEditorLoading() {
const { isLoaded: hasLoadedPost } = useEditedEntityRecord();
const [ loaded, setLoaded ] = useState( false );
Expand All @@ -22,6 +24,25 @@ export function useIsSiteEditorLoading() {
[ loaded ]
);

/*
* If the maximum expected loading time has passed, we're marking the
* editor as loaded, in order to prevent any failed requests from blocking
* the editor canvas from appearing.
*/
useEffect( () => {
let timeout;

if ( ! loaded ) {
timeout = setTimeout( () => {
setLoaded( true );
}, MAX_LOADING_TIME );
}

return () => {
clearTimeout( timeout );
};
}, [ loaded ] );

useEffect( () => {
if ( inLoadingPause ) {
/*
Expand Down