From 63c2008a86de19847677fda7b9fedce73ed7669f Mon Sep 17 00:00:00 2001 From: Manu MA Date: Tue, 8 Oct 2019 19:01:38 +0200 Subject: [PATCH 1/3] fix(content): set overscroll only on iOS (#19470) fixes #19465 --- core/src/components/content/content.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx index 51ccf2f402..a4f1941635 100644 --- a/core/src/components/content/content.tsx +++ b/core/src/components/content/content.tsx @@ -122,7 +122,7 @@ export class Content implements ComponentInterface { private shouldForceOverscroll() { const { forceOverscroll, mode } = this; return forceOverscroll === undefined - ? mode === 'ios' && isPlatform(window, 'mobile') + ? mode === 'ios' && isPlatform('ios') : forceOverscroll; } From 637f26b3642a266b6ef3b9d3d71b7327a5d3cc37 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 8 Oct 2019 19:42:59 -0400 Subject: [PATCH 2/3] fix(searchbar): update alignment of chips and other elements in toolbar (#19596) fixes #19495 fixes #19502 --- .../components/searchbar/searchbar.ios.scss | 9 ++++++++ .../searchbar/test/toolbar/index.html | 5 +++++ core/src/components/toolbar/toolbar.ios.scss | 21 +++++++++---------- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/core/src/components/searchbar/searchbar.ios.scss b/core/src/components/searchbar/searchbar.ios.scss index f1f2a4a98d..d4e4821d7d 100644 --- a/core/src/components/searchbar/searchbar.ios.scss +++ b/core/src/components/searchbar/searchbar.ios.scss @@ -155,6 +155,15 @@ } } +// Searchbar in Toolbar +// ----------------------------------------- + +:host-context(ion-toolbar) { + @include padding(1px, null, 15px, null); + + height: 52px; +} + // Searchbar in Toolbar Color // ----------------------------------------- diff --git a/core/src/components/searchbar/test/toolbar/index.html b/core/src/components/searchbar/test/toolbar/index.html index cebf95934a..7521fa3f09 100644 --- a/core/src/components/searchbar/test/toolbar/index.html +++ b/core/src/components/searchbar/test/toolbar/index.html @@ -33,6 +33,11 @@ Clear + + + + Chip + diff --git a/core/src/components/toolbar/toolbar.ios.scss b/core/src/components/toolbar/toolbar.ios.scss index 642fe16f64..dcc675a73e 100644 --- a/core/src/components/toolbar/toolbar.ios.scss +++ b/core/src/components/toolbar/toolbar.ios.scss @@ -41,20 +41,19 @@ @include padding(0, null); } -// TODO - important is needed because searchbar is scoped -:host(.toolbar-searchbar) ::slotted(ion-searchbar) { - /* stylelint-disable */ - height: 52px !important; - - padding-top: 1px !important; - padding-bottom: 15px !important; - /* stylelint-enable */ -} - -:host(.toolbar-searchbar) ::slotted(ion-buttons) { +:host(.toolbar-searchbar) ::slotted(*) { align-self: start; } +:host(.toolbar-searchbar) ::slotted(ion-chip) { + @include margin(3px, null, null, null); +} + +:host(.toolbar-searchbar) ::slotted(ion-back-button) { + height: 38px; +} + + // iOS Toolbar Slot Placement // -------------------------------------------------- From 6f5e304e18bd30fc84397e4c72b29ef138e1c66b Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 9 Oct 2019 15:03:01 -0400 Subject: [PATCH 3/3] 4.10.3 --- CHANGELOG.md | 10 ++++++++++ angular/package.json | 4 ++-- core/package.json | 2 +- docs/package.json | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e94e4a647..b78139a881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [4.10.3](https://github.com/ionic-team/ionic/compare/v4.10.2...v4.10.3) (2019-10-09) + + +### Bug Fixes + +* **content:** set overscroll only on iOS ([#19470](https://github.com/ionic-team/ionic/issues/19470)) ([63c2008](https://github.com/ionic-team/ionic/commit/63c2008a86de19847677fda7b9fedce73ed7669f)), closes [#19465](https://github.com/ionic-team/ionic/issues/19465) +* **searchbar:** update alignment of chips and other elements in toolbar ([#19596](https://github.com/ionic-team/ionic/issues/19596)) ([637f26b](https://github.com/ionic-team/ionic/commit/637f26b3642a266b6ef3b9d3d71b7327a5d3cc37)), closes [#19495](https://github.com/ionic-team/ionic/issues/19495) [#19502](https://github.com/ionic-team/ionic/issues/19502) + + + ## [4.10.2](https://github.com/ionic-team/ionic/compare/v4.10.1...v4.10.2) (2019-10-08) diff --git a/angular/package.json b/angular/package.json index c261e07b6b..6199346fb9 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "4.10.2", + "version": "4.10.3", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -49,7 +49,7 @@ "css/" ], "dependencies": { - "@ionic/core": "4.10.2", + "@ionic/core": "4.10.3", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/package.json b/core/package.json index 8b6ae49f02..b05181011e 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "4.10.2", + "version": "4.10.3", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index 8da9162af6..9be33bb739 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "4.10.2", + "version": "4.10.3", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "files": [