Skip to content

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

feat(active-toolbar): add active toolbar

pubuzhixing87e737a207b8c
diff --git a/package-lock.json b/package-lock.json
index 9c7645b..b333517 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
"version": "0.0.0",
"license": "MIT",
"dependencies": {
+ "@floating-ui/react": "^0.26.24",
"@plait/common": "^0.66.1",
"@plait/core": "^0.66.1",
"@plait/draw": "^0.66.1",
@@ -2659,6 +2660,20 @@
"@floating-ui/core": "^0.7.3"
}
},
+ "node_modules/@floating-ui/react": {
+ "version": "0.26.24",
+ "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.24.tgz",
+ "integrity": "sha512-2ly0pCkZIGEQUq5H8bBK0XJmc1xIK/RM3tvVzY3GBER7IOD1UgmC2Y2tjj4AuS+TC+vTE1KJv2053290jua0Sw==",
+ "dependencies": {
+ "@floating-ui/react-dom": "^2.1.2",
+ "@floating-ui/utils": "^0.2.8",
+ "tabbable": "^6.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
"node_modules/@floating-ui/react-dom": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz",
@@ -2672,6 +2687,40 @@
"react-dom": ">=16.8.0"
}
},
+ "node_modules/@floating-ui/react/node_modules/@floating-ui/core": {
+ "version": "1.6.8",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
+ "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+ "dependencies": {
+ "@floating-ui/utils": "^0.2.8"
+ }
+ },
+ "node_modules/@floating-ui/react/node_modules/@floating-ui/dom": {
+ "version": "1.6.11",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz",
+ "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==",
+ "dependencies": {
+ "@floating-ui/core": "^1.6.0",
+ "@floating-ui/utils": "^0.2.8"
+ }
+ },
+ "node_modules/@floating-ui/react/node_modules/@floating-ui/react-dom": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
+ "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+ "dependencies": {
+ "@floating-ui/dom": "^1.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
+ "node_modules/@floating-ui/utils": {
+ "version": "0.2.8",
+ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+ "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
+ },
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.14",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -14588,6 +14637,11 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
"dev": true
},
+ "node_modules/tabbable": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+ "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
+ },
"node_modules/tapable": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
diff --git a/package.json b/package.json
index 768235b..0941280 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
},
"private": true,
"dependencies": {
+ "@floating-ui/react": "^0.26.24",
"@plait/common": "^0.66.1",
"@plait/core": "^0.66.1",
"@plait/draw": "^0.66.1",
diff --git a/packages/drawnix/src/components/color-picker.scss b/packages/drawnix/src/components/color-picker.scss
new file mode 100644
index 0000000..3b41139
--- /dev/null
+++ b/packages/drawnix/src/components/color-picker.scss
@@ -0,0 +1,38 @@
+@import "open-color/open-color.scss";
+
+.color-select-item {
+ width: var(--default-button-size);
+ height: var(--default-button-size);
+ border-radius: 50%;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ border: 1px solid var(--color-gray-30);
+ cursor: pointer;
+ padding: 0;
+ &.active {
+ border-color: var(--color-primary);
+ &.transparent {
+ .selected-icon {
+ background-color: $oc-white;
+ }
+ }
+ }
+ .selected-icon {
+ stroke: currentColor;
+ outline: none;
+ position: absolute;
+ width: var(--default-icon-size);
+ height: var(--default-icon-size);
+
+ }
+ &.transparent {
+ border: none;
+ .transparent-icon {
+ display: block;
+ width: var(-default-button-size);
+ height: var(-default-button-size);
+ color: rgba($oc-black, 0.4);
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/drawnix/src/components/color-picker.tsx b/packages/drawnix/src/components/color-picker.tsx
new file mode 100644
index 0000000..1e1eb90
--- /dev/null
+++ b/packages/drawnix/src/components/color-picker.tsx
@@ -0,0 +1,82 @@
+import { CSSProperties, useState } from 'react';
+import { Check, TransparentIcon } from './icons';
+import { Island } from './island';
+import Stack from '../components/stack';
+import './color-picker.scss';
+import { splitRows } from '../utils';
+import classNames from 'classnames';
+import { ATTACHED_ELEMENT_CLASS_NAME } from '@plait/core';
+import React from 'react';
+
+const CLASSIC_COLORS = [
+ { name: 'Transparent', value: 'transparent' },
+ { name: 'Black', value: '#000000' },
+ { name: 'White', value: '#FFFFFF' },
+ { name: 'Gray', value: '#808080' },
+ { name: 'Deep Blue', value: '#1E90FF' },
+ { name: 'Red', value: '#FF4500' },
+ { name: 'Green', value: '#2ECC71' },
+ { name: 'Yellow', value: '#FFD700' },
+ { name: 'Purple', value: '#8A2BE2' },
+ { name: 'Orange', value: '#FFA500' },
+ { name: 'Pastel Pink', value: '#FFB3BA' },
+ { name: 'Cyan', value: '#00CED1' },
+ { name: 'Brown', value: '#8B4513' },
+ { name: 'Forest Green', value: '#228B22' },
+ { name: 'Light Gray', value: '#D3D3D3' },
+];
+
+const ROWS_CLASSIC_COLORS = splitRows(CLASSIC_COLORS, 4);
+
+export type ColorPickerProps = {
+ onSelect: (color: string) => void;
+ currentColor?: string;
+ style?: CSSProperties;
+ className?: string;
+};
+
+export const ColorPicker = React.forwardRef((props: ColorPickerProps, ref) => {
+ const { onSelect, currentColor } = props;
+ const innerRef = React.useRef(null);
+ React.useImperativeHandle(ref, () => innerRef.current);
+ const [selectedColor, setSelectedColor] = useState(
+ currentColor || ROWS_CLASSIC_COLORS[0][0].value
+ );
+ return (
+ <Island
+ ref={innerRef}
+ padding={4}
+ className={classNames(`${ATTACHED_ELEMENT_CLASS_NAME}`, props.className)}
+ style={props.style}
+ >
+ <Stack.Col gap={2}>
+ {ROWS_CLASSIC_COLORS.map((colors, index) => (
+ <Stack.Row key={index} gap={2}>
+ {colors.map((color) => {
+ return (
+ <button
+ key={color.value}
+ className={`color-select-item ${
+ selectedColor === color.value ? 'active' : ''
+ } ${color.value === 'transparent' ? 'transparent' : ''}`}
+ style={{
+ backgroundColor: color.value,
+ color: color.value === '#000000' ? '#FFFFFF' : '#000000',
+ }}
+ onClick={() => {
+ setSelectedColor(color.value);
+ onSelect(color.value);
+ }}
+ title={color.name}
+ >
+ {color.value === 'transparent' && TransparentIcon}
+ {selectedColor === color.value && Check}
+ </button>
+ );
+ })}
+ </Stack.Row>
+ ))}
+ </Stack.Col>
+ </Island>
+ );
+});
diff --git a/packages/drawnix/src/components/icons.tsx b/packages/drawnix/src/components/icons.tsx
index d1c45f1..3a952b3 100644
--- a/packages/drawnix/src/components/icons.tsx
+++ b/packages/drawnix/src/components/icons.tsx
@@ -230,3 +230,64 @@ export const OpenFileIcon = createIcon(
</g>
</svg>
);
+
+export const BackgroundColorIcon = createIcon(
+ <svg viewBox="0 0 24 24" className="background-color-icon">
+ <g
+ xmlns="http://www.w3.org/2000/svg"
+ transform="translate(1 1)"
+ fillRule="evenodd"
+ fill="#000"
+ >
+ <circle fillOpacity=".04" r="11" cy="11" cx="11"></circle>
+ <path
+ d="M17 20.221V17h3.221A11.06 11.06 0 0 1 17 20.221zm-12 0A11.06 11.06 0 0 1 1.779 17H5v3.221zM20.221 5H17V1.779A11.06 11.06 0 0 1 20.221 5zM9 .181V1H6.411A10.919 10.919 0 0 1 9 .181zM15.589 1H13V.181c.907.167 1.775.445 2.589.819zM13 21.819V21h2.589c-.814.374-1.682.652-2.589.819zm-4 0A10.919 10.919 0 0 1 6.411 21H9v.819zm-8-6.23A10.919 10.919 0 0 1 .181 13H1v2.589zm0-9.178V9H.181C.348 8.093.626 7.225 1 6.411zM21.819 9H21V6.411c.374.814.652 1.682.819 2.589zM21 15.589V13h.819A10.919 10.919 0 0 1 21 15.589zM5 1.779V5H1.779A11.06 11.06 0 0 1 5 1.779zM5 13h4v4H5v-4zm8 0h4v4h-4v-4zM5 5h4v4H5V5zm8 0h4v4h-4V5zm0 12v4H9v-4h4zm8-8v4h-4V9h4zm-8 0v4H9V9h4zM5 9v4H1V9h4zm8-8v4H9V1h4z"
+ fillOpacity=".12"
+ ></path>
+ </g>
+ </svg>
+);
+
+export const TransparentIcon = createIcon(
+ <svg viewBox="0 0 32 32" className="transparent-icon">
+ <g
+ xmlns="http://www.w3.org/2000/svg"
+ fillRule="nonzero"
+ fill="currentColor"
+ >
+ <path d="M2 16c0 7.733 6.267 14 14 14s14-6.267 14-14S23.733 2 16 2 2 8.267 2 16zm-1 0C1 7.716 7.714 1 16 1c8.284 0 15 6.714 15 15 0 8.284-6.714 15-15 15-8.284 0-15-6.714-15-15z"></path>
+ <path d="M6.354 26.354l-.708-.708 20-20 .708.708z"></path>
+ </g>
+ </svg>
+);
+
+export const Check = createIcon(
+ <svg
+ className="selected-icon"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 24 24"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="2"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ >
+ <polyline points="20 6 9 17 4 12"></polyline>
+ </svg>
+);
+
+export const StrokeIcon = createIcon(
+ <svg viewBox="0 0 24 24" className="stroke-icon">
+ <g xmlns="http://www.w3.org/2000/svg" fillRule="evenodd" fill="#000">
+ <path
+ d="M12 5a7 7 0 1 0 0 14 7 7 0 0 0 0-14zm0-4c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1z"
+ fillRule="nonzero"
+ fillOpacity=".04"
+ ></path>
+ <path
+ d="M12 5V1c1.491 0 2.914.297 4.21.835L14.68 5.53A6.979 6.979 0 0 0 12 5zm4.95 2.048l2.828-2.828a11.016 11.016 0 0 1 2.388 3.568l-3.697 1.53a7.01 7.01 0 0 0-1.519-2.27zM19 12h4c0 1.491-.297 2.914-.835 4.21l-3.696-1.53c.342-.826.531-1.73.531-2.68zm-2.05 4.95l2.828 2.828a11.016 11.016 0 0 1-3.567 2.387l-1.532-3.696a7.01 7.01 0 0 0 2.27-1.52zM12 19v4c-1.491 0-2.914-.297-4.21-.835l1.53-3.696c.826.342 1.73.531 2.68.531zm-4.95-2.05l-2.828 2.828a11.016 11.016 0 0 1-2.387-3.567l3.696-1.532a7.01 7.01 0 0 0 1.52 2.27zM5 12H1c0-1.491.297-2.914.835-4.21L5.53 9.32A6.979 6.979 0 0 0 5 12zm2.05-4.95L4.222 4.222a11.016 11.016 0 0 1 3.567-2.387L9.321 5.53a7.01 7.01 0 0 0-2.27 1.52z"
+ fillOpacity=".12"
+ ></path>
+ </g>
+ </svg>
+);
diff --git a/packages/drawnix/src/components/tool-icon.scss b/packages/drawnix/src/components/tool-icon.scss
index c463450..b71bb24 100644
--- a/packages/drawnix/src/components/tool-icon.scss
+++ b/packages/drawnix/src/components/tool-icon.scss
@@ -6,6 +6,7 @@
border-radius: var(--border-radius-md);
display: inline-flex;
align-items: center;
+ justify-content: center;
position: relative;
cursor: pointer;
-webkit-tap-highlight-color: transparent;
@@ -55,6 +56,11 @@
width: var(--lg-icon-size);
height: var(--lg-icon-size);
outline: none;
+ &.background-color-icon, &.stroke-icon {
+ stroke: none;
+ width: var(--xlg-icon-size);
+ height: var(--xlg-icon-size);
+ }
}
}
diff --git a/packages/drawnix/src/components/toolbar/active-toolbar.scss b/packages/drawnix/src/components/toolbar/active-toolbar.scss
new file mode 100644
index 0000000..4cc4b61
--- /dev/null
+++ b/packages/drawnix/src/components/toolbar/active-toolbar.scss
@@ -0,0 +1,23 @@
+.property-button {
+ height: var(--lg-button-size);
+ width: var(--lg-button-size);
+ .color-label {
+ cursor: pointer;
+ }
+ .fill-label {
+ display: inline-block;
+ width: var(--xlg-icon-size);
+ height: var(--xlg-icon-size);
+ border-radius: 50%;
+ &.color-white {
+ border: 1px solid var(--color-gray-30);
+ }
+ }
+ .stroke-label {
+ border-radius: 50%;
+ width: calc(var(--xlg-icon-size) - var(--border-radius-lg));
+ height: calc(var(--xlg-icon-size) - var(--border-radius-lg));
+ border-width: var(--border-radius-sm);
+ border-style: solid;
+ }
+}
diff --git a/packages/drawnix/src/components/toolbar/active-toolbar.tsx b/packages/drawnix/src/components/toolbar/active-toolbar.tsx
new file mode 100644
index 0000000..4391350
--- /dev/null
+++ b/packages/drawnix/src/components/toolbar/active-toolbar.tsx
@@ -0,0 +1,172 @@
+import Stack from '../stack';
+import { BackgroundColorIcon, StrokeIcon } from '../icons';
+import {
+ ATTACHED_ELEMENT_CLASS_NAME,
+ getSelectedElements,
+ isSelectionMoving,
+ Path,
+ PlaitBoard,
+ PlaitElement,
+ SELECTION_RECTANGLE_BOUNDING_CLASS_NAME,
+ SELECTION_RECTANGLE_CLASS_NAME,
+ Transforms,
+} from '@plait/core';
+import React, { useEffect } from 'react';
+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 './active-toolbar.scss';
+import {
+ DrawTransforms,
+ getMemorizeKey,
+ getStrokeColorByElement,
+ isDrawElementClosed,
+ PlaitDrawElement,
+} from '@plait/draw';
+import { ActiveColorToolButton } from './color-tool-button';
+import { PropertyTransforms } from '@plait/common';
+
+export type DrawActiveProps = {};
+
+export const ActiveToolbar: React.FC<DrawActiveProps> = ({}) => {
+ const board = useBoard();
+ const selectedElements = getSelectedElements(board);
+ const isOpen = selectedElements.length > 0 && !isSelectionMoving(board);
+
+ const { viewport, selection } = board;
+ const { refs, floatingStyles } = useFloating({
+ placement: 'top',
+ middleware: [offset(32), flip()],
+ });
+
+ let state: { fill: string | undefined; strokeColor: string | undefined } = {
+ fill: 'red',
+ strokeColor: undefined,
+ };
+
+ if (isOpen) {
+ state = getElementState(board);
+ }
+
+ useEffect(() => {
+ if (isOpen) {
+ let selectionG = PlaitBoard.getBoardContainer(board).querySelector(
+ `.${SELECTION_RECTANGLE_BOUNDING_CLASS_NAME}`
+ );
+ if (!selectionG) {
+ selectionG = PlaitBoard.getBoardContainer(board).querySelector(
+ `.${SELECTION_RECTANGLE_CLASS_NAME}`
+ );
+ }
+ refs.setPositionReference(selectionG);
+ }
+ }, [viewport, selection]);
+
+ return (
+ <>
+ {isOpen && (
+ <div ref={refs.setFloating} style={floatingStyles}>
+ <Island
+ padding={1}
+ className={classNames(
+ 'active-toolbar',
+ ATTACHED_ELEMENT_CLASS_NAME
+ )}
+ >
+ <Stack.Row gap={1}>
+ <ActiveColorToolButton
+ key={0}
+ currentColor={state.fill}
+ container={refs.floating.current}
+ title={`Fill Color`}
+ transparentIcon={BackgroundColorIcon}
+ onSelect={(selectedColor: string) => {
+ PropertyTransforms.setFillColor(board, selectedColor, {
+ getMemorizeKey,
+ callback: (element: PlaitElement, path: Path) => {
+ const tableElement =
+ PlaitDrawElement.isElementByTable(element);
+ if (tableElement) {
+ DrawTransforms.setTableFill(
+ board,
+ element,
+ selectedColor,
+ path
+ );
+ } else {
+ if (isDrawElementClosed(element as PlaitDrawElement)) {
+ Transforms.setNode(
+ board,
+ { fill: selectedColor },
+ path
+ );
+ }
+ }
+ },
+ });
+ }}
+ >
+ <label
+ className={classNames('fill-label', 'color-label', {
+ 'color-white': state.fill === '#FFFFFF',
+ })}
+ style={{ backgroundColor: state.fill }}
+ ></label>
+ </ActiveColorToolButton>
+ <ActiveColorToolButton
+ key={1}
+ currentColor={state.strokeColor}
+ container={refs.floating.current}
+ title={`Stroke`}
+ transparentIcon={StrokeIcon}
+ onSelect={(selectedColor: string) => {
+ console.log(`selectedColor: ${selectedColor}`);
+ PropertyTransforms.setStrokeColor(board, selectedColor, {
+ getMemorizeKey,
+ });
+ }}
+ >
+ <label
+ className={classNames('stroke-label', 'color-label', {
+ 'color-white': state.fill === '#FFFFFF',
+ })}
+ style={{ borderColor: state.strokeColor }}
+ ></label>
+ </ActiveColorToolButton>
+ </Stack.Row>
+ </Island>
+ </div>
+ )}
+ </>
+ );
+};
+
+export const getMindElementState = (
+ board: PlaitBoard,
+ element: MindElement
+) => {
+ return {
+ fill: element.fill,
+ strokeColor: getStrokeByMindElement(board, element),
+ };
+};
+
+export const getDrawElementState = (
+ board: PlaitBoard,
+ element: PlaitDrawElement
+) => {
+ return {
+ fill: element.fill,
+ strokeColor: getStrokeColorByElement(board, element),
+ };
+};
+
+export const getElementState = (board: PlaitBoard) => {
+ const selectedElement = getSelectedElements(board)[0];
+ if (MindElement.isMindElement(board, selectedElement)) {
+ return getMindElementState(board, selectedElement);
+ }
+ return getDrawElementState(board, selectedElement as PlaitDrawElement);
+};
diff --git a/packages/drawnix/src/components/toolbar/color-tool-button.tsx b/packages/drawnix/src/components/toolbar/color-tool-button.tsx
new file mode 100644
index 0000000..8c62b56
--- /dev/null
+++ b/packages/drawnix/src/components/toolbar/color-tool-button.tsx
@@ -0,0 +1,80 @@
+import React, { ReactNode, useState } from 'react';
+import { ColorPicker } from '../color-picker';
+import { ToolButton } from '../tool-button';
+import classNames from 'classnames';
+import {
+ autoUpdate,
+ flip,
+ offset,
+ useClick,
+ useDismiss,
+ useFloating,
+ useInteractions,
+ useRole,
+} from '@floating-ui/react';
+
+export type ActiveFillToolButtonProps = {
+ currentColor: string | undefined;
+ container: HTMLElement | undefined | null;
+ transparentIcon: ReactNode;
+ title: string;
+ children?: React.ReactNode;
+ onSelect: (selectedColor: string) => void;
+};
+
+export const ActiveColorToolButton: React.FC<ActiveFillToolButtonProps> = ({
+ currentColor,
+ container,
+ transparentIcon,
+ title,
+ children,
+ onSelect,
+}) => {
+ const [isOpen, setIsOpen] = useState(false);
+ const { refs, floatingStyles, context } = useFloating({
+ placement: 'left',
+ open: isOpen,
+ onOpenChange: setIsOpen,
+ whileElementsMounted: autoUpdate,
+ middleware: [offset(8), flip()],
+ });
+
+ const click = useClick(context);
+ const dismiss = useDismiss(context);
+ const role = useRole(context);
+
+ const { getReferenceProps } = useInteractions([click, dismiss, role]);
+
+ return (
+ <>
+ <div ref={refs.setReference}>
+ <ToolButton
+ className={classNames(`property-button`)}
+ visible={true}
+ icon={
+ currentColor && currentColor !== 'transparent'
+ ? undefined
+ : transparentIcon
+ }
+ type="button"
+ title={title}
+ aria-label={title}
+ {...getReferenceProps()}
+ >
+ {currentColor && currentColor !== 'transparent' && children}
+ </ToolButton>
+ </div>
+
+ {isOpen && (
+ <ColorPicker
+ ref={refs.setFloating}
+ style={floatingStyles}
+ onSelect={(selectedColor) => {
+ onSelect(selectedColor);
+ }}
+ currentColor={currentColor}
+ ></ColorPicker>
+ )}
+ </>
+ );
+};
diff --git a/packages/drawnix/src/components/toolbar/shape-panel.tsx b/packages/drawnix/src/components/toolbar/shape-panel.tsx
index 795dac0..0d472c0 100644
--- a/packages/drawnix/src/components/toolbar/shape-panel.tsx
+++ b/packages/drawnix/src/components/toolbar/shape-panel.tsx
@@ -15,6 +15,7 @@ import React from 'react';
import { BoardCreationMode, setCreationMode } from '@plait/common';
import { BasicShapes, DrawPointerType } from '@plait/draw';
import { useBoard } from '@plait/react-board';
+import { splitRows } from '../../utils';
export interface ShapeProps {
icon: React.ReactNode;
@@ -22,14 +23,6 @@ export interface ShapeProps {
pointer: DrawPointerType;
}
-const splitRows = (shapes: ShapeProps[], cols: number) => {
- let result = [];
- for (let i = 0; i < shapes.length; i += cols) {
- result.push(shapes.slice(i, i + cols));
- }
- return result;
-};
-
const SHAPES: ShapeProps[] = [
{
icon: RectangleIcon,
diff --git a/packages/drawnix/src/drawnix.tsx b/packages/drawnix/src/drawnix.tsx
index faa1b03..406141e 100644
--- a/packages/drawnix/src/drawnix.tsx
+++ b/packages/drawnix/src/drawnix.tsx
@@ -19,6 +19,7 @@ import { DrawToolbar } from './components/toolbar/draw-toolbar';
import './styles/index.scss';
import { MainMenu } from './components/main-menu/main-menu';
import { ZoomToolbar } from './components/toolbar/zoom-toolbar';
+import { ActiveToolbar } from './components/toolbar/active-toolbar';
export type DrawnixProps = {
value: PlaitElement[];
@@ -60,7 +61,7 @@ export const Drawnix: React.FC<DrawnixProps> = ({ value, onChange }) => {
options={options}
plugins={plugins}
onChange={(data: BoardChangeData) => {
- console.log(JSON.stringify(data));
+ // console.log(JSON.stringify(data));
}}
>
<Board></Board>
@@ -71,6 +72,7 @@ export const Drawnix: React.FC<DrawnixProps> = ({ value, onChange }) => {
}}
></DrawToolbar>
<ZoomToolbar></ZoomToolbar>
+ <ActiveToolbar></ActiveToolbar>
</Wrapper>
</div>
);
diff --git a/packages/drawnix/src/styles/theme.scss b/packages/drawnix/src/styles/theme.scss
index 2c39a8a..4177c22 100644
--- a/packages/drawnix/src/styles/theme.scss
+++ b/packages/drawnix/src/styles/theme.scss
@@ -16,6 +16,7 @@
--default-icon-size: 1rem;
--lg-button-size: 2.25rem;
--lg-icon-size: 1.125rem;
+ --xlg-icon-size: 1.375rem;
--editor-container-padding: 1rem;
@media screen and (min-device-width: 1921px) {
diff --git a/packages/drawnix/src/utils.ts b/packages/drawnix/src/utils.ts
index ee9230f..24f8d98 100644
--- a/packages/drawnix/src/utils.ts
+++ b/packages/drawnix/src/utils.ts
@@ -70,3 +70,11 @@ export function download(blob: Blob | MediaSource, filename: string) {
window.URL.revokeObjectURL(url);
a.remove();
}
+
+export const splitRows = <T>(shapes: T[], cols: number) => {
+ let result = [];
+ for (let i = 0; i < shapes.length; i += cols) {
+ result.push(shapes.slice(i, i + cols));
+ }
+ return result;
+};