fix(ios): scrollview safe area when no scroll (#6568)

MartoYankov · web-flow · commit f90995f8f90c · 2018-11-19T09:23:06.000Z
diff --git a/apps/app/ui-tests-app/scroll-view/safe-area-root-element.xml b/apps/app/ui-tests-app/scroll-view/safe-area-root-element.xml
@@ -6,7 +6,7 @@
     </Page.actionBar>
 
     <ScrollView>
-        <StackLayout>
+        <StackLayout backgroundColor="teal">
             <GridLayout height="30" backgroundColor="red" />
             <GridLayout height="30" backgroundColor="yellow" />
             <GridLayout height="30" backgroundColor="green" />
diff --git a/apps/app/ui-tests-app/scroll-view/safe-area-sub-element.xml b/apps/app/ui-tests-app/scroll-view/safe-area-sub-element.xml
@@ -7,7 +7,7 @@
 
     <GridLayout>
         <ScrollView>
-            <StackLayout>
+            <StackLayout backgroundColor="teal">
                 <GridLayout height="30" backgroundColor="red" />
                 <GridLayout height="30" backgroundColor="yellow" />
                 <GridLayout height="30" backgroundColor="green" />
diff --git a/tns-core-modules/ui/scroll-view/scroll-view.ios.ts b/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
@@ -164,16 +164,14 @@ export class ScrollView extends ScrollViewBase {
             nativeView.contentInsetAdjustmentBehavior = 2;
         }
 
-        let scrollWidth = width;
-        let scrollHeight = height;
+        let scrollWidth = width + insets.left + insets.right;
+        let scrollHeight = height + insets.top + insets.bottom;
         if (this.orientation === "horizontal") {
-            scrollWidth = Math.max(this._contentMeasuredWidth + insets.left + insets.right, width);
-            scrollHeight = height + insets.top + insets.bottom;
+            scrollWidth = Math.max(this._contentMeasuredWidth + insets.left + insets.right, scrollWidth);
             width = Math.max(this._contentMeasuredWidth, width);
         }
         else {
-            scrollHeight = Math.max(this._contentMeasuredHeight + insets.top + insets.bottom, height);
-            scrollWidth = width + insets.left + insets.right;
+            scrollHeight = Math.max(this._contentMeasuredHeight + insets.top + insets.bottom, scrollHeight);
             height = Math.max(this._contentMeasuredHeight, height);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -164,16 +164,14 @@ export class ScrollView extends ScrollViewBase {`
`164`	`164`	`nativeView.contentInsetAdjustmentBehavior = 2;`
`165`	`165`	`}`
`166`	`166`
`167`		`- let scrollWidth = width;`
`168`		`- let scrollHeight = height;`
	`167`	`+ let scrollWidth = width + insets.left + insets.right;`
	`168`	`+ let scrollHeight = height + insets.top + insets.bottom;`
`169`	`169`	`if (this.orientation === "horizontal") {`
`170`		`- scrollWidth = Math.max(this._contentMeasuredWidth + insets.left + insets.right, width);`
`171`		`- scrollHeight = height + insets.top + insets.bottom;`
	`170`	`+ scrollWidth = Math.max(this._contentMeasuredWidth + insets.left + insets.right, scrollWidth);`
`172`	`171`	`width = Math.max(this._contentMeasuredWidth, width);`
`173`	`172`	`}`
`174`	`173`	`else {`
`175`		`- scrollHeight = Math.max(this._contentMeasuredHeight + insets.top + insets.bottom, height);`
`176`		`- scrollWidth = width + insets.left + insets.right;`
	`174`	`+ scrollHeight = Math.max(this._contentMeasuredHeight + insets.top + insets.bottom, scrollHeight);`
`177`	`175`	`height = Math.max(this._contentMeasuredHeight, height);`
`178`	`176`	`}`
`179`	`177`