PrivateCoffee/tldraw
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Restore fill pointer events for all shapes

Browse source
This commit is contained in:
Steve Ruiz 2021-07-12 12:48:07 +01:00
parent 6b3bd2ac04
commit 08c5166b61
2 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
state/shape-utils/ellipse.tsx
View file

@ -59,17 +59,15 @@ const ellipse = registerShapeUtils<EllipseShape>({
return (
<>
{style.isFilled && (
<ellipse
cx={radiusX}
cy={radiusY}
rx={rx}
ry={ry}
stroke="none"
fill={styles.fill}
pointerEvents="fill"
/>
)}
<ellipse
cx={radiusX}
cy={radiusY}
rx={rx}
ry={ry}
stroke="none"
fill={style.isFilled ? styles.fill : 'transparent'}
pointerEvents="all"
/>
<path
d={path}
fill={styles.stroke}
@ -106,7 +104,7 @@ const ellipse = registerShapeUtils<EllipseShape>({
strokeWidth={sw}
strokeDasharray={strokeDasharray}
strokeDashoffset={strokeDashoffset}
pointerEvents={style.isFilled ? 'all' : 'stroke'}
pointerEvents="all"
/>
)
},

27
state/shape-utils/rectangle.tsx
View file

@ -40,26 +40,23 @@ const rectangle = registerShapeUtils<RectangleShape>({
return (
<>
{style.isFilled && (
<rect
rx={radius}
ry={radius}
x={+styles.strokeWidth / 2}
y={+styles.strokeWidth / 2}
width={Math.max(0, size[0] - strokeWidth)}
height={Math.max(0, size[1] - strokeWidth)}
strokeWidth={0}
fill={styles.fill}
stroke={styles.stroke}
/>
)}
<rect
rx={radius}
ry={radius}
x={+styles.strokeWidth / 2}
y={+styles.strokeWidth / 2}
width={Math.max(0, size[0] - strokeWidth)}
height={Math.max(0, size[1] - strokeWidth)}
fill={style.isFilled ? styles.fill : 'transparent'}
stroke="none"
/>
<path
d={pathData}
fill={styles.stroke}
stroke={styles.stroke}
strokeWidth={styles.strokeWidth}
filter={isHovered ? 'url(#expand)' : 'none'}
pointerEvents={style.isFilled ? 'all' : 'stroke'}
pointerEvents="all"
/>
</>
)
@ -110,7 +107,7 @@ const rectangle = registerShapeUtils<RectangleShape>({
fill={styles.fill}
stroke="transparent"
strokeWidth={sw}
pointerEvents={style.isFilled ? 'all' : 'stroke'}
pointerEvents="all"
/>
<g filter={isHovered ? 'url(#expand)' : 'none'} pointerEvents="stroke">
{paths}