Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: removing react-color

Ilian Sapundshieva4a4c3f6b42e
diff --git a/package.json b/package.json
index 6e91117e9..7b32186e1 100644
--- a/package.json
+++ b/package.json
@@ -205,8 +205,7 @@
"rc-table": "^7.8.0",
"react": "18.2.0",
"react-beautiful-dnd": "^13.1.1",
- "react-best-gradient-color-picker": "^3.0.7",
- "react-color": "^2.19.3",
+ "react-best-gradient-color-picker": "^3.0.10",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "18.2.0",
diff --git a/src/renderer/components/dialogs/ColorPickerDialog.tsx b/src/renderer/components/dialogs/ColorPickerDialog.tsx
index 3b0a17c7b..57ccce62e 100644
--- a/src/renderer/components/dialogs/ColorPickerDialog.tsx
+++ b/src/renderer/components/dialogs/ColorPickerDialog.tsx
@@ -22,7 +22,7 @@ import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import Dialog from '@mui/material/Dialog';
-import { SketchPicker } from 'react-color';
+import ColorPicker from 'react-best-gradient-color-picker';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import { useTranslation } from 'react-i18next';
@@ -65,22 +65,16 @@ interface Props {
function ColorPickerDialog(props: Props) {
const { t } = useTranslation();
const [color, setColor] = useState(undefined);
- const [colorHex, setColorHex] = useState(undefined);
const { open = false, onClose } = props;
function onConfirm() {
- if (color && colorHex) {
- const hexAlphaColor = colorHex + Math.round(color.a * 255).toString(16);
- props.setColor(hexAlphaColor);
- }
+ // if (color && colorHex) {
+ // const hexAlphaColor = colorHex + Math.round(color.a * 255).toString(16);
+ props.setColor(color);
+ //}
props.onClose();
}
- function handleChangeComplete(newColor: any) {
- setColor(newColor.rgb);
- setColorHex(newColor.hex);
- }
-
return (
<Dialog
open={open}
@@ -107,16 +101,15 @@ function ColorPickerDialog(props: Props) {
overflowX: 'hidden',
}}
>
- <SketchPicker
- style={{
- padding: '0 !important',
- boxShadow: 'none !important',
- backgroundColor: 'transparent !important',
- }}
- name="color"
- presetColors={props.presetColors ? props.presetColors : presetColors}
- color={color || props.color}
- onChangeComplete={handleChangeComplete}
+ <ColorPicker
+ value={color || props.color}
+ onChange={(newColor) => setColor(newColor)}
+ presets={props.presetColors ? props.presetColors : presetColors}
+ hideEyeDrop
+ disableDarkMode
+ hideControls
+ // @ts-ignore
+ style={{ backgroundColor: 'transparent' }}
/>
</DialogContent>
<DialogActions>