javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 13:51:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: iOS crash on iOS 14 when onLayout is called without a nativeView

Browse Source
This commit is contained in:
Martin Guillon
2021-08-02 15:01:20 +02:00
parent ba773c78ae
commit ae193189ae
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/ui/scroll-view/index.ios.ts
View File

@ -165,7 +165,7 @@ export class ScrollView extends ScrollViewBase {
const nativeView = this.nativeViewProtected; const nativeView = this.nativeViewProtected;
if (majorVersion > 10) { if (nativeView && majorVersion > 10) {
// Disable automatic adjustment of scroll view insets // Disable automatic adjustment of scroll view insets
// Consider exposing this as property with all 4 modes // Consider exposing this as property with all 4 modes
// https://developer.apple.com/documentation/uikit/uiscrollview/contentinsetadjustmentbehavior // https://developer.apple.com/documentation/uikit/uiscrollview/contentinsetadjustmentbehavior
@ -182,7 +182,10 @@ export class ScrollView extends ScrollViewBase {
height = Math.max(this._contentMeasuredHeight, height); height = Math.max(this._contentMeasuredHeight, height);
} }
nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(scrollWidth), layout.toDeviceIndependentPixels(scrollHeight)); if (nativeView) {
nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(scrollWidth), layout.toDeviceIndependentPixels(scrollHeight));
}
View.layoutChild(this, this.layoutView, insets.left, insets.top, insets.left + width, insets.top + height); View.layoutChild(this, this.layoutView, insets.left, insets.top, insets.left + width, insets.top + height);
} }