Skip to content

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

fix(toolbar): make arrow and shape picker button automatically select the first arrow/shape if it's the first time

Andy Lu (Lu, Yu-An)451b36ebf137
diff --git a/packages/drawnix/src/components/arrow-picker.tsx b/packages/drawnix/src/components/arrow-picker.tsx
index 3f54d74..1f26d56 100644
--- a/packages/drawnix/src/components/arrow-picker.tsx
+++ b/packages/drawnix/src/components/arrow-picker.tsx
@@ -16,7 +16,7 @@ export interface ArrowProps {
pointer: ArrowLineShape;
}
-const ARROWS: ArrowProps[] = [
+export const ARROWS: ArrowProps[] = [
{
icon: StraightArrowIcon,
title: 'toolbar.arrow.straight',
diff --git a/packages/drawnix/src/components/shape-picker.tsx b/packages/drawnix/src/components/shape-picker.tsx
index 7691be6..54e77fa 100644
--- a/packages/drawnix/src/components/shape-picker.tsx
+++ b/packages/drawnix/src/components/shape-picker.tsx
@@ -25,7 +25,7 @@ export interface ShapeProps {
pointer: DrawPointerType;
}
-const SHAPES: ShapeProps[] = [
+export const SHAPES: ShapeProps[] = [
{
icon: RectangleIcon,
title: 'toolbar.shape.rectangle',
diff --git a/packages/drawnix/src/components/toolbar/creation-toolbar.tsx b/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
index 6d542cf..f9598b3 100644
--- a/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
+++ b/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
@@ -43,6 +43,8 @@ import {
import { ExtraToolsButton } from './extra-tools/extra-tools-button';
import { addImage } from '../../utils/image';
import { useI18n } from '../../i18n';
+import { SHAPES } from '../shape-picker';
+import { ARROWS } from '../arrow-picker';
export enum PopupKey {
'shape' = 'shape',
@@ -141,6 +143,8 @@ export const CreationToolbar = () => {
useState<AppToolButtonProps>(
BUTTONS.find((button) => button.key === PopupKey.freehand)!
);
+ const [lastShapePointer, setLastShapePointer] = useState<string | undefined>(SHAPES[0].pointer);
+ const [lastArrowPointer, setLastArrowPointer] = useState<string | undefined>(ARROWS[0].pointer);
const onPointerDown = (pointer: DrawnixPointerType) => {
setCreationMode(board, BoardCreationMode.dnd);
@@ -246,8 +250,10 @@ export const CreationToolbar = () => {
if (isShapePointer(board)) {
BoardTransforms.updatePointerType(board, board.pointer);
} else {
- BoardTransforms.updatePointerType(board, button.pointer!);
- }
+ setPointer(lastShapePointer || SHAPES[0].pointer)
+ setCreationMode(board, BoardCreationMode.drawing);
+ BoardTransforms.updatePointerType(board, lastShapePointer || SHAPES[0].pointer);
+ }
}}
/>
</PopoverTrigger>
@@ -256,6 +262,7 @@ export const CreationToolbar = () => {
onPointerUp={(pointer: DrawPointerType) => {
setShapeOpen(false);
setPointer(pointer);
+ setLastShapePointer(pointer);
}}
></ShapePicker>
</PopoverContent>
@@ -285,7 +292,9 @@ export const CreationToolbar = () => {
if (isArrowLinePointer(board)) {
BoardTransforms.updatePointerType(board, board.pointer);
} else {
- BoardTransforms.updatePointerType(board, button.pointer!);
+ setCreationMode(board, BoardCreationMode.drawing);
+ BoardTransforms.updatePointerType(board, lastArrowPointer || ARROWS[0].pointer);
+ setPointer(lastArrowPointer || ARROWS[0].pointer);
}
}}
/>