merge release-4.10.3

Release 4.10.3

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)
 
 

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": {

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",

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;
   }
 

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
 // -----------------------------------------
 

core/src/components/searchbar/test/toolbar/index.html

@@ -33,6 +33,11 @@
             <ion-button>Clear</ion-button>
           </ion-buttons>
         </ion-toolbar>
+        <ion-toolbar>
+          <ion-back-button default-href="#" slot="start"></ion-back-button>
+          <ion-searchbar translucent></ion-searchbar>
+          <ion-chip slot="end" outline>Chip</ion-chip>
+        </ion-toolbar>
       </ion-header>
 
       <ion-content id="content" fullscreen>

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
 // --------------------------------------------------
 

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": [