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

Duotone: fix code typo #62953

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Duotone: fix code typo #62953

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d0cf6
Duotone: re-fix Safari issue
ellatrix Jun 28, 2024
ebb8b93
Add colors dependency
ellatrix Jul 1, 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
28 changes: 16 additions & 12 deletions packages/block-editor/src/hooks/duotone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,26 +295,30 @@ function useDuotoneStyles( {
return;
}

// Safari does not always update the duotone filter when the duotone colors
// are changed. When using Safari, force the block element to be repainted by
// the browser to ensure any changes are reflected visually. This logic matches
// that used on the site frontend in `block-supports/duotone.php`.
// Safari does not always update the duotone filter when the duotone
// colors are changed. When using Safari, force the block element to be
// repainted by the browser to ensure any changes are reflected
// visually. This logic matches that used on the site frontend in
// `block-supports/duotone.php`.
if ( blockElement && isSafari ) {
const display = blockElement.style.display;
// Switch to `inline-block` to force a repaint. In the editor, `inline-block`
// is used instead of `none` to ensure that scroll position is not affected,
// as `none` results in the editor scrolling to the top of the block.
// Switch to `inline-block` to force a repaint. In the editor,
// `inline-block` is used instead of `none` to ensure that scroll
// position is not affected, as `none` results in the editor
// scrolling to the top of the block.
blockElement.style.display = 'inline-block';
// Simply accessing el.offsetHeight flushes layout and style
// changes in WebKit without having to wait for setTimeout.
// Simply accessing el.offsetHeight flushes layout and style changes
// in WebKit without having to wait for setTimeout.
// eslint-disable-next-line no-unused-expressions
blockElement.offsetHeight;
blockElement.style.display = display;
}
}, [ isValidFilter, blockElement ] );
// `colors` must be a dependency so this effect runs when the colors
// change in Safari.
}, [ isValidFilter, blockElement, colors ] );
}

function useBlockProps( { name, style } ) {
function useBlockProps( { clientId, name, style } ) {
const id = useInstanceId( useBlockProps );
const selector = useMemo( () => {
const blockType = getBlockType( name );
Expand Down Expand Up @@ -362,7 +366,7 @@ function useBlockProps( { name, style } ) {
const shouldRender = selector && attribute;

useDuotoneStyles( {
clientId: id,
clientId,
id: filterClass,
selector,
attribute,
Expand Down
Loading