Skip to content

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

feat(popup-toolbar): bump plait into 0.71.0 and mind node link stroke and node stroke support dashed/dotted style #22

pubuzhixing8dfbf2b3a5632
diff --git a/package-lock.json b/package-lock.json
index 7455ae8..d32257e 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.70.0",
- "@plait/core": "^0.70.0",
- "@plait/draw": "^0.70.0",
- "@plait/layouts": "^0.70.0",
- "@plait/mind": "^0.70.0",
- "@plait/text-plugins": "^0.70.0",
+ "@plait/common": "^0.71.0",
+ "@plait/core": "^0.71.0",
+ "@plait/draw": "^0.71.0",
+ "@plait/layouts": "^0.71.0",
+ "@plait/mind": "^0.71.0",
+ "@plait/text-plugins": "^0.71.0",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
@@ -4345,17 +4345,17 @@
}
},
"node_modules/@plait/common": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.70.0.tgz",
- "integrity": "sha512-+8/pvOBDT1wrdqCXGs4jksQgtueegFiGX0r8xK4/8UB0BMWDtT9leC1wHchWjJmZNmjXECdqTIvm1aVeFvBw6g==",
+ "version": "0.71.0",
+ "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.71.0.tgz",
+ "integrity": "sha512-iDZmsTlp+BnaqI1/YT2/AZlFUth64A8PZFRnO6Lv6e9HVkbTG5dYMPyDhrC8SKksPTYJl91gXRucbRNwxko7KQ==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/core": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.70.0.tgz",
- "integrity": "sha512-kJgs64phq8Yq/1lqkeTku8CmMXoAixz3NaZCm72p7qhsozk5s02czWPqlXFlEO74Mv0tSIhF0QDopO3QbIS66w==",
+ "version": "0.71.0",
+ "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.71.0.tgz",
+ "integrity": "sha512-W0bFstK2IhKZGKw0Lhmtp8QzQgi1aaCGd+uTT7Y7ON9LC+IBxwz0ig4eSs4dbsIP7LKgsnedoj1ZpwGRfUbuKw==",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4368,33 +4368,33 @@
}
},
"node_modules/@plait/draw": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.70.0.tgz",
- "integrity": "sha512-hazAC/9p9SVyzBVfRDa0NJAjuYBz151dtbFMZPpg0Mb17Ab0J4A3+Ffd/ihJoMimx45mmX5xVhmZH3BubjWiFg==",
+ "version": "0.71.0",
+ "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.71.0.tgz",
+ "integrity": "sha512-YIuSnQqGYwJCXlcDaD9ERTXXDS7aCUBbWuQxpFZOVTN58phrW4nnPrh9fmBbkij7ZtlWbYZTcZ46SbdhUWb/7w==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/layouts": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.70.0.tgz",
- "integrity": "sha512-4KiVR+GuVJHCTtQ77Q40Mzv84yk8WVWCQgDGtdwXz/pk8afyIuJU/sG86YhftkRgr2osy5TBlXEW0POhYO+KdA==",
+ "version": "0.71.0",
+ "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.71.0.tgz",
+ "integrity": "sha512-1me3JzQ8Dm/mQUUmV4lZNcxYcGeWaL62MRY9HjyXY5NMCMGXR23QeEtrtkFFsC4I//EtgiLlZmJWp+876u9TDA==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/mind": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.70.0.tgz",
- "integrity": "sha512-I0HQMDF6uWA3/QeFyzhZyZUVOXuM7PiMhWnmJBLC+YRXcj7RzkSZhmMMXR+VW0vr4xIiIyQ1rWN6vzdfiiCVsA==",
+ "version": "0.71.0",
+ "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.71.0.tgz",
+ "integrity": "sha512-DR74s925pjnlMRvIEA45Rz+2scMJYP9dXSCWcPNlZ+9sbIWAw3cO1t+TmSb18YuZeFecmsQduMLQoupvOP39+w==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/text-plugins": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.70.0.tgz",
- "integrity": "sha512-J1V6CTlNbgeGcilFtzDhkg83z5MELd+4Z73Z3abtxYex2Zh+hCfzD/q9kD+uPA1R7qvamptt6ineD6KRNss3cg==",
+ "version": "0.71.0",
+ "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.71.0.tgz",
+ "integrity": "sha512-W0UfT7XHMAVyJhBT62SMn918mQGQtTB6TXZG+VIncJj50g4Byc2HzqOvymiu+XazXlOim+DkmnjIHoW8w13dCQ==",
"dependencies": {
"tslib": "^2.3.0"
}
@@ -7373,6 +7373,20 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/bl": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -7675,18 +7689,43 @@
}
},
"node_modules/chokidar": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
- "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
"dev": true,
+ "optional": true,
+ "peer": true,
"dependencies": {
- "readdirp": "^4.0.1"
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
},
"engines": {
- "node": ">= 14.16.0"
+ "node": ">= 8.10.0"
},
"funding": {
"url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/chokidar/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
}
},
"node_modules/chrome-trace-event": {
@@ -10764,6 +10803,20 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "binary-extensions": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/is-boolean-object": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
@@ -14093,16 +14146,17 @@
}
},
"node_modules/readdirp": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
- "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"dev": true,
- "engines": {
- "node": ">= 14.16.0"
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "picomatch": "^2.2.1"
},
- "funding": {
- "type": "individual",
- "url": "https://paulmillr.com/funding/"
+ "engines": {
+ "node": ">=8.10.0"
}
},
"node_modules/regenerate": {
@@ -14488,6 +14542,34 @@
"@parcel/watcher": "^2.4.1"
}
},
+ "node_modules/sass/node_modules/chokidar": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+ "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+ "dev": true,
+ "dependencies": {
+ "readdirp": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 14.16.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ }
+ },
+ "node_modules/sass/node_modules/readdirp": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+ "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 14.16.0"
+ },
+ "funding": {
+ "type": "individual",
+ "url": "https://paulmillr.com/funding/"
+ }
+ },
"node_modules/saxes": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
diff --git a/package.json b/package.json
index e96723d..db5fd99 100644
--- a/package.json
+++ b/package.json
@@ -10,12 +10,12 @@
"private": true,
"dependencies": {
"@floating-ui/react": "^0.26.24",
- "@plait/common": "^0.70.0",
- "@plait/core": "^0.70.0",
- "@plait/draw": "^0.70.0",
- "@plait/layouts": "^0.70.0",
- "@plait/mind": "^0.70.0",
- "@plait/text-plugins": "^0.70.0",
+ "@plait/common": "^0.71.0",
+ "@plait/core": "^0.71.0",
+ "@plait/draw": "^0.71.0",
+ "@plait/layouts": "^0.71.0",
+ "@plait/mind": "^0.71.0",
+ "@plait/text-plugins": "^0.71.0",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx
index a5860bb..498ba01 100644
--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx
+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx
@@ -18,13 +18,16 @@ import { useBoard } from '@plait/react-board';
import { flip, offset, useFloating } from '@floating-ui/react';
import { Island } from '../../island';
import classNames from 'classnames';
-import { getStrokeByMindElement, MindElement } from '@plait/mind';
+import {
+ getStrokeColorByElement as getStrokeColorByMindElement,
+ MindElement,
+} from '@plait/mind';
import './popup-toolbar.scss';
import {
DrawTransforms,
getMemorizeKey,
getSelectedTableCellsEditor,
- getStrokeColorByElement,
+ getStrokeColorByElement as getStrokeColorByDrawElement,
isDrawElementClosed,
isDrawElementsIncludeText,
PlaitDrawElement,
@@ -269,7 +272,7 @@ export const getMindElementState = (
const marks = getTextMarksByElement(element);
return {
fill: element.fill,
- strokeColor: getStrokeByMindElement(board, element),
+ strokeColor: getStrokeColorByMindElement(board, element),
marks,
};
};
@@ -288,7 +291,7 @@ export const getDrawElementState = (
}
return {
fill: element.fill,
- strokeColor: getStrokeColorByElement(board, element),
+ strokeColor: getStrokeColorByDrawElement(board, element),
marks,
};
};
@@ -337,10 +340,7 @@ export const hasStrokeStyleProperty = (
board: PlaitBoard,
element: PlaitElement
) => {
- return (
- hasStrokeProperty(board, element) &&
- !MindElement.isMindElement(board, element)
- );
+ return hasStrokeProperty(board, element);
};
export const hasTextProperty = (board: PlaitBoard, element: PlaitElement) => {