diff --git a/.github/workflows/stencil-nightly.yml b/.github/workflows/stencil-nightly.yml index f6d33736f4..c5db4e1bb3 100644 --- a/.github/workflows/stencil-nightly.yml +++ b/.github/workflows/stencil-nightly.yml @@ -8,7 +8,12 @@ on: # at 6:00 UTC (6:00 am UTC) - cron: '00 06 * * 1-5' workflow_dispatch: - # allows for manual invocations in the GitHub UI + inputs: + npm_release_tag: + required: true + type: string + description: What version should be pulled from NPM? + default: nightly # When pushing a new commit we should # cancel the previous test run to not @@ -24,7 +29,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-core-stencil-prerelease with: - stencil-version: nightly + stencil-version: ${{ inputs.npm_release_tag || 'nightly' }} test-core-clean-build: needs: [build-core-with-stencil-nightly] @@ -47,7 +52,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-spec with: - stencil-version: nightly + stencil-version: ${{ inputs.npm_release_tag || 'nightly' }} test-core-screenshot: strategy: diff --git a/CHANGELOG.md b/CHANGELOG.md index ce95286a27..78b280dd28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + + +### Bug Fixes + +* **fab-button:** position is correct with custom sizes ([#28195](https://github.com/ionic-team/ionic-framework/issues/28195)) ([eb41b55](https://github.com/ionic-team/ionic-framework/commit/eb41b556b57c97139b9c36dc3e3be3711d8afaca)), closes [#22564](https://github.com/ionic-team/ionic-framework/issues/22564) +* **range:** knob positions are correct on initial render with custom elements build ([#28257](https://github.com/ionic-team/ionic-framework/issues/28257)) ([ac2c8e6](https://github.com/ionic-team/ionic-framework/commit/ac2c8e6c22da4d0d8224def24ddef56ee9d26246)), closes [#25444](https://github.com/ionic-team/ionic-framework/issues/25444) + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + + +### Bug Fixes + +* **react:** Nav unmounts component while invoking popTo or popToRoot ([#27821](https://github.com/ionic-team/ionic-framework/issues/27821)) ([0edcb2c](https://github.com/ionic-team/ionic-framework/commit/0edcb2cd85133ae8c304c53c37ca829e5fbad447)), closes [#27798](https://github.com/ionic-team/ionic-framework/issues/27798) +* **title:** large title uses custom font on transition ([#28231](https://github.com/ionic-team/ionic-framework/issues/28231)) ([71a7af0](https://github.com/ionic-team/ionic-framework/commit/71a7af0f52fe62937b1dea1ca2739e78801a2a6d)) + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 405a601b97..fd69a43dd2 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + + +### Bug Fixes + +* **fab-button:** position is correct with custom sizes ([#28195](https://github.com/ionic-team/ionic-framework/issues/28195)) ([eb41b55](https://github.com/ionic-team/ionic-framework/commit/eb41b556b57c97139b9c36dc3e3be3711d8afaca)), closes [#22564](https://github.com/ionic-team/ionic-framework/issues/22564) +* **range:** knob positions are correct on initial render with custom elements build ([#28257](https://github.com/ionic-team/ionic-framework/issues/28257)) ([ac2c8e6](https://github.com/ionic-team/ionic-framework/commit/ac2c8e6c22da4d0d8224def24ddef56ee9d26246)), closes [#25444](https://github.com/ionic-team/ionic-framework/issues/25444) + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + + +### Bug Fixes + +* **title:** large title uses custom font on transition ([#28231](https://github.com/ionic-team/ionic-framework/issues/28231)) ([71a7af0](https://github.com/ionic-team/ionic-framework/commit/71a7af0f52fe62937b1dea1ca2739e78801a2a6d)) + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) diff --git a/core/package-lock.json b/core/package-lock.json index 1a6966fa71..b0faecc9a4 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1,21 +1,21 @@ { "name": "@ionic/core", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/core", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, "devDependencies": { "@axe-core/playwright": "^4.7.3", - "@capacitor/core": "^5.4.1", + "@capacitor/core": "^5.4.2", "@capacitor/haptics": "^5.0.6", "@capacitor/keyboard": "^5.0.6", "@capacitor/status-bar": "^5.0.6", @@ -27,7 +27,7 @@ "@rollup/plugin-virtual": "^2.0.3", "@stencil/angular-output-target": "^0.8.2", "@stencil/react-output-target": "^0.5.3", - "@stencil/sass": "^3.0.5", + "@stencil/sass": "^3.0.6", "@stencil/vue-output-target": "^0.8.6", "@types/jest": "^27.5.2", "@types/node": "^14.6.0", @@ -606,9 +606,9 @@ "dev": true }, "node_modules/@capacitor/core": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.4.1.tgz", - "integrity": "sha512-QG9gORuxw2WNcVpLHT1W3LzACOJvFWRuHcz4b9edzxehSELqiSQ4DoGWLp4PuNBBp2oV/fGA4FMNmfZ1jIAAWg==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.4.2.tgz", + "integrity": "sha512-XbR1vldJFzBWHeoGPpgfNy3Zhjf0NxXdHEaGNANWVBg0ZWG2gwFr1dcRALUUQtbwrEEkCCNiLYg4YiQPRk7SEQ==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -1653,9 +1653,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -1674,9 +1674,9 @@ } }, "node_modules/@stencil/sass": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.5.tgz", - "integrity": "sha512-9nyllMXOEvHywo6fP2iwXgnq32A+OOUE36Aq7iUjzwT3wdr04qsvupO1JNIyRvmvCDF15hOKXztrZH1/wDu2Zg==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.6.tgz", + "integrity": "sha512-d+k8qCvDgzI/vIV7M5QavIS6b75X4yn+YQH80KA/L0oL/hKD8KeF3wMOd7P1nDhGLIGRNw5tBDbe0GeIsGVU7A==", "dev": true, "engines": { "node": ">=12.0.0", @@ -10849,9 +10849,9 @@ "dev": true }, "@capacitor/core": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.4.1.tgz", - "integrity": "sha512-QG9gORuxw2WNcVpLHT1W3LzACOJvFWRuHcz4b9edzxehSELqiSQ4DoGWLp4PuNBBp2oV/fGA4FMNmfZ1jIAAWg==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.4.2.tgz", + "integrity": "sha512-XbR1vldJFzBWHeoGPpgfNy3Zhjf0NxXdHEaGNANWVBg0ZWG2gwFr1dcRALUUQtbwrEEkCCNiLYg4YiQPRk7SEQ==", "dev": true, "requires": { "tslib": "^2.1.0" @@ -11598,9 +11598,9 @@ "requires": {} }, "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" }, "@stencil/react-output-target": { "version": "0.5.3", @@ -11610,9 +11610,9 @@ "requires": {} }, "@stencil/sass": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.5.tgz", - "integrity": "sha512-9nyllMXOEvHywo6fP2iwXgnq32A+OOUE36Aq7iUjzwT3wdr04qsvupO1JNIyRvmvCDF15hOKXztrZH1/wDu2Zg==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-3.0.6.tgz", + "integrity": "sha512-d+k8qCvDgzI/vIV7M5QavIS6b75X4yn+YQH80KA/L0oL/hKD8KeF3wMOd7P1nDhGLIGRNw5tBDbe0GeIsGVU7A==", "dev": true, "requires": {} }, diff --git a/core/package.json b/core/package.json index 6107abe789..76b470d32e 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "7.4.1", + "version": "7.4.3", "description": "Base components for Ionic", "keywords": [ "ionic", @@ -31,13 +31,13 @@ "loader/" ], "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, "devDependencies": { "@axe-core/playwright": "^4.7.3", - "@capacitor/core": "^5.4.1", + "@capacitor/core": "^5.4.2", "@capacitor/haptics": "^5.0.6", "@capacitor/keyboard": "^5.0.6", "@capacitor/status-bar": "^5.0.6", @@ -49,7 +49,7 @@ "@rollup/plugin-virtual": "^2.0.3", "@stencil/angular-output-target": "^0.8.2", "@stencil/react-output-target": "^0.5.3", - "@stencil/sass": "^3.0.5", + "@stencil/sass": "^3.0.6", "@stencil/vue-output-target": "^0.8.6", "@types/jest": "^27.5.2", "@types/node": "^14.6.0", @@ -94,6 +94,7 @@ "test.spec": "stencil test --spec --max-workers=2", "test.spec.debug": "npx --node-arg=\"--inspect-brk\" stencil test --spec", "test.e2e": "npx playwright test", + "test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots", "test.watch": "jest --watch --no-cache", "test.treeshake": "node scripts/treeshaking.js dist/index.js", "validate": "npm run lint && npm run test && npm run build && npm run test.treeshake" diff --git a/core/src/components.d.ts b/core/src/components.d.ts index 44ba508e79..72e908cb92 100644 --- a/core/src/components.d.ts +++ b/core/src/components.d.ts @@ -6980,6 +6980,7 @@ declare namespace LocalJSX { */ "mode"?: "ios" | "md"; "onIonTabBarChanged"?: (event: IonTabBarCustomEvent) => void; + "onIonTabBarLoaded"?: (event: IonTabBarCustomEvent) => void; /** * The selected tab component */ diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx index f0de55608e..41b5837609 100644 --- a/core/src/components/content/content.tsx +++ b/core/src/components/content/content.tsx @@ -1,6 +1,6 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Build, Component, Element, Event, Host, Listen, Method, Prop, forceUpdate, h, readTask } from '@stencil/core'; -import { componentOnReady } from '@utils/helpers'; +import { componentOnReady, hasLazyBuild } from '@utils/helpers'; import { isPlatform } from '@utils/platform'; import { isRTL } from '@utils/rtl'; import { createColorClasses, hostContext } from '@utils/theme'; @@ -34,6 +34,9 @@ export class Content implements ComponentInterface { private isMainContent = true; private resizeTimeout: ReturnType | null = null; + private tabsElement: HTMLElement | null = null; + private tabsLoadCallback?: () => void; + // Detail is used in a hot loop in the scroll event, by allocating it here // V8 will be able to inline any read/write to it since it's a monomorphic class. // https://mrale.ph/blog/2015/01/11/whats-up-with-monomorphism.html @@ -115,15 +118,61 @@ export class Content implements ComponentInterface { connectedCallback() { this.isMainContent = this.el.closest('ion-menu, ion-popover, ion-modal') === null; + + /** + * The fullscreen content offsets need to be + * computed after the tab bar has loaded. Since + * lazy evaluation means components are not hydrated + * at the same time, we need to wait for the ionTabBarLoaded + * event to fire. This does not impact dist-custom-elements + * because there is no hydration there. + */ + if (hasLazyBuild(this.el)) { + /** + * We need to cache the reference to the tabs. + * If just the content is unmounted then we won't + * be able to query for the closest tabs on disconnectedCallback + * since the content has been removed from the DOM tree. + */ + const closestTabs = (this.tabsElement = this.el.closest('ion-tabs')); + if (closestTabs !== null) { + /** + * When adding and removing the event listener + * we need to make sure we pass the same function reference + * otherwise the event listener will not be removed properly. + * We can't only pass `this.resize` because "this" in the function + * context becomes a reference to IonTabs instead of IonContent. + * + * Additionally, we listen for ionTabBarLoaded on the IonTabs + * instance rather than the IonTabBar instance. It's possible for + * a tab bar to be conditionally rendered/mounted. Since ionTabBarLoaded + * bubbles, we can catch any instances of child tab bars loading by listening + * on IonTabs. + */ + this.tabsLoadCallback = () => this.resize(); + closestTabs.addEventListener('ionTabBarLoaded', this.tabsLoadCallback); + } + } } disconnectedCallback() { this.onScrollEnd(); - } - @Listen('appload', { target: 'window' }) - onAppLoad() { - this.resize(); + if (hasLazyBuild(this.el)) { + /** + * The event listener and tabs caches need to + * be cleared otherwise this will create a memory + * leak where the IonTabs instance can never be + * garbage collected. + */ + const { tabsElement, tabsLoadCallback } = this; + if (tabsElement !== null && tabsLoadCallback !== undefined) { + tabsElement.removeEventListener('ionTabBarLoaded', tabsLoadCallback); + } + + this.tabsElement = null; + this.tabsLoadCallback = undefined; + } } /** diff --git a/core/src/components/fab-button/fab-button.scss b/core/src/components/fab-button/fab-button.scss index d3841dd541..0bf1495072 100755 --- a/core/src/components/fab-button/fab-button.scss +++ b/core/src/components/fab-button/fab-button.scss @@ -199,7 +199,7 @@ // -------------------------------------------------- :host(.fab-button-small) { - @include margin(($fab-size - $fab-small-size) * 0.5); + @include margin($fab-button-small-margin); width: #{$fab-small-size}; height: #{$fab-small-size}; diff --git a/core/src/components/fab-button/fab-button.vars.scss b/core/src/components/fab-button/fab-button.vars.scss index 5cca974ef5..2556fec9b3 100755 --- a/core/src/components/fab-button/fab-button.vars.scss +++ b/core/src/components/fab-button/fab-button.vars.scss @@ -11,3 +11,6 @@ $fab-small-size: 40px !default; /// @prop - Border radius of the FAB button $fab-border-radius: 50% !default; + +/// @prop - Margin applied to the small FAB button +$fab-button-small-margin: 8px !default; diff --git a/core/src/components/fab-list/fab-list.scss b/core/src/components/fab-list/fab-list.scss index daff4a6893..5726d77751 100644 --- a/core/src/components/fab-list/fab-list.scss +++ b/core/src/components/fab-list/fab-list.scss @@ -4,7 +4,7 @@ // -------------------------------------------------- :host { - @include margin($fab-size + $fab-list-margin, 0); + @include margin(calc(100% + #{$fab-list-margin}), 0); display: none; position: absolute; @@ -13,8 +13,15 @@ flex-direction: column; align-items: center; - min-width: $fab-size; - min-height: $fab-size; + /** + * The list should be centered relative to the parent + * FAB button. We set minimum dimensions so the + * FAB list can be centered relative to the small FAB button. + * However, the small FAB button adds start/end margin, so we need + * to account for that in the FAB list dimensions. + */ + min-width: $fab-small-size + ($fab-button-small-margin * 2); + min-height: $fab-small-size + ($fab-button-small-margin * 2); } :host(.fab-list-active) { @@ -59,14 +66,14 @@ } :host(.fab-list-side-start) { - @include margin(0, $fab-size + $fab-list-margin); + @include margin(0, calc(100% + #{$fab-list-margin})); @include position-horizontal(null, 0); flex-direction: row-reverse; } :host(.fab-list-side-end) { - @include margin(0, $fab-size + $fab-list-margin); + @include margin(0, calc(100% + #{$fab-list-margin})); @include position(null, null, null, 0); flex-direction: row; diff --git a/core/src/components/fab/fab.scss b/core/src/components/fab/fab.scss index c6c24afc70..73fc4b375d 100644 --- a/core/src/components/fab/fab.scss +++ b/core/src/components/fab/fab.scss @@ -1,4 +1,5 @@ @import "./fab.vars"; +@import "../fab-list/fab-list.vars"; // Floating Action Button Container // -------------------------------------------------- @@ -6,6 +7,9 @@ :host { position: absolute; + width: fit-content; + height: fit-content; + z-index: $z-index-fixed-content; } @@ -14,8 +18,8 @@ // -------------------------------------------------- :host(.fab-horizontal-center) { - @include position(null, null, null, 50%); - @include margin-horizontal(-$fab-size * 0.5, null); + @include position(null, 0px, null, 0px); + @include margin(null, auto); } :host(.fab-horizontal-start) { @@ -38,22 +42,93 @@ top: $fab-content-margin; } +/** + * Reset the top value since edge + * styles use margin-top. + */ :host(.fab-vertical-top.fab-edge) { - top: -$fab-size * 0.5; + top: 0; } +/** + * We need to adjust the parent FAB button up by half + * its height so that half of it sits on the header. As a result, + * we target the slotted ion-fab-button instead of targeting the host. + */ +:host(.fab-vertical-top.fab-edge) ::slotted(ion-fab-button) { + margin-top: -50%; +} + +/** + * The small FAB button adds top and bottom margin. We need to account for + * that margin when we adjust the FAB button for edge styles since we + * are overriding the margin-top value below. + */ +:host(.fab-vertical-top.fab-edge) ::slotted(ion-fab-button.fab-button-small) { + margin-top: calc((-100% + $fab-button-small-margin * 2) / 2); +} + +/** + * Since we are adjusting the FAB button we also need + * to adjust the sibling ion-fab-list otherwise there will be + * a gap between the parent FAB button and the associated list. + */ +:host(.fab-vertical-top.fab-edge) ::slotted(ion-fab-list.fab-list-side-start), +:host(.fab-vertical-top.fab-edge) ::slotted(ion-fab-list.fab-list-side-end) { + @include margin(-50%, null, null, null); +} + +:host(.fab-vertical-top.fab-edge) ::slotted(ion-fab-list.fab-list-side-top), +:host(.fab-vertical-top.fab-edge) ::slotted(ion-fab-list.fab-list-side-bottom) { + @include margin(calc(50% + #{$fab-list-margin}) null, null, null); +} :host(.fab-vertical-bottom) { bottom: $fab-content-margin; } +/** + * Reset the bottom value since edge + * styles use margin-bottom. + */ :host(.fab-vertical-bottom.fab-edge) { - bottom: -$fab-size * 0.5; + bottom: 0; } +/** + * We need to adjust the parent FAB button down by half + * its height so that half of it sits on the footer. As a result, + * we target the slotted ion-fab-button instead of targeting the host. + */ +:host(.fab-vertical-bottom.fab-edge) ::slotted(ion-fab-button) { + margin-bottom: -50%; +} + +/** + * The small FAB button adds top and bottom margin. We need to account for + * that margin when we adjust the FAB button for edge styles since we + * are overriding the margin-bottom value below. + */ +:host(.fab-vertical-bottom.fab-edge) ::slotted(ion-fab-button.fab-button-small) { + margin-bottom: calc((-100% + $fab-button-small-margin * 2) / 2); +} + +/** + * Since we are adjusting the FAB button we also need + * to adjust the sibling ion-fab-list otherwise there will be + * a gap between the parent FAB button and the associated list. + */ +:host(.fab-vertical-bottom.fab-edge) ::slotted(ion-fab-list.fab-list-side-start), +:host(.fab-vertical-bottom.fab-edge) ::slotted(ion-fab-list.fab-list-side-end) { + @include margin(null, null, -50%, null); +} + +:host(.fab-vertical-bottom.fab-edge) ::slotted(ion-fab-list.fab-list-side-top), +:host(.fab-vertical-bottom.fab-edge) ::slotted(ion-fab-list.fab-list-side-bottom) { + @include margin(null, null, calc(50% + #{$fab-list-margin}) null); +} :host(.fab-vertical-center) { - @include margin(-$fab-size * 0.5, null, null, null); - - top: 50%; + @include position(0px, null, 0px, null); + @include margin(auto, null); } diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts b/core/src/components/fab/test/custom-size/fab.e2e.ts new file mode 100644 index 0000000000..1a73994463 --- /dev/null +++ b/core/src/components/fab/test/custom-size/fab.e2e.ts @@ -0,0 +1,17 @@ +import { expect } from '@playwright/test'; +import { configs, test, Viewports } from '@utils/test/playwright'; + +/** + * This behavior does not vary across modes + */ +configs({ modes: ['ios'] }).forEach(({ title, config, screenshot }) => { + test.describe(title('fab: custom size'), () => { + test('should position fabs correctly with custom sizes', async ({ page }) => { + await page.goto(`/src/components/fab/test/custom-size`, config); + + await page.setViewportSize(Viewports.tablet.landscape); + + await expect(page).toHaveScreenshot(screenshot(`fab-custom-size`)); + }); + }); +}); diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Chrome-linux.png b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Chrome-linux.png new file mode 100644 index 0000000000..2c259946ef Binary files /dev/null and b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Chrome-linux.png differ diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Firefox-linux.png b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Firefox-linux.png new file mode 100644 index 0000000000..3999c543b5 Binary files /dev/null and b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Firefox-linux.png differ diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Safari-linux.png b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Safari-linux.png new file mode 100644 index 0000000000..8d770f8358 Binary files /dev/null and b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-ltr-Mobile-Safari-linux.png differ diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Chrome-linux.png b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Chrome-linux.png new file mode 100644 index 0000000000..2c259946ef Binary files /dev/null and b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Chrome-linux.png differ diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Firefox-linux.png b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Firefox-linux.png new file mode 100644 index 0000000000..95c09da789 Binary files /dev/null and b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Firefox-linux.png differ diff --git a/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Safari-linux.png b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Safari-linux.png new file mode 100644 index 0000000000..8d770f8358 Binary files /dev/null and b/core/src/components/fab/test/custom-size/fab.e2e.ts-snapshots/fab-custom-size-ios-rtl-Mobile-Safari-linux.png differ diff --git a/core/src/components/fab/test/custom-size/index.html b/core/src/components/fab/test/custom-size/index.html new file mode 100644 index 0000000000..eb2e0b9d25 --- /dev/null +++ b/core/src/components/fab/test/custom-size/index.html @@ -0,0 +1,241 @@ + + + + + Floating Action Button - Custom Size + + + + + + + + + + + + + + Floating Action Button - Custom Size + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Floating Action Button - Basic + + + + + diff --git a/core/src/components/header/header.ios.scss b/core/src/components/header/header.ios.scss index 7c1211b6af..26b6453332 100644 --- a/core/src/components/header/header.ios.scss +++ b/core/src/components/header/header.ios.scss @@ -107,3 +107,28 @@ .header-collapse-condense-inactive.header-collapse-condense ion-toolbar.in-toolbar ion-buttons.buttons-collapse { visibility: hidden; } + +/** + * The main header is only hidden once the collapsible large + * title is configured. As a result, if the main header loads + * before the collapsible large title is configured then the + * main header will be visible briefly before being hidden + * by the collapsible large title. + * + * The following selector ensures that any main header + * on a page with a collapsible large title is hidden + * before the collapsible large title is configured. + * Once the collapsible large title is configured the main + * header will have the ".header-collapse-main" class, and + * this selector will no longer apply. + * + * The :has(...) part of the selector ensures a couple things: + * 1. This will only apply within a page view since the content + * must be a subsequent-sibling of the header (~ ion-content). + * 2. This will only apply when that content has a collapse header (ion-header[collapse="condense"]) + * + * We use opacity: 0 to avoid a layout shift. + */ +ion-header:not(.header-collapse-main):has(~ ion-content ion-header[collapse="condense"]) { + opacity: 0; +} diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx index ec12c98210..350984b5a0 100644 --- a/core/src/components/menu/menu.tsx +++ b/core/src/components/menu/menu.tsx @@ -40,6 +40,15 @@ export class Menu implements ComponentInterface, MenuI { private blocker = GESTURE_CONTROLLER.createBlocker({ disableScroll: true }); private didLoad = false; + /** + * Flag used to determine if an open/close + * operation was cancelled. For example, if + * an app calls "menu.open" then disables the menu + * part way through the animation, then this would + * be considered a cancelled operation. + */ + private operationCancelled = false; + isAnimating = false; width!: number; _isOpen = false; @@ -432,6 +441,17 @@ export class Menu implements ComponentInterface, MenuI { await this.loadAnimation(); await this.startAnimation(shouldOpen, animated); + + /** + * If the animation was cancelled then + * return false because the operation + * did not succeed. + */ + if (this.operationCancelled) { + this.operationCancelled = false; + return false; + } + this.afterAnimation(shouldOpen); return true; @@ -472,18 +492,24 @@ export class Menu implements ComponentInterface, MenuI { const easingReverse = mode === 'ios' ? iosEasingReverse : mdEasingReverse; const ani = (this.animation as Animation)! .direction(isReversed ? 'reverse' : 'normal') - .easing(isReversed ? easingReverse : easing) - .onFinish(() => { - if (ani.getDirection() === 'reverse') { - ani.direction('normal'); - } - }); + .easing(isReversed ? easingReverse : easing); if (animated) { await ani.play(); } else { ani.play({ sync: true }); } + + /** + * We run this after the play invocation + * instead of using ani.onFinish so that + * multiple onFinish callbacks do not get + * run if an animation is played, stopped, + * and then played again. + */ + if (ani.getDirection() === 'reverse') { + ani.direction('normal'); + } } private _isActive() { @@ -643,8 +669,6 @@ export class Menu implements ComponentInterface, MenuI { } private afterAnimation(isOpen: boolean) { - assert(this.isAnimating, '_before() should be called while animating'); - // keep opening/closing the menu disabled for a touch more yet // only add listeners/css if it's enabled and isOpen // and only remove listeners/css if it's not open @@ -713,10 +737,30 @@ export class Menu implements ComponentInterface, MenuI { this.gesture.enable(isActive && this.swipeGesture); } - // Close menu immediately - if (!isActive && this._isOpen) { - // close if this menu is open, and should not be enabled - this.forceClosing(); + /** + * If the menu is disabled but it is still open + * then we should close the menu immediately. + * Additionally, if the menu is in the process + * of animating {open, close} and the menu is disabled + * then it should still be closed immediately. + */ + if (!isActive) { + /** + * It is possible to disable the menu while + * it is mid-animation. When this happens, we + * need to set the operationCancelled flag + * so that this._setOpen knows to return false + * and not run the "afterAnimation" callback. + */ + if (this.isAnimating) { + this.operationCancelled = true; + } + + /** + * If the menu is disabled then we should + * forcibly close the menu even if it is open. + */ + this.afterAnimation(false); } if (doc?.contains(this.el)) { @@ -730,19 +774,6 @@ export class Menu implements ComponentInterface, MenuI { menuController._setActiveMenu(this); } } - - assert(!this.isAnimating, 'can not be animating'); - } - - private forceClosing() { - assert(this._isOpen, 'menu cannot be closed'); - - this.isAnimating = true; - - const ani = (this.animation as Animation)!.direction('reverse'); - ani.play({ sync: true }); - - this.afterAnimation(false); } render() { diff --git a/core/src/components/menu/test/disable/index.html b/core/src/components/menu/test/disable/index.html new file mode 100644 index 0000000000..fd561ce69d --- /dev/null +++ b/core/src/components/menu/test/disable/index.html @@ -0,0 +1,41 @@ + + + + + Menu - Disable + + + + + + + + + + + + + + Menu + + + Menu Content + + +
+ + + + + + Menu - Disable + + + Content +
+ + + diff --git a/core/src/components/menu/test/disable/menu.e2e.ts b/core/src/components/menu/test/disable/menu.e2e.ts new file mode 100644 index 0000000000..c4a352694a --- /dev/null +++ b/core/src/components/menu/test/disable/menu.e2e.ts @@ -0,0 +1,66 @@ +import { expect } from '@playwright/test'; +import { configs, test } from '@utils/test/playwright'; + +/** + * This behavior does not vary across modes/directions + */ +configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) => { + test.describe(title('menu: disable'), () => { + test.beforeEach(async ({ page }) => { + await page.goto(`/src/components/menu/test/disable`, config); + }); + + test('should disable when menu is fully open', async ({ page }) => { + const logs: string[] = []; + + page.on('console', (msg) => { + if (msg.type() === 'error') { + logs.push(msg.text()); + } + }); + + const menu = page.locator('ion-menu'); + + // Should be visible on initial presentation + await menu.evaluate((el: HTMLIonMenuElement) => el.open()); + await expect(menu).toBeVisible(); + + // Disabling menu should hide it + await menu.evaluate((el: HTMLIonMenuElement) => (el.disabled = true)); + await expect(menu).toBeHidden(); + + // Re-enabling menu and opening it show make it visible + await menu.evaluate((el: HTMLIonMenuElement) => (el.disabled = false)); + await menu.evaluate((el: HTMLIonMenuElement) => el.open()); + await expect(menu).toBeVisible(); + + expect(logs.length).toBe(0); + }); + + test('should disable when menu is animating', async ({ page }) => { + const logs: string[] = []; + + page.on('console', (msg) => { + if (msg.type() === 'error') { + logs.push(msg.text()); + } + }); + + const menu = page.locator('ion-menu'); + + // Opening and quickly disabling menu should hide it + menu.evaluate((el: HTMLIonMenuElement) => { + el.open(); + setTimeout(() => (el.disabled = true), 0); + }); + await expect(menu).toBeHidden(); + + // Re-enabling menu and opening it show make it visible + await menu.evaluate((el: HTMLIonMenuElement) => (el.disabled = false)); + await menu.evaluate((el: HTMLIonMenuElement) => el.open()); + await expect(menu).toBeVisible(); + + expect(logs.length).toBe(0); + }); + }); +}); diff --git a/core/src/components/nav/nav.scss b/core/src/components/nav/nav.scss index d036423e21..125bb460fb 100644 --- a/core/src/components/nav/nav.scss +++ b/core/src/components/nav/nav.scss @@ -6,6 +6,5 @@ position: absolute; contain: layout size style; - overflow: hidden; z-index: $z-index-page-container; } diff --git a/core/src/components/picker-column/test/test.utils.ts b/core/src/components/picker-column/test/test.utils.ts index ded9d57f87..658b32a32f 100644 --- a/core/src/components/picker-column/test/test.utils.ts +++ b/core/src/components/picker-column/test/test.utils.ts @@ -39,7 +39,7 @@ export async function testPickerColumn( await page.waitForChanges(); screenshots.push({ - name: `picker-${description}-column-diff-${i}-${page.getSnapshotSettings()}.png`, + name: screenshot(`picker-${description}-column-diff-${i}`), screenshot: await page.screenshot(), }); } diff --git a/core/src/components/range/range.tsx b/core/src/components/range/range.tsx index bc51d322a4..2e194cd8c6 100644 --- a/core/src/components/range/range.tsx +++ b/core/src/components/range/range.tsx @@ -319,6 +319,7 @@ export class Range implements ComponentInterface { componentDidLoad() { this.originalIonInput = this.ionInput; this.setupGesture(); + this.updateRatio(); this.didLoad = true; } diff --git a/core/src/components/router-outlet/router-outlet.scss b/core/src/components/router-outlet/router-outlet.scss index d036423e21..125bb460fb 100644 --- a/core/src/components/router-outlet/router-outlet.scss +++ b/core/src/components/router-outlet/router-outlet.scss @@ -6,6 +6,5 @@ position: absolute; contain: layout size style; - overflow: hidden; z-index: $z-index-page-container; } diff --git a/core/src/components/router-outlet/router-outlet.tsx b/core/src/components/router-outlet/router-outlet.tsx index dbdd8763ed..d25234f814 100644 --- a/core/src/components/router-outlet/router-outlet.tsx +++ b/core/src/components/router-outlet/router-outlet.tsx @@ -3,6 +3,7 @@ import { Component, Element, Event, Method, Prop, Watch, h } from '@stencil/core import { getTimeGivenProgression } from '@utils/animation/cubic-bezier'; import { attachComponent, detachComponent } from '@utils/framework-delegate'; import { shallowEqualStringMap, hasLazyBuild } from '@utils/helpers'; +import { createLockController } from '@utils/lock-controller'; import { transition } from '@utils/transition'; import { config } from '../../global/config'; @@ -24,11 +25,11 @@ import type { RouteID, RouterDirection, RouteWrite, NavOutlet } from '../router/ shadow: true, }) export class RouterOutlet implements ComponentInterface, NavOutlet { + private readonly lockController = createLockController(); private activeEl: HTMLElement | undefined; // TODO(FW-2832): types private activeComponent: any; private activeParams: any; - private waitPromise?: Promise; private gesture?: Gesture; private ani?: Animation; private gestureOrAnimationInProgress = false; @@ -140,7 +141,7 @@ export class RouterOutlet implements ComponentInterface, NavOutlet { leavingEl: HTMLElement | undefined, opts?: RouterOutletOptions ): Promise { - const unlock = await this.lock(); + const unlock = await this.lockController.lock(); let changed = false; try { changed = await this.transition(enteringEl, leavingEl, opts); @@ -285,18 +286,6 @@ export class RouterOutlet implements ComponentInterface, NavOutlet { return true; } - // TODO: FW-5048 - Remove this code in favor of using lock controller from utils - private async lock() { - const p = this.waitPromise; - let resolve!: () => void; - this.waitPromise = new Promise((r) => (resolve = r)); - - if (p !== undefined) { - await p; - } - return resolve; - } - render() { return ; } diff --git a/core/src/components/segment/segment.tsx b/core/src/components/segment/segment.tsx index 6aa98fa755..c96425c802 100644 --- a/core/src/components/segment/segment.tsx +++ b/core/src/components/segment/segment.tsx @@ -1,6 +1,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Prop, State, Watch, h, writeTask } from '@stencil/core'; import type { Gesture, GestureDetail } from '@utils/gesture'; +import { raf } from '@utils/helpers'; import { isRTL } from '@utils/rtl'; import { createColorClasses, hostContext } from '@utils/theme'; @@ -83,31 +84,7 @@ export class Segment implements ComponentInterface { * Used by `ion-segment-button` to determine if the button should be checked. */ this.ionSelect.emit({ value }); - - if (this.scrollable) { - const buttons = this.getButtons(); - const activeButton = buttons.find((button) => button.value === value); - if (activeButton !== undefined) { - /** - * Scrollable segment buttons should be - * centered within the view including - * buttons that are partially offscreen. - */ - activeButton.scrollIntoView({ - behavior: 'smooth', - inline: 'center', - - /** - * Segment should scroll on the - * horizontal axis. `block: 'nearest'` - * ensures that the vertical axis - * does not scroll if the segment - * as a whole is already in view. - */ - block: 'nearest', - }); - } - } + this.scrollActiveButtonIntoView(); } /** @@ -163,6 +140,14 @@ export class Segment implements ComponentInterface { async componentDidLoad() { this.setCheckedClasses(); + /** + * We need to wait for the buttons to all be rendered + * before we can scroll. + */ + raf(() => { + this.scrollActiveButtonIntoView(); + }); + this.gesture = (await import('../../utils/gesture')).createGesture({ el: this.el, gestureName: 'segment', @@ -320,6 +305,35 @@ export class Segment implements ComponentInterface { } } + private scrollActiveButtonIntoView() { + const { scrollable, value } = this; + + if (scrollable) { + const buttons = this.getButtons(); + const activeButton = buttons.find((button) => button.value === value); + if (activeButton !== undefined) { + /** + * Scrollable segment buttons should be + * centered within the view including + * buttons that are partially offscreen. + */ + activeButton.scrollIntoView({ + behavior: 'smooth', + inline: 'center', + + /** + * Segment should scroll on the + * horizontal axis. `block: 'nearest'` + * ensures that the vertical axis + * does not scroll if the segment + * as a whole is already in view. + */ + block: 'nearest', + }); + } + } + } + private setNextIndex(detail: GestureDetail, isEnd = false) { const rtl = isRTL(this.el); const activated = this.activated; diff --git a/core/src/components/segment/test/scrollable/segment.e2e.ts b/core/src/components/segment/test/scrollable/segment.e2e.ts index 3a21b9ac92..1b015fcc68 100644 --- a/core/src/components/segment/test/scrollable/segment.e2e.ts +++ b/core/src/components/segment/test/scrollable/segment.e2e.ts @@ -2,7 +2,7 @@ import { expect } from '@playwright/test'; import { configs, test } from '@utils/test/playwright'; configs().forEach(({ title, screenshot, config }) => { - test.describe(title('segment: scrollable'), () => { + test.describe(title('segment: scrollable (rendering)'), () => { test('should not have visual regressions', async ({ page }) => { await page.setContent( ` @@ -45,3 +45,47 @@ configs().forEach(({ title, screenshot, config }) => { }); }); }); + +configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => { + test.describe(title('segment: scrollable (functionality)'), () => { + test('should scroll active button into view when value is already set', async ({ page }) => { + await page.setContent( + ` + + + First + + + Second + + + Third + + + Fourth + + + Fifth + + + Sixth + + + Seventh + + + Eighth + + + Ninth + + + `, + config + ); + + const activeButton = page.locator('#activeButton'); + await expect(activeButton).toBeInViewport(); + }); + }); +}); diff --git a/core/src/components/tab-bar/tab-bar.tsx b/core/src/components/tab-bar/tab-bar.tsx index 0589b773ad..7dea85e741 100644 --- a/core/src/components/tab-bar/tab-bar.tsx +++ b/core/src/components/tab-bar/tab-bar.tsx @@ -57,6 +57,14 @@ export class TabBar implements ComponentInterface { /** @internal */ @Event() ionTabBarChanged!: EventEmitter; + /** + * @internal + * This event is used in IonContent to correctly + * calculate the fullscreen content offsets + * when IonTabBar is used. + */ + @Event() ionTabBarLoaded!: EventEmitter; + componentWillLoad() { this.selectedTabChanged(); } @@ -82,6 +90,10 @@ export class TabBar implements ComponentInterface { } } + componentDidLoad() { + this.ionTabBarLoaded.emit(); + } + render() { const { color, translucent, keyboardVisible } = this; const mode = getIonMode(this); diff --git a/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts b/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts index fedd12f046..ada3b65e46 100644 --- a/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts +++ b/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts @@ -39,5 +39,40 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, screenshot, c await expect(tabBar).toHaveScreenshot(screenshot(`tab-bar-translucent`)); }); + test('should render translucent tab bar even when wrapped in a page container', async ({ page }) => { + await page.setContent( + ` + + +
+ My Content +
+ + + Recents + + + + Favorites + 23 + + + + Settings + + + + `, + config + ); + + const tabBar = page.locator('ion-tab-bar'); + + await expect(tabBar).toHaveScreenshot(screenshot(`tab-bar-translucent-container`)); + }); }); }); diff --git a/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts-snapshots/tab-bar-translucent-container-ios-ltr-Mobile-Chrome-linux.png b/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts-snapshots/tab-bar-translucent-container-ios-ltr-Mobile-Chrome-linux.png new file mode 100644 index 0000000000..7bbef774e4 Binary files /dev/null and b/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts-snapshots/tab-bar-translucent-container-ios-ltr-Mobile-Chrome-linux.png differ diff --git a/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts-snapshots/tab-bar-translucent-container-ios-ltr-Mobile-Safari-linux.png b/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts-snapshots/tab-bar-translucent-container-ios-ltr-Mobile-Safari-linux.png new file mode 100644 index 0000000000..933de4462f Binary files /dev/null and b/core/src/components/tab-bar/test/translucent/tab-bar.e2e.ts-snapshots/tab-bar-translucent-container-ios-ltr-Mobile-Safari-linux.png differ diff --git a/core/src/components/title/title.ios.scss b/core/src/components/title/title.ios.scss index a993c94787..5a377b4e80 100644 --- a/core/src/components/title/title.ios.scss +++ b/core/src/components/title/title.ios.scss @@ -61,6 +61,7 @@ :host(.title-large.ion-cloned-element) { --color: #{$text-color}; + font-family: var(--ion-font-family); } :host(.title-large) .toolbar-title { diff --git a/core/src/css/core.scss b/core/src/css/core.scss index ee77b2f467..28dd99e974 100644 --- a/core/src/css/core.scss +++ b/core/src/css/core.scss @@ -156,7 +156,6 @@ html.ios ion-modal.modal-card .ion-page { justify-content: space-between; contain: layout size style; - overflow: hidden; z-index: $z-index-page-container; } diff --git a/core/src/utils/animation/animation.ts b/core/src/utils/animation/animation.ts index 8d7b358bed..c547bafd3c 100644 --- a/core/src/utils/animation/animation.ts +++ b/core/src/utils/animation/animation.ts @@ -30,6 +30,8 @@ interface AnimationOnFinishCallback { o?: AnimationCallbackOptions; } +type AnimationOnStopCallback = AnimationOnFinishCallback; + export const createAnimation = (animationId?: string): Animation => { let _delay: number | undefined; let _duration: number | undefined; @@ -63,6 +65,7 @@ export const createAnimation = (animationId?: string): Animation => { const id: string | undefined = animationId; const onFinishCallbacks: AnimationOnFinishCallback[] = []; const onFinishOneTimeCallbacks: AnimationOnFinishCallback[] = []; + const onStopOneTimeCallbacks: AnimationOnStopCallback[] = []; const elements: HTMLElement[] = []; const childAnimations: Animation[] = []; const stylesheets: HTMLElement[] = []; @@ -134,6 +137,35 @@ export const createAnimation = (animationId?: string): Animation => { return numAnimationsRunning !== 0 && !paused; }; + /** + * @internal + * Remove a callback from a chosen callback array + * @param callbackToRemove: A reference to the callback that should be removed + * @param callbackObjects: An array of callbacks that callbackToRemove should be removed from. + */ + const clearCallback = ( + callbackToRemove: AnimationLifecycle, + callbackObjects: AnimationOnFinishCallback[] | AnimationOnStopCallback[] + ) => { + const index = callbackObjects.findIndex((callbackObject) => callbackObject.c === callbackToRemove); + + if (index > -1) { + callbackObjects.splice(index, 1); + } + }; + + /** + * @internal + * Add a callback to be fired when an animation is stopped/cancelled. + * @param callback: A reference to the callback that should be fired + * @param opts: Any options associated with this particular callback + */ + const onStop = (callback: AnimationLifecycle, opts?: AnimationCallbackOptions) => { + onStopOneTimeCallbacks.push({ c: callback, o: opts }); + + return ani; + }; + const onFinish = (callback: AnimationLifecycle, opts?: AnimationCallbackOptions) => { const callbacks = opts?.oneTimeCallback ? onFinishOneTimeCallbacks : onFinishCallbacks; callbacks.push({ c: callback, o: opts }); @@ -953,7 +985,34 @@ export const createAnimation = (animationId?: string): Animation => { shouldCalculateNumAnimations = false; } - onFinish(() => resolve(), { oneTimeCallback: true }); + /** + * When one of these callbacks fires we + * need to clear the other's callback otherwise + * you can potentially get these callbacks + * firing multiple times if the play method + * is subsequently called. + * Example: + * animation.play() (onStop and onFinish callbacks are registered) + * animation.stop() (onStop callback is fired, onFinish is not) + * animation.play() (onStop and onFinish callbacks are registered) + * Total onStop callbacks: 1 + * Total onFinish callbacks: 2 + */ + const onStopCallback = () => { + clearCallback(onFinishCallback, onFinishOneTimeCallbacks); + resolve(); + }; + const onFinishCallback = () => { + clearCallback(onStopCallback, onStopOneTimeCallbacks); + resolve(); + }; + + /** + * The play method resolves when an animation + * run either finishes or is cancelled. + */ + onFinish(onFinishCallback, { oneTimeCallback: true }); + onStop(onStopCallback, { oneTimeCallback: true }); childAnimations.forEach((animation) => { animation.play(); @@ -969,6 +1028,14 @@ export const createAnimation = (animationId?: string): Animation => { }); }; + /** + * Stops an animation and resets it state to the + * beginning. This does not fire any onFinish + * callbacks because the animation did not finish. + * However, since the animation was not destroyed + * (i.e. the animation could run again) we do not + * clear the onFinish callbacks. + */ const stop = () => { childAnimations.forEach((animation) => { animation.stop(); @@ -980,6 +1047,9 @@ export const createAnimation = (animationId?: string): Animation => { } resetFlags(); + + onStopOneTimeCallbacks.forEach((onStopCallback) => onStopCallback.c(0, ani)); + onStopOneTimeCallbacks.length = 0; }; const from = (property: string, value: any) => { diff --git a/core/src/utils/animation/test/animation.spec.ts b/core/src/utils/animation/test/animation.spec.ts index 3f267b6038..b9cfb18c3d 100644 --- a/core/src/utils/animation/test/animation.spec.ts +++ b/core/src/utils/animation/test/animation.spec.ts @@ -4,6 +4,24 @@ import { processKeyframes } from '../animation-utils'; import { getTimeGivenProgression } from '../cubic-bezier'; describe('Animation Class', () => { + describe('play()', () => { + it('should resolve when the animation is cancelled', async () => { + // Tell Jest to expect 1 assertion for async code + expect.assertions(1); + const el = document.createElement('div'); + const animation = createAnimation() + .addElement(el) + .fromTo('transform', 'translateX(0px)', 'translateX(100px)') + .duration(100000); + + const animationPromise = animation.play(); + + animation.stop(); + + // Expect that the promise resolves and returns undefined + expect(animationPromise).resolves.toEqual(undefined); + }); + }); describe('isRunning()', () => { let animation: Animation; beforeEach(() => { diff --git a/core/src/utils/gesture/swipe-back.ts b/core/src/utils/gesture/swipe-back.ts index 2a8da3abd3..2be8ebdff7 100644 --- a/core/src/utils/gesture/swipe-back.ts +++ b/core/src/utils/gesture/swipe-back.ts @@ -79,7 +79,11 @@ export const createSwipeBackGesture = ( return createGesture({ el, gestureName: 'goback-swipe', - gesturePriority: 40, + /** + * Swipe to go back should have priority over other horizontal swipe + * gestures. These gestures have a priority of 100 which is why 101 was chosen here. + */ + gesturePriority: 101, threshold: 10, canStart, onStart: onStartHandler, diff --git a/core/src/utils/test/playwright/docs/README.md b/core/src/utils/test/playwright/docs/README.md index 3836f331f4..b3a30efe7c 100644 --- a/core/src/utils/test/playwright/docs/README.md +++ b/core/src/utils/test/playwright/docs/README.md @@ -6,5 +6,6 @@ This directory contains information on how to get the most out of Ionic's E2E te | Directory | Description | | - | - | +| [Usage Instructions](./usage-instructions.md) | How to run tests and update screenshots | | [Best Practices](./best-practices.md) | Contains information on conventions to follow as well as pitfalls to avoid when writing tests | | [API](./api.md) | Documents the custom functionality that has been built on top of Playwright | \ No newline at end of file diff --git a/core/src/utils/test/playwright/docs/api.md b/core/src/utils/test/playwright/docs/api.md index 627099220d..f3fea6d524 100644 --- a/core/src/utils/test/playwright/docs/api.md +++ b/core/src/utils/test/playwright/docs/api.md @@ -108,7 +108,6 @@ The [page fixture](https://playwright.dev/docs/test-fixtures) has been extended | `setIonViewport` | Resizes the browser window to fit the entire height of `ion-content` on screen. Only needed when taking fullsize screenshots with `ion-content`. | | `waitForChanges` | Waits for Stencil to re-render before proceeeding. This is typically only needed when you update a property on a component. | | `spyOnEvent` | Creates an event spy that can be used to wait for a [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) to be emitted. | -| `getSnapshotSettings` (DEPRECATED) | Returns information about the current test (such as mode or direction) to generate a unique screenshot name. Deprecated: Use the `screenshot` function provided by the test [generator](#generators) instead. |
diff --git a/core/src/utils/test/playwright/docs/usage-instructions.md b/core/src/utils/test/playwright/docs/usage-instructions.md new file mode 100644 index 0000000000..de7c348018 --- /dev/null +++ b/core/src/utils/test/playwright/docs/usage-instructions.md @@ -0,0 +1,114 @@ +# Usage Instructions + +E2E tests verify Ionic components in a real browser. This is useful for testing user interaction and catching visual regressions. We use Playwright as it allows us to test in multiple browsers. Tests can be written and run using Playwright's public API. + +## Table of Contents + +- [Installing Dependencies](#installing-dependencies) +- [Running Tests](#running-tests) +- [Managing Screenshots](#managing-screenshots) +- [Further Reading](#further-reading) + +## Installing Dependencies + +Follow these steps to install Playwright dependencies. These steps must also be run whenever the installed version of Playwright changes to ensure that you are testing with the correct browser binaries. + +1. Install the Playwright dependency in the `core` directory: `npm ci` +2. Download the correct browsers: `npx playwright install` + +## Running Tests + +### Running All Test Files + +All E2E tests can be run using the following command: + +```shell +npm run test.e2e +``` + +> [!NOTE] +> This command is a wrapper for `npx playwright test`. All data passed to `npm run test.e2e` can also be passed to `npx playwright test`. + +### Running Specific Test Files + +Specific test files can be run by passing the file paths or a directory that contains multiple test files. See [Managing Screenshots](#managing-screenshots) for generating ground truths before running screenshot tests. + +**Specific Test Files** + +```shell +npm run test.e2e src/components/button/test/basic/button.e2e.ts src/components/button/test/a11y/button.e2e.ts +``` + +**Test Directory with Multiple Files** + +```shell +# Will run all the test files in the `test` directory +npm run test.e2e src/components/button/test +``` + +## Managing Screenshots + +### Generating or Updating Ground Truths (Local Development) + +If you are running a test that takes a screenshot, you must first generate the reference screenshot from your reference branch. This is known as generating a "ground truth screenshot". All other screenshots will be compared to this ground truth. Alternatively, if the reference branch has changed since the last time you generated ground truths you may need to update your local ground truths. + +For most types of work the reference branch is typically `main`. Features are merged into a different branch, so developers should use that as the reference branch. For example, if branch `foo` will be merged into `bar`, then the reference branch is `bar`. + +The examples provided in the [Running Tests](#running-tests) section also apply here, allowing you to update screenshots for a specific test file. + +Note that since you are generating the reference branch ground truth screenshots, you must be on the reference branch locally. Don't forget to pull the latest reference branch changes and then re-build using `npm run build`. + +```shell +npm run test.e2e.update-snapshots +``` + +Optionally, you can pass a directory to only update the ground truths for that directory & subdirectories. This is useful when working on a specific component. + +```shell +npm run test.e2e.update-snapshots src/components/alert/ +``` + +From here, you can switch back to your branch and run the tests. + +> [!NOTE] +> Locally generated ground truths should not be committed to the repo. The `.gitignore` file prevents this from accidentally happening. + +### Updating Ground Truths (CI) + +> [!IMPORTANT] +> Only Ionic Team members can update ground truths on the main repo. Ground truths cannot be updated on forked versions of the repo. + +When making an intentional visual change, you will need to update the ground truth screenshots or add new ones. It is important that the ground truth and comparison screenshots are taken in the same environment, so do not update the ground truth screenshots locally and commit them to the repo. + +Instead, use the [Update Reference Screenshots GitHub Action](https://github.com/ionic-team/ionic-framework/actions/workflows/update-screenshots.yml). + +1. Click the **Run workflow** dropdown. +2. Select your branch. +3. Click **Run workflow**. + +This workflow will re-run the screenshot tests. Instead of failing any tests with mismatched screenshots, it will take new ground truth screenshots. These ground truth screenshots will be pushed as a single commit to your branch once the workflow is completed. + +### Verifying Screenshot Differences + +When any of the screenshot tests fail, it means a potential regression was caught. Developers must manually verify the difference in the Playwright test report. + +If the screenshots fail on CI then developers must download the build artifact. On the **Summary** page for a particular workflow, find the **Artifacts** section. Screenshot tests are currently parallelized across several test runners, and the results from each of those runners is included in an artifact with the following naming scheme: + +``` +test-results-[current shard]-[total shards] + +Example: + +test-results-2-5 --> Test results from job runner 2 out of 5. +``` + +Download the appropriate artifact and unzip the file. + +In the newly created directory, open the `playwright-report/index.html` in your browser. From here, you will be able to see the tests that failed as well as the expected screenshot, the actual screenshot, and the pixel differences. + +> [!WARNING] +> It is recommended to verify the screenshot difference within the Playwright test report first. If you choose to try and reproduce the difference in a browser manually, make sure you are using the **exact** same browser version that Playwright is using. + +## Further Reading + +For more info on how to use Playwright, please see the [Playwright documentation](https://playwright.dev/docs/intro). diff --git a/core/src/utils/test/playwright/page/utils/get-snapshot-settings.ts b/core/src/utils/test/playwright/page/utils/get-snapshot-settings.ts deleted file mode 100644 index 8e91d91a6e..0000000000 --- a/core/src/utils/test/playwright/page/utils/get-snapshot-settings.ts +++ /dev/null @@ -1,33 +0,0 @@ -import type { Page, TestInfo } from '@playwright/test'; - -/** - * This provides metadata that can be used to - * create a unique screenshot URL. - * For example, we need to be able to differentiate - * between iOS in LTR mode and iOS in RTL mode. - */ -export const getSnapshotSettings = (page: Page, testInfo: TestInfo) => { - const url = page.url(); - const splitUrl = url.split('?'); - const paramsString = splitUrl[1]; - - const { mode, rtl } = testInfo.project.metadata; - - /** - * Account for custom settings when overriding - * the mode/rtl setting. Fall back to the - * project metadata if nothing was found. This - * will happen if you call page.getSnapshotSettings - * before page.goto. - */ - const urlToParams = new URLSearchParams(paramsString); - const formattedMode = urlToParams.get('ionic:mode') ?? mode; - const formattedRtl = urlToParams.get('rtl') ?? rtl; - - /** - * If encoded in the search params, the rtl value - * can be `'true'` instead of `true`. - */ - const rtlString = formattedRtl === true || formattedRtl === 'true' ? 'rtl' : 'ltr'; - return `${formattedMode}-${rtlString}`; -}; diff --git a/core/src/utils/test/playwright/page/utils/index.ts b/core/src/utils/test/playwright/page/utils/index.ts index d5fad6cc12..e0caf9d01a 100644 --- a/core/src/utils/test/playwright/page/utils/index.ts +++ b/core/src/utils/test/playwright/page/utils/index.ts @@ -1,6 +1,5 @@ export * from './wait-for-changes'; export * from './goto'; -export * from './get-snapshot-settings'; export * from './set-ion-viewport'; export * from './spy-on-event'; export * from './set-content'; diff --git a/core/src/utils/test/playwright/playwright-declarations.ts b/core/src/utils/test/playwright/playwright-declarations.ts index 74d4ff93e7..d900f37abe 100644 --- a/core/src/utils/test/playwright/playwright-declarations.ts +++ b/core/src/utils/test/playwright/playwright-declarations.ts @@ -78,11 +78,6 @@ export interface E2EPage extends Page { * Use this method when taking full-screen screenshots. */ setIonViewport: (options?: SetIonViewportOptions) => Promise; - /** - * This provides metadata that can be used to create a unique screenshot URL. - * For example, we need to be able to differentiate between iOS in LTR mode and iOS in RTL mode. - */ - getSnapshotSettings: () => string; /** * After changes have been made to a component, such as an update to a property or attribute, * we need to wait until the changes have been applied to the DOM. diff --git a/core/src/utils/test/playwright/playwright-page.ts b/core/src/utils/test/playwright/playwright-page.ts index bbab9b9b0c..1b20d6c271 100644 --- a/core/src/utils/test/playwright/playwright-page.ts +++ b/core/src/utils/test/playwright/playwright-page.ts @@ -10,15 +10,7 @@ import { test as base } from '@playwright/test'; import { PageUtils } from '../press-keys'; import { initPageEvents } from './page/event-spy'; -import { - getSnapshotSettings, - goto as goToPage, - setContent, - setIonViewport, - spyOnEvent, - waitForChanges, - locator, -} from './page/utils'; +import { goto as goToPage, setContent, setIonViewport, spyOnEvent, waitForChanges, locator } from './page/utils'; import type { LocatorOptions } from './page/utils'; import type { E2EPage, @@ -57,7 +49,6 @@ export async function extendPageFixture(page: E2EPage, testInfo: TestInfo) { page.locator = (selector: string, options?: LocatorOptions) => locator(page, originalLocator, selector, options); // Custom Ionic methods - page.getSnapshotSettings = () => getSnapshotSettings(page, testInfo); page.setIonViewport = (options?: SetIonViewportOptions) => setIonViewport(page, options); page.waitForChanges = (timeoutMs?: number) => waitForChanges(page, timeoutMs); page.spyOnEvent = (eventName: string) => spyOnEvent(page, eventName); diff --git a/core/src/utils/test/playwright/viewports/index.ts b/core/src/utils/test/playwright/viewports/index.ts index 307945e549..cc17dec898 100644 --- a/core/src/utils/test/playwright/viewports/index.ts +++ b/core/src/utils/test/playwright/viewports/index.ts @@ -4,6 +4,10 @@ export const Viewports = { width: 768, height: 900, }, + landscape: { + width: 900, + height: 768, + }, }, // Based off https://github.com/ionic-team/ionic-framework/blob/2fe23d9d46c3593843c781c57340332e5a86fd64/core/src/components/split-pane/split-pane.tsx#L9-L13 large: { diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c9c700ee6e..efbafafe54 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/docs + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + +**Note:** Version bump only for package @ionic/docs + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/docs diff --git a/docs/package-lock.json b/docs/package-lock.json index 87481d2803..7d88443c3a 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/docs", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/docs", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT" } } diff --git a/docs/package.json b/docs/package.json index 9988086ead..c73a989461 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "7.4.1", + "version": "7.4.3", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts", diff --git a/lerna.json b/lerna.json index 77b8478787..17d93b7795 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "docs", "packages/*" ], - "version": "7.4.1" + "version": "7.4.3" } diff --git a/packages/angular-server/CHANGELOG.md b/packages/angular-server/CHANGELOG.md index 9c18c35392..32cd6e0dc6 100644 --- a/packages/angular-server/CHANGELOG.md +++ b/packages/angular-server/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/angular-server + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + +**Note:** Version bump only for package @ionic/angular-server + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/angular-server diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index 22302b86bb..912531163e 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular-server", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular-server", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@ionic/core": "^7.4.1" + "@ionic/core": "^7.4.3" }, "devDependencies": { "@angular-eslint/eslint-plugin": "^14.0.0", @@ -1060,19 +1060,19 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" } }, "node_modules/@ionic/core/node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -7342,19 +7342,19 @@ "dev": true }, "@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "requires": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, "dependencies": { "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" } } }, diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index 9a50ecf239..6baca2a254 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "7.4.1", + "version": "7.4.3", "description": "Angular SSR Module for Ionic", "keywords": [ "ionic", @@ -61,6 +61,6 @@ }, "prettier": "@ionic/prettier-config", "dependencies": { - "@ionic/core": "^7.4.1" + "@ionic/core": "^7.4.3" } } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index e97819d14c..6dac242b0e 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/angular + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + +**Note:** Version bump only for package @ionic/angular + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/angular diff --git a/packages/angular/package-lock.json b/packages/angular/package-lock.json index 3de47098fd..b98268fd40 100644 --- a/packages/angular/package-lock.json +++ b/packages/angular/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@ionic/core": "^7.4.1", + "@ionic/core": "^7.4.3", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" @@ -1227,19 +1227,19 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" } }, "node_modules/@ionic/core/node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -8104,19 +8104,19 @@ "dev": true }, "@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "requires": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, "dependencies": { "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" } } }, diff --git a/packages/angular/package.json b/packages/angular/package.json index 42e61895cb..5fc30b101d 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "7.4.1", + "version": "7.4.3", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -47,7 +47,7 @@ } }, "dependencies": { - "@ionic/core": "^7.4.1", + "@ionic/core": "^7.4.3", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index b132d88e94..81d6fb107a 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/react-router + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + +**Note:** Version bump only for package @ionic/react-router + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/react-router diff --git a/packages/react-router/package-lock.json b/packages/react-router/package-lock.json index d3fbcdadb9..6899fb45cc 100644 --- a/packages/react-router/package-lock.json +++ b/packages/react-router/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/react-router", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/react-router", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@ionic/react": "^7.4.1", + "@ionic/react": "^7.4.3", "tslib": "*" }, "devDependencies": { @@ -205,11 +205,11 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" } @@ -401,11 +401,11 @@ } }, "node_modules/@ionic/react": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.4.1.tgz", - "integrity": "sha512-9ByyybeNJfchPCk7tz8/beKarjzF1yG7KZS1s2DMyUSFt7x2y3F3v6WrwG0xQgoYLNJYJIPmR+CKc/4eQeMbXA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.4.3.tgz", + "integrity": "sha512-j33s8CFe3Cu3AQtIlZdI/W4+e5hDzjRcX6uwqRrizcMQS66Sj9Ik9RN5v3jV/9R8MHLElXZof/AhofNEhe7BTw==", "dependencies": { - "@ionic/core": "7.4.1", + "@ionic/core": "7.4.3", "ionicons": "^7.0.0", "tslib": "*" }, @@ -486,9 +486,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -3663,11 +3663,11 @@ "dev": true }, "@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "requires": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, @@ -3786,11 +3786,11 @@ "requires": {} }, "@ionic/react": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.4.1.tgz", - "integrity": "sha512-9ByyybeNJfchPCk7tz8/beKarjzF1yG7KZS1s2DMyUSFt7x2y3F3v6WrwG0xQgoYLNJYJIPmR+CKc/4eQeMbXA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.4.3.tgz", + "integrity": "sha512-j33s8CFe3Cu3AQtIlZdI/W4+e5hDzjRcX6uwqRrizcMQS66Sj9Ik9RN5v3jV/9R8MHLElXZof/AhofNEhe7BTw==", "requires": { - "@ionic/core": "7.4.1", + "@ionic/core": "7.4.3", "ionicons": "^7.0.0", "tslib": "*" } @@ -3844,9 +3844,9 @@ } }, "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" }, "@types/estree": { "version": "0.0.39", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 8657da90cb..03d561893e 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "7.4.1", + "version": "7.4.3", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -37,7 +37,7 @@ "dist/" ], "dependencies": { - "@ionic/react": "^7.4.1", + "@ionic/react": "^7.4.3", "tslib": "*" }, "peerDependencies": { diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index a08985a1e2..a1f76842d9 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/react + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + + +### Bug Fixes + +* **react:** Nav unmounts component while invoking popTo or popToRoot ([#27821](https://github.com/ionic-team/ionic-framework/issues/27821)) ([0edcb2c](https://github.com/ionic-team/ionic-framework/commit/0edcb2cd85133ae8c304c53c37ca829e5fbad447)), closes [#27798](https://github.com/ionic-team/ionic-framework/issues/27798) + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/react diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 478d976bc4..108d33ef48 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/react", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/react", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@ionic/core": "^7.4.1", + "@ionic/core": "^7.4.3", "ionicons": "^7.0.0", "tslib": "*" }, @@ -697,19 +697,19 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" } }, "node_modules/@ionic/core/node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -11778,19 +11778,19 @@ "dev": true }, "@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "requires": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, "dependencies": { "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" } } }, diff --git a/packages/react/package.json b/packages/react/package.json index ee7919865b..e68e3b6547 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "7.4.1", + "version": "7.4.3", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -41,7 +41,7 @@ "css/" ], "dependencies": { - "@ionic/core": "^7.4.1", + "@ionic/core": "^7.4.3", "ionicons": "^7.0.0", "tslib": "*" }, diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index b1d1af94f8..b0d981c68e 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/vue-router + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + +**Note:** Version bump only for package @ionic/vue-router + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/vue-router diff --git a/packages/vue-router/package-lock.json b/packages/vue-router/package-lock.json index a8a166cc29..e23ba115b3 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue-router", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue-router", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@ionic/vue": "^7.4.1" + "@ionic/vue": "^7.4.3" }, "devDependencies": { "@ionic/eslint-config": "^0.3.0", @@ -660,11 +660,11 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" } @@ -871,11 +871,11 @@ } }, "node_modules/@ionic/vue": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.4.1.tgz", - "integrity": "sha512-yHmpBG69j+CCE7vpa6zyQ38vCMx68U/UZ90MAUPRYSvpCXGx0714YbSZ68S1JDU5bwz8h0Gv/zOfm/JWcYwzOA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.4.3.tgz", + "integrity": "sha512-DV/SExC/e3rcLoowuYb5bwo4N/oP5fWHQo1xLP654I/879hlwPJlCxdWFtaE2OlT3aEix9ssLYeNiWaxuK+9dQ==", "dependencies": { - "@ionic/core": "7.4.1", + "@ionic/core": "7.4.3", "ionicons": "^7.0.0" } }, @@ -1323,9 +1323,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -7697,11 +7697,11 @@ "dev": true }, "@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "requires": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, @@ -7829,11 +7829,11 @@ "requires": {} }, "@ionic/vue": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.4.1.tgz", - "integrity": "sha512-yHmpBG69j+CCE7vpa6zyQ38vCMx68U/UZ90MAUPRYSvpCXGx0714YbSZ68S1JDU5bwz8h0Gv/zOfm/JWcYwzOA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.4.3.tgz", + "integrity": "sha512-DV/SExC/e3rcLoowuYb5bwo4N/oP5fWHQo1xLP654I/879hlwPJlCxdWFtaE2OlT3aEix9ssLYeNiWaxuK+9dQ==", "requires": { - "@ionic/core": "7.4.1", + "@ionic/core": "7.4.3", "ionicons": "^7.0.0" } }, @@ -8192,9 +8192,9 @@ } }, "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" }, "@tootallnate/once": { "version": "2.0.0", diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 045368bfec..4a4ac4ce5d 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue-router", - "version": "7.4.1", + "version": "7.4.3", "description": "Vue Router integration for @ionic/vue", "scripts": { "test.spec": "jest", @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/ionic-team/ionic#readme", "dependencies": { - "@ionic/vue": "^7.4.1" + "@ionic/vue": "^7.4.3" }, "devDependencies": { "@ionic/eslint-config": "^0.3.0", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 6b47437ecd..27959eef06 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.3](https://github.com/ionic-team/ionic-framework/compare/v7.4.2...v7.4.3) (2023-10-04) + +**Note:** Version bump only for package @ionic/vue + + + + + +## [7.4.2](https://github.com/ionic-team/ionic-framework/compare/v7.4.1...v7.4.2) (2023-09-27) + +**Note:** Version bump only for package @ionic/vue + + + + + ## [7.4.1](https://github.com/ionic-team/ionic-framework/compare/v7.4.0...v7.4.1) (2023-09-20) **Note:** Version bump only for package @ionic/vue diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index a0861a218c..d563491149 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue", - "version": "7.4.1", + "version": "7.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue", - "version": "7.4.1", + "version": "7.4.3", "license": "MIT", "dependencies": { - "@ionic/core": "^7.4.1", + "@ionic/core": "^7.4.3", "ionicons": "^7.0.0" }, "devDependencies": { @@ -207,11 +207,11 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "dependencies": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" } @@ -423,9 +423,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==", "bin": { "stencil": "bin/stencil" }, @@ -3746,11 +3746,11 @@ "dev": true }, "@ionic/core": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.1.tgz", - "integrity": "sha512-ZM18jm8nvyw7HAWhLYmJ9HABqtvzw9tIn2/Oq70XBMkayO9f3LzrgHvRoOqIAMS00QYuAZw+5XhpGAvcqh/sqA==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.4.3.tgz", + "integrity": "sha512-JPQLGojKnI/L0UBVshRv86DOSDj61rJRFYQImU4IcgP/rw5ckxwt3iZ5NtdJl0eEDwu91n68aGJdU+TFJjMJgQ==", "requires": { - "@stencil/core": "^4.3.0", + "@stencil/core": "^4.4.0", "ionicons": "7.1.0", "tslib": "^2.1.0" }, @@ -3885,9 +3885,9 @@ } }, "@stencil/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.3.0.tgz", - "integrity": "sha512-WYjftKg5fuqO7mf3nTl1aCRurkeMmfEF38WcBG4VLF6UPQ+MA76/koedGR2LGhATGByx+pbxR4iRxAr2Bspc9A==" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.4.0.tgz", + "integrity": "sha512-YlLyCqGBsMEuZb3XTO/STT0TX9eSwjoVhCJgtjVfQOF+ebIMVlojTh40CmDveWiWbth687cbr6S2heeussV8Sg==" }, "@types/json-schema": { "version": "7.0.11", diff --git a/packages/vue/package.json b/packages/vue/package.json index 5c9f4065e9..18c40711c2 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue", - "version": "7.4.1", + "version": "7.4.3", "description": "Vue specific wrapper for @ionic/core", "scripts": { "eslint": "eslint src", @@ -66,7 +66,7 @@ "vue-router": "^4.0.16" }, "dependencies": { - "@ionic/core": "^7.4.1", + "@ionic/core": "^7.4.3", "ionicons": "^7.0.0" }, "vetur": {