refactor(tabs): export correct interface

CHANGELOG.md

@@ -3,31 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [7.7.0](https://github.com/ionic-team/ionic-framework/compare/v7.6.7...v7.7.0) (2024-01-31)
-
-
-### Features
-
-* add experimental hardware back button support in browsers ([#28705](https://github.com/ionic-team/ionic-framework/issues/28705)) ([658d1ca](https://github.com/ionic-team/ionic-framework/commit/658d1caccd530350843b85c0e24544ec27dd9eb4)), closes [#28703](https://github.com/ionic-team/ionic-framework/issues/28703)
-
-
-
-
-
-## [7.6.7](https://github.com/ionic-team/ionic-framework/compare/v7.6.6...v7.6.7) (2024-01-31)
-
-
-### Bug Fixes
-
-* **accordion:** prevent opening of readonly accordion using keyboard ([#28865](https://github.com/ionic-team/ionic-framework/issues/28865)) ([e10f49c](https://github.com/ionic-team/ionic-framework/commit/e10f49c43daa11fe7deb5a9b9bfd34897542b6b1)), closes [#28344](https://github.com/ionic-team/ionic-framework/issues/28344)
-* **action-sheet, alert, toast:** button roles autocomplete with available options ([#27940](https://github.com/ionic-team/ionic-framework/issues/27940)) ([f6fc22b](https://github.com/ionic-team/ionic-framework/commit/f6fc22bba60388701b80a9421510e3d843d39e9e)), closes [#27965](https://github.com/ionic-team/ionic-framework/issues/27965)
-* **item:** ensure button focus state on property change ([#28892](https://github.com/ionic-team/ionic-framework/issues/28892)) ([bf7922c](https://github.com/ionic-team/ionic-framework/commit/bf7922c8b37b32dbf90650cb74a2e77bedf0c118)), closes [#28525](https://github.com/ionic-team/ionic-framework/issues/28525)
-* **item:** only default slot content wraps ([#28773](https://github.com/ionic-team/ionic-framework/issues/28773)) ([9448783](https://github.com/ionic-team/ionic-framework/commit/9448783bb19b187f867054c86d215e3dc97952c1)), closes [#28769](https://github.com/ionic-team/ionic-framework/issues/28769)
-
-
-
-
-
 ## [7.6.6](https://github.com/ionic-team/ionic-framework/compare/v7.6.5...v7.6.6) (2024-01-24)
 
 

core/CHANGELOG.md

@@ -3,31 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [7.7.0](https://github.com/ionic-team/ionic-framework/compare/v7.6.7...v7.7.0) (2024-01-31)
-
-
-### Features
-
-* add experimental hardware back button support in browsers ([#28705](https://github.com/ionic-team/ionic-framework/issues/28705)) ([658d1ca](https://github.com/ionic-team/ionic-framework/commit/658d1caccd530350843b85c0e24544ec27dd9eb4)), closes [#28703](https://github.com/ionic-team/ionic-framework/issues/28703)
-
-
-
-
-
-## [7.6.7](https://github.com/ionic-team/ionic-framework/compare/v7.6.6...v7.6.7) (2024-01-31)
-
-
-### Bug Fixes
-
-* **accordion:** prevent opening of readonly accordion using keyboard ([#28865](https://github.com/ionic-team/ionic-framework/issues/28865)) ([e10f49c](https://github.com/ionic-team/ionic-framework/commit/e10f49c43daa11fe7deb5a9b9bfd34897542b6b1)), closes [#28344](https://github.com/ionic-team/ionic-framework/issues/28344)
-* **action-sheet, alert, toast:** button roles autocomplete with available options ([#27940](https://github.com/ionic-team/ionic-framework/issues/27940)) ([f6fc22b](https://github.com/ionic-team/ionic-framework/commit/f6fc22bba60388701b80a9421510e3d843d39e9e)), closes [#27965](https://github.com/ionic-team/ionic-framework/issues/27965)
-* **item:** ensure button focus state on property change ([#28892](https://github.com/ionic-team/ionic-framework/issues/28892)) ([bf7922c](https://github.com/ionic-team/ionic-framework/commit/bf7922c8b37b32dbf90650cb74a2e77bedf0c118)), closes [#28525](https://github.com/ionic-team/ionic-framework/issues/28525)
-* **item:** only default slot content wraps ([#28773](https://github.com/ionic-team/ionic-framework/issues/28773)) ([9448783](https://github.com/ionic-team/ionic-framework/commit/9448783bb19b187f867054c86d215e3dc97952c1)), closes [#28769](https://github.com/ionic-team/ionic-framework/issues/28769)
-
-
-
-
-
 ## [7.6.6](https://github.com/ionic-team/ionic-framework/compare/v7.6.5...v7.6.6) (2024-01-24)
 
 

core/api.txt

@@ -1362,8 +1362,8 @@ ion-tabs,shadow
 ion-tabs,method,getSelected,getSelected() => Promise<string | undefined>
 ion-tabs,method,getTab,getTab(tab: string | HTMLIonTabElement) => Promise<HTMLIonTabElement | undefined>
 ion-tabs,method,select,select(tab: string | HTMLIonTabElement) => Promise<boolean>
-ion-tabs,event,ionTabsDidChange,{ tab: string; },false
-ion-tabs,event,ionTabsWillChange,{ tab: string; },false
+ion-tabs,event,ionTabsDidChange,TabsEventDetail,false
+ion-tabs,event,ionTabsWillChange,TabsEventDetail,false
 
 ion-text,shadow
 ion-text,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true

core/package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "@ionic/core",
-  "version": "7.7.0",
+  "version": "7.6.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@ionic/core",
-      "version": "7.7.0",
+      "version": "7.6.6",
       "license": "MIT",
       "dependencies": {
-        "@stencil/core": "^4.12.0",
+        "@stencil/core": "^4.10.0",
         "ionicons": "^7.2.2",
         "tslib": "^2.1.0"
       },
@@ -17,8 +17,8 @@
         "@axe-core/playwright": "^4.8.4",
         "@capacitor/core": "^5.6.0",
         "@capacitor/haptics": "^5.0.6",
-        "@capacitor/keyboard": "^5.0.8",
-        "@capacitor/status-bar": "^5.0.7",
+        "@capacitor/keyboard": "^5.0.7",
+        "@capacitor/status-bar": "^5.0.6",
         "@ionic/eslint-config": "^0.3.0",
         "@ionic/prettier-config": "^2.0.0",
         "@playwright/test": "^1.39.0",
@@ -26,7 +26,7 @@
         "@rollup/plugin-virtual": "^2.0.3",
         "@stencil/angular-output-target": "^0.8.3",
         "@stencil/react-output-target": "^0.5.3",
-        "@stencil/sass": "^3.0.9",
+        "@stencil/sass": "^3.0.8",
         "@stencil/vue-output-target": "^0.8.7",
         "@types/jest": "^29.5.6",
         "@types/node": "^14.6.0",
@@ -652,18 +652,18 @@
       }
     },
     "node_modules/@capacitor/keyboard": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-5.0.8.tgz",
-      "integrity": "sha512-XYyBzGlzjgLPqyPVdu5McGLYV6+G2efVR4I3l5cF1B27M6U/oFqv9CQU74WNG08nee28bfccboNpv6eWCLYn1A==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-5.0.7.tgz",
+      "integrity": "sha512-+6lW8z2nXTM2NOG7D7pOasCfIGicz26+EeDRXIj5AtJibbjwtE1Q5GIY+qGHgzpmwOF0qmcrGJBz4zagDwUapg==",
       "dev": true,
       "peerDependencies": {
         "@capacitor/core": "^5.0.0"
       }
     },
     "node_modules/@capacitor/status-bar": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-5.0.7.tgz",
-      "integrity": "sha512-KblB3gV2LDMEjx3fQoNBAzxb+Tr+2mv68SfFLLDCMiMUD3Eile2TAWRWd1yxy496pDFTOs2BJtup8++iuuuJ/w==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-5.0.6.tgz",
+      "integrity": "sha512-7od8CxsBnot1XMK3IeOkproFL4hgoKoWAc3pwUvmDOkQsXoxwQm4SR9mLwQavv1XfxtHbFV9Ukd7FwMxOPSViw==",
       "dev": true,
       "peerDependencies": {
         "@capacitor/core": "^5.0.0"
@@ -1825,9 +1825,9 @@
       }
     },
     "node_modules/@stencil/core": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.0.tgz",
-      "integrity": "sha512-qAQcfNmp2sdxAh1DlyUhHfDmIUS7mhI+5LAhPphg74zK9sKgFL5vpLzgjs0wohpjlmI4msgJFYiRB8lxVPqjPg==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.10.0.tgz",
+      "integrity": "sha512-7lDTPY1IxXN2/C+wQPHt3e/dYgY4YgelA8MxOsU3ZftXtpzWad/QNWhSAtKisJMrSjQh41jMDOgD0yLBwV6E7w==",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -1846,9 +1846,9 @@
       }
     },
     "node_modules/@stencil/sass": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.9.tgz",
-      "integrity": "sha512-GtPMjf5r4/BVBCO3LvcoMSIfOa6T+0wq+SrTGEilC4NCZpuZdAlZffWxXi80caZ1jDclwdzJ2qGwEgCAfvGoNA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.8.tgz",
+      "integrity": "sha512-QJUG4Dr/b3wSizViwQXorrk1PJzxOsKkq5hSqtUHc3NNG3iomC4DQFYGeu15yNfoCDBtt4qkyHSCynsekQ8F6A==",
       "dev": true,
       "engines": {
         "node": ">=12.0.0",
@@ -11340,16 +11340,16 @@
       "requires": {}
     },
     "@capacitor/keyboard": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-5.0.8.tgz",
-      "integrity": "sha512-XYyBzGlzjgLPqyPVdu5McGLYV6+G2efVR4I3l5cF1B27M6U/oFqv9CQU74WNG08nee28bfccboNpv6eWCLYn1A==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-5.0.7.tgz",
+      "integrity": "sha512-+6lW8z2nXTM2NOG7D7pOasCfIGicz26+EeDRXIj5AtJibbjwtE1Q5GIY+qGHgzpmwOF0qmcrGJBz4zagDwUapg==",
       "dev": true,
       "requires": {}
     },
     "@capacitor/status-bar": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-5.0.7.tgz",
-      "integrity": "sha512-KblB3gV2LDMEjx3fQoNBAzxb+Tr+2mv68SfFLLDCMiMUD3Eile2TAWRWd1yxy496pDFTOs2BJtup8++iuuuJ/w==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-5.0.6.tgz",
+      "integrity": "sha512-7od8CxsBnot1XMK3IeOkproFL4hgoKoWAc3pwUvmDOkQsXoxwQm4SR9mLwQavv1XfxtHbFV9Ukd7FwMxOPSViw==",
       "dev": true,
       "requires": {}
     },
@@ -12184,9 +12184,9 @@
       "requires": {}
     },
     "@stencil/core": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.0.tgz",
-      "integrity": "sha512-qAQcfNmp2sdxAh1DlyUhHfDmIUS7mhI+5LAhPphg74zK9sKgFL5vpLzgjs0wohpjlmI4msgJFYiRB8lxVPqjPg=="
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.10.0.tgz",
+      "integrity": "sha512-7lDTPY1IxXN2/C+wQPHt3e/dYgY4YgelA8MxOsU3ZftXtpzWad/QNWhSAtKisJMrSjQh41jMDOgD0yLBwV6E7w=="
     },
     "@stencil/react-output-target": {
       "version": "0.5.3",
@@ -12196,9 +12196,9 @@
       "requires": {}
     },
     "@stencil/sass": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.9.tgz",
-      "integrity": "sha512-GtPMjf5r4/BVBCO3LvcoMSIfOa6T+0wq+SrTGEilC4NCZpuZdAlZffWxXi80caZ1jDclwdzJ2qGwEgCAfvGoNA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.8.tgz",
+      "integrity": "sha512-QJUG4Dr/b3wSizViwQXorrk1PJzxOsKkq5hSqtUHc3NNG3iomC4DQFYGeu15yNfoCDBtt4qkyHSCynsekQ8F6A==",
       "dev": true,
       "requires": {}
     },

core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ionic/core",
-  "version": "7.7.0",
+  "version": "7.6.6",
   "description": "Base components for Ionic",
   "keywords": [
     "ionic",
@@ -31,7 +31,7 @@
     "loader/"
   ],
   "dependencies": {
-    "@stencil/core": "^4.12.0",
+    "@stencil/core": "^4.10.0",
     "ionicons": "^7.2.2",
     "tslib": "^2.1.0"
   },
@@ -39,8 +39,8 @@
     "@axe-core/playwright": "^4.8.4",
     "@capacitor/core": "^5.6.0",
     "@capacitor/haptics": "^5.0.6",
-    "@capacitor/keyboard": "^5.0.8",
-    "@capacitor/status-bar": "^5.0.7",
+    "@capacitor/keyboard": "^5.0.7",
+    "@capacitor/status-bar": "^5.0.6",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^2.0.0",
     "@playwright/test": "^1.39.0",
@@ -48,7 +48,7 @@
     "@rollup/plugin-virtual": "^2.0.3",
     "@stencil/angular-output-target": "^0.8.3",
     "@stencil/react-output-target": "^0.5.3",
-    "@stencil/sass": "^3.0.9",
+    "@stencil/sass": "^3.0.8",
     "@stencil/vue-output-target": "^0.8.7",
     "@types/jest": "^29.5.6",
     "@types/node": "^14.6.0",

core/src/components.d.ts

@@ -38,6 +38,7 @@ import { SegmentButtonLayout } from "./components/segment-button/segment-button-
 import { SelectChangeEventDetail, SelectCompareFn, SelectInterface } from "./components/select/select-interface";
 import { SelectPopoverOption } from "./components/select-popover/select-popover-interface";
 import { TabBarChangedEventDetail, TabButtonClickEventDetail, TabButtonLayout } from "./components/tab-bar/tab-bar-interface";
+import { TabsEventDetail } from "./components/tabs/tabs-interface";
 import { TextareaChangeEventDetail, TextareaInputEventDetail } from "./components/textarea/textarea-interface";
 import { ToastButton, ToastDismissOptions, ToastLayout, ToastPosition, ToastPresentOptions, ToastSwipeGestureDirection } from "./components/toast/toast-interface";
 import { ToggleChangeEventDetail } from "./components/toggle/toggle-interface";
@@ -74,6 +75,7 @@ export { SegmentButtonLayout } from "./components/segment-button/segment-button-
 export { SelectChangeEventDetail, SelectCompareFn, SelectInterface } from "./components/select/select-interface";
 export { SelectPopoverOption } from "./components/select-popover/select-popover-interface";
 export { TabBarChangedEventDetail, TabButtonClickEventDetail, TabButtonLayout } from "./components/tab-bar/tab-bar-interface";
+export { TabsEventDetail } from "./components/tabs/tabs-interface";
 export { TextareaChangeEventDetail, TextareaInputEventDetail } from "./components/textarea/textarea-interface";
 export { ToastButton, ToastDismissOptions, ToastLayout, ToastPosition, ToastPresentOptions, ToastSwipeGestureDirection } from "./components/toast/toast-interface";
 export { ToggleChangeEventDetail } from "./components/toggle/toggle-interface";
@@ -4503,8 +4505,8 @@ declare global {
     };
     interface HTMLIonTabsElementEventMap {
         "ionNavWillLoad": void;
-        "ionTabsWillChange": { tab: string };
-        "ionTabsDidChange": { tab: string };
+        "ionTabsWillChange": TabsEventDetail;
+        "ionTabsDidChange": TabsEventDetail;
     }
     interface HTMLIonTabsElement extends Components.IonTabs, HTMLStencilElement {
         addEventListener<K extends keyof HTMLIonTabsElementEventMap>(type: K, listener: (this: HTMLIonTabsElement, ev: IonTabsCustomEvent<HTMLIonTabsElementEventMap[K]>) => any, options?: boolean | AddEventListenerOptions): void;
@@ -7711,11 +7713,11 @@ declare namespace LocalJSX {
         /**
           * Emitted when the navigation has finished transitioning to a new component.
          */
-        "onIonTabsDidChange"?: (event: IonTabsCustomEvent<{ tab: string }>) => void;
+        "onIonTabsDidChange"?: (event: IonTabsCustomEvent<TabsEventDetail>) => void;
         /**
           * Emitted when the navigation is about to transition to a new component.
          */
-        "onIonTabsWillChange"?: (event: IonTabsCustomEvent<{ tab: string }>) => void;
+        "onIonTabsWillChange"?: (event: IonTabsCustomEvent<TabsEventDetail>) => void;
         "useRouter"?: boolean;
     }
     interface IonText {

core/src/components/accordion/test/a11y/index.html

@@ -23,22 +23,28 @@
 
             <ion-list slot="content">
               <ion-item>
-                <ion-input label="Name" type="text"></ion-input>
+                <ion-label>Name</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Email" type="email"></ion-input>
+                <ion-label>Email</ion-label>
+                <ion-input type="email"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Phone" type="tel"></ion-input>
+                <ion-label>Phone</ion-label>
+                <ion-input type="tel"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Extension" type="text"></ion-input>
+                <ion-label>Extension</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Country" type="text"></ion-input>
+                <ion-label>Country</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="City/Province" type="text"></ion-input>
+                <ion-label>City/Province</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
             </ion-list>
           </ion-accordion>
@@ -50,19 +56,24 @@
 
             <ion-list slot="content">
               <ion-item>
-                <ion-input label="Address 1" type="text"></ion-input>
+                <ion-label>Address 1</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Address 2" type="email"></ion-input>
+                <ion-label>Address 2</ion-label>
+                <ion-input type="email"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="City" type="tel"></ion-input>
+                <ion-label>City</ion-label>
+                <ion-input type="tel"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="State" type="text"></ion-input>
+                <ion-label>State</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Zip Code" type="text"></ion-input>
+                <ion-label>Zip Code</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
             </ion-list>
           </ion-accordion>
@@ -74,19 +85,24 @@
 
             <ion-list slot="content">
               <ion-item>
-                <ion-input label="Address 1" id="address1" type="text"></ion-input>
+                <ion-label>Address 1</ion-label>
+                <ion-input id="address1" type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Address 2" type="email"></ion-input>
+                <ion-label>Address 2</ion-label>
+                <ion-input type="email"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="City" type="tel"></ion-input>
+                <ion-label>City</ion-label>
+                <ion-input type="tel"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input lable="State" type="text"></ion-input>
+                <ion-label>State</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
               <ion-item>
-                <ion-input label="Zip Code" type="text"></ion-input>
+                <ion-label>Zip Code</ion-label>
+                <ion-input type="text"></ion-input>
               </ion-item>
             </ion-list>
           </ion-accordion>

core/src/components/action-sheet/action-sheet-interface.ts

@@ -1,4 +1,4 @@
-import type { AnimationBuilder, LiteralUnion, Mode } from '../../interface';
+import type { AnimationBuilder, Mode } from '../../interface';
 
 export interface ActionSheetOptions {
   header?: string;
@@ -19,7 +19,7 @@ export interface ActionSheetOptions {
 
 export interface ActionSheetButton<T = any> {
   text?: string;
-  role?: LiteralUnion<'cancel' | 'destructive' | 'selected', string>;
+  role?: 'cancel' | 'destructive' | 'selected' | string;
   icon?: string;
   cssClass?: string | string[];
   id?: string;

core/src/components/alert/alert-interface.ts

@@ -1,4 +1,4 @@
-import type { AnimationBuilder, LiteralUnion, Mode, TextFieldTypes } from '../../interface';
+import type { AnimationBuilder, Mode, TextFieldTypes } from '../../interface';
 import type { IonicSafeString } from '../../utils/sanitization';
 
 export interface AlertOptions {
@@ -45,7 +45,7 @@ type AlertButtonOverlayHandler = boolean | void | { [key: string]: any };
 
 export interface AlertButton {
   text: string;
-  role?: LiteralUnion<'cancel' | 'destructive', string>;
+  role?: 'cancel' | 'destructive' | string;
   cssClass?: string | string[];
   id?: string;
   htmlAttributes?: { [key: string]: any };

core/src/components/app/app.tsx

@@ -1,8 +1,6 @@
 import type { ComponentInterface } from '@stencil/core';
 import { Build, Component, Element, Host, Method, h } from '@stencil/core';
 import type { FocusVisibleUtility } from '@utils/focus-visible';
-import { shoudUseCloseWatcher } from '@utils/hardware-back-button';
-import { printIonWarning } from '@utils/logging';
 import { isPlatform } from '@utils/platform';
 
 import { config } from '../../global/config';
@@ -36,20 +34,9 @@ export class App implements ComponentInterface {
           import('../../utils/input-shims/input-shims').then((module) => module.startInputShims(config, platform));
         }
         const hardwareBackButtonModule = await import('../../utils/hardware-back-button');
-        const supportsHardwareBackButtonEvents = isHybrid || shoudUseCloseWatcher();
-        if (config.getBoolean('hardwareBackButton', supportsHardwareBackButtonEvents)) {
+        if (config.getBoolean('hardwareBackButton', isHybrid)) {
           hardwareBackButtonModule.startHardwareBackButton();
         } else {
-          /**
-           * If an app sets hardwareBackButton: false and experimentalCloseWatcher: true
-           * then the close watcher will not be used.
-           */
-          if (shoudUseCloseWatcher()) {
-            printIonWarning(
-              'experimentalCloseWatcher was set to `true`, but hardwareBackButton was set to `false`. Both config options must be `true` for the Close Watcher API to be used.'
-            );
-          }
-
           hardwareBackButtonModule.blockHardwareBackButton();
         }
         if (typeof (window as any) !== 'undefined') {

core/src/components/datetime-button/test/buttons/index.html

@@ -18,7 +18,7 @@
       </ion-header>
       <ion-content>
         <ion-item>
-          <ion-input aria-label="input" value="March 15, 2022 at 12:43 AM"></ion-input>
+          <ion-input value="March 15, 2022 at 12:43 AM"></ion-input>
           <ion-datetime-button slot="end" id="default-button" datetime="default-datetime">
             <ion-icon color="primary" id="custom-date-button" slot="date-target" name="calendar"></ion-icon>
             <ion-icon color="primary" id="custom-time-button" slot="time-target" name="time"></ion-icon>

core/src/components/datetime/test/basic/index.html

@@ -214,7 +214,8 @@
           <ion-popover class="options-popover" trigger="popover-trigger">
             <ion-list lines="none">
               <ion-item>
-                <ion-checkbox>Dark Mode</ion-checkbox>
+                <ion-label>Dark Mode</ion-label>
+                <ion-checkbox slot="end"></ion-checkbox>
               </ion-item>
               <ion-item detail="true" href="?ionic:mode=ios">
                 <ion-label>iOS Mode</ion-label>
@@ -224,19 +225,23 @@
               </ion-item>
 
               <ion-item>
-                <ion-toggle id="titleToggle">Show Default Title</ion-toggle>
+                <ion-label>Show Default Title</ion-label>
+                <ion-toggle id="titleToggle"></ion-toggle>
               </ion-item>
 
               <ion-item>
-                <ion-toggle id="buttonsToggle">Show Default Buttons</ion-toggle>
+                <ion-label>Show Default Buttons</ion-label>
+                <ion-toggle id="buttonsToggle"></ion-toggle>
               </ion-item>
 
               <ion-item>
-                <ion-input label="Locale" placeholder="default" id="locale"></ion-input>
+                <ion-label>Locale</ion-label>
+                <ion-input placeholder="default" id="locale"></ion-input>
               </ion-item>
 
               <ion-item>
-                <ion-select label="Color" id="color" value="primary">
+                <ion-label>Color</ion-label>
+                <ion-select id="color" value="primary">
                   <ion-select-option value="primary">Primary</ion-select-option>
                   <ion-select-option value="secondary">Secondary</ion-select-option>
                   <ion-select-option value="tertiary">Tertiary</ion-select-option>

core/src/components/item/test/a11y/index.html

@@ -16,19 +16,23 @@
       <h1>Item</h1>
 
       <ion-item>
-        <ion-input label="Item with Input" placeholder="Placeholder"></ion-input>
+        <ion-label>Item with Input</ion-label>
+        <ion-input placeholder="Placeholder"></ion-input>
       </ion-item>
 
       <ion-item disabled>
-        <ion-input label="Item disabled with Input" placeholder="Placeholder"></ion-input>
+        <ion-label>Item disabled with Input</ion-label>
+        <ion-input placeholder="Placeholder"></ion-input>
       </ion-item>
 
       <ion-item>
-        <ion-input label="Item with Input disabled" placeholder="Placeholder" disabled></ion-input>
+        <ion-label>Item with Input disabled</ion-label>
+        <ion-input placeholder="Placeholder" disabled></ion-input>
       </ion-item>
 
       <ion-item>
-        <ion-select label="Item with Select" label-placement="floating">
+        <ion-label position="floating">Item with Select</ion-label>
+        <ion-select>
           <ion-select-option value="">No Game Console</ion-select-option>
           <ion-select-option value="nes">NES</ion-select-option>
           <ion-select-option value="n64" selected>Nintendo64</ion-select-option>
@@ -40,7 +44,8 @@
       </ion-item>
 
       <ion-item disabled>
-        <ion-select label="Item disabled with Select" label-placement="floating">
+        <ion-label position="floating">Item disabled with Select</ion-label>
+        <ion-select>
           <ion-select-option value="">No Game Console</ion-select-option>
           <ion-select-option value="nes">NES</ion-select-option>
           <ion-select-option value="n64" selected>Nintendo64</ion-select-option>
@@ -52,7 +57,8 @@
       </ion-item>
 
       <ion-item>
-        <ion-select label="Item with Select disabled" label-placement="floating" disabled>
+        <ion-label position="floating">Item with Select disabled</ion-label>
+        <ion-select disabled>
           <ion-select-option value="">No Game Console</ion-select-option>
           <ion-select-option value="nes">NES</ion-select-option>
           <ion-select-option value="n64" selected>Nintendo64</ion-select-option>
@@ -64,27 +70,33 @@
       </ion-item>
 
       <ion-item>
-        <ion-toggle>Item with Toggle</ion-toggle>
+        <ion-label>Item with Toggle</ion-label>
+        <ion-toggle slot="end"></ion-toggle>
       </ion-item>
 
       <ion-item disabled>
-        <ion-toggle>Item disabled with Toggle</ion-toggle>
+        <ion-label>Item disabled with Toggle</ion-label>
+        <ion-toggle slot="end"></ion-toggle>
       </ion-item>
 
       <ion-item>
-        <ion-toggle disabled>Item with Toggle disabled</ion-toggle>
+        <ion-label>Item with Toggle disabled</ion-label>
+        <ion-toggle slot="end" disabled></ion-toggle>
       </ion-item>
 
       <ion-item>
-        <ion-radio value="biff">Item with Radio</ion-radio>
+        <ion-label>Item with Radio</ion-label>
+        <ion-radio slot="start" value="biff"></ion-radio>
       </ion-item>
 
       <ion-item disabled>
-        <ion-radio value="biff">Item disabled with Radio</ion-radio>
+        <ion-label>Item disabled with Radio</ion-label>
+        <ion-radio slot="start" value="biff"></ion-radio>
       </ion-item>
 
       <ion-item>
-        <ion-radio value="biff" disabled>Item with Radio disabled</ion-radio>
+        <ion-label>Item with Radio disabled</ion-label>
+        <ion-radio slot="start" value="biff" disabled></ion-radio>
       </ion-item>
     </main>
   </body>

core/src/components/item/test/basic/index.html

@@ -98,9 +98,8 @@
         </ion-item>
 
         <ion-item class="overflow-visible">
+          <ion-label position="fixed">PIN:</ion-label>
           <ion-input
-            label="PIN:"
-            label-placement="fixed"
             type="number"
             pattern="[0-9]*"
             inputmode="numeric"

core/src/components/item/test/bottom/index.html

@@ -31,27 +31,32 @@
       <ion-content class="ion-padding-vertical">
         <ion-list class="basic">
           <ion-item>
-            <ion-input label="No Helper/Error" name="input" id="text"></ion-input>
+            <ion-label>No Helper/Error</ion-label>
+            <ion-input name="input" id="text"></ion-input>
           </ion-item>
 
           <ion-item>
-            <ion-input label="Helper and Error"></ion-input>
+            <ion-label>Helper and Error</ion-label>
+            <ion-input></ion-input>
             <ion-note slot="helper">Helper Text</ion-note>
             <ion-note slot="error">Error Text</ion-note>
           </ion-item>
 
           <ion-item>
-            <ion-input label="Helper Only"></ion-input>
+            <ion-label>Helper Only</ion-label>
+            <ion-input></ion-input>
             <ion-note slot="helper">Helper Text</ion-note>
           </ion-item>
 
           <ion-item>
-            <ion-input label="Error Only"></ion-input>
+            <ion-label>Error Only</ion-label>
+            <ion-input></ion-input>
             <ion-note slot="error">Error Text</ion-note>
           </ion-item>
 
           <ion-item class="custom">
-            <ion-input label="Both w/ Custom CSS"></ion-input>
+            <ion-label>Both w/ Custom CSS</ion-label>
+            <ion-input></ion-input>
             <ion-note slot="helper">Helper Text</ion-note>
             <ion-note slot="error">Error Text</ion-note>
           </ion-item>
@@ -61,14 +66,16 @@
           <ion-row>
             <ion-col>
               <ion-item fill="solid">
-                <ion-input label="Helper and Error (Fill Solid)"></ion-input>
+                <ion-label>Helper and Error (Fill Solid)</ion-label>
+                <ion-input></ion-input>
                 <ion-note slot="helper">Helper Text</ion-note>
                 <ion-note slot="error">Error Text</ion-note>
               </ion-item>
             </ion-col>
             <ion-col>
               <ion-item fill="outline">
-                <ion-input label="Helper and Error (Fill Outline)"></ion-input>
+                <ion-label>Helper and Error (Fill Outline)</ion-label>
+                <ion-input></ion-input>
                 <ion-note slot="helper">Helper Text</ion-note>
                 <ion-note slot="error">Error Text</ion-note>
               </ion-item>
@@ -77,7 +84,8 @@
           <ion-row>
             <ion-col>
               <ion-item>
-                <ion-toggle id="error-toggle" color="danger">Toggle Error</ion-toggle>
+                <ion-label>Toggle Error</ion-label>
+                <ion-toggle slot="start" id="error-toggle" color="danger"></ion-toggle>
               </ion-item>
             </ion-col>
           </ion-row>

core/src/components/item/test/inputs/index.html

@@ -39,6 +39,18 @@
               <ion-item id="btnUndefinedValue" button="true" onclick="setUndefinedValue()">
                 <ion-label>Set "undefined" values</ion-label>
               </ion-item>
+              <ion-item id="btnLabelsDefault" button="true" onclick="setLabelDefault()">
+                <ion-label>Labels: Default</ion-label>
+              </ion-item>
+              <ion-item id="btnLabelsFloating" button="true" onclick="setLabelFloating()">
+                <ion-label>Labels: Floating</ion-label>
+              </ion-item>
+              <ion-item id="btnLabelsStacked" button="true" onclick="setLabelStacked()">
+                <ion-label>Labels: Stacked</ion-label>
+              </ion-item>
+              <ion-item id="btnLabelsFixed" button="true" onclick="setLabelFixed()">
+                <ion-label>Labels: Fixed</ion-label>
+              </ion-item>
             </ion-list>
           </ion-popover>
         </ion-toolbar>
@@ -48,23 +60,28 @@
         <form onsubmit="return onSubmit(event)">
           <ion-list>
             <ion-item>
-              <ion-input label="Input" name="input" id="input" placeholder="Input"></ion-input>
+              <ion-label>Input</ion-label>
+              <ion-input name="input" id="input" placeholder="Input"></ion-input>
             </ion-item>
 
             <ion-item>
-              <ion-textarea label="Textarea" name="textarea" id="textarea" placeholder="Textarea"></ion-textarea>
+              <ion-label>Textarea</ion-label>
+              <ion-textarea name="textarea" id="textarea" placeholder="Textarea"></ion-textarea>
             </ion-item>
 
             <ion-item>
-              <ion-toggle name="toggle" id="toggle">Toggle</ion-toggle>
+              <ion-label>Toggle</ion-label>
+              <ion-toggle name="toggle" id="toggle" slot="end"></ion-toggle>
             </ion-item>
 
             <ion-item>
-              <ion-checkbox name="checkbox" id="checkbox">Checkbox</ion-checkbox>
+              <ion-label>Checkbox</ion-label>
+              <ion-checkbox name="checkbox" id="checkbox" slot="end"></ion-checkbox>
             </ion-item>
 
             <ion-item>
-              <ion-select label="Select" name="select" id="select" placeholder="Select">
+              <ion-label>Select</ion-label>
+              <ion-select name="select" id="select" placeholder="Select">
                 <ion-select-option value="1">1</ion-select-option>
                 <ion-select-option value="2">2</ion-select-option>
                 <ion-select-option value="3">3</ion-select-option>
@@ -76,7 +93,8 @@
             </ion-item>
 
             <ion-item>
-              <ion-range label="Range" name="range" id="range" value="10"></ion-range>
+              <ion-label>Range</ion-label>
+              <ion-range name="range" id="range" value="10"></ion-range>
             </ion-item>
           </ion-list>
 
@@ -129,6 +147,28 @@
         toggle.checked = checkbox.checked = false;
       }
 
+      function setLabelDefault() {
+        setLabelPosition(undefined);
+      }
+
+      function setLabelFixed() {
+        setLabelPosition('fixed');
+      }
+
+      function setLabelFloating() {
+        setLabelPosition('floating');
+      }
+
+      function setLabelStacked() {
+        setLabelPosition('stacked');
+      }
+
+      function setLabelPosition(position) {
+        Array.from(document.querySelectorAll('form ion-list ion-label')).forEach(
+          (label) => (label.position = position)
+        );
+      }
+
       function getFormControls() {
         return formControlIds.reduce((acc, id) => {
           acc[id] = document.querySelector(`#${id}`);

core/src/components/label/test/basic/index.html

@@ -41,45 +41,58 @@
         <ion-list>
           <ion-item>
             <ion-label>Default</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item>
             <ion-label color="tertiary">Tertiary</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item>
             <ion-label class="custom">Custom</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item>
             <ion-label class="ion-text-wrap">Wrap label this label just goes on and on and on</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item>
             <ion-label position="fixed">Fixed</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item>
             <ion-label position="floating">Floating</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item class="floating-color">
             <ion-label position="floating" color="success">Floating: Success</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item>
             <ion-label position="stacked">Stacked</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item class="stacked-color">
             <ion-label position="stacked" color="danger">Stacked: Danger</ion-label>
+            <ion-input></ion-input>
           </ion-item>
         </ion-list>
 
         <ion-list>
           <ion-item color="tertiary">
             <ion-label position="floating">(Item: Tertiary) Floating</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item color="primary">
             <ion-label position="stacked">(Item: Primary) Stacked</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item class="floating-color" color="tertiary">
             <ion-label position="floating" color="success">(Item: Tertiary) Floating: Success</ion-label>
+            <ion-input></ion-input>
           </ion-item>
           <ion-item class="stacked-color" color="primary">
             <ion-label position="stacked" color="danger">(Item: Primary) Stacked: Danger</ion-label>
+            <ion-input></ion-input>
           </ion-item>
         </ion-list>
       </ion-content>

core/src/components/label/test/basic/label.e2e.ts

@@ -34,7 +34,7 @@ configs().forEach(({ title, screenshot, config }) => {
         `
         <ion-item>
           <ion-label position="stacked">My Label</ion-label>
-          <ion-input aria-label="My Label"></ion-input>
+          <ion-input></ion-input>
         </ion-item>
       `,
         config
@@ -49,7 +49,7 @@ configs().forEach(({ title, screenshot, config }) => {
         `
         <ion-item>
           <ion-label position="floating">My Label</ion-label>
-          <ion-input aria-label="My Label"></ion-input>
+          <ion-input></ion-input>
         </ion-item>
       `,
         config

core/src/components/menu/menu.tsx

@@ -2,7 +2,6 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core';
 import { Build, Component, Element, Event, Host, Listen, Method, Prop, State, Watch, h } from '@stencil/core';
 import { getTimeGivenProgression } from '@utils/animation/cubic-bezier';
 import { GESTURE_CONTROLLER } from '@utils/gesture';
-import { shoudUseCloseWatcher } from '@utils/hardware-back-button';
 import type { Attributes } from '@utils/helpers';
 import { inheritAriaAttributes, assert, clamp, isEndSide as isEnd } from '@utils/helpers';
 import { menuController } from '@utils/menu-controller';
@@ -322,6 +321,7 @@ export class Menu implements ComponentInterface, MenuI {
     }
   }
 
+  @Listen('keydown')
   onKeydown(ev: KeyboardEvent) {
     if (ev.key === 'Escape') {
       this.close();
@@ -781,14 +781,8 @@ export class Menu implements ComponentInterface, MenuI {
     const { type, disabled, isPaneVisible, inheritedAttributes, side } = this;
     const mode = getIonMode(this);
 
-    /**
-     * If the Close Watcher is enabled then
-     * the ionBackButton listener in the menu controller
-     * will handle closing the menu when Escape is pressed.
-     */
     return (
       <Host
-        onKeyDown={shoudUseCloseWatcher() ? null : this.onKeydown}
         role="navigation"
         aria-label={inheritedAttributes['aria-label'] || 'menu'}
         class={{

core/src/components/modal/test/sheet/index.html

@@ -85,7 +85,10 @@
         </ion-header>
 
         <ion-content class="ion-padding">
-          <input id="root-input" />
+          <ion-item>
+            <ion-label>Input outside modal</ion-label>
+            <ion-input id="root-input" legacy="true"></ion-input>
+          </ion-item>
 
           <ion-button id="sheet-modal" onclick="presentModal()">Present Sheet Modal</ion-button>
           <ion-button

core/src/components/modal/test/sheet/modal.e2e.ts

@@ -52,7 +52,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
 
       await ionModalDidPresent.next();
 
-      const input = page.locator('#root-input').first();
+      const input = page.locator('#root-input input').first();
       await input.click();
       await expect(input).toBeFocused();
     });

core/src/components/modal/test/spec/index.html

@@ -60,7 +60,8 @@
 
         <ion-content>
           <ion-item>
-            <ion-toggle>Use Custom Animation</ion-toggle>
+            <ion-label>Use Custom Animation</ion-label>
+            <ion-toggle></ion-toggle>
           </ion-item>
 
           <ion-list id="list"></ion-list>

core/src/components/popover/test/basic/index.html

@@ -212,7 +212,7 @@
           connectedCallback() {
             this.innerHTML = `
           <ion-content>
-            <ion-textarea aria-label="textarea" rows="4" style="max-height: 44px; overflow-y: auto;" value="the cursor in this <ion-textarea>\nmust be able to be moved\nwith the arrow keys and\nhome and end keys"></ion-textarea>
+            <ion-textarea rows="4" style="max-height: 44px; overflow-y: auto;" value="the cursor in this <ion-textarea>\nmust be able to be moved\nwith the arrow keys and\nhome and end keys"></ion-textarea>
             <textarea rows="4" style="display:block;width: 100%;border: 0;padding: 8px; max-height: 44px; overflow-y: auto">the cursor in this <textarea>\nmust be able to be moved\nwith the arrow keys and\nhome and end keys</textarea>
           </ion-content>
         `;

core/src/components/progress-bar/test/buffer/index.html

@@ -60,7 +60,7 @@
           <ion-progress-bar class="progressBarBuffer" value="0.20" buffer="0.4" reversed="true"></ion-progress-bar>
 
           <ion-item>
-            <ion-range aria-label="Buffer" pin="true" value="0" id="progressValueBuffer">
+            <ion-range legacy="true" pin="true" value="0" id="progressValueBuffer">
               <ion-label slot="start">0</ion-label>
               <ion-label slot="end">100</ion-label>
             </ion-range>

core/src/components/progress-bar/test/determinate/index.html

@@ -69,7 +69,7 @@
           <ion-progress-bar id="progressBar"></ion-progress-bar>
 
           <ion-item>
-            <ion-range aria-label="Buffer" pin="true" value="0" id="progressValue">
+            <ion-range legacy="true" pin="true" value="0" id="progressValue">
               <ion-label slot="start">0</ion-label>
               <ion-label slot="end">100</ion-label>
             </ion-range>

core/src/components/radio-group/test/radio-group-events.e2e.ts

@@ -7,9 +7,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
       await page.setContent(
         `
       <ion-radio-group value="1">
-        <ion-radio value="1" aria-label="1"></ion-radio>
-        <ion-radio value="2" aria-label="2"></ion-radio>
-        <ion-radio value="3" aria-label="3"></ion-radio>
+        <ion-radio value="1"></ion-radio>
+        <ion-radio value="2"></ion-radio>
+        <ion-radio value="3"></ion-radio>
       </ion-radio-group>
     `,
         config
@@ -29,9 +29,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
       await page.setContent(
         `
       <ion-radio-group>
-        <ion-radio value="1" aria-label="1"></ion-radio>
-        <ion-radio value="2" aria-label="2"></ion-radio>
-        <ion-radio value="3" aria-label="3"></ion-radio>
+        <ion-radio value="1"></ion-radio>
+        <ion-radio value="2"></ion-radio>
+        <ion-radio value="3"></ion-radio>
       </ion-radio-group>
     `,
         config
@@ -51,9 +51,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
       await page.setContent(
         `
       <ion-radio-group value="1">
-        <ion-radio value="1" aria-label="1"></ion-radio>
-        <ion-radio value="2" aria-label="2"></ion-radio>
-        <ion-radio value="3" aria-label="3"></ion-radio>
+        <ion-radio value="1"></ion-radio>
+        <ion-radio value="2"></ion-radio>
+        <ion-radio value="3"></ion-radio>
       </ion-radio-group>
     `,
         config
@@ -72,9 +72,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
       await page.setContent(
         `
         <ion-radio-group value="1">
-          <ion-radio value="1" aria-label="1"></ion-radio>
-          <ion-radio value="2" aria-label="2"></ion-radio>
-          <ion-radio value="3" aria-label="3"></ion-radio>
+          <ion-radio value="1"></ion-radio>
+          <ion-radio value="2"></ion-radio>
+          <ion-radio value="3"></ion-radio>
         </ion-radio-group>
       `,
         config
@@ -94,9 +94,9 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
         await page.setContent(
           `
         <ion-radio-group allow-empty-selection="true" value="1">
-          <ion-radio value="1" aria-label="1"></ion-radio>
-          <ion-radio value="2" aria-label="2"></ion-radio>
-          <ion-radio value="3" aria-label="3"></ion-radio>
+          <ion-radio value="1"></ion-radio>
+          <ion-radio value="2"></ion-radio>
+          <ion-radio value="3"></ion-radio>
         </ion-radio-group>
       `,
           config

core/src/components/range/test/label/range.e2e.ts

@@ -7,7 +7,7 @@ configs().forEach(({ title, screenshot, config }) => {
       test('should render a range with no visible label', async ({ page }) => {
         await page.setContent(
           `
-          <ion-range style="padding-inline-start: 20px;" aria-label="Range"></ion-range>
+          <ion-range legacy="true"></ion-range>
         `,
           config
         );
@@ -80,7 +80,7 @@ configs().forEach(({ title, screenshot, config }) => {
       test('should render a range with no visible label', async ({ page }) => {
         await page.setContent(
           `
-          <ion-range aria-label="Range">
+          <ion-range legacy="true">
             <ion-icon name="volume-off" slot="start"></ion-icon>
             <ion-icon name="volume-high" slot="end"></ion-icon>
           </ion-range>