Skip to content

开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.

feat(creation-toolbar): remove default action when click shape and arrow icon in creation toolbar improve tool-button

pubuzhixing8a46c2dfb9acc
diff --git a/packages/drawnix/src/components/popup/link-popup/link-popup.tsx b/packages/drawnix/src/components/popup/link-popup/link-popup.tsx
index 2079fb6..7399a62 100644
--- a/packages/drawnix/src/components/popup/link-popup/link-popup.tsx
+++ b/packages/drawnix/src/components/popup/link-popup/link-popup.tsx
@@ -159,7 +159,8 @@ export const LinkPopup = () => {
icon={FeltTipPenIcon}
title={`Edit link`}
aria-label={`Edit link`}
- onPointerDown={() => {
+ onPointerDown={({ event }) => {
+ event.preventDefault();
setAppState({
...appState,
linkState: {
diff --git a/packages/drawnix/src/components/tool-button.tsx b/packages/drawnix/src/components/tool-button.tsx
index 2b08e0e..b6b6316 100644
--- a/packages/drawnix/src/components/tool-button.tsx
+++ b/packages/drawnix/src/components/tool-button.tsx
@@ -28,7 +28,10 @@ type ToolButtonBaseProps = {
disabled?: boolean;
className?: string;
style?: CSSProperties;
- onPointerDown?(data: { pointerType: EventPointerType }): void;
+ onPointerDown?(data: {
+ pointerType: EventPointerType;
+ event: React.PointerEvent<HTMLElement>;
+ }): void;
onPointerUp?(data: { pointerType: EventPointerType }): void;
};
@@ -124,8 +127,10 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
type={type}
onClick={onClick}
onPointerDown={(event) => {
- event.preventDefault();
- props.onPointerDown?.({ pointerType: event.pointerType || null });
+ props.onPointerDown?.({
+ pointerType: event.pointerType || null,
+ event,
+ });
}}
onPointerUp={(event) => {
props.onPointerUp?.({ pointerType: event.pointerType || null });
@@ -163,7 +168,10 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
title={props.title}
onPointerDown={(event) => {
lastPointerTypeRef.current = event.pointerType || null;
- props.onPointerDown?.({ pointerType: event.pointerType || null });
+ props.onPointerDown?.({
+ pointerType: event.pointerType || null,
+ event,
+ });
}}
onPointerUp={(event) => {
props.onPointerUp?.({ pointerType: event.pointerType || null });
diff --git a/packages/drawnix/src/components/toolbar/creation-toolbar.tsx b/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
index 8153eba..4750fbd 100644
--- a/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
+++ b/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
@@ -196,12 +196,6 @@ export const CreationToolbar = () => {
aria-label={`Shape`}
onPointerDown={() => {
setShapeOpen(!shapeOpen);
- BoardTransforms.updatePointerType(
- board,
- BasicShapes.rectangle
- );
- setPointer(BasicShapes.rectangle);
- setCreationMode(board, BoardCreationMode.drawing);
}}
/>
</PopoverTrigger>
@@ -236,12 +230,6 @@ export const CreationToolbar = () => {
aria-label={`Arrow`}
onPointerDown={() => {
setArrowOpen(!shapeOpen);
- BoardTransforms.updatePointerType(
- board,
- ArrowLineShape.straight
- );
- setPointer(ArrowLineShape.straight);
- setCreationMode(board, BoardCreationMode.drawing);
}}
/>
</PopoverTrigger>