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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: add eyedropper to color picker (#3221)
Oleg Isonen42ab6a71177e
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.tsxindex b04e083121..6d121b9583 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@@ -17,6 +17,8 @@ import {useDisableCanvasPointerEvents,css,InputField,+ IconButton,+ Grid,} from "@webstudio-is/design-system";import { toValue } from "@webstudio-is/css-engine";import { theme } from "@webstudio-is/design-system";@@ -24,6 +26,7 @@ import type { StyleSource } from "./style-info";import { CssValueInput } from "./css-value-input";import type { IntermediateStyleValue } from "./css-value-input/css-value-input";import { ColorThumb } from "./color-thumb";+import { EyedropperIcon } from "@webstudio-is/icons";// To support color namesextend([namesPlugin]);@@ -78,6 +81,34 @@ const styleValueToRgbaColor = (value: CssColorPickerValueInput): RgbaColor => {};};+const getEyeDropper = () => {+ // eslint-disable-next-line @typescript-eslint/no-explicit-any+ const Constructor = (window as any).EyeDropper;+ if (Constructor === undefined) {+ return;+ }+ const eyeDropper = new Constructor();+ return (callback: (rgb: string) => void) => {+ eyeDropper.open().then((result: { sRGBHex: string }) => {+ callback(result.sRGBHex);+ });+ };+};++const EyeDropper = ({ onChange }: { onChange: (rgb: string) => void }) => {+ const open = getEyeDropper();+ return (+ <IconButton+ disabled={open === undefined}+ onClick={() => {+ open?.(onChange);+ }}+ >+ <EyedropperIcon />+ </IconButton>+ );+};+export type CssColorPickerValueInput =| RgbValue| KeywordValue@@ -175,10 +206,19 @@ export const ColorPicker = ({const parsedColor = colord(rgbValue);const currentHex = parsedColor.toHex();- const onComplete = useDebouncedCallback(- (value: RgbValue) => onChangeComplete({ value }),- 500- );+ const handleComplete = (value: string | RgbValue) => {+ if (typeof value === "string") {+ const color = colord(value);+ if (color.isValid()) {+ onChangeComplete({ value: colorResultToRgbValue(color.toRgb()) });+ }+ return;+ }++ onChangeComplete({ value });+ };++ const handleCompleteDebounced = useDebouncedCallback(handleComplete, 500);const prefix = (<Popover modal open={displayColorPicker} onOpenChange={handleOpenChange}>@@ -202,22 +242,21 @@ export const ColorPicker = ({onChange={(newValue) => {const color = fixColor(newValue);onChange(color);- // debounced- onComplete(color);- }}- />- <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()));- }+ handleCompleteDebounced(color);}}/>+ <Grid css={{ gridTemplateColumns: "auto 1fr" }} gap="1">+ <EyeDropper onChange={handleComplete} />+ <InputField+ key={currentHex}+ defaultValue={currentHex.slice(1)}+ onChange={(event) => {+ const value = event.target.value.trim();+ const hex = value.startsWith("#") ? value : `#${value}`;+ handleComplete(hex);+ }}+ />+ </Grid></PopoverContent></Popover>);diff --git a/packages/icons/icons/eyedropper.svg b/packages/icons/icons/eyedropper.svgnew file mode 100644index 0000000000..411afa53bb--- /dev/null+++ b/packages/icons/icons/eyedropper.svg@@ -0,0 +1,13 @@+<svg+ width="16"+ height="16"+ viewBox="0 0 16 16"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+>+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M10.7241 2.00202C11.6282 1.09796 13.0939 1.09796 13.998 2.00202C14.9021 2.90609 14.9021 4.37186 13.998 5.27593L11.3934 7.88058L11.8777 8.36494C12.1315 8.61878 12.1315 9.03034 11.8777 9.28418C11.6239 9.53802 11.2123 9.53802 10.9585 9.28418L10.2342 8.5599L4.79762 13.9965C4.02521 14.7689 2.77287 14.7689 2.00045 13.9965C1.22804 13.2241 1.22804 11.9717 2.00045 11.1993L7.43703 5.76273L6.71583 5.04154C6.46199 4.78769 6.46199 4.37614 6.71583 4.1223C6.96967 3.86846 7.38123 3.86846 7.63507 4.1223L8.11945 4.60668L10.7241 2.00202ZM8.35627 6.68197L2.91969 12.1185C2.65496 12.3833 2.65496 12.8125 2.91969 13.0772C3.18443 13.342 3.61365 13.342 3.87838 13.0772L9.31496 7.64066L8.35627 6.68197Z"+ />+</svg>diff --git a/packages/icons/src/__generated__/eyedropper.tsx b/packages/icons/src/__generated__/eyedropper.tsxnew file mode 100644index 0000000000..ac66c36f89--- /dev/null+++ b/packages/icons/src/__generated__/eyedropper.tsx@@ -0,0 +1,15 @@+// Generated from icons/eyedropper.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const EyedropperIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M10.724 2.002a2.315 2.315 0 0 1 3.274 3.274L11.393 7.88l.485.484a.65.65 0 0 1-.92.92l-.724-.725-5.436 5.436A1.978 1.978 0 0 1 2 11.2l5.437-5.436-.721-.721a.65.65 0 0 1 .92-.92l.483.485 2.605-2.605Zm-2.368 4.68L2.92 12.118a.678.678 0 0 0 .958.96L9.315 7.64l-.959-.959Z" clipRule="evenodd" /></svg>+ );+ }+);++EyedropperIcon.displayName = "EyedropperIcon";diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex e173657b3b..d81a45c2a0 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -91,6 +91,7 @@ export * from "./extension";export * from "./external-link";export * from "./eyecon-closed";export * from "./eyecon-open";+export * from "./eyedropper";export * from "./folder";export * from "./footer";export * from "./form-text-area";diff --git a/packages/icons/src/__generated__/svg/eyedropper.ts b/packages/icons/src/__generated__/svg/eyedropper.tsnew file mode 100644index 0000000000..c4874d130f--- /dev/null+++ b/packages/icons/src/__generated__/svg/eyedropper.ts@@ -0,0 +1 @@+export const EyedropperIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path d="M10.724 2.002a2.315 2.315 0 0 1 3.274 3.274L11.393 7.88l.485.484a.65.65 0 0 1-.92.92l-.724-.725-5.436 5.436A1.978 1.978 0 0 1 2 11.2l5.437-5.436-.721-.721a.65.65 0 0 1 .92-.92l.483.485 2.605-2.605Zm-2.368 4.68L2.92 12.118a.678.678 0 0 0 .958.96L9.315 7.64l-.959-.959Z" clip-rule="evenodd"/></svg>`;diff --git a/packages/icons/src/__generated__/svg/index.ts b/packages/icons/src/__generated__/svg/index.tsindex bfb7ed8b11..f72a40c1a9 100644--- a/packages/icons/src/__generated__/svg/index.ts+++ b/packages/icons/src/__generated__/svg/index.ts@@ -91,6 +91,7 @@ export { ExtensionIcon } from "./extension";export { ExternalLinkIcon } from "./external-link";export { EyeconClosedIcon } from "./eyecon-closed";export { EyeconOpenIcon } from "./eyecon-open";+export { EyedropperIcon } from "./eyedropper";export { FolderIcon } from "./folder";export { FooterIcon } from "./footer";export { FormTextAreaIcon } from "./form-text-area";