Skip to content
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

fix(color-picker): ensure shorthand hex is expanded regardless of alpha channel presence #11188

Merged
merged 4 commits into from
Jan 8, 2025
Merged

fix(color-picker): ensure shorthand hex is expanded regardless of alpha channel presence #11188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec7c8b4
fix(color-picker): ensure shorthand hex is expanded regardless of alp…
jcfranco Jan 2, 2025
ad141d9
update test
jcfranco Jan 3, 2025
d26cd61
Merge branch 'dev' into jcfranco/11187-ensure-shorthand-hex-is-expand…
jcfranco Jan 7, 2025
af5fa68
Merge branch 'dev' into jcfranco/11187-ensure-shorthand-hex-is-expand…
jcfranco Jan 8, 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
24 changes: 16 additions & 8 deletions ...es/calcite-components/src/components/color-picker-hex-input/color-picker-hex-input.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe("calcite-color-picker-hex-input", () => {

it("commits shorthand hex on blur", async () => {
const defaultHex = "#b33f33";
const editedHex = "#aabbcc";
const expandedHex = "#aabbcc";
const page = await newE2EPage();
await page.setContent(`<calcite-color-picker-hex-input value='${defaultHex}'></calcite-color-picker-hex-input>`);

Expand All @@ -129,45 +129,53 @@ describe("calcite-color-picker-hex-input", () => {
await page.keyboard.press("Tab");
await page.waitForChanges();

expect(await input.getProperty("value")).toBe(editedHex);
expect(await input.getProperty("value")).toBe(expandedHex);

await selectText(input);
await page.keyboard.type("abcd");
await page.keyboard.press("Tab");
await page.waitForChanges();

expect(await input.getProperty("value")).toBe(editedHex);
expect(await input.getProperty("value")).toBe(expandedHex);
});

it("commits shorthand hexa on blur", async () => {
it("commits shorthand hex and hexa on blur", async () => {
const defaultHexa = "#b33f33ff";
const editedHexa = "#aabbccdd";
const expandedHexa = "#aabbccdd";
const expandedHex = "#aabbccff";
const page = await newE2EPage();
await page.setContent(
`<calcite-color-picker-hex-input alpha-channel value='${defaultHexa}'></calcite-color-picker-hex-input>`,
);

const input = await page.find(`calcite-color-picker-hex-input`);
await selectText(input);
await page.keyboard.type("abc");
await page.keyboard.type("ab");
await page.keyboard.press("Tab");
await page.waitForChanges();

expect(await input.getProperty("value")).toBe(defaultHexa);

await selectText(input);
await page.keyboard.type("abc");
await page.keyboard.press("Tab");
await page.waitForChanges();

expect(await input.getProperty("value")).toBe(expandedHex);

await selectText(input);
await page.keyboard.type("abcd");
await page.keyboard.press("Tab");
await page.waitForChanges();

expect(await input.getProperty("value")).toBe(editedHexa);
expect(await input.getProperty("value")).toBe(expandedHexa);

await selectText(input);
await page.keyboard.type("abcde");
await page.keyboard.press("Tab");
await page.waitForChanges();

expect(await input.getProperty("value")).toBe(editedHexa);
expect(await input.getProperty("value")).toBe(expandedHexa);
});

it("normalizes value when initialized", async () => {
Expand Down
3 changes: 2 additions & 1 deletion packages/calcite-components/src/components/color-picker-hex-input/color-picker-hex-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,9 @@ export class ColorPickerHexInput extends LitElement implements LoadableComponent
const { allowEmpty, internalColor } = this;
const willClearValue = allowEmpty && !inputValue;
const isLonghand = isLonghandHex(hex);
const anyShorthand = isShorthandHex(hex, true) || isShorthandHex(hex, false);

if (isShorthandHex(hex, this.alphaChannel)) {
if (anyShorthand) {
// ensure modified pasted hex values are committed since we prevent default to remove the # char.
this.onHexInputChange();
}
Expand Down
Loading