diff --git a/packages/edit-site/src/components/global-styles/screen-revisions/index.js b/packages/edit-site/src/components/global-styles/screen-revisions/index.js index e4ffb209964187..5d0ebcc0fae2ee 100644 --- a/packages/edit-site/src/components/global-styles/screen-revisions/index.js +++ b/packages/edit-site/src/components/global-styles/screen-revisions/index.js @@ -81,11 +81,7 @@ function ScreenRevisions() { }; const restoreRevision = ( revision ) => { - setUserConfig( () => ( { - styles: revision?.styles, - settings: revision?.settings, - _links: revision?._links, - } ) ); + setUserConfig( () => revision ); setIsLoadingRevisionWithUnsavedChanges( false ); onCloseRevisions(); }; @@ -134,11 +130,7 @@ function ScreenRevisions() { * See: https://github.com/WordPress/gutenberg/issues/55866 */ if ( shouldSelectFirstItem ) { - setCurrentlySelectedRevision( { - styles: firstRevision?.styles || {}, - settings: firstRevision?.settings || {}, - id: firstRevision?.id, - } ); + setCurrentlySelectedRevision( firstRevision ); } }, [ shouldSelectFirstItem, firstRevision ] ); diff --git a/packages/edit-site/src/components/global-styles/variations/variation.js b/packages/edit-site/src/components/global-styles/variations/variation.js index a3214149edec33..268f4836c69e32 100644 --- a/packages/edit-site/src/components/global-styles/variations/variation.js +++ b/packages/edit-site/src/components/global-styles/variations/variation.js @@ -27,11 +27,7 @@ export default function Variation( { variation, children, isPill } ) { const { base, user, setUserConfig } = useContext( GlobalStylesContext ); const context = useMemo( () => ( { - user: { - settings: variation.settings ?? {}, - styles: variation.styles ?? {}, - _links: variation._links ?? {}, - }, + user: variation, base, merged: mergeBaseAndUserConfigs( base, variation ), setUserConfig: () => {}, @@ -39,13 +35,7 @@ export default function Variation( { variation, children, isPill } ) { [ variation, base ] ); - const selectVariation = () => { - setUserConfig( () => ( { - settings: variation.settings, - styles: variation.styles, - _links: variation._links, - } ) ); - }; + const selectVariation = () => setUserConfig( () => variation ); const selectOnEnter = ( event ) => { if ( event.keyCode === ENTER ) {