Merge branch 'master' into zsviczian-loop-lock

# Conflicts:
#	packages/excalidraw/components/ColorPicker/Picker.tsx
This commit is contained in:
dwelle 2025-05-11 15:08:54 +02:00
commit defdd7977c
2 changed files with 0 additions and 3 deletions

View File

@ -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}

View File

@ -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,