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(input, input-text, input-number): restore handling of autofocus global attribute #11118

Merged
merged 2 commits into from
Dec 21, 2024
Merged

fix(input, input-text, input-number): restore handling of autofocus global attribute #11118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9fa64a
fix(input, input-text, input-number): restore handling of autofocus g…
jcfranco Dec 20, 2024
1d7a45b
fix tests
jcfranco Dec 21, 2024
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
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/input-number/input-number.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class InputNumber
private actionWrapperEl = createRef<HTMLDivElement>();

attributeWatch = useWatchAttributes(
["enterkeyhint", "inputmode"],
["autofocus", "enterkeyhint", "inputmode"],
this.handleGlobalAttributesChanged,
);

Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/input-text/input-text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class InputText
private actionWrapperEl = createRef<HTMLDivElement>();

attributeWatch = useWatchAttributes(
["enterkeyhint", "inputmode", "spellcheck"],
["autofocus", "enterkeyhint", "inputmode", "spellcheck"],
this.handleGlobalAttributesChanged,
);

Expand Down
36 changes: 32 additions & 4 deletions packages/calcite-components/src/components/input/common/tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,26 @@ export function testWorkaroundForGlobalPropRemoval(
<${inputTag} autofocus inputmode="${testInputMode}" enterkeyhint="${testEnterKeyHint}"></${inputTag}>
`);

const input = await page.find(`${inputTag} >>> input`);
const internalInput = await page.find(`${inputTag} >>> input`);

expect(internalInput.getAttribute("autofocus")).toBe("");
expect(internalInput.getAttribute("inputmode")).toBe(testInputMode);
expect(internalInput.getAttribute("enterkeyhint")).toBe(testEnterKeyHint);

const input = await page.find(inputTag);

// we intentionally teast each one to avoid renders caused by unrelated props affecting result
await input.removeAttribute("autofocus");
await page.waitForChanges();
expect(internalInput.getAttribute("autofocus")).toBe(null);

expect(input.getAttribute("autofocus")).toBe("");
expect(input.getAttribute("inputmode")).toBe(testInputMode);
expect(input.getAttribute("enterkeyhint")).toBe(testEnterKeyHint);
await input.removeAttribute("inputmode");
await page.waitForChanges();
expect(internalInput.getAttribute("inputmode")).toBe("");

await input.removeAttribute("enterkeyhint");
await page.waitForChanges();
expect(internalInput.getAttribute("enterkeyhint")).toBe("");
});

it("supports global props", async () => {
Expand All @@ -150,5 +165,18 @@ export function testWorkaroundForGlobalPropRemoval(
expect(internalInput.getAttribute("autofocus")).toBe("");
expect(internalInput.getAttribute("inputmode")).toBe(testInputMode);
expect(internalInput.getAttribute("enterkeyhint")).toBe(testEnterKeyHint);

// we intentionally teast each one to avoid renders caused by unrelated props affecting result
input.setProperty("autofocus", false);
await page.waitForChanges();
expect(internalInput.getAttribute("autofocus")).toBe(null);

input.setProperty("inputMode", null);
await page.waitForChanges();
expect(internalInput.getAttribute("inputmode")).toBe("");

input.setProperty("enterKeyHint", null);
await page.waitForChanges();
expect(internalInput.getAttribute("enterkeyhint")).toBe("");
});
}
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/input/input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class Input
private actionWrapperEl = createRef<HTMLDivElement>();

attributeWatch = useWatchAttributes(
["enterkeyhint", "inputmode", "spellcheck"],
["autofocus", "enterkeyhint", "inputmode", "spellcheck"],
this.handleGlobalAttributesChanged,
);

Expand Down
Loading