Skip to content

fix: transform on <g> instead of <svg> as a safari fix #3691

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

Open
Arukuen wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: transform on <g> instead of <svg> as a safari fix #3691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ec53e
fix: transform on <g> instead of <svg> as a safari fix
Arukuen Mar 19, 2026
5bbb116
fix: handle edge cases
Arukuen Mar 19, 2026
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
26 changes: 24 additions & 2 deletions src/block-components/image/get-shape-css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,31 @@ export const getShapeCSS = ( shape, shapeFlipX, shapeFlipY, shapeStretch ) => {
const MaskImage = getShapeSVG( shape )
const MaskComp = <MaskImage
preserveAspectRatio={ ! [ '', 'square' ].includes( shape ) && shapeStretch ? 'none' : undefined }
transform={ ! shapeFlipX && ! shapeFlipY ? undefined : `scale(${ shapeFlipX ? -1 : 1 },${ shapeFlipY ? -1 : 1 })` }
/>
const maskString = btoa( svgRenderToString( MaskComp ) )

let svgString = svgRenderToString( MaskComp )

// Safari fix: instead of transform on <svg>, wrap contents in a <g> with transform
if ( shapeFlipX || shapeFlipY ) {
const scaleX = shapeFlipX ? -1 : 1
const scaleY = shapeFlipY ? -1 : 1

// Extract viewBox to compute translate offset
const viewBoxMatch = svgString.match( /viewBox=["']([^"']+)["']/ )
const [ minX, minY, width, height ] = viewBoxMatch
? viewBoxMatch[ 1 ].trim().split( /[\s,]+/ ).map( Number ) : [ 0, 0, 100, 100 ]

const translateX = shapeFlipX ? width + ( 2 * minX ) : 0
const translateY = shapeFlipY ? height + ( 2 * minY ) : 0

// SVG transform are applied right to left
// Scale first (flip) and translate (reposition to view)
svgString = svgString.replace(
/(<svg[^>]*>)([\s\S]*)(<\/svg>)/,
`$1<g transform="translate(${ translateX },${ translateY }) scale(${ scaleX },${ scaleY })">$2</g>$3`
)
}

const maskString = btoa( svgString )
return `url('data:image/svg+xml;base64,${ maskString }')`
}
Loading