Merge remote-tracking branch 'origin/main' into benelan/ccr-vite-fix

* origin/main: chore: release next fix(input-time-zone): prevent items from being deselected (#7661)
Esri · Sep 5, 2023 · 67da1f5 · 67da1f5
2 parents 05ab848 + 4b4c43c
commit 67da1f5
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/calcite-components-react/CHANGELOG.md b/packages/calcite-components-react/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.1-next.2](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.7.1-next.1...@esri/calcite-components-react@1.7.1-next.2) (2023-09-05)
+
+**Note:** Version bump only for package @esri/calcite-components-react
+
 ## [1.7.1-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.7.1-next.0...@esri/calcite-components-react@1.7.1-next.1) (2023-09-02)
 
 **Note:** Version bump only for package @esri/calcite-components-react

diff --git a/packages/calcite-components-react/package.json b/packages/calcite-components-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@esri/calcite-components-react",
   "sideEffects": false,
-  "version": "1.7.1-next.1",
+  "version": "1.7.1-next.2",
   "homepage": "https://developers.arcgis.com/calcite-design-system/",
   "description": "A set of React components that wrap calcite components",
   "license": "SEE LICENSE.md",
@@ -20,7 +20,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@esri/calcite-components": "^1.7.1-next.1"
+    "@esri/calcite-components": "^1.7.1-next.2"
   },
   "peerDependencies": {
     "react": ">=16.7",

diff --git a/packages/calcite-components/CHANGELOG.md b/packages/calcite-components/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.1-next.2](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.7.1-next.1...@esri/calcite-components@1.7.1-next.2) (2023-09-05)
+
+### Bug Fixes
+
+- **input-time-zone:** prevent items from being deselected ([#7661](https://github.com/Esri/calcite-design-system/issues/7661)) ([c2dd436](https://github.com/Esri/calcite-design-system/commit/c2dd4368c2707dcfdfeafb85d80e2f48706e0354)), closes [#7530](https://github.com/Esri/calcite-design-system/issues/7530)
+
 ## [1.7.1-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.7.1-next.0...@esri/calcite-components@1.7.1-next.1) (2023-09-02)
 
 ### Bug Fixes

diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@esri/calcite-components",
-  "version": "1.7.1-next.1",
+  "version": "1.7.1-next.2",
   "homepage": "https://developers.arcgis.com/calcite-design-system/",
   "description": "Web Components for Esri's Calcite Design System.",
   "main": "dist/index.cjs.js",

diff --git a/packages/calcite-components/src/components/input-time-zone/input-time-zone.e2e.ts b/packages/calcite-components/src/components/input-time-zone/input-time-zone.e2e.ts
@@ -103,4 +103,21 @@ describe("calcite-input-time-zone", () => {
 
     expect(await timeZoneItem.getProperty("textLabel")).toMatch("GMT-6");
   });
+
+  it("does not allow users to deselect a timezone offset", async () => {
+    const page = await newE2EPage();
+    await page.emulateTimezone("America/Los_Angeles");
+    await page.setContent(html`<calcite-input-time-zone value="-360" open></calcite-input-time-zone>`);
+    await page.waitForChanges();
+
+    let selectedTimeZoneItem = await page.find("calcite-input-time-zone >>> calcite-combobox-item[selected]");
+    await selectedTimeZoneItem.click();
+    await page.waitForChanges();
+
+    selectedTimeZoneItem = await page.find("calcite-input-time-zone >>> calcite-combobox-item[selected]");
+    const input = await page.find("calcite-input-time-zone");
+
+    expect(await input.getProperty("value")).toBe("-360");
+    expect(await selectedTimeZoneItem.getProperty("textLabel")).toMatch("GMT-6");
+  });
 });
diff --git a/packages/calcite-components/src/components/input-time-zone/input-time-zone.tsx b/packages/calcite-components/src/components/input-time-zone/input-time-zone.tsx
@@ -138,13 +138,6 @@ export class InputTimeZone
    */
   @Prop({ mutable: true }) value: string;
 
-  @Watch("value")
-  valueWatcher(value: string): void {
-    if (this.comboboxEl && this.comboboxEl.value !== value) {
-      this.comboboxEl.value = value;
-    }
-  }
-
   //--------------------------------------------------------------------------
   //
   //  Public Methods
@@ -316,7 +309,7 @@ export class InputTimeZone
           open={this.open}
           overlayPositioning={this.overlayPositioning}
           scale={this.scale}
-          selectionMode="single"
+          selectionMode="single-persist"
           // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
           ref={this.setComboboxRef}
         >