开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
feat(popup-toolbar): support set branch color remove color property when select transparent #17
pubuzhixing8e4b69d832c26
diff --git a/package-lock.json b/package-lock.jsonindex 2c74766..a0a142b 100644--- a/package-lock.json+++ b/package-lock.json@@ -10,12 +10,12 @@"license": "MIT","dependencies": {"@floating-ui/react": "^0.26.24",- "@plait/common": "^0.67.2",- "@plait/core": "^0.67.2",- "@plait/draw": "^0.67.2",- "@plait/layouts": "^0.67.2",- "@plait/mind": "^0.67.2",- "@plait/text-plugins": "^0.67.2",+ "@plait/common": "^0.68.0",+ "@plait/core": "^0.68.0",+ "@plait/draw": "^0.68.0",+ "@plait/layouts": "^0.68.0",+ "@plait/mind": "^0.68.0",+ "@plait/text-plugins": "^0.68.0","@radix-ui/react-popover": "^1.0.3","ahooks": "^3.8.0","browser-fs-access": "^0.35.0",@@ -3927,17 +3927,17 @@}},"node_modules/@plait/common": {- "version": "0.67.2",- "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.67.2.tgz",- "integrity": "sha512-O1ue8Kvv+6OInaMtYQJ6aKgWpRwsanre7t4hMc2HX3qhjv2rfiokPEIMuMkJyR3HCmbQ3fQV5arVHM7BYF7UfQ==",+ "version": "0.68.0",+ "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.68.0.tgz",+ "integrity": "sha512-PLc4Hek74Gf95lxmfXBgaZGj5p+E+9Prd5wMeXiAdKzM6O84l/5vgMCGuPlOMRyBujpb3ib0fZos8wmmVo4jeg==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/core": {- "version": "0.67.2",- "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.67.2.tgz",- "integrity": "sha512-RfzTYAKwXVq0jEAeGL8YgRdxlpsnobeYL7+UZTTbyjyw5Ly9c6dG+C6nps3jBVln7jvMLjYYgnpFjnzrcqj9Zw==",+ "version": "0.68.0",+ "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.68.0.tgz",+ "integrity": "sha512-vSLtWn5+Hgio4DsGsl/i++itYrBJmR7VY0wNYeR7idCqzcUtAXmsE36eT2dEh71bH8GKPrXC88HqnY0FejtAUA==","dependencies": {"tslib": "^2.3.0"},@@ -3950,33 +3950,33 @@}},"node_modules/@plait/draw": {- "version": "0.67.2",- "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.67.2.tgz",- "integrity": "sha512-E2VzkGQrWpfcu00loM0JTWIQ1qdDbGRy9z8uwNLo5SdV4byUPlcZPnwHsx0U4pwBFqYMn4lf9VJ2NteLFt45mA==",+ "version": "0.68.0",+ "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.68.0.tgz",+ "integrity": "sha512-FgXuWlfA9kYQaipDO57uVg5c3sv5xwhkvlo4TOekIyb/PEs6gR9UhPXspAwD5Eq4sCWjGCFYsTPW5Us8qYoXuA==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/layouts": {- "version": "0.67.2",- "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.67.2.tgz",- "integrity": "sha512-PJ1RjN5MlgQ3G/ielWHfohZjaOniXmAU6UG7sVMMPXZVzN+aAQwPziXIfDlYiUR6T0Viuq62ssCGkkpqIzslOg==",+ "version": "0.68.0",+ "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.68.0.tgz",+ "integrity": "sha512-OHP43qNIxT6A4aFy5AFwYhZiwT5GlxZrme+iTEygYK1dJ6Vq3yzSZw1/piDm0tcorlu55xg8MoXo18hCFkgufw==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/mind": {- "version": "0.67.2",- "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.67.2.tgz",- "integrity": "sha512-movgySjuXfLqszJpzPMDaO3InSL8R1vJlg4h7fT1COF0haX4TfmX6QPIu5gctSYLFFCipgMm4vSoDFUw6DCJXg==",+ "version": "0.68.0",+ "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.68.0.tgz",+ "integrity": "sha512-HjqAtw2v7r+jh7WmELXSbxoKt86dWV+ERyMG9u07+QTdEOFi2MxOPF16iWu/+rkmopRiCPgPIQeKwOeClRNtcw==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/text-plugins": {- "version": "0.67.2",- "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.67.2.tgz",- "integrity": "sha512-HOHHUEVyxpa+7nM5rACr1kSpcLgwtrOGLLdKHOj6Nte6V/F8BfE6Fetx18dJCWTsJAYp5r6hlqj52+2UZgsfrg==",+ "version": "0.68.0",+ "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.68.0.tgz",+ "integrity": "sha512-C1a0mN1EJdfiFO9dekKUhwqIvnqlZ6+Hx913+Gz/TFPW5B7a8/fiByrUlzteQ7mxQ87g3/5XOZLvw4Xw3idZ9w==","dependencies": {"tslib": "^2.3.0"}diff --git a/package.json b/package.jsonindex 2891a31..09b0458 100644--- a/package.json+++ b/package.json@@ -10,12 +10,12 @@"private": true,"dependencies": {"@floating-ui/react": "^0.26.24",- "@plait/common": "^0.67.2",- "@plait/core": "^0.67.2",- "@plait/draw": "^0.67.2",- "@plait/layouts": "^0.67.2",- "@plait/mind": "^0.67.2",- "@plait/text-plugins": "^0.67.2",+ "@plait/common": "^0.68.0",+ "@plait/core": "^0.68.0",+ "@plait/draw": "^0.68.0",+ "@plait/layouts": "^0.68.0",+ "@plait/mind": "^0.68.0",+ "@plait/text-plugins": "^0.68.0","@radix-ui/react-popover": "^1.0.3","ahooks": "^3.8.0","browser-fs-access": "^0.35.0",diff --git a/packages/drawnix/src/components/color-picker.tsx b/packages/drawnix/src/components/color-picker.tsxindex 06f2ae9..0f9a5c2 100644--- a/packages/drawnix/src/components/color-picker.tsx+++ b/packages/drawnix/src/components/color-picker.tsx@@ -12,7 +12,7 @@ import {} from '../utils/color';import React from 'react';import { SizeSlider } from './size-slider';-import { CLASSIC_COLORS, WHITE } from '../constants/color';+import { CLASSIC_COLORS, TRANSPARENT, WHITE } from '../constants/color';import { DEFAULT_COLOR } from '@plait/core';const ROWS_CLASSIC_COLORS = splitRows(CLASSIC_COLORS, 4);@@ -60,6 +60,10 @@ export const ColorPicker = React.forwardRef((props: ColorPickerProps, ref) => {}}onClick={() => {setSelectedColor(color.value);+ if (color.value === TRANSPARENT) {+ onSelect(color.value);+ return;+ }if (opacity !== 100) {onSelect(applyOpacityToHex(color.value, opacity));} else {diff --git a/packages/drawnix/src/components/popup-toolbar/popup-toolbar.tsx b/packages/drawnix/src/components/popup-toolbar/popup-toolbar.tsxindex 1b4bb9d..19457b5 100644--- a/packages/drawnix/src/components/popup-toolbar/popup-toolbar.tsx+++ b/packages/drawnix/src/components/popup-toolbar/popup-toolbar.tsx@@ -39,6 +39,7 @@ import { PopupFontColorButton } from './font-color-button';import { PopupStrokeButton } from './stroke-button';import { PopupFillButton } from './fill-button';import { isWhite, removeHexAlpha } from '../../utils/color';+import { TRANSPARENT } from '../../constants/color';export type PopupToolbarProps = {};@@ -156,7 +157,7 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {onSelect={(selectedColor: string) => {TextTransforms.setTextColor(board,- selectedColor,+ getColorPropertyValue(selectedColor),undefined,getSelectedTableCellsEditor(board));@@ -168,10 +169,25 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {currentColor={state.strokeColor}title={`Stroke`}onColorSelect={(selectedColor: string) => {- console.log(`selectedColor: ${selectedColor}`);- PropertyTransforms.setStrokeColor(board, selectedColor, {- getMemorizeKey,- });+ PropertyTransforms.setStrokeColor(+ board,+ getColorPropertyValue(selectedColor),+ {+ getMemorizeKey,+ }+ );+ const selectedElements = getSelectedElements(board);++ if (selectedElements.length) {+ selectedElements.forEach((element) => {+ const path = PlaitBoard.findPath(board, element);+ Transforms.setNode(+ board,+ { branchColor: getColorPropertyValue(selectedColor) },+ path+ );+ });+ }}}><label@@ -194,14 +210,14 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {DrawTransforms.setTableFill(board,element,- selectedColor,+ getColorPropertyValue(selectedColor),path);} else {if (isDrawElementClosed(element as PlaitDrawElement)) {Transforms.setNode(board,- { fill: selectedColor },+ { fill: getColorPropertyValue(selectedColor) },path);}@@ -212,7 +228,8 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {><labelclassName={classNames('fill-label', 'color-label', {- 'color-white': state.fill && isWhite(removeHexAlpha(state.fill)),+ 'color-white':+ state.fill && isWhite(removeHexAlpha(state.fill)),})}style={{ backgroundColor: state.fill }}></label>@@ -288,3 +305,11 @@ export const hasTextProperty = (board: PlaitBoard, element: PlaitElement) => {}return false;};++export const getColorPropertyValue = (color: string) => {+ if (color === TRANSPARENT) {+ return null;+ } else {+ return color;+ }+};