Merge branch 'master' into zsviczian-loop-lock
# Conflicts: # packages/excalidraw/components/ColorPicker/Picker.tsx
This commit is contained in:
commit
defdd7977c
@ -171,7 +171,6 @@ const ColorPickerPopupContent = ({
|
|||||||
updateData({ openPopup: null });
|
updateData({ openPopup: null });
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
label={label}
|
|
||||||
type={type}
|
type={type}
|
||||||
elements={elements}
|
elements={elements}
|
||||||
updateData={updateData}
|
updateData={updateData}
|
||||||
|
@ -32,7 +32,6 @@ import type { ColorPickerType } from "./colorPickerUtils";
|
|||||||
interface PickerProps {
|
interface PickerProps {
|
||||||
color: string | null;
|
color: string | null;
|
||||||
onChange: (color: string) => void;
|
onChange: (color: string) => void;
|
||||||
label: string;
|
|
||||||
type: ColorPickerType;
|
type: ColorPickerType;
|
||||||
elements: readonly ExcalidrawElement[];
|
elements: readonly ExcalidrawElement[];
|
||||||
palette: ColorPaletteCustom;
|
palette: ColorPaletteCustom;
|
||||||
@ -47,7 +46,6 @@ export const Picker = React.forwardRef(
|
|||||||
{
|
{
|
||||||
color,
|
color,
|
||||||
onChange,
|
onChange,
|
||||||
label,
|
|
||||||
type,
|
type,
|
||||||
elements,
|
elements,
|
||||||
palette,
|
palette,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user