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

Jump to bottom

Preview (block/patterns): optimise store registration #58257

Closed
wants to merge 2 commits into from
Closed

Preview (block/patterns): optimise store registration #58257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e597f7
Preview (block/patterns): optimise store registration
ellatrix Jan 25, 2024
a33b8fa
Add preview setting
ellatrix Jan 25, 2024
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
58 changes: 40 additions & 18 deletions packages/block-editor/src/components/block-preview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,51 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { useDisabled, useMergeRefs } from '@wordpress/compose';
import { useSelect } from '@wordpress/data';
import {
useSelect,
withRegistry,
createRegistry,
RegistryProvider,
} from '@wordpress/data';
import { memo, useMemo } from '@wordpress/element';
import deprecated from '@wordpress/deprecated';

/**
* Internal dependencies
*/
import { ExperimentalBlockEditorProvider } from '../provider';
import { STORE_NAME as blockEditorStoreName } from '../../store/constants';
import AutoHeightBlockPreview from './auto';
import EditorStyles from '../editor-styles';
import { store as blockEditorStore } from '../../store';
import { store as blockEditorStore, storeConfig } from '../../store';
import { __experimentalUpdateSettings } from '../../store/private-actions';
import { resetBlocks } from '../../store/actions';
import { BlockListItems } from '../block-list';

const PreviewProvider = withRegistry( ( props ) => {
const { children, value, settings, registry } = props;
// Previews are meant to be static, so create a store and immediately
// dispatch the settings and blocks so it doesn't call subscribers.
const subRegistry = useMemo( () => {
const newRegistry = createRegistry( {}, registry );
const store = newRegistry.registerStore(
blockEditorStoreName,
storeConfig
);
store.dispatch(
__experimentalUpdateSettings( {
...settings,
__internalIsInitialized: true,
__unstableIsPreviewMode: true,
} )
);
store.dispatch( resetBlocks( value ) );
return newRegistry;
}, [ registry, value, settings ] );
return (
<RegistryProvider value={ subRegistry }>{ children }</RegistryProvider>
);
} );

export function BlockPreview( {
blocks,
viewportWidth = 1200,
Expand Down Expand Up @@ -49,14 +81,10 @@ export function BlockPreview( {
} );
}

const originalSettings = useSelect(
const settings = useSelect(
( select ) => select( blockEditorStore ).getSettings(),
[]
);
const settings = useMemo(
() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
[ originalSettings ]
);
const renderedBlocks = useMemo(
() => ( Array.isArray( blocks ) ? blocks : [ blocks ] ),
[ blocks ]
Expand All @@ -67,16 +95,13 @@ export function BlockPreview( {
}

return (
<ExperimentalBlockEditorProvider
value={ renderedBlocks }
settings={ settings }
>
<PreviewProvider value={ renderedBlocks } settings={ settings }>
<AutoHeightBlockPreview
viewportWidth={ viewportWidth }
minHeight={ minHeight }
additionalStyles={ additionalStyles }
/>
</ExperimentalBlockEditorProvider>
</PreviewProvider>
);
}

Expand Down Expand Up @@ -129,13 +154,10 @@ export function useBlockPreview( { blocks, props = {}, layout } ) {
);

const children = (
<ExperimentalBlockEditorProvider
value={ renderedBlocks }
settings={ settings }
>
<PreviewProvider value={ renderedBlocks } settings={ settings }>
<EditorStyles />
<BlockListItems renderAppender={ false } layout={ layout } />
</ExperimentalBlockEditorProvider>
</PreviewProvider>
);

return {
Expand Down
Loading