Skip to content

feat(color-picker): support hiding color-field #12484

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.

Sign up for GitHub

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

Merged
Amretasre002762670 merged 5 commits into from
Jul 11, 2025
Merged

feat(color-picker): support hiding color-field #12484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9efd7a
feat(color-picker): support hiding color-field
Amretasre002762670 Jul 10, 2025
be1bccd
Merge branch 'dev' into Amretasre002762670/10031-add-disble-for-color…
Amretasre002762670 Jul 10, 2025
3b03e15
Added test changes for field-disabled
Amretasre002762670 Jul 11, 2025
e203c2c
changed graph to field for consistency
Amretasre002762670 Jul 11, 2025
c3bc834
Merge branch 'dev' into Amretasre002762670/10031-add-disble-for-color…
Amretasre002762670 Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/calcite-components/src/components/color-picker/color-picker.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ describe("calcite-color-picker", () => {
propertyName: "clearable",
defaultValue: false,
},
{
propertyName: "fieldDisabled",
defaultValue: false,
},
{
propertyName: "format",
defaultValue: "auto",
Expand Down
4 changes: 3 additions & 1 deletion packages/calcite-components/src/components/color-picker/color-picker.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { scale } = ATTRIBUTES;

type ColorPickerStoryArgs = Pick<
ColorPicker,
"channelsDisabled" | "hexDisabled" | "savedDisabled" | "scale" | "clearable" | "value"
"channelsDisabled" | "hexDisabled" | "savedDisabled" | "fieldDisabled" | "scale" | "clearable" | "value"
>;

export default {
Expand All @@ -16,6 +16,7 @@ export default {
channelsDisabled: false,
hexDisabled: false,
savedDisabled: false,
fieldDisabled: false,
scale: scale.defaultValue,
clearable: false,
value: "#b33f33",
Expand All @@ -36,6 +37,7 @@ export const simple = (args: ColorPickerStoryArgs): string => html`
scale="${args.scale}"
${boolean("clearable", args.clearable)}
value="${args.value}"
${boolean("field-disabled", args.fieldDisabled)}
></calcite-color-picker>
`;

Expand Down
50 changes: 28 additions & 22 deletions packages/calcite-components/src/components/color-picker/color-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ export class ColorPicker extends LitElement implements InteractiveComponent {
/** When `true`, interaction is prevented and the component is displayed with lower opacity. */
@property({ reflect: true }) disabled = false;

/** When `true`, hides the color graph. */

@jcfranco jcfranco Jul 11, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep terminology consistent and use color field here.

@property() fieldDisabled = false;
Comment thread
Amretasre002762670 marked this conversation as resolved.
Outdated

/**
* The format of `value`.
*
Expand Down Expand Up @@ -1469,6 +1472,7 @@ export class ColorPicker extends LitElement implements InteractiveComponent {
staticDimensions: {
thumb: { radius: thumbRadius },
},
fieldDisabled,
hexDisabled,
hueScopeLeft,
messages,
Expand Down Expand Up @@ -1506,28 +1510,30 @@ export class ColorPicker extends LitElement implements InteractiveComponent {
return (
<InteractiveContainer disabled={this.disabled}>
<div class={CSS.container}>
<div class={CSS.controlAndScope}>
<canvas
class={CSS.colorField}
onPointerDown={this.handleColorFieldPointerDown}
ref={this.initColorField}
/>
<div
ariaLabel={vertical ? messages.value : messages.saturation}
ariaValueMax={vertical ? HSV_LIMITS.v : HSV_LIMITS.s}
ariaValueMin="0"
ariaValueNow={(vertical ? color?.saturationv() : color?.value()) || "0"}
class={{ [CSS.scope]: true, [CSS.colorFieldScope]: true }}
onKeyDown={this.handleColorFieldScopeKeyDown}
ref={this.storeColorFieldScope}
role="slider"
style={{
top: `${adjustedColorFieldScopeTop || 0}px`,
left: `${adjustedColorFieldScopeLeft || 0}px`,
}}
tabIndex="0"
/>
</div>
{fieldDisabled ? null : (
<div class={CSS.controlAndScope}>
Comment thread
Amretasre002762670 marked this conversation as resolved.
<canvas
class={CSS.colorField}
onPointerDown={this.handleColorFieldPointerDown}
ref={this.initColorField}
/>
<div
ariaLabel={vertical ? messages.value : messages.saturation}
ariaValueMax={vertical ? HSV_LIMITS.v : HSV_LIMITS.s}
ariaValueMin="0"
ariaValueNow={(vertical ? color?.saturationv() : color?.value()) || "0"}
class={{ [CSS.scope]: true, [CSS.colorFieldScope]: true }}
onKeyDown={this.handleColorFieldScopeKeyDown}
ref={this.storeColorFieldScope}
role="slider"
style={{
top: `${adjustedColorFieldScopeTop || 0}px`,
left: `${adjustedColorFieldScopeLeft || 0}px`,
}}
tabIndex="0"
/>
</div>
)}
<div class={CSS.previewAndSliders}>
<calcite-color-picker-swatch
class={CSS.preview}
Expand Down