Skip to content

Commit 2667ee3

Browse files
brandyscarneybrandyscarney
authored
merge main (#30346)
2 parents 796e007 + 43b707e commit 2667ee3

31 files changed

+215
-99
lines changed

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.3](https://github.com/ionic-team/ionic-framework/compare/v8.5.2...v8.5.3) (2025-04-02)
7+
8+
9+
### Bug Fixes
10+
11+
* **checkbox:** ensure proper visual selection when navigating via VoiceOver in Safari ([#30300](https://github.com/ionic-team/ionic-framework/issues/30300)) ([bb40a1e](https://github.com/ionic-team/ionic-framework/commit/bb40a1efe71237075db2f3a536eddeb1d7c400fc))
12+
* **overlays:** exclude backdrop-no-scroll class when toast is presented ([#30123](https://github.com/ionic-team/ionic-framework/issues/30123)) ([7f9df7a](https://github.com/ionic-team/ionic-framework/commit/7f9df7a89447e51eec0b1516069a1e0c9c9722e5)), closes [#30112](https://github.com/ionic-team/ionic-framework/issues/30112)
13+
* **segment-view:** prevent vertical scroll while scrolling horizontally ([#30276](https://github.com/ionic-team/ionic-framework/issues/30276)) ([105796f](https://github.com/ionic-team/ionic-framework/commit/105796f6bc8f961f58ecbb101285097cc86891c0)), closes [#30001](https://github.com/ionic-team/ionic-framework/issues/30001)
14+
15+
16+
17+
18+
619
## [8.5.2](https://github.com/ionic-team/ionic-framework/compare/v8.5.1...v8.5.2) (2025-03-26)
720

821

‎core/CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.3](https://github.com/ionic-team/ionic-framework/compare/v8.5.2...v8.5.3) (2025-04-02)
7+
8+
9+
### Bug Fixes
10+
11+
* **checkbox:** ensure proper visual selection when navigating via VoiceOver in Safari ([#30300](https://github.com/ionic-team/ionic-framework/issues/30300)) ([bb40a1e](https://github.com/ionic-team/ionic-framework/commit/bb40a1efe71237075db2f3a536eddeb1d7c400fc))
12+
* **overlays:** exclude backdrop-no-scroll class when toast is presented ([#30123](https://github.com/ionic-team/ionic-framework/issues/30123)) ([7f9df7a](https://github.com/ionic-team/ionic-framework/commit/7f9df7a89447e51eec0b1516069a1e0c9c9722e5)), closes [#30112](https://github.com/ionic-team/ionic-framework/issues/30112)
13+
* **segment-view:** prevent vertical scroll while scrolling horizontally ([#30276](https://github.com/ionic-team/ionic-framework/issues/30276)) ([105796f](https://github.com/ionic-team/ionic-framework/commit/105796f6bc8f961f58ecbb101285097cc86891c0)), closes [#30001](https://github.com/ionic-team/ionic-framework/issues/30001)
14+
15+
16+
17+
18+
619
## [8.5.2](https://github.com/ionic-team/ionic-framework/compare/v8.5.1...v8.5.2) (2025-03-26)
720

821

‎core/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/core",
3-
"version": "8.5.2",
3+
"version": "8.5.3",
44
"description": "Base components for Ionic",
55
"keywords": [
66
"ionic",

‎core/src/components/segment-content/segment-content.scss

+13
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,17 @@
88
flex-shrink: 0;
99

1010
width: 100%;
11+
12+
overflow-y: scroll;
13+
14+
/* Hide scrollbar in Firefox */
15+
scrollbar-width: none;
16+
17+
/* Hide scrollbar in IE and Edge */
18+
-ms-overflow-style: none;
19+
20+
/* Hide scrollbar in webkit */
21+
&::-webkit-scrollbar {
22+
display: none;
23+
}
1124
}

‎core/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export { getTimeGivenProgression } from './utils/animation/cubic-bezier';
88
export { createGesture } from './utils/gesture';
99
export { initialize } from './global/ionic-global';
1010
export { componentOnReady } from './utils/helpers';
11+
export { LogLevel } from './utils/logging';
1112
export { isPlatform, Platforms, PlatformConfig, getPlatforms } from './utils/platform';
1213
export { IonicSafeString } from './utils/sanitization';
1314
export { IonicConfig, getMode, setupConfig } from './utils/config';

‎core/src/utils/logging/test/logging.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { config } from '@global/config';
2-
import { LogLevel } from '../index';
2+
import { LogLevel } from '../../../index';
33

44
import { printIonError, printIonWarning } from '../index';
55

‎core/src/utils/overlays.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,9 @@ export const present = async <OverlayPresentOptions>(
520520
*/
521521
if (overlay.el.tagName !== 'ION-TOAST') {
522522
setRootAriaHidden(true);
523+
document.body.classList.add(BACKDROP_NO_SCROLL);
523524
}
524525

525-
document.body.classList.add(BACKDROP_NO_SCROLL);
526-
527526
hideUnderlyingOverlaysFromScreenReaders(overlay.el);
528527
hideAnimatingOverlayFromScreenReaders(overlay.el);
529528

@@ -646,6 +645,8 @@ export const dismiss = async <OverlayDismissOptions>(
646645
return false;
647646
}
648647

648+
const presentedOverlays = doc !== undefined ? getPresentedOverlays(doc) : [];
649+
649650
/**
650651
* For accessibility, toasts lack focus traps and don’t receive
651652
* `aria-hidden` on the root element when presented.
@@ -657,7 +658,7 @@ export const dismiss = async <OverlayDismissOptions>(
657658
* Therefore, we must remove `aria-hidden` from the root element
658659
* when the last non-toast overlay is dismissed.
659660
*/
660-
const overlaysNotToast = doc !== undefined ? getPresentedOverlays(doc).filter((o) => o.tagName !== 'ION-TOAST') : [];
661+
const overlaysNotToast = presentedOverlays.filter((o) => o.tagName !== 'ION-TOAST');
661662

662663
const lastOverlayNotToast = overlaysNotToast.length === 1 && overlaysNotToast[0].id === overlay.el.id;
663664

‎core/src/utils/test/overlays/overlays-scroll-blocking.spec.ts

+22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { newSpecPage } from '@stencil/core/testing';
22

33
import { Modal } from '../../../components/modal/modal';
4+
import { Toast } from '../../../components/toast/toast';
45

56
describe('overlays: scroll blocking', () => {
67
it('should not block scroll when the overlay is created', async () => {
@@ -85,4 +86,25 @@ describe('overlays: scroll blocking', () => {
8586

8687
expect(body).not.toHaveClass('backdrop-no-scroll');
8788
});
89+
90+
// Fixes https://github.com/ionic-team/ionic-framework/issues/30112
91+
it('should not block scroll when the toast overlay is presented', async () => {
92+
const page = await newSpecPage({
93+
components: [Toast],
94+
html: `
95+
<ion-toast></ion-toast>
96+
`,
97+
});
98+
99+
const toast = page.body.querySelector('ion-toast')!;
100+
const body = page.doc.querySelector('body')!;
101+
102+
await toast.present();
103+
104+
expect(body).not.toHaveClass('backdrop-no-scroll');
105+
106+
await toast.dismiss();
107+
108+
expect(body).not.toHaveClass('backdrop-no-scroll');
109+
});
88110
});

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"core",
44
"packages/*"
55
],
6-
"version": "8.5.2"
6+
"version": "8.5.3"
77
}

‎packages/angular-server/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.3](https://github.com/ionic-team/ionic-framework/compare/v8.5.2...v8.5.3) (2025-04-02)
7+
8+
**Note:** Version bump only for package @ionic/angular-server
9+
10+
11+
12+
13+
614
## [8.5.2](https://github.com/ionic-team/ionic-framework/compare/v8.5.1...v8.5.2) (2025-03-26)
715

816
**Note:** Version bump only for package @ionic/angular-server

‎packages/angular-server/package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/angular-server/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/angular-server",
3-
"version": "8.5.2",
3+
"version": "8.5.3",
44
"description": "Angular SSR Module for Ionic",
55
"keywords": [
66
"ionic",
@@ -62,6 +62,6 @@
6262
},
6363
"prettier": "@ionic/prettier-config",
6464
"dependencies": {
65-
"@ionic/core": "^8.5.2"
65+
"@ionic/core": "^8.5.3"
6666
}
6767
}

‎packages/angular/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.3](https://github.com/ionic-team/ionic-framework/compare/v8.5.2...v8.5.3) (2025-04-02)
7+
8+
**Note:** Version bump only for package @ionic/angular
9+
10+
11+
12+
13+
614
## [8.5.2](https://github.com/ionic-team/ionic-framework/compare/v8.5.1...v8.5.2) (2025-03-26)
715

816
**Note:** Version bump only for package @ionic/angular

‎packages/angular/package-lock.json

+12-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/angular/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/angular",
3-
"version": "8.5.2",
3+
"version": "8.5.3",
44
"description": "Angular specific wrappers for @ionic/core",
55
"keywords": [
66
"ionic",
@@ -47,7 +47,7 @@
4747
}
4848
},
4949
"dependencies": {
50-
"@ionic/core": "^8.5.2",
50+
"@ionic/core": "^8.5.3",
5151
"ionicons": "^7.0.0",
5252
"jsonc-parser": "^3.0.0",
5353
"tslib": "^2.3.0"

‎packages/docs/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.3](https://github.com/ionic-team/ionic-framework/compare/v8.5.2...v8.5.3) (2025-04-02)
7+
8+
**Note:** Version bump only for package @ionic/docs
9+
10+
11+
12+
13+
614
## [8.5.2](https://github.com/ionic-team/ionic-framework/compare/v8.5.1...v8.5.2) (2025-03-26)
715

816
**Note:** Version bump only for package @ionic/docs

‎packages/docs/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/docs",
3-
"version": "8.5.2",
3+
"version": "8.5.3",
44
"description": "Pre-packaged API documentation for the Ionic docs.",
55
"main": "core.json",
66
"types": "core.d.ts",

0 commit comments

Comments
 (0)