-
Notifications
You must be signed in to change notification settings - Fork 104
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add shave config to editor, and update all color pickers #47
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import { type CSSProperties } from "react"; | ||
| import { Sketch } from "./Sketch"; | ||
| import { | ||
| Button, | ||
| PopoverTrigger, | ||
| PopoverContent, | ||
| Popover, | ||
| } from "@nextui-org/react"; | ||
| import { ColorFormat } from "./types"; | ||
|
|
||
| const rgbaObjToRgbaStr = (rgbaObj: { | ||
| r: number; | ||
| g: number; | ||
| b: number; | ||
| a: number; | ||
| }): string => { | ||
| return `rgba(${rgbaObj.r}, ${rgbaObj.g}, ${rgbaObj.b}, ${rgbaObj.a})`; | ||
| }; | ||
|
|
||
| export const ColorPicker = ({ | ||
| onClick, | ||
| onChange, | ||
| style, | ||
| value, | ||
| colorFormat = "hex", | ||
| presetColors, | ||
| }: { | ||
| onClick?: () => void; | ||
| onChange: (hex: string) => void; | ||
| style?: CSSProperties; | ||
| value: string; | ||
| colorFormat: ColorFormat; | ||
| presetColors: string[]; | ||
| }) => { | ||
| return ( | ||
| <Popover showArrow placement="bottom"> | ||
| <PopoverTrigger> | ||
| <Button | ||
| onClick={onClick} | ||
| className="border-2" | ||
| style={{ | ||
| ...style, | ||
| backgroundColor: value, | ||
| }} | ||
| /> | ||
| </PopoverTrigger> | ||
| <PopoverContent className="p-0"> | ||
| <Sketch | ||
| color={value} | ||
| presetColors={presetColors} | ||
| colorFormat={colorFormat} | ||
| onChange={(color) => { | ||
| if (colorFormat === "rgba") { | ||
| onChange(rgbaObjToRgbaStr(color.rgba)); | ||
| } else { | ||
| onChange(color.hex); | ||
| } | ||
| }} | ||
| /> | ||
| </PopoverContent> | ||
| </Popover> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,258 @@ | ||
| import React, { useState, type CSSProperties } from "react"; | ||
| import Saturation from "@uiw/react-color-saturation"; | ||
| import Alpha from "@uiw/react-color-alpha"; | ||
| import EditableInput from "@uiw/react-color-editable-input"; | ||
| import RGBA from "@uiw/react-color-editable-input-rgba"; | ||
| import Hue from "@uiw/react-color-hue"; | ||
| import { | ||
| validHex, | ||
| type HsvaColor, | ||
| rgbaStringToHsva, | ||
| hsvaToHex, | ||
| hsvaToHexa, | ||
| hexToHsva, | ||
| color as handleColor, | ||
| type ColorResult, | ||
| } from "@uiw/color-convert"; | ||
| import Swatch from "@uiw/react-color-swatch"; | ||
| import { useEffect } from "react"; | ||
| import { roundTwoDecimals } from "./utils"; | ||
| import { ColorFormat } from "./types"; | ||
|
|
||
| // Similar to https://github.com/uiwjs/react-color/blob/632d4e9201e26b42ee7d5bfeda407144e9a6e2f3/packages/color-sketch/src/index.tsx but with EyeDropper added | ||
|
|
||
| // https://gist.github.com/bkrmendy/f4582173f50fab209ddfef1377ab31e3 | ||
| interface ColorSelectionOptions { | ||
| signal?: AbortSignal; | ||
| } | ||
| interface ColorSelectionResult { | ||
| sRGBHex: string; | ||
| } | ||
| interface EyeDropper { | ||
| open: (options?: ColorSelectionOptions) => Promise<ColorSelectionResult>; | ||
| } | ||
| interface EyeDropperConstructor { | ||
| new (): EyeDropper; | ||
| } | ||
| declare global { | ||
| interface Window { | ||
| EyeDropper?: EyeDropperConstructor | undefined; | ||
| } | ||
| } | ||
|
|
||
| const EyeDropperButton = ({ | ||
| onChange, | ||
| }: { | ||
| onChange: (hex: string) => void; | ||
| }) => { | ||
| if (!window.EyeDropper) { | ||
| return null; | ||
| } | ||
|
|
||
| // https://icons.getbootstrap.com/icons/eyedropper/ v1.11.3 | ||
| const eyedropperIcon = ( | ||
| <svg | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| width="16" | ||
| height="16" | ||
| fill="currentColor" | ||
| viewBox="0 0 16 16" | ||
| > | ||
| <path d="M13.354.646a1.207 1.207 0 0 0-1.708 0L8.5 3.793l-.646-.647a.5.5 0 1 0-.708.708L8.293 5l-7.147 7.146A.5.5 0 0 0 1 12.5v1.793l-.854.853a.5.5 0 1 0 .708.707L1.707 15H3.5a.5.5 0 0 0 .354-.146L11 7.707l1.146 1.147a.5.5 0 0 0 .708-.708l-.647-.646 3.147-3.146a1.207 1.207 0 0 0 0-1.708zM2 12.707l7-7L10.293 7l-7 7H2z" /> | ||
| </svg> | ||
| ); | ||
|
|
||
| return ( | ||
| <button | ||
| className="btn pt-1 ps-2 pe-1 h-fit" | ||
| type="button" | ||
| onClick={async () => { | ||
| const eyeDropper = new window.EyeDropper!(); | ||
| try { | ||
| const result = await eyeDropper.open(); | ||
| onChange(result.sRGBHex.slice(1)); | ||
| } catch (err) { | ||
| // The user escaped the eyedropper mode, do nothing | ||
| } | ||
| }} | ||
| > | ||
| {eyedropperIcon} | ||
| </button> | ||
| ); | ||
| }; | ||
|
|
||
| export interface SketchProps | ||
| extends Omit<React.HTMLAttributes<HTMLDivElement>, "onChange" | "color"> { | ||
| prefixCls?: string; | ||
| width?: number; | ||
| color?: string | HsvaColor; | ||
| presetColors: string[]; | ||
| colorFormat: ColorFormat; | ||
| onChange?: (newShade: ColorResult) => void; | ||
| } | ||
|
|
||
| const Bar = (props: { left?: string }) => ( | ||
| <div | ||
| style={{ | ||
| boxShadow: "rgb(0 0 0 / 60%) 0px 0px 2px", | ||
| width: 4, | ||
| top: 1, | ||
| bottom: 1, | ||
| left: props.left, | ||
| borderRadius: 1, | ||
| position: "absolute", | ||
| backgroundColor: "#fff", | ||
| }} | ||
| /> | ||
| ); | ||
|
|
||
| export const Sketch = React.forwardRef<HTMLDivElement, SketchProps>( | ||
| (props, ref) => { | ||
| const { | ||
| prefixCls = "w-color-sketch", | ||
| className, | ||
| onChange, | ||
| width = 240, | ||
| color, | ||
| style, | ||
| colorFormat, | ||
| presetColors, | ||
| ...other | ||
| } = props; | ||
|
|
||
| let formattedPresetColors = presetColors; | ||
| if (colorFormat === "rgba") { | ||
| formattedPresetColors = presetColors.map((rgbaColor) => | ||
| hsvaToHexa(rgbaStringToHsva(rgbaColor)), | ||
| ); | ||
| } | ||
|
|
||
| const [hsva, setHsva] = useState({ h: 209, s: 36, v: 90, a: 1 }); | ||
| useEffect(() => { | ||
| if (typeof color === "string" && validHex(color)) { | ||
| setHsva(hexToHsva(color)); | ||
| } | ||
| if (typeof color === "string" && color.startsWith("rgba")) { | ||
| setHsva(rgbaStringToHsva(color)); | ||
| } | ||
| if (typeof color === "object") { | ||
| setHsva(color); | ||
| } | ||
| }, [color]); | ||
|
|
||
| const handleChange = (hsv: HsvaColor) => { | ||
| for (const [key, value] of Object.entries(hsv)) { | ||
| hsv[key as keyof HsvaColor] = roundTwoDecimals(value); | ||
| } | ||
| setHsva(hsv); | ||
| onChange && onChange(handleColor(hsv)); | ||
| }; | ||
|
|
||
| const handleHex = (value: string | number) => { | ||
| if ( | ||
| typeof value === "string" && | ||
| validHex(value) && | ||
| /(3|6)/.test(String(value.length)) | ||
| ) { | ||
| handleChange(hexToHsva(value)); | ||
| } | ||
| }; | ||
| const handleSaturationChange = (newColor: HsvaColor) => | ||
| handleChange({ ...hsva, ...newColor, a: hsva.a }); | ||
| const styleMain = { | ||
| "--sketch-background": "rgb(255, 255, 255)", | ||
| "--sketch-box-shadow": | ||
| "rgb(0 0 0 / 15%) 0px 0px 0px 1px, rgb(0 0 0 / 15%) 0px 8px 16px", | ||
| "--sketch-swatch-box-shadow": "rgb(0 0 0 / 15%) 0px 0px 0px 1px inset", | ||
| "--sketch-swatch-border-top": "1px solid rgb(238, 238, 238)", | ||
| background: "var(--sketch-background)", | ||
| borderRadius: 4, | ||
| boxShadow: "var(--sketch-box-shadow)", | ||
| width, | ||
| ...style, | ||
| } as CSSProperties; | ||
| const styleSwatch = { | ||
| borderTop: "var(--sketch-swatch-border-top)", | ||
| paddingTop: 10, | ||
| paddingLeft: 10, | ||
| } as CSSProperties; | ||
| const styleSwatchRect = { | ||
| marginRight: 10, | ||
| marginBottom: 10, | ||
| borderRadius: 3, | ||
| boxShadow: "var(--sketch-swatch-box-shadow)", | ||
| } as CSSProperties; | ||
| return ( | ||
| <div | ||
| {...other} | ||
| className={`${prefixCls} ${className || ""}`} | ||
| ref={ref} | ||
| style={styleMain} | ||
| > | ||
| <div style={{ padding: "10px 10px 8px" }}> | ||
| <Saturation | ||
| hsva={hsva} | ||
| style={{ width: "auto", height: 150 }} | ||
| onChange={handleSaturationChange} | ||
| /> | ||
| <div style={{ display: "flex", marginTop: 4 }}> | ||
| <div style={{ flex: 1 }}> | ||
| <Hue | ||
| width="auto" | ||
| height={10} | ||
| hue={hsva.h} | ||
| pointer={Bar} | ||
| innerProps={{ | ||
| style: { marginLeft: 1, marginRight: 5 }, | ||
| }} | ||
| onChange={(newHue) => handleChange({ ...hsva, ...newHue })} | ||
| /> | ||
| </div> | ||
| </div> | ||
| {colorFormat === "rgba" && ( | ||
| <div style={{ display: "flex", marginTop: 4 }}> | ||
| <div style={{ flex: 1 }}> | ||
| <Alpha | ||
| width="auto" | ||
| height={10} | ||
| hsva={hsva} | ||
| pointer={Bar} | ||
| innerProps={{ | ||
| style: { marginLeft: 1, marginRight: 5 }, | ||
| }} | ||
| onChange={(newHvsa) => { | ||
| handleChange({ ...hsva, ...newHvsa }); | ||
| }} | ||
| /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| </div> | ||
| <div style={{ display: "flex", margin: "0 10px 3px 10px" }}> | ||
| <EditableInput | ||
| label="Hex" | ||
| value={hsvaToHex(hsva).replace(/^#/, "").toLocaleUpperCase()} | ||
| onChange={(_, val) => handleHex(val)} | ||
| style={{ minWidth: 58 }} | ||
| /> | ||
| <RGBA | ||
| hsva={hsva} | ||
| style={{ marginLeft: 6 }} | ||
| aProps={colorFormat === "rgba" ? undefined : false} | ||
| onChange={(result) => handleChange(result.hsva)} | ||
| /> | ||
| <EyeDropperButton onChange={handleHex} /> | ||
tomkennedy22 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </div> | ||
| <Swatch | ||
| style={styleSwatch} | ||
| colors={formattedPresetColors} | ||
| color={hsvaToHex(hsva)} | ||
| onChange={(hsvColor) => handleChange(hsvColor)} | ||
| rectProps={{ | ||
| style: styleSwatchRect, | ||
| }} | ||
| /> | ||
| </div> | ||
| ); | ||
| }, | ||
| ); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll fix this when I merge in a minute, but there's no need for this type annotation, TypeScript already knows it's string[]