feat(token lab): editable color tokens #428
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
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 |
|---|---|---|
| @@ -1,25 +1,151 @@ | ||
| .container { | ||
| display: grid; | ||
| grid-auto-flow: column; | ||
| width: 28rem; | ||
| height: 1.5rem; | ||
| gap: 1rem; | ||
| grid-template-columns: 3fr 20fr 5fr; | ||
| contain: inline-size; | ||
|
Comment on lines
+4
to
+7
There was a problem hiding this comment. Most parameters for the layout of the row are centralized here. |
||
| place-items: center; | ||
| } | ||
|
|
||
| .swatch { | ||
| background: var(--color); | ||
| border: 1px solid oklch(0 0 0 / 20%); | ||
| border-radius: 0.25rem; | ||
| padding: 0; | ||
| width: 100%; | ||
| height: 100%; | ||
| cursor: pointer; | ||
|
|
||
| &:hover { | ||
| border-color: var(--tz-color-border-2); | ||
| } | ||
|
|
||
| &:focus-visible { | ||
| outline: 2px solid var(--tz-color-base-lime-800); | ||
| outline-offset: 2px; | ||
|
Comment on lines
-14
to
+26
There was a problem hiding this comment. This token does not exist. Could there be others leftover from refactors? There was a problem hiding this comment. Yes we’ve gone through a few refactors and there are some stragglers. Thanks for fixing! |
||
| } | ||
| } | ||
|
|
||
| .popover { | ||
| display: grid; | ||
| background: var(--tz-color-bg-1); | ||
| padding: 1rem; | ||
|
There was a problem hiding this comment.
This should be using an elevated token instead, but I couldn't find an analogue. The color picker is also hardcoded to this token anyway. Elevated tokens seems like a broad effort. |
||
| filter: drop-shadow(4px 8px 8px oklch(0.1 0 0 / 0.5)); | ||
| place-items: center; | ||
| border-radius: 1rem; | ||
| transition-property: opacity, translate; | ||
| transition-duration: 0.2s; | ||
| transition-timing-function: ease-in-out; | ||
| } | ||
|
|
||
| .popover::after { | ||
| content: ''; | ||
| display: block; | ||
| background-color: var(--tz-color-bg-1); | ||
| height: 1rem; | ||
| width: 1rem; | ||
| } | ||
|
|
||
| .popover[data-side=bottom] { | ||
| padding-top: 0; /* the triangle is going to do double duty as the top padding */ | ||
| @starting-style { | ||
| opacity: 0; | ||
| translate: 0 2rem; | ||
| } | ||
| &::after { | ||
|
Comment on lines
+53
to
+56
There was a problem hiding this comment. First starting style rule of the codebase 🎉 |
||
| grid-row: 1; | ||
| translate: 0 -8px; | ||
| mask: conic-gradient( | ||
| from 135deg at top, | ||
| black 90deg, | ||
| transparent 91deg, | ||
| transparent 359deg, | ||
| black 360deg | ||
| ) top / 100% 50% no-repeat; | ||
| } | ||
| } | ||
|
|
||
| .popover[data-side=top] { | ||
| padding-bottom: 0; | ||
| @starting-style { | ||
| opacity: 0; | ||
| translate: 0 -2rem; | ||
| } | ||
| &::after { | ||
| grid-row: 2; | ||
| translate: 0 8px; | ||
| mask: conic-gradient( | ||
| from -45deg at bottom, | ||
| black 90deg, | ||
| transparent 91deg, | ||
| transparent 359deg, | ||
| black 360deg | ||
| ) bottom / 100% 50% no-repeat; | ||
| } | ||
| } | ||
|
|
||
| .channels { | ||
| display: grid; | ||
| width: 100%; | ||
| grid-template-columns: repeat(4, 1fr); | ||
| outline: var(--tz-border-3); | ||
| border-radius: 0.25rem; | ||
| height: 100%; | ||
| contain: inline-size; | ||
| } | ||
|
|
||
| .colorSpaceDropdown { | ||
| font-family: var(--tz-font-mono); | ||
| color: var(--tz-color-text-1); | ||
| height: 100%; | ||
| contain: size paint; | ||
| border-radius: initial; | ||
| display: grid; | ||
| padding: 0 0.5rem; | ||
| justify-content: stretch; | ||
|
|
||
| & > :nth-child(1) { | ||
| grid-area: 1/1; | ||
| justify-self: start; | ||
| } | ||
| & > :nth-child(2) { | ||
| grid-area: 1/1; | ||
| justify-self: end; | ||
| } | ||
| & :global(.tz-select-item-inner) { | ||
| display: block; | ||
| } | ||
| & :global(.tz-select-item-icon) { | ||
| display: none; | ||
| } | ||
| &:hover, &:focus-visible { | ||
| outline-color: transparent; | ||
| background: var(--tz-color-bg-2); | ||
| } | ||
| } | ||
|
|
||
| .colorSpaceDropdownItem { | ||
| font-family: var(--tz-font-mono); | ||
| } | ||
|
|
||
| .channel { | ||
| display: inline-block; | ||
| padding: 0 0.5rem; | ||
| font-family: var(--tz-font-mono); | ||
| border-left: var(--tz-border-3); | ||
| color: var(--tz-color-text-1); | ||
| align-content: center; | ||
| } | ||
|
|
||
| .alpha { | ||
| display: inline-block; | ||
| width: 100%; | ||
| height: 100%; | ||
| padding: 0 0.5rem; | ||
| font-family: var(--tz-font-mono); | ||
| outline: var(--tz-border-3); | ||
| border-radius: 0.25rem; | ||
| align-content: center; | ||
| } | ||
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 |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| declare const classNames: { | ||
| readonly container: "container"; | ||
| readonly swatch: "swatch"; | ||
| readonly popover: "popover"; | ||
| readonly channels: "channels"; | ||
| readonly colorSpaceDropdown: "colorSpaceDropdown"; | ||
| readonly "tz-select-item-inner": "tz-select-item-inner"; | ||
| readonly "tz-select-item-icon": "tz-select-item-icon"; | ||
| readonly colorSpaceDropdownItem: "colorSpaceDropdownItem"; | ||
| readonly channel: "channel"; | ||
| readonly alpha: "alpha"; | ||
| }; | ||
| export = classNames; |
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 |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| import * as Popover from '@radix-ui/react-popover'; | ||
| import { ChevronDown } from '@terrazzo/icons'; | ||
| import ColorPicker, { COLOR_PICKER_SPACES } from '@terrazzo/react-color-picker'; | ||
| import { Select, SelectItem } from '@terrazzo/tiles'; | ||
| import type { ColorValueNormalized } from '@terrazzo/token-tools'; | ||
| import useColor, { ColorOutput } from '@terrazzo/use-color'; | ||
| import c from './EditableColorToken.module.css'; | ||
|
|
||
| export interface EditableColorTokenProps { | ||
|
|
@@ -9,11 +13,67 @@ export interface EditableColorTokenProps { | |
| } | ||
|
|
||
| export default function EditableColorToken({ id, mode = '.', value }: EditableColorTokenProps) { | ||
| const [color, setColor] = useColor(value); | ||
| const channels = normalizedChannels(color); | ||
|
|
||
| return <div className={c.container}> | ||
| <Popover.Root> | ||
| <Popover.Trigger className={c.swatch} aria-label={`Edit ${id}`} style={{ '--color': color.css }}/> | ||
| <Popover.Portal> | ||
| <Popover.Content className={c.popover}> | ||
| <ColorPicker color={color} setColor={setColor} /> | ||
| </Popover.Content> | ||
| </Popover.Portal> | ||
| </Popover.Root> | ||
| <div className={c.channels}> | ||
| <Select | ||
| className={c.colorSpaceDropdown} | ||
| value={color.original.mode} | ||
| trigger={color.original.mode} | ||
| triggerIcon={<ChevronDown />} | ||
| onValueChange={space => setColor(color[space as keyof typeof color] ?? color.original)} | ||
| > | ||
| {Object.entries(COLOR_PICKER_SPACES).map(([id, label]) => ( | ||
| <SelectItem className={c.colorSpaceDropdownItem} key={id} value={id}> | ||
| {label} | ||
| </SelectItem> | ||
| ))} | ||
| </Select> | ||
| {channels.map((v, i) => <output className={c.channel} key={i}>{trimTrailingZeros(String(v).slice(0, 6))}</output>)} | ||
| </div> | ||
| <output className={c.alpha}>{trimTrailingZeros(String((color.original.alpha * 100)).slice(0, 6))}%</output> | ||
|
Comment on lines
+42
to
+44
There was a problem hiding this comment. Went with 5 digits (6 characters) of precision to match the design, but it feels kinda excessive. There was a problem hiding this comment. I wonder if using It could just as well complicate it too though. Just a thought. There was a problem hiding this comment. Yeah I’ve gone back-and-forth about this. If we’re shooting for 24-bit color, we need 10–12 digits or so: 16-bit color is probably a better target because today many devices are in the ~10 bit color range. 16-bit color is fairly safely-represented at ~7 significant digits. The fewer decimals you have, the less fidelity and colors will “snap” to the wrong color. The designs probably should have more decimals than they do now. Also +1 I think |
||
| </div>; | ||
| } | ||
|
|
||
| function normalizedChannels({ original }: ColorOutput): ColorValueNormalized["channels"] { | ||
| switch (original.mode) { | ||
| case 'a98': | ||
| case 'lrgb': | ||
| case 'p3': | ||
| case 'prophoto': | ||
| case 'rec2020': | ||
| case 'rgb': | ||
| return [original.r, original.g, original.b]; | ||
| case 'hsl': | ||
| case 'okhsl': | ||
| return [original.h, original.s, original.l]; | ||
| case 'hsv': | ||
| case 'okhsv': | ||
| return [original.h, original.s, original.v]; | ||
| case 'hwb': | ||
| return [original.h, original.w, original.b]; | ||
| case 'lab': | ||
| case 'oklab': | ||
| return [original.l, original.a, original.b]; | ||
| case 'lch': | ||
| case 'oklch': | ||
| return [original.l, original.c, original.h]; | ||
| case 'xyz50': | ||
| case 'xyz65': | ||
| return [original.x, original.y, original.z]; | ||
| } | ||
| } | ||
|
|
||
| function trimTrailingZeros(value: string) { | ||
| return value.replace(/\.0+$/, '').replace(/(?<=\.[^\.]+)0+$/, ''); | ||
| } | ||
|
Comment on lines
+77
to
79
There was a problem hiding this comment. 0.2300 => 0.23 |
||
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
Oops, something went wrong.
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.
Fixes a layout issue on chromium
Screen.Recording.2025-01-27.093656.mp4