开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
feat(arrow): support set arrow mark (#258)
Sixd48a3cc2c7ef
diff --git a/packages/drawnix/src/components/arrow-mark-picker.tsx b/packages/drawnix/src/components/arrow-mark-picker.tsxnew file mode 100644index 0000000..a168158--- /dev/null+++ b/packages/drawnix/src/components/arrow-mark-picker.tsx@@ -0,0 +1,72 @@+import classNames from 'classnames';+import { Island } from './island';+import Stack from './stack';+import { ToolButton } from './tool-button';+import { LineIcon, ArrowIcon } from './icons';+import { useBoard } from '@plait-board/react-board';+import { ATTACHED_ELEMENT_CLASS_NAME } from '@plait/core';+import React from 'react';+import { PropertyTransforms } from '@plait/common';+import { ArrowLineHandle } from '@plait/draw';+import { useI18n } from '../i18n';++export type ArrowMarkerPickerProps = {+ end: 'source' | 'target';+ property: ArrowLineHandle;+};++export const ArrowMarkerPicker: React.FC<ArrowMarkerPickerProps> = ({+ end,+ property,+}) => {+ const board = useBoard();+ const { marker: currentMarker } = property;+ const { t } = useI18n();++ const setMarker = (marker: string) => {+ PropertyTransforms.setProperty(board, {+ [end]: {+ ...property,+ marker,+ },+ });+ };++ return (+ <Island+ padding={2}+ className={classNames(+ `${ATTACHED_ELEMENT_CLASS_NAME} ${+ end === 'source' ? 'source-arrow-island' : ''+ } `+ )}+ >+ <Stack.Row gap={1}>+ <ToolButton+ className={classNames(`property-button`)}+ visible={true}+ icon={LineIcon}+ type="button"+ title={t('line.none')}+ aria-label={t('line.none')}+ selected={currentMarker === 'none'}+ onPointerUp={() => {+ setMarker('none');+ }}+ ></ToolButton>+ <ToolButton+ className={classNames(`property-button`)}+ visible={true}+ icon={ArrowIcon}+ type="button"+ title={t('line.arrow')}+ aria-label={t('line.arrow')}+ selected={currentMarker === 'arrow'}+ onPointerUp={() => {+ setMarker('arrow');+ }}+ ></ToolButton>+ </Stack.Row>+ </Island>+ );+};diff --git a/packages/drawnix/src/components/icons.tsx b/packages/drawnix/src/components/icons.tsxindex 062d9a3..a62920f 100644--- a/packages/drawnix/src/components/icons.tsx+++ b/packages/drawnix/src/components/icons.tsx@@ -45,9 +45,18 @@ export const TextIcon = createIcon();export const EraseIcon = createIcon(- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">- <path stroke="none" d="M0 0h24v24H0z"/>- <path d="M19 20h-10.5l-4.21 -4.3a1 1 0 0 1 0 -1.41l10 -10a1 1 0 0 1 1.41 0l5 5a1 1 0 0 1 0 1.41l-9.2 9.3" /><path d="M18 13.3l-6.3 -6.3" />+ <svg+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ >+ <path stroke="none" d="M0 0h24v24H0z" />+ <path d="M19 20h-10.5l-4.21 -4.3a1 1 0 0 1 0 -1.41l10 -10a1 1 0 0 1 1.41 0l5 5a1 1 0 0 1 0 1.41l-9.2 9.3" />+ <path d="M18 13.3l-6.3 -6.3" /></svg>);@@ -519,3 +528,27 @@ export const LinkIcon = createIcon(</g></svg>);++export const ArrowIcon = createIcon(+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">+ <g stroke="none">+ <path d="M8.44521878,4.21103025 C8.58299906,3.97171622 8.8886944,3.88940684 9.12800843,4.02718711 L15.242109,7.54725833 C15.3194119,7.59176394 15.3834015,7.65613893 15.4274422,7.73370766 C15.5637831,7.97384463 15.4796398,8.27904026 15.2395028,8.41538118 L9.12748155,11.8855614 C9.0176214,11.947936 8.88822223,11.9664118 8.76529593,11.9372749 C8.4965984,11.8735862 8.33040588,11.604134 8.39409456,11.3354364 L9.018,8.69941945 L1.5,8.7 C1.22385763,8.7 1,8.47614237 1,8.2 L1,8 C1,7.72385763 1.22385763,7.5 1.5,7.5 L9.075,7.49941945 L8.39165922,4.57430951 C8.3700078,4.48168206 8.37536432,4.38547957 8.40609313,4.29679626 Z"></path>+ </g>+ </svg>+);++export const LineIcon = createIcon(+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">+ <g stroke="none">+ <rect x="1" y="7.5" width="14" height="1.2" rx=".5"></rect>+ </g>+ </svg>+);++export const StraightLineIcon = createIcon(+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">+ <g stroke="none">+ <path d="M14.701408,3.54812055 C14.9888311,3.38321272 15.3555178,3.48253099 15.5204256,3.76995411 C15.6853334,4.05737723 15.5860152,4.42406391 15.298592,4.58897174 L1.29859203,12.6214138 C1.01116891,12.7863216 0.644482231,12.6870034 0.479574406,12.3995802 C0.314666581,12.1121571 0.41398485,11.7454704 0.701407969,11.5805626 L14.701408,3.54812055 Z"></path>+ </g>+ </svg>+);diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsxnew file mode 100644index 0000000..eca5ec5--- /dev/null+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsx@@ -0,0 +1,59 @@+import React, { useState } from 'react';+import { ToolButton } from '../../tool-button';+import classNames from 'classnames';+import { PlaitBoard } from '@plait/core';+import { ArrowIcon, LineIcon } from '../../icons';+import { Popover, PopoverContent, PopoverTrigger } from '../../popover/popover';+import { ArrowLineHandle } from '@plait/draw';+import { ArrowMarkerPicker } from '../../arrow-mark-picker';+import { useI18n } from '../../../i18n';++export type ArrowMarkButtonProps = {+ board: PlaitBoard;+ endProperty?: ArrowLineHandle;+ children?: React.ReactNode;+ end: 'source' | 'target';+};++export const ArrowMarkButton: React.FC<ArrowMarkButtonProps> = ({+ board,+ end,+ endProperty,+}) => {+ const [isPopoverOpen, setIsPopoverrOpen] = useState(false);+ const marker = endProperty?.marker;+ const container = PlaitBoard.getBoardContainer(board);+ const { t } = useI18n();+ const title = `${t(`line.${end}`)} — ${t(`line.${marker}`)}`;++ return (+ <Popover+ sideOffset={12}+ open={isPopoverOpen}+ onOpenChange={(open) => {+ setIsPopoverrOpen(open);+ }}+ placement={'top'}+ >+ <PopoverTrigger asChild>+ <ToolButton+ className={classNames(+ `property-button ${end === 'source' ? 'source-arrow-button' : ''}`+ )}+ visible={true}+ icon={marker === 'none' ? LineIcon : ArrowIcon}+ type="button"+ title={title}+ aria-label={title}+ selected={isPopoverOpen}+ onPointerUp={() => {+ setIsPopoverrOpen(!isPopoverOpen);+ }}+ ></ToolButton>+ </PopoverTrigger>+ <PopoverContent container={container}>+ <ArrowMarkerPicker end={end} property={endProperty} />+ </PopoverContent>+ </Popover>+ );+};diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scss b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scssindex 0211c10..1b5ac5c 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scss+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scss@@ -38,4 +38,8 @@justify-content: space-between;padding: 0 8px;}+}++.source-arrow-island .property-button ,.source-arrow-button{+ transform: rotateY(180deg);}\ No newline at end of filediff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsxindex c917517..258a70b 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx@@ -24,6 +24,7 @@ import {} from '@plait/mind';import './popup-toolbar.scss';import {+ ArrowLineHandle,getStrokeColorByElement as getStrokeColorByDrawElement,isClosedCustomGeometry,isClosedDrawElement,@@ -39,6 +40,8 @@ import { isWhite, removeHexAlpha } from '../../../utils/color';import { NO_COLOR } from '../../../constants/color';import { Freehand } from '../../../plugins/freehand/type';import { PopupLinkButton } from './link-button';+import { ArrowMarkButton } from './arrow-mark-button';+import { useI18n } from '../../../i18n';export const PopupToolbar = () => {const board = useBoard();@@ -64,6 +67,10 @@ export const PopupToolbar = () => {hasStroke?: boolean;hasStrokeStyle?: boolean;marks?: Omit<CustomText, 'text'>;+ // Line state+ isLine?: boolean;+ source?: ArrowLineHandle;+ target?: ArrowLineHandle;} = {fill: 'red',};@@ -80,6 +87,9 @@ export const PopupToolbar = () => {const hasStrokeStyle =selectedElements.some((value) => hasStrokeStyleProperty(board, value)) &&!PlaitBoard.hasBeenTextEditing(board);+ const isLine = selectedElements.every((value) =>+ PlaitDrawElement.isArrowLine(value)+ );state = {...getElementState(board),hasFill,@@ -87,8 +97,10 @@ export const PopupToolbar = () => {hasStroke,hasStrokeStyle,hasText,+ isLine,};}+ const { t } = useI18n();useEffect(() => {if (open) {const hasSelected = selectedElements.length > 0;@@ -172,7 +184,7 @@ export const PopupToolbar = () => {board={board}key={0}currentColor={state.marks?.color}- title={`Font Color`}+ title={t('popupToolbar.fontColor')}fontColorIcon={<FontColorIcon currentColor={state.marks?.color} />}@@ -183,7 +195,7 @@ export const PopupToolbar = () => {board={board}key={1}currentColor={state.strokeColor}- title={`Stroke`}+ title={t('popupToolbar.stroke')}hasStrokeStyle={state.hasStrokeStyle || false}><label@@ -197,7 +209,7 @@ export const PopupToolbar = () => {board={board}key={2}currentColor={state.fill}- title={`Fill Color`}+ title={t('popupToolbar.fillColor')}><labelclassName={classNames('fill-label', 'color-label', {@@ -212,9 +224,26 @@ export const PopupToolbar = () => {<PopupLinkButtonboard={board}key={3}- title={`Link`}+ title={t('popupToolbar.link')}></PopupLinkButton>)}+ {state.isLine && (+ <>+ <ArrowMarkButton+ board={board}+ key={4}+ end={'source'}+ endProperty={state.source}++ />+ <ArrowMarkButton+ board={board}+ key={5}+ end={'target'}+ endProperty={state.target}+ />+ </>+ )}</Stack.Row></Island>)}@@ -243,6 +272,8 @@ export const getDrawElementState = (fill: element.fill,strokeColor: getStrokeColorByDrawElement(board, element),marks,+ source: element?.source || {},+ target: element?.target || {},};};diff --git a/packages/drawnix/src/i18n.tsx b/packages/drawnix/src/i18n.tsxindex 009777f..b3fd174 100644--- a/packages/drawnix/src/i18n.tsx+++ b/packages/drawnix/src/i18n.tsx@@ -1,4 +1,10 @@-import React, { createContext, useContext, useState, ReactNode, useMemo } from 'react';+import React, {+ createContext,+ useContext,+ useState,+ ReactNode,+ useMemo,+} from 'react';// Define supported languagesexport type Language = 'zh' | 'en';@@ -16,13 +22,13 @@ export interface Translations {'toolbar.shape': string;'toolbar.image': string;'toolbar.extraTools': string;-+// Zoom controls'zoom.in': string;'zoom.out': string;'zoom.fit': string;'zoom.100': string;-+// Themes'theme.default': string;'theme.colorful': string;@@ -30,19 +36,19 @@ export interface Translations {'theme.retro': string;'theme.dark': string;'theme.starry': string;-+// General'general.undo': string;'general.redo': string;'general.menu': string;'general.duplicate': string;'general.delete': string;-+// Language'language.switcher': string;'language.chinese': string;'language.english': string;-+// Menu items'menu.open': string;'menu.saveFile': string;@@ -51,7 +57,7 @@ export interface Translations {'menu.exportImage.jpg': string;'menu.cleanBoard': string;'menu.github': string;-+// Dialog translations'dialog.mermaid.title': string;'dialog.mermaid.description': string;@@ -69,7 +75,7 @@ export interface Translations {'dialog.markdown.preview': string;'dialog.markdown.insert': string;'dialog.error.loadMermaid': string;-+// Extra tools menu items'extraTools.mermaidToDrawnix': string;'extraTools.markdownToDrawnix': string;@@ -79,6 +85,18 @@ export interface Translations {'cleanConfirm.description': string;'cleanConfirm.cancel': string;'cleanConfirm.ok': string;++ // popup toolbar+ 'popupToolbar.fontColor': string;+ 'popupToolbar.stroke': string;+ 'popupToolbar.fillColor': string;+ 'popupToolbar.link': string;++ //line+ 'line.source': string;+ 'line.target': string;+ 'line.arrow': string;+ 'line.none': string;}// Translation data@@ -95,13 +113,13 @@ const translations: Record<Language, Translations> = {'toolbar.shape': '形状','toolbar.image': '图片 — Cmd+U','toolbar.extraTools': '更多工具',-+// Zoom controls'zoom.in': '放大 — Cmd++','zoom.out': '缩小 — Cmd+-','zoom.fit': '自适应','zoom.100': '缩放至 100%',-+// Themes'theme.default': '默认','theme.colorful': '缤纷',@@ -109,19 +127,19 @@ const translations: Record<Language, Translations> = {'theme.retro': '复古','theme.dark': '暗夜','theme.starry': '星空',-+// General'general.undo': '撤销','general.redo': '重做','general.menu': '应用菜单','general.duplicate': '复制','general.delete': '删除',-+// Language'language.switcher': '语言','language.chinese': '中文','language.english': 'English',-+// Menu items'menu.open': '打开','menu.saveFile': '保存文件',@@ -130,7 +148,7 @@ const translations: Record<Language, Translations> = {'menu.exportImage.jpg': 'JPG','menu.cleanBoard': '清除画布','menu.github': 'GitHub',-+// Dialog translations'dialog.mermaid.title': 'Mermaid 转 Drawnix','dialog.mermaid.description': '目前仅支持',@@ -148,7 +166,7 @@ const translations: Record<Language, Translations> = {'dialog.markdown.preview': '预览','dialog.markdown.insert': '插入','dialog.error.loadMermaid': '加载 Mermaid 库失败',-+// Extra tools menu items'extraTools.mermaidToDrawnix': 'Mermaid 到 Drawnix','extraTools.markdownToDrawnix': 'Markdown 到 Drawnix',@@ -158,6 +176,18 @@ const translations: Record<Language, Translations> = {'cleanConfirm.description': '这将会清除整个画布。你是否要继续?','cleanConfirm.cancel': '取消','cleanConfirm.ok': '确认',++ // popup toolbar+ 'popupToolbar.fontColor': '字体颜色',+ 'popupToolbar.stroke': '边框',+ 'popupToolbar.fillColor': '填充颜色',+ 'popupToolbar.link': '链接',++ //+ 'line.source': '起点',+ 'line.target': '终点',+ 'line.arrow': '箭头',+ 'line.none': '无',},en: {// Toolbar items@@ -171,13 +201,13 @@ const translations: Record<Language, Translations> = {'toolbar.shape': 'Shape','toolbar.image': 'Image — Cmd+U','toolbar.extraTools': 'Extra Tools',-+// Zoom controls'zoom.in': 'Zoom In — Cmd++','zoom.out': 'Zoom Out — Cmd+-','zoom.fit': 'Fit to Screen','zoom.100': 'Zoom to 100%',-+// Themes'theme.default': 'Default','theme.colorful': 'Colorful',@@ -185,19 +215,19 @@ const translations: Record<Language, Translations> = {'theme.retro': 'Retro','theme.dark': 'Dark','theme.starry': 'Starry',-+// General'general.undo': 'Undo','general.redo': 'Redo','general.menu': 'App Menu','general.duplicate': 'Duplicate','general.delete': 'Delete',-+// Language'language.switcher': 'Language','language.chinese': '中文','language.english': 'English',-+// Menu items'menu.open': 'Open','menu.saveFile': 'Save File',@@ -206,34 +236,50 @@ const translations: Record<Language, Translations> = {'menu.exportImage.jpg': 'JPG','menu.cleanBoard': 'Clear Board','menu.github': 'GitHub',-+// Dialog translations'dialog.mermaid.title': 'Mermaid to Drawnix','dialog.mermaid.description': 'Currently supports','dialog.mermaid.flowchart': 'flowcharts',- 'dialog.mermaid.sequence': 'sequence diagrams',+ 'dialog.mermaid.sequence': 'sequence diagrams','dialog.mermaid.class': 'class diagrams',- 'dialog.mermaid.otherTypes': ', and other diagram types (rendered as images).',+ 'dialog.mermaid.otherTypes':+ ', and other diagram types (rendered as images).','dialog.mermaid.syntax': 'Mermaid Syntax','dialog.mermaid.placeholder': 'Write your Mermaid chart definition here...','dialog.mermaid.preview': 'Preview','dialog.mermaid.insert': 'Insert',- 'dialog.markdown.description': 'Supports automatic conversion of Markdown syntax to mind map.',+ 'dialog.markdown.description':+ 'Supports automatic conversion of Markdown syntax to mind map.','dialog.markdown.syntax': 'Markdown Syntax',- 'dialog.markdown.placeholder': 'Write your Markdown text definition here...',+ 'dialog.markdown.placeholder':+ 'Write your Markdown text definition here...','dialog.markdown.preview': 'Preview','dialog.markdown.insert': 'Insert','dialog.error.loadMermaid': 'Failed to load Mermaid library',-+// Extra tools menu items'extraTools.mermaidToDrawnix': 'Mermaid to Drawnix','extraTools.markdownToDrawnix': 'Markdown to Drawnix',// Clean confirm dialog'cleanConfirm.title': 'Clear Board',- 'cleanConfirm.description': 'This will clear the entire board. Do you want to continue?',+ 'cleanConfirm.description':+ 'This will clear the entire board. Do you want to continue?','cleanConfirm.cancel': 'Cancel','cleanConfirm.ok': 'OK',++ // popup toolbar+ 'popupToolbar.fontColor': 'Font Color',+ 'popupToolbar.stroke': 'Stroke',+ 'popupToolbar.fillColor': 'Fill Color',+ 'popupToolbar.link': 'Link',++ //line+ 'line.source': 'Start',+ 'line.target': 'End',+ 'line.arrow': 'Arrow',+ 'line.none': 'None',},};@@ -254,9 +300,9 @@ interface I18nProviderProps {}// I18nProvider component-export const I18nProvider: React.FC<I18nProviderProps> = ({- children,- defaultLanguage = 'zh'+export const I18nProvider: React.FC<I18nProviderProps> = ({+ children,+ defaultLanguage = 'zh',}) => {const [language, setLanguage] = useState<Language>(defaultLanguage);@@ -264,29 +310,28 @@ export const I18nProvider: React.FC<I18nProviderProps> = ({return translations[language][key] || key;};- const value: I18nContextType = useMemo(() => ({- language,- setLanguage,- t,- }), [language]);-- return (- <I18nContext.Provider value={value}>- {children}- </I18nContext.Provider>+ const value: I18nContextType = useMemo(+ () => ({+ language,+ setLanguage,+ t,+ }),+ [language]);++ return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>;};// useI18n hookexport const useI18n = (): I18nContextType => {const context = useContext(I18nContext);-+if (!context) {throw new Error('useI18n must be used within I18nProvider');}-+return context;};// Export types for external use-export type { I18nContextType };\ No newline at end of file+export type { I18nContextType };