[@mantine/tiptap] Fix incorrect color displayed in ColorPickerControl (…

…mantinedev#4667) * [@mantine/tiptap] ColorPickerControl: fix incorrect color displayed * fix code style
arel · Sep 13, 2023 · 5575b40 · 5575b40
1 parent ee5e475
commit 5575b40
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/mantine-tiptap/src/controls/ColorPickerControl/ColorPickerControl.tsx b/src/mantine-tiptap/src/controls/ColorPickerControl/ColorPickerControl.tsx
@@ -46,9 +46,8 @@ export const ColorPickerControl = forwardRef<HTMLButtonElement, ColorPickerContr
  const [state, setState] = useState<'palette' | 'colorPicker'>('palette');
  const theme = useMantineTheme();
  const currentColor =
- editor?.getAttributes('textStyle').color || theme.colorScheme === 'dark'
- ? theme.colors.dark[1]
- : theme.black;
+ editor?.getAttributes('textStyle').color ||
+ (theme.colorScheme === 'dark' ? theme.colors.dark[1] : theme.black);
 
  const handleChange = (value: string, shouldClose = true) => {
  (editor.chain() as any).focus().setColor(value).run();