Skip to content
Merged
Changes from all commits
Commits
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
45 changes: 38 additions & 7 deletions packages/block-library/src/breadcrumbs/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@wordpress/components';
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import { useEffect, useState } from '@wordpress/element';
import { useEffect, useRef, useState } from '@wordpress/element';
import { useServerSideRender } from '@wordpress/server-side-render';
import { useDisabled } from '@wordpress/compose';

Expand Down Expand Up @@ -109,7 +109,25 @@ export default function BreadcrumbEdit( {
block: name,
urlQueryArgs: { post_id: postId, invalidationKey },
} );

const prevContentRef = useRef( '' );
useEffect( () => {
if ( status === 'success' ) {
prevContentRef.current = content;
}
}, [ content, status ] );
const [ showLoader, setShowLoader ] = useState( false );
useEffect( () => {
if ( status !== 'loading' ) {
return;
}
const timeout = setTimeout( () => {
setShowLoader( true );
}, 400 );
return () => {
clearTimeout( timeout );
setShowLoader( false );
};
}, [ status ] );
const disabledRef = useDisabled();
const blockProps = useBlockProps( { ref: disabledRef } );

Expand Down Expand Up @@ -286,11 +304,24 @@ export default function BreadcrumbEdit( {
) }
/>
</InspectorControls>
{ status === 'loading' && ! showPlaceholder && (
<div { ...blockProps }>
<Spinner />
</div>
) }
{ status === 'loading' &&
! showPlaceholder &&
( prevContentRef.current ? (
<HtmlRenderer
wrapperProps={ {
...blockProps,
style: {
...blockProps.style,
opacity: showLoader ? 0.3 : 1,
},
} }
html={ prevContentRef.current }
/>
) : (
<div { ...blockProps }>
<Spinner />
</div>
) ) }
{ status === 'error' && (
<div { ...blockProps }>
<p>
Expand Down
Loading