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

Assembler: Unset white background (try 2) #89381

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Assembler: Unset white background (try 2) #89381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e672e57
Fix issue with block renderer forcing a white background
taipeicoder Apr 10, 2024
0cb4051
Typecheck
taipeicoder Apr 10, 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
30 changes: 28 additions & 2 deletions packages/block-renderer/src/components/block-renderer-container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ const { unlock } = __dangerousOptInToUnstableAPIsOnlyForCoreModules(

const { getDuotoneFilter } = unlock( blockEditorPrivateApis );

const isSafari =
window?.navigator.userAgent &&
window.navigator.userAgent.includes( 'Safari' ) &&
! window.navigator.userAgent.includes( 'Chrome' ) &&
! window.navigator.userAgent.includes( 'Chromium' );

interface BlockRendererContainerProps {
children: ReactNode;
styles?: RenderedStyle[];
Expand Down Expand Up @@ -50,11 +56,31 @@ const ScaledBlockRendererContainer = ( {
const { settings } = useContext( BlockRendererContext );
const { styles, assets, duotone } = useMemo(
() => ( {
styles: settings.styles,
styles: settings.styles.map( ( styles: RenderedStyle ) => {
if ( ! isSafari || ! styles.css || ! styles.css.includes( 'body' ) ) {
return styles;
}

// The Iframe component injects the CSS rule body{ background: white } to <head>.
// In Safari, this creates a specificity issue that prevents other background colors
// to be applied to the body.
// As a solution, we use regex to add !important to these background colors.
//
// TODO: Remove this workaround when https://github.com/WordPress/gutenberg/pull/60106
// lands in Calypso's @wordpress/block-editor, which should be 12.23.0.
const regex = /(body\s*{[\s\S]*?\bbackground-color\s*:\s*([^;}]+)\s*;[\s\S]*?})/g;
styles.css = styles.css.replace( regex, ( match, cssRule, bgColor ) => {
return ! bgColor.includes( '!important' )
? cssRule.replace( bgColor, bgColor + ' !important' )
: cssRule;
} );

return styles;
} ),
assets: settings.__unstableResolvedAssets,
duotone: settings.__experimentalFeatures?.color?.duotone,
} ),
[ settings ]
[ settings, isSafari ]
);

const styleAssets = useParsedAssets( assets?.styles ) as HTMLLinkElement[];
Expand Down
Loading