Merge branch 'master' into zsviczian-loop-lock

# Conflicts: # packages/excalidraw/components/ColorPicker/Picker.tsx
2025-05-11 15:08:54 +02:00 · 2025-05-11 15:08:54 +02:00 · defdd7977c
commit defdd7977c
parent 54b124c4f4 c4c064982f
2 changed files with 0 additions and 3 deletions
--- a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx
+++ b/packages/excalidraw/components/ColorPicker/ColorPicker.tsx
@ -171,7 +171,6 @@ const ColorPickerPopupContent = ({
              updateData({ openPopup: null });
            }
          }}
-          label={label}
          type={type}
          elements={elements}
          updateData={updateData}
--- a/packages/excalidraw/components/ColorPicker/Picker.tsx
+++ b/packages/excalidraw/components/ColorPicker/Picker.tsx
@ -32,7 +32,6 @@ import type { ColorPickerType } from "./colorPickerUtils";
 interface PickerProps {
  color: string | null;
  onChange: (color: string) => void;
-  label: string;
  type: ColorPickerType;
  elements: readonly ExcalidrawElement[];
  palette: ColorPaletteCustom;
@ -47,7 +46,6 @@ export const Picker = React.forwardRef(
    {
      color,
      onChange,
-      label,
      type,
      elements,
      palette,