Skip to content

Additional Time Zone Changes #12288

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

Closed
josercarcamo wants to merge 15 commits into from
Closed

Additional Time Zone Changes #12288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
85a0625
fix(input-time-zone): set display value to 'city, country' when value…
josercarcamo May 29, 2025
1de13b7
Improved name of variable
josercarcamo May 29, 2025
7a54755
Updated test to support city, country display when control is closed
josercarcamo May 29, 2025
c8d4e70
Merge branch 'dev' into josercarcamo/10980-input-time-zone-omits-country
josercarcamo May 29, 2025
f5fcd88
Refactored code into getItemLabel
josercarcamo Jun 2, 2025
800de89
Merge branch 'josercarcamo/10980-input-time-zone-omits-country' of gi…
josercarcamo Jun 2, 2025
9fa4ca3
Removed unnecessary calls to overrideSelectedLabelForRegion
josercarcamo Jun 2, 2025
c406154
Undid test changes.
josercarcamo Jun 3, 2025
b94809e
Change test to use toBe when value is changed programmatically
josercarcamo Jun 3, 2025
cac0f97
Changed 'toMatch' to 'toBe'
josercarcamo Jun 3, 2025
b0a0ce3
Merge branch 'dev' into josercarcamo/10980-input-time-zone-omits-country
josercarcamo Jun 3, 2025
2ea3746
Removed unnecessary argument
josercarcamo Jun 3, 2025
a030b0e
Merge branch 'josercarcamo/10980-input-time-zone-omits-country' of gi…
josercarcamo Jun 3, 2025
f621348
Removed unnecessary line of code
josercarcamo Jun 4, 2025
1b048b8
Changed 'toMatch' to 'toBe' for the 'region' suite only
josercarcamo Jun 4, 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
10 changes: 3 additions & 7 deletions packages/calcite-components/src/components/input-time-zone/input-time-zone.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,7 @@ describe("calcite-input-time-zone", () => {

const timeZoneItem = await page.find("calcite-input-time-zone >>> calcite-combobox-item[selected]");

expect(await timeZoneItem.getProperty("textLabel")).toMatch(
toUserFriendlyName(getCity(testTimeZoneItems[1].name)),
);
expect(await timeZoneItem.getProperty("textLabel")).toBe("Phoenix, United States");
});

it("ignores invalid values", async () => {
Expand All @@ -386,9 +384,7 @@ describe("calcite-input-time-zone", () => {

const timeZoneItem = await page.find("calcite-input-time-zone >>> calcite-combobox-item[selected]");

expect(await timeZoneItem.getProperty("textLabel")).toMatch(
toUserFriendlyName(getCity(testTimeZoneItems[0].name)),
);
expect(await timeZoneItem.getProperty("textLabel")).toBe("Mexico City, Mexico");
});

it("properly sets region label when setting value programmatically", async () => {
Expand All @@ -407,7 +403,7 @@ describe("calcite-input-time-zone", () => {

const timeZoneItem = await page.find("calcite-input-time-zone >>> calcite-combobox-item[selected]");

expect(await timeZoneItem.getProperty("textLabel")).toMatch(toUserFriendlyName(getCity(region)));
expect(await timeZoneItem.getProperty("textLabel")).toBe("New York, United States");
});

it("maps deprecated time zones to aliases", async () => {
Expand Down
31 changes: 14 additions & 17 deletions packages/calcite-components/src/components/input-time-zone/input-time-zone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ export class InputTimeZone
}

loaded(): void {
this.overrideSelectedLabelForRegion(this.open);
this.openChanged();
}

Expand Down Expand Up @@ -357,11 +356,6 @@ export class InputTimeZone

this._value = normalized;
this.selectedTimeZoneItem = timeZoneItem;

if (normalized !== value) {
await this.updateComplete;
this.overrideSelectedLabelForRegion(this.open);
}
}

onLabelClick(): void {
Expand All @@ -378,28 +372,23 @@ export class InputTimeZone
* @param open
* @private
*/
private overrideSelectedLabelForRegion(open: boolean): void {
private overrideSelectedLabelForRegion(): void {
if (this.mode !== "region" || !this.selectedTimeZoneItem) {
return;
}

const { label, metadata } = this.selectedTimeZoneItem;

this.comboboxEl.selectedItems[0].textLabel =
!metadata.country || open
? label
: getSelectedRegionTimeZoneLabel(label, metadata.country, this.messages);
this.comboboxEl.selectedItems[0].textLabel = this.getItemLabel(this.selectedTimeZoneItem);
}

private onComboboxBeforeClose(event: CustomEvent): void {
event.stopPropagation();
this.overrideSelectedLabelForRegion(false);
this.overrideSelectedLabelForRegion();
this.calciteInputTimeZoneBeforeClose.emit();
}

private onComboboxBeforeOpen(event: CustomEvent): void {
event.stopPropagation();
this.overrideSelectedLabelForRegion(true);
this.overrideSelectedLabelForRegion();
this.calciteInputTimeZoneBeforeOpen.emit();
}

Expand Down Expand Up @@ -486,6 +475,14 @@ export class InputTimeZone
return value ? this.normalizer(value) : value;
}

private getItemLabel(item: TimeZoneItem): string {
const selected = this.selectedTimeZoneItem === item;
const { label, metadata } = item;
return !this.open && item.metadata.country && selected
? getSelectedRegionTimeZoneLabel(label, metadata.country, this.messages)
: label;
}

//#endregion

//#region Rendering
Expand Down Expand Up @@ -556,15 +553,15 @@ export class InputTimeZone
{items.map((item) => {
const selected = this.selectedTimeZoneItem === item;
const { label, metadata, value } = item;

const textLabel = this.getItemLabel(item);
return (
<calcite-combobox-item
data-label={label}
description={metadata.country}
key={label}
metadata={metadata}
selected={selected}
textLabel={label}
textLabel={textLabel}
value={value}
>
<span class={CSS.offset} slot="content-end">
Expand Down