Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: replace the color picker (#3113)

Bogdan Chadkin8922655ba84f
diff --git a/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx
index ec129d3ba3..e554147e7c 100644
--- a/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx
@@ -1,7 +1,8 @@
import { useState } from "react";
import { colord, extend, type RgbaColor } from "colord";
import namesPlugin from "colord/plugins/names";
-import { type ColorResult, type RGBColor, SketchPicker } from "react-color";
+import { useDebouncedCallback } from "use-debounce";
+import { RgbaColorPicker } from "react-colorful";
import type {
InvalidValue,
KeywordValue,
@@ -13,8 +14,9 @@ import {
Popover,
PopoverTrigger,
PopoverContent,
- css,
useDisableCanvasPointerEvents,
+ css,
+ InputField,
} from "@webstudio-is/design-system";
import { toValue } from "@webstudio-is/css-engine";
import { theme } from "@webstudio-is/design-system";
@@ -26,25 +28,14 @@ import { ColorThumb } from "./color-thumb";
// To support color names
extend([namesPlugin]);
-const pickerStyle = css({
- padding: theme.spacing[5],
- background: theme.colors.panel,
- // @todo this lib doesn't have another way to define styles for inputs
- // we should either submit a PR or replace it
- "& input": {
- color: theme.colors.hiContrast,
- background: theme.colors.loContrast,
+const colorfulStyles = css({
+ ".react-colorful__pointer": {
+ width: 20,
+ height: 20,
},
});
-const defaultPickerStyles = {
- default: {
- // Workaround to allow overrides using className
- picker: { padding: "", background: "" },
- },
-};
-
-const colorResultToRgbValue = (rgb: RgbaColor | RGBColor): RgbValue => {
+const colorResultToRgbValue = (rgb: RgbaColor): RgbValue => {
return {
type: "rgb",
r: rgb.r,
@@ -155,16 +146,14 @@ export const ColorPicker = ({
* By default, the color can be transparent, but if the user chooses a color from the picker,
* we must set alpha = 1 otherwise all selected colors will be transparent.
*/
- const fixColor = (color: ColorResult) => {
- const newColor = { ...color.rgb };
-
+ const fixColor = (color: RgbaColor) => {
if (
currentValue.type === "keyword" &&
currentValue.value === "transparent"
) {
- newColor.a = 1;
+ color = { ...color, a: 1 };
}
- return colorResultToRgbValue(newColor);
+ return colorResultToRgbValue(color);
};
const handleOpenChange = (open: boolean) => {
@@ -181,6 +170,14 @@ export const ColorPicker = ({
enableCanvasPointerEvents();
};
+ const parsedColor = colord(rgbValue);
+ const currentHex = parsedColor.toHex();
+
+ const onComplete = useDebouncedCallback(
+ (value: RgbValue) => onChangeComplete({ value }),
+ 500
+ );
+
const prefix = (
<Popover modal open={displayColorPicker} onOpenChange={handleOpenChange}>
<PopoverTrigger
@@ -190,24 +187,34 @@ export const ColorPicker = ({
>
<ColorThumb color={rgbValue} css={{ margin: theme.spacing[3] }} />
</PopoverTrigger>
-
- <PopoverContent>
- <SketchPicker
+ <PopoverContent
+ css={{
+ display: "grid",
+ padding: theme.spacing[5],
+ gap: theme.spacing[5],
+ }}
+ >
+ <RgbaColorPicker
+ className={colorfulStyles.toString()}
color={rgbValue}
- onChange={(color: ColorResult, event) => {
- const newColor = fixColor(color);
- onChange(newColor);
+ onChange={(newValue) => {
+ const color = fixColor(newValue);
+ onChange(color);
+ // debounced
+ onComplete(color);
}}
- onChangeComplete={(color: ColorResult) => {
- const newColor = fixColor(color);
- onChangeComplete({
- value: newColor,
- });
+ />
+ <InputField
+ key={currentHex}
+ defaultValue={currentHex.slice(1)}
+ onChange={(event) => {
+ const value = event.target.value.trim();
+ const hex = value.startsWith("#") ? value : `#${value}`;
+ const color = colord(hex);
+ if (color.isValid()) {
+ onComplete(colorResultToRgbValue(color.toRgb()));
+ }
}}
- // @todo to remove both when we have preset colors
- presetColors={[]}
- className={pickerStyle()}
- styles={defaultPickerStyles}
/>
</PopoverContent>
</Popover>
diff --git a/apps/builder/package.json b/apps/builder/package.json
index d578bb6c9f..388e973dd1 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -102,7 +102,7 @@
"pretty-bytes": "^6.1.1",
"prismjs": "^1.29.0",
"react": "^18.2.0",
- "react-color": "^2.19.3",
+ "react-colorful": "^5.6.1",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.12",
"react-hotkeys-hook": "^4.4.1",
@@ -133,7 +133,6 @@
"@types/lodash.debounce": "^4.0.6",
"@types/prismjs": "^1.26.0",
"@types/react": "^18.2.21",
- "@types/react-color": "^3.0.6",
"@types/react-dom": "^18.2.7",
"@types/uuid": "^8.3.4",
"@webstudio-is/jest-config": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ba69385b58..7fc812a0b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -308,9 +308,9 @@ importers:
react:
specifier: ^18.2.0
version: 18.2.0
- react-color:
- specifier: ^2.19.3
- version: 2.19.3([email protected])
+ react-colorful:
+ specifier: ^5.6.1
react-dom:
specifier: ^18.2.0
version: 18.2.0([email protected])
@@ -396,9 +396,6 @@ importers:
'@types/react':
specifier: ^18.2.21
version: 18.2.21
- '@types/react-color':
- specifier: ^3.0.6
- version: 3.0.6
'@types/react-dom':
specifier: ^18.2.7
version: 18.2.7
@@ -3829,14 +3826,6 @@ packages:
resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
dev: true
- resolution: {integrity: sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==}
- peerDependencies:
- react: '*'
- dependencies:
- react: 18.2.0
- dev: false
-
resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
engines: {node: '>=12'}
@@ -7809,13 +7798,6 @@ packages:
resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
- resolution: {integrity: sha512-OzPIO5AyRmLA7PlOyISlgabpYUa3En74LP8mTMa0veCA719SvYQov4WLMsHvCgXP+L+KI9yGhYnqZafVGG0P4w==}
- dependencies:
- '@types/react': 18.2.21
- '@types/reactcss': 1.2.6
- dev: true
-
resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==}
dependencies:
@@ -7835,12 +7817,6 @@ packages:
'@types/scheduler': 0.16.2
csstype: 3.1.1
- resolution: {integrity: sha512-qaIzpCuXNWomGR1Xq8SCFTtF4v8V27Y6f+b9+bzHiv087MylI/nTCqqdChNeWS7tslgROmYB7yeiruWX7WnqNg==}
- dependencies:
- '@types/react': 18.2.21
- dev: true
-
resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
@@ -12438,10 +12414,6 @@ packages:
dependencies:
p-locate: 5.0.0
- resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
- dev: false
-
resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
@@ -12568,10 +12540,6 @@ packages:
remove-accents: 0.4.2
dev: false
- resolution: {integrity: sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==}
- dev: false
-
resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
dependencies:
@@ -14542,21 +14510,6 @@ packages:
iconv-lite: 0.4.24
unpipe: 1.0.0
- resolution: {integrity: sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==}
- peerDependencies:
- react: '*'
- dependencies:
- '@icons/material': 0.2.4([email protected])
- lodash: 4.17.21
- lodash-es: 4.17.21
- material-colors: 1.2.6
- prop-types: 15.8.1
- react: 18.2.0
- reactcss: 1.2.3([email protected])
- tinycolor2: 1.4.2
- dev: false
-
resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
peerDependencies:
@@ -14800,15 +14753,6 @@ packages:
dependencies:
loose-envify: 1.4.0
- resolution: {integrity: sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==}
- peerDependencies:
- react: '*'
- dependencies:
- lodash: 4.17.21
- react: 18.2.0
- dev: false
-
resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
dependencies:
@@ -16002,10 +15946,6 @@ packages:
resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
- resolution: {integrity: sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==}
- dev: false
-
resolution: {integrity: sha512-X6j4JkYviJJ7jPVuBkd1geC35pq+3J5z3q1N5z57FIhBooKQqrO4B7C6dy3RzSJIKYB6Ze0/G3KcWtinzO7MGg==}
dev: false