Skip to content

Commit f69b4f1

Browse files
committed
Refactor event handling in toolbar component to use consistent pointerdown and mousedown event listeners, improving event propagation management.
1 parent e110ee7 commit f69b4f1

File tree

1 file changed

+5
-23
lines changed
  • packages/react-grab/src/components/toolbar

1 file changed

+5
-23
lines changed

packages/react-grab/src/components/toolbar/index.tsx

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,11 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
14751475
}px)`,
14761476
"transform-origin": getTransformOrigin(),
14771477
}}
1478-
onPointerDown={handlePointerDown}
1478+
on:pointerdown={(event) => {
1479+
stopEventPropagation(event);
1480+
handlePointerDown(event);
1481+
}}
1482+
on:mousedown={stopEventPropagation}
14791483
onMouseEnter={() => !isCollapsed() && props.onSelectHoverChange?.(true)}
14801484
onMouseLeave={() => props.onSelectHoverChange?.(false)}
14811485
>
@@ -1525,7 +1529,6 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
15251529
}}
15261530
selectButton={
15271531
<>
1528-
{/* HACK: Native events with stopImmediatePropagation prevent page-level dropdowns from closing */}
15291532
<button
15301533
data-react-grab-ignore-events
15311534
data-react-grab-toolbar-toggle
@@ -1538,11 +1541,6 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
15381541
buttonSpacingClass(),
15391542
hitboxConstraintClass(),
15401543
)}
1541-
on:pointerdown={(event) => {
1542-
stopEventPropagation(event);
1543-
handlePointerDown(event);
1544-
}}
1545-
on:mousedown={stopEventPropagation}
15461544
onClick={(event) => {
15471545
setIsSelectTooltipVisible(false);
15481546
handleToggle(event);
@@ -1567,7 +1565,6 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
15671565
}
15681566
historyButton={
15691567
<>
1570-
{/* HACK: Native events with stopImmediatePropagation prevent page-level dropdowns from closing */}
15711568
<button
15721569
data-react-grab-ignore-events
15731570
data-react-grab-toolbar-history
@@ -1583,11 +1580,6 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
15831580
buttonSpacingClass(),
15841581
hitboxConstraintClass(),
15851582
)}
1586-
on:pointerdown={(event) => {
1587-
stopEventPropagation(event);
1588-
handlePointerDown(event);
1589-
}}
1590-
on:mousedown={stopEventPropagation}
15911583
onClick={(event) => {
15921584
setIsHistoryTooltipVisible(false);
15931585
handleHistory(event);
@@ -1640,11 +1632,6 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
16401632
buttonSpacingClass(),
16411633
hitboxConstraintClass(),
16421634
)}
1643-
on:pointerdown={(event) => {
1644-
stopEventPropagation(event);
1645-
handlePointerDown(event);
1646-
}}
1647-
on:mousedown={stopEventPropagation}
16481635
onClick={(event) => {
16491636
setIsCopyAllTooltipVisible(false);
16501637
handleCopyAll(event);
@@ -1688,11 +1675,6 @@ export const Toolbar: Component<ToolbarProps> = (props) => {
16881675
buttonSpacingClass(),
16891676
hitboxConstraintClass(),
16901677
)}
1691-
on:pointerdown={(event) => {
1692-
stopEventPropagation(event);
1693-
handlePointerDown(event);
1694-
}}
1695-
on:mousedown={stopEventPropagation}
16961678
onClick={(event) => {
16971679
setIsMenuTooltipVisible(false);
16981680
handleToggleMenu(event);

0 commit comments

Comments
 (0)