Skip to content

fix(color-picker): fix opacity slider keyboard nudging #7400

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
jcfranco merged 1 commit into from
Aug 1, 2023
Merged

fix(color-picker): fix opacity slider keyboard nudging #7400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 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 @@ -2240,5 +2240,31 @@ describe("calcite-color-picker", () => {
left: "0px",
});
});

describe("alpha channel", () => {
it("allows editing alpha value via keyboard", async () => {
const page = await newE2EPage();
await page.setContent(`<calcite-color-picker alpha-channel value="#ffffffff"></calcite-color-picker>`);

const picker = await page.find("calcite-color-picker");
const scope = await page.find(`calcite-color-picker >>> .${CSS.opacityScope}`);

await scope.press("ArrowDown");
expect(await picker.getProperty("value")).toBe("#fffffffc");
await scope.press("ArrowDown");
expect(await picker.getProperty("value")).toBe("#fffffffa");
await scope.press("ArrowDown");
expect(await picker.getProperty("value")).toBe("#fffffff7");

await scope.press("ArrowUp");
expect(await picker.getProperty("value")).toBe("#fffffffa");

await scope.press("ArrowRight");
expect(await picker.getProperty("value")).toBe("#fffffffc");

await scope.press("ArrowLeft");
expect(await picker.getProperty("value")).toBe("#fffffffa");
});
});
});
});
17 changes: 9 additions & 8 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 @@ -723,7 +723,6 @@ export class ColorPicker
colorFieldScopeLeft,
colorFieldScopeTop,
dimensions: {
colorField: { width: colorFieldWidth },
slider: { width: sliderWidth },
thumb: { radius: thumbRadius },
},
Expand All @@ -746,7 +745,7 @@ export class ColorPicker
const opacityTop = thumbRadius;
const opacityLeft =
opacityScopeLeft ??
(colorFieldWidth * alphaToOpacity(DEFAULT_COLOR.alpha())) / OPACITY_LIMITS.max;
(sliderWidth * alphaToOpacity(DEFAULT_COLOR.alpha())) / OPACITY_LIMITS.max;
const noColor = color === null;
const vertical = scopeOrientation === "vertical";
const noHex = hexDisabled || hideHex;
Expand Down Expand Up @@ -1560,16 +1559,18 @@ export class ColorPicker
const modifier = event.shiftKey ? 10 : 1;
const { key } = event;
const arrowKeyToXOffset = {
ArrowUp: 1,
ArrowRight: 1,
ArrowDown: -1,
ArrowLeft: -1,
ArrowUp: 0.01,
ArrowRight: 0.01,
ArrowDown: -0.01,
ArrowLeft: -0.01,
};

if (arrowKeyToXOffset[key]) {
event.preventDefault();
const delta = opacityToAlpha(arrowKeyToXOffset[key] * modifier);
this.captureHueSliderColor(this.opacityScopeLeft + delta);
const delta = arrowKeyToXOffset[key] * modifier;
const alpha = this.baseColorFieldColor.alpha();
const color = this.baseColorFieldColor.alpha(alpha + delta);
this.internalColorSet(color, false);
}
};

Expand Down