merge release-6.1.7

Release 6.1.7
2025-08-23 14:01:20 +08:00 · 2022-05-26 17:18:03 -04:00
parent 8515879bde 2c7746d773
commit 4786abda3f
267 changed files with 1479 additions and 794 deletions
--- a/angular/CHANGELOG.md
+++ b/angular/CHANGELOG.md
@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [6.1.7](https://github.com/ionic-team/ionic/compare/v6.1.6...v6.1.7) (2022-05-26)
+
+
+### Bug Fixes
+
+* **accordion:** accordions expand when using binding ([#25322](https://github.com/ionic-team/ionic/issues/25322)) ([61e571e](https://github.com/ionic-team/ionic/commit/61e571e585ed8ad9b0ca2f98f57bb16616413ba6)), closes [#25307](https://github.com/ionic-team/ionic/issues/25307)
+* **range:** interfaces are now correctly exported ([#25342](https://github.com/ionic-team/ionic/issues/25342)) ([15f0c06](https://github.com/ionic-team/ionic/commit/15f0c0669f7598386edf487f408462b90ed91a08)), closes [#25341](https://github.com/ionic-team/ionic/issues/25341)
+
+
+
+
+
 ## [6.1.6](https://github.com/ionic-team/ionic/compare/v6.1.5...v6.1.6) (2022-05-18)

 **Note:** Version bump only for package @ionic/angular
--- a/angular/package-lock.json
+++ b/angular/package-lock.json
@ -1,15 +1,15 @@
 {
  "name": "@ionic/angular",
-  "version": "6.1.6",
+  "version": "6.1.7",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@ionic/angular",
-      "version": "6.1.6",
+      "version": "6.1.7",
      "license": "MIT",
      "dependencies": {
-        "@ionic/core": "^6.1.6",
+        "@ionic/core": "^6.1.7",
        "jsonc-parser": "^3.0.0",
        "tslib": "^2.0.0"
      },
@ -1023,9 +1023,9 @@
      "dev": true
    },
    "node_modules/@ionic/core": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.1.6.tgz",
-      "integrity": "sha512-AsYGEHKVHy082RST3RBrIiOZX6VXNy6qYSYtf6TwOwmF/YV+/ASaB1TqVO/jP658ML106nNcjUM0fTkbm9UXRA==",
+      "version": "6.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.1.7.tgz",
+      "integrity": "sha512-CUbH7xtKcPejHTyMvvUJZq4GIyLbL2YflzFH+mad1PoLN4TLwFTTKTDB1oeFNqwnTzaByeBvhEWSayxCbLgvjQ==",
      "dependencies": {
        "@stencil/core": "^2.14.2",
        "ionicons": "^6.0.0",
@ -7951,9 +7951,9 @@
      "dev": true
    },
    "@ionic/core": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.1.6.tgz",
-      "integrity": "sha512-AsYGEHKVHy082RST3RBrIiOZX6VXNy6qYSYtf6TwOwmF/YV+/ASaB1TqVO/jP658ML106nNcjUM0fTkbm9UXRA==",
+      "version": "6.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.1.7.tgz",
+      "integrity": "sha512-CUbH7xtKcPejHTyMvvUJZq4GIyLbL2YflzFH+mad1PoLN4TLwFTTKTDB1oeFNqwnTzaByeBvhEWSayxCbLgvjQ==",
      "requires": {
        "@stencil/core": "^2.14.2",
        "ionicons": "^6.0.0",
--- a/angular/package.json
+++ b/angular/package.json
@ -1,6 +1,6 @@
 {
  "name": "@ionic/angular",
-  "version": "6.1.6",
+  "version": "6.1.7",
  "description": "Angular specific wrappers for @ionic/core",
  "keywords": [
    "ionic",
@ -44,7 +44,7 @@
    "validate": "npm i && npm run lint && npm run test && npm run build"
  },
  "dependencies": {
-    "@ionic/core": "^6.1.6",
+    "@ionic/core": "^6.1.7",
    "jsonc-parser": "^3.0.0",
    "tslib": "^2.0.0"
  },
--- a/angular/src/directives/proxies.ts
+++ b/angular/src/directives/proxies.ts
@ -464,16 +464,18 @@ import type { ScrollBaseDetail as IContentScrollBaseDetail } from '@ionic/core';
 import type { ScrollDetail as IContentScrollDetail } from '@ionic/core';
 export declare interface IonContent extends Components.IonContent {
  /**
-   * Emitted when the scroll has started. 
+   * Emitted when the scroll has started. This event is disabled by default.
+Set `scrollEvents` to `true` to enable. 
   */
  ionScrollStart: EventEmitter<CustomEvent<IContentScrollBaseDetail>>;
  /**
   * Emitted while scrolling. This event is disabled by default.
-Look at the property: `scrollEvents` 
+Set `scrollEvents` to `true` to enable. 
   */
  ionScroll: EventEmitter<CustomEvent<IContentScrollDetail>>;
  /**
-   * Emitted when the scroll has ended. 
+   * Emitted when the scroll has ended. This event is disabled by default.
+Set `scrollEvents` to `true` to enable. 
   */
  ionScrollEnd: EventEmitter<CustomEvent<IContentScrollBaseDetail>>;

--- a/angular/src/index.ts
+++ b/angular/src/index.ts
@ -107,6 +107,10 @@ export {
  PopoverOptions,
  RadioGroupCustomEvent,
  RadioGroupChangeEventDetail,
+  RangeCustomEvent,
+  RangeChangeEventDetail,
+  RangeKnobMoveStartEventDetail,
+  RangeKnobMoveEndEventDetail,
  RefresherCustomEvent,
  RefresherEventDetail,
  RouterEventDetail,
--- a/angular/test/test-app/e2e/src/accordion.spec.ts
+++ b/angular/test/test-app/e2e/src/accordion.spec.ts
@ -0,0 +1,19 @@
+describe('Accordion', () => {
+  beforeEach(() => {
+    cy.visit('/accordions');
+  });
+
+  it('should correctly expand on multiple modal opens', () => {
+    cy.get('#open-modal').click();
+
+    cy.get('ion-accordion:first-of-type').should('have.class', 'accordion-expanded');
+    cy.get('ion-accordion:last-of-type').should('not.have.class', 'accordion-expanded');
+
+    cy.get('#dismiss').click();
+
+    cy.get('#open-modal').click();
+
+    cy.get('ion-accordion:first-of-type').should('have.class', 'accordion-expanded');
+    cy.get('ion-accordion:last-of-type').should('not.have.class', 'accordion-expanded');
+  });
+});
--- a/angular/test/test-app/src/app/accordion/accordion-modal/accordion-modal.component.html
+++ b/angular/test/test-app/src/app/accordion/accordion-modal/accordion-modal.component.html
@ -0,0 +1,17 @@
+<ion-content>
+  <ion-button id="dismiss" (click)="modal.dismiss()">Dismiss Modal</ion-button>
+  <ion-accordion-group [value]="'a'">
+    <ion-accordion value="a">
+      <ion-item slot="header">
+        <ion-label>A</ion-label>
+      </ion-item>
+      <div slot="content">A content</div>
+    </ion-accordion>
+    <ion-accordion value="b">
+      <ion-item slot="header">
+        <ion-label>B</ion-label>
+      </ion-item>
+      <div slot="content">B content</div>
+    </ion-accordion>
+  </ion-accordion-group>
+</ion-content>
--- a/angular/test/test-app/src/app/accordion/accordion-modal/accordion-modal.component.ts
+++ b/angular/test/test-app/src/app/accordion/accordion-modal/accordion-modal.component.ts
@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-accordion-modal',
+  templateUrl: './accordion-modal.component.html',
+})
+export class AccordionModalComponent {
+  modal: HTMLIonModalElement;
+
+  constructor() {}
+}
--- a/angular/test/test-app/src/app/accordion/accordion.component.html
+++ b/angular/test/test-app/src/app/accordion/accordion.component.html
@ -0,0 +1,13 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-buttons>
+      <ion-back-button></ion-back-button>
+    </ion-buttons>
+    <ion-title>
+      Accordion test
+    </ion-title>
+  </ion-toolbar>
+</ion-header>
+<ion-content>
+  <ion-button id="open-modal" (click)="open()">Open Modal</ion-button>
+</ion-content>
--- a/angular/test/test-app/src/app/accordion/accordion.component.ts
+++ b/angular/test/test-app/src/app/accordion/accordion.component.ts
@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { AccordionModalComponent } from './accordion-modal/accordion-modal.component';
+
+@Component({
+  selector: 'app-accordion',
+  templateUrl: './accordion.component.html',
+})
+export class AccordionComponent {
+
+  constructor(
+    private modalCtrl: ModalController
+  ) { }
+
+  async open() {
+    const modal = await this.modalCtrl.create({
+      component: AccordionModalComponent,
+      animated: false,
+    });
+    await modal.present();
+  }
+}
--- a/angular/test/test-app/src/app/app-routing.module.ts
+++ b/angular/test/test-app/src/app/app-routing.module.ts
@ -20,9 +20,11 @@ import { NavigationPage1Component } from './navigation-page1/navigation-page1.co
 import { NavigationPage2Component } from './navigation-page2/navigation-page2.component';
 import { NavigationPage3Component } from './navigation-page3/navigation-page3.component';
 import { AlertComponent } from './alert/alert.component';
+import { AccordionComponent } from './accordion/accordion.component';

 const routes: Routes = [
  { path: '', component: HomePageComponent },
+  { path: 'accordions', component: AccordionComponent },
  { path: 'alerts', component: AlertComponent },
  { path: 'inputs', component: InputsComponent },
  { path: 'form', component: FormComponent },
--- a/angular/test/test-app/src/app/app.module.ts
+++ b/angular/test/test-app/src/app/app.module.ts
@ -30,6 +30,8 @@ import { NavigationPage1Component } from './navigation-page1/navigation-page1.co
 import { NavigationPage2Component } from './navigation-page2/navigation-page2.component';
 import { NavigationPage3Component } from './navigation-page3/navigation-page3.component';
 import { AlertComponent } from './alert/alert.component';
+import { AccordionComponent } from './accordion/accordion.component';
+import { AccordionModalComponent } from './accordion/accordion-modal/accordion-modal.component';

@NgModule({
  declarations: [
@ -56,7 +58,9 @@ import { AlertComponent } from './alert/alert.component';
    NavigationPage1Component,
    NavigationPage2Component,
    NavigationPage3Component,
-    AlertComponent
+    AlertComponent,
+    AccordionComponent,
+    AccordionModalComponent
  ],
  imports: [
    BrowserModule.withServerTransition({ appId: 'serverApp' }),
--- a/angular/test/test-app/src/app/home-page/home-page.component.html
+++ b/angular/test/test-app/src/app/home-page/home-page.component.html
@ -62,5 +62,10 @@
          Providers
        </ion-label>
      </ion-item>
+      <ion-item routerLink="/accordions">
+        <ion-label>
+          Accordions Test
+        </ion-label>
+      </ion-item>
    </ion-list>
  </ion-content>