开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
feat(color-picker): support merge operations for update opacity #4 (#45)
pubuzhixing8fe213247506b
diff --git a/packages/drawnix/src/components/color-picker.tsx b/packages/drawnix/src/components/color-picker.tsxindex 7698b98..ce4892f 100644--- a/packages/drawnix/src/components/color-picker.tsx+++ b/packages/drawnix/src/components/color-picker.tsx@@ -12,22 +12,31 @@ import {} from '../utils/color';import React from 'react';import { SizeSlider } from './size-slider';+import {+ DEFAULT_COLOR,+ isNullOrUndefined,+ MERGING,+ PlaitHistoryBoard,+} from '@plait/core';import {CLASSIC_COLORS,NO_COLOR,TRANSPARENT,WHITE,} from '../constants/color';-import { DEFAULT_COLOR, isNullOrUndefined } from '@plait/core';+import { useBoard } from '@plait/react-board';const ROWS_CLASSIC_COLORS = splitRows(CLASSIC_COLORS, 4);export type ColorPickerProps = {onSelect: (color: string) => void;+ onColorChange?: (color: string) => void;+ onOpacityChange?: (opacity: number) => void;currentColor?: string;};export const ColorPicker = React.forwardRef((props: ColorPickerProps, ref) => {+ const board = useBoard();const { onSelect, currentColor } = props;const [selectedColor, setSelectedColor] = useState((currentColor && removeHexAlpha(currentColor)) ||@@ -38,55 +47,67 @@ export const ColorPicker = React.forwardRef((props: ColorPickerProps, ref) => {return (!isNullOrUndefined(_opacity) ? _opacity : 100) as number;});return (- <Stack.Col gap={3}>- <SizeSlider- step={5}- defaultValue={opacity}- onChange={(value) => {- setOpacity(value);- onSelect(applyOpacityToHex(selectedColor, value));- }}- disabled={selectedColor === CLASSIC_COLORS[0]['value']}- ></SizeSlider>- <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' : ''- } ${isNoColor(color.value) ? 'no-color' : ''}`}- style={{- backgroundColor: isNoColor(color.value)- ? TRANSPARENT- : color.value,- color: isDefaultStroke(color.value) ? WHITE : DEFAULT_COLOR,- }}- onClick={() => {- setSelectedColor(color.value);- if (color.value === NO_COLOR) {- setOpacity(100);- onSelect(color.value);- return;- }- if (opacity !== 100) {- onSelect(applyOpacityToHex(color.value, opacity));- } else {- onSelect(color.value);- }- }}- title={color.name}- >- {isNoColor(color.value) && NoColorIcon}- {selectedColor === color.value && Check}- </button>- );- })}- </Stack.Row>- ))}+ <>+ <Stack.Col gap={3}>+ <SizeSlider+ step={5}+ defaultValue={opacity}+ onChange={(value) => {+ setOpacity(value);+ onSelect(applyOpacityToHex(selectedColor, value));+ }}+ beforeStart={() => {+ MERGING.set(board, true);+ // can use in @plait/[email protected]+ // PlaitHistoryBoard.setSplittingOnce(board, true);+ }}+ afterEnd={() => {+ MERGING.set(board, false);+ }}+ disabled={selectedColor === CLASSIC_COLORS[0]['value']}+ ></SizeSlider>+ <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' : ''+ } ${isNoColor(color.value) ? 'no-color' : ''}`}+ style={{+ backgroundColor: isNoColor(color.value)+ ? TRANSPARENT+ : color.value,+ color: isDefaultStroke(color.value)+ ? WHITE+ : DEFAULT_COLOR,+ }}+ onClick={() => {+ setSelectedColor(color.value);+ if (color.value === NO_COLOR) {+ setOpacity(100);+ onSelect(color.value);+ return;+ }+ if (opacity !== 100) {+ onSelect(applyOpacityToHex(color.value, opacity));+ } else {+ onSelect(color.value);+ }+ }}+ title={color.name}+ >+ {isNoColor(color.value) && NoColorIcon}+ {selectedColor === color.value && Check}+ </button>+ );+ })}+ </Stack.Row>+ ))}+ </Stack.Col></Stack.Col>- </Stack.Col>+ </>);});diff --git a/packages/drawnix/src/components/size-slider.tsx b/packages/drawnix/src/components/size-slider.tsxindex 03def46..1f0003a 100644--- a/packages/drawnix/src/components/size-slider.tsx+++ b/packages/drawnix/src/components/size-slider.tsx@@ -2,6 +2,7 @@ import React, { useState, useRef, useCallback, useEffect } from 'react';import { toFixed } from '@plait/core';import './size-slider.scss';import classNames from 'classnames';+import { throttle } from 'lodash';interface SliderProps {min?: number;@@ -10,6 +11,8 @@ interface SliderProps {defaultValue?: number;disabled?: boolean;onChange?: (value: number) => void;+ beforeStart?: () => void;+ afterEnd?: () => void;}export const SizeSlider: React.FC<SliderProps> = ({@@ -19,7 +22,10 @@ export const SizeSlider: React.FC<SliderProps> = ({defaultValue = 100,disabled = false,onChange,+ beforeStart,+ afterEnd,}) => {+ const [isDragging, setIsDragging] = useState(false);const [value, setValue] = useState(defaultValue);const thumbPercentageRef = useRef(0);const sliderRef = useRef<HTMLDivElement>(null);@@ -40,30 +46,39 @@ export const SizeSlider: React.FC<SliderProps> = ({}, [defaultValue]);const handleSliderChange = useCallback(- (event: React.MouseEvent<HTMLDivElement> | MouseEvent) => {- if (sliderRef.current && thumbRef.current) {- const sliderRect = sliderRef.current.getBoundingClientRect();- const x = event.clientX - sliderRect.left;- let percentage = Math.min(Math.max(x / sliderRect.width, 0), 1);- if (percentage >= (100 - thumbPercentageRef.current) / 100) {- percentage = 1;- } else if (percentage <= thumbPercentageRef.current / 100) {- percentage = 0;+ throttle(+ (event: React.MouseEvent<HTMLDivElement> | MouseEvent) => {+ if (sliderRef.current && thumbRef.current) {+ const sliderRect = sliderRef.current.getBoundingClientRect();+ const x = event.clientX - sliderRect.left;+ let percentage = Math.min(Math.max(x / sliderRect.width, 0), 1);+ if (percentage >= (100 - thumbPercentageRef.current) / 100) {+ percentage = 1;+ } else if (percentage <= thumbPercentageRef.current / 100) {+ percentage = 0;+ }+ const newValue =+ Math.round((percentage * (max - min)) / step) * step + min;+ setValue(newValue);+ onChange && onChange(newValue);}- const newValue =- Math.round((percentage * (max - min)) / step) * step + min;- setValue(newValue);- onChange && onChange(newValue);- }- },+ },+ 50,+ { leading: true, trailing: true }+ ),[min, max, step, onChange]);const handlePointerDown = useCallback(() => {+ setIsDragging(true);const handleMouseMove = (e: MouseEvent) => handleSliderChange(e);const handleMouseUp = () => {document.removeEventListener('pointermove', handleMouseMove);document.removeEventListener('pointerup', handleMouseUp);+ afterEnd && afterEnd();+ setTimeout(() => {+ setIsDragging(false);+ }, 0);};document.addEventListener('pointermove', handleMouseMove);@@ -84,7 +99,7 @@ export const SizeSlider: React.FC<SliderProps> = ({ref={sliderRef}className="slider-track"onClick={(event) => {- if (disabled) {+ if (disabled || isDragging) {return;}handleSliderChange(event);@@ -94,6 +109,7 @@ export const SizeSlider: React.FC<SliderProps> = ({if (disabled) {return;}+ beforeStart && beforeStart();handlePointerDown();}}>