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

fix(ios): resilience to nativeView access under edge cases (#10276)

Browse Source
This commit is contained in:
Nathan Walker
2023-04-24 13:45:31 -07:00
committed by GitHub
parent c63a50a196
commit 4551da075b
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/ui/core/view/index.ios.ts
View File

@ -898,6 +898,7 @@ export class View extends ViewCommon implements ViewDefinition {
CATransaction.begin(); CATransaction.begin();
} }
if (this.nativeViewProtected) {
if (value instanceof UIColor) { if (value instanceof UIColor) {
this.nativeViewProtected.backgroundColor = value; this.nativeViewProtected.backgroundColor = value;
} else { } else {
@ -906,6 +907,7 @@ export class View extends ViewCommon implements ViewDefinition {
}); });
this._setNativeClipToBounds(); this._setNativeClipToBounds();
} }
}
if (!updateSuspended) { if (!updateSuspended) {
CATransaction.commit(); CATransaction.commit();
@ -915,9 +917,11 @@ export class View extends ViewCommon implements ViewDefinition {
} }
_setNativeClipToBounds() { _setNativeClipToBounds() {
if (this.nativeViewProtected) {
const backgroundInternal = this.style.backgroundInternal; const backgroundInternal = this.style.backgroundInternal;
this.nativeViewProtected.clipsToBounds = (this.nativeViewProtected instanceof UIScrollView || backgroundInternal.hasBorderWidth() || backgroundInternal.hasBorderRadius()) && !backgroundInternal.hasBoxShadow(); this.nativeViewProtected.clipsToBounds = (this.nativeViewProtected instanceof UIScrollView || backgroundInternal.hasBorderWidth() || backgroundInternal.hasBorderRadius()) && !backgroundInternal.hasBoxShadow();
} }
}
private _setupPopoverControllerDelegate(controller: UIViewController, parent: View) { private _setupPopoverControllerDelegate(controller: UIViewController, parent: View) {
const popoverPresentationController = controller.popoverPresentationController; const popoverPresentationController = controller.popoverPresentationController;

2
packages/core/ui/layouts/layout-base.ios.ts
View File

@ -23,7 +23,9 @@ export class LayoutBase extends LayoutBaseCommon {
_setNativeClipToBounds() { _setNativeClipToBounds() {
if (this.clipToBounds) { if (this.clipToBounds) {
if (this.nativeViewProtected) {
this.nativeViewProtected.clipsToBounds = true; this.nativeViewProtected.clipsToBounds = true;
}
} else { } else {
super._setNativeClipToBounds(); super._setNativeClipToBounds();
} }

2
packages/core/ui/list-view/index.ios.ts
View File

@ -275,8 +275,10 @@ export class ListView extends ListViewBase {
_setNativeClipToBounds() { _setNativeClipToBounds() {
// Always set clipsToBounds for list-view // Always set clipsToBounds for list-view
if (this.ios) {
this.ios.clipsToBounds = true; this.ios.clipsToBounds = true;
} }
}
@profile @profile
public onLoaded() { public onLoaded() {