FIX: Add defaultColor to color picker
NB: Dani will have to pass the color from the theme
This commit is contained in:
committed by
Nicolás Hatcher Andrés
parent
9e65ea3024
commit
475c3e9d49
@@ -262,7 +262,8 @@ const BorderPicker = (properties: BorderPickerProps) => {
|
||||
</BorderPickerDialog>
|
||||
<ColorPicker
|
||||
color={borderColor}
|
||||
title={t("color_picker.no_fill")}
|
||||
defaultColor="#000000"
|
||||
title={t("color_picker.default")}
|
||||
onChange={(color): void => {
|
||||
setBorderColor(color);
|
||||
setColorPickerOpen(false);
|
||||
|
||||
@@ -9,6 +9,7 @@ import { theme } from "../../theme";
|
||||
// Types
|
||||
type ColorPickerProps = {
|
||||
color: string;
|
||||
defaultColor: string;
|
||||
title: string;
|
||||
onChange: (color: string) => void;
|
||||
onClose: () => void;
|
||||
@@ -23,6 +24,7 @@ const colorPickerWidth = 240;
|
||||
// Main Component
|
||||
const ColorPicker = ({
|
||||
color,
|
||||
defaultColor,
|
||||
title,
|
||||
onChange,
|
||||
onClose,
|
||||
@@ -177,8 +179,8 @@ const ColorPicker = ({
|
||||
open={isMenuOpen}
|
||||
onClose={handleClose}
|
||||
>
|
||||
<MenuItemWrapper onClick={() => handleColorSelect(color)}>
|
||||
<MenuItemSquare style={{ backgroundColor: color }} />
|
||||
<MenuItemWrapper onClick={() => handleColorSelect(defaultColor)}>
|
||||
<MenuItemSquare style={{ backgroundColor: defaultColor }} />
|
||||
<MenuItemText>{title}</MenuItemText>
|
||||
</MenuItemWrapper>
|
||||
<HorizontalDivider />
|
||||
|
||||
@@ -138,6 +138,7 @@ function SheetTab(props: SheetTabProps) {
|
||||
/>
|
||||
<ColorPicker
|
||||
color={color}
|
||||
defaultColor="#FFFFFF"
|
||||
title={t("color_picker.no_fill")}
|
||||
onChange={(color): void => {
|
||||
props.onColorChanged(color);
|
||||
|
||||
@@ -443,6 +443,7 @@ function Toolbar(properties: ToolbarProperties) {
|
||||
|
||||
<ColorPicker
|
||||
color={properties.fontColor}
|
||||
defaultColor="#000000"
|
||||
title={t("color_picker.default")}
|
||||
onChange={(color): void => {
|
||||
properties.onTextColorPicked(color);
|
||||
@@ -456,6 +457,7 @@ function Toolbar(properties: ToolbarProperties) {
|
||||
/>
|
||||
<ColorPicker
|
||||
color={properties.fillColor}
|
||||
defaultColor="#FFFFFF"
|
||||
title={t("color_picker.default")}
|
||||
onChange={(color): void => {
|
||||
if (color !== null) {
|
||||
|
||||
Reference in New Issue
Block a user