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): proper disposal and recreation of iOS native views (#9879)

Browse Source
This commit is contained in:
Dimitris - Rafail Katsampas
2022-04-30 21:00:30 +03:00
committed by Nathan Walker
parent b7e6128576
commit f548fdc735
5 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/ui/animation/animation-interfaces.ts
View File

@@ -69,5 +69,5 @@ export interface AnimationDefinitionInternal extends AnimationDefinition {
export interface IOSView extends View {
_suspendPresentationLayerUpdates();
_resumePresentationLayerUpdates();
_isPresentationLayerUpdateSuspeneded();
_isPresentationLayerUpdateSuspended();
}

10
packages/core/ui/core/view-base/index.ts
View File

@@ -909,6 +909,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
public destroyNode(forceDestroyChildren?: boolean): void {
this.reusable = false;
this.callUnloaded();
this._tearDownUI(forceDestroyChildren);
}
@@ -958,12 +959,9 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
this._suspendNativeUpdates(SuspendType.UISetup);
if (global.isAndroid) {
this.setNativeView(null);
this._androidView = null;
}
// this._iosView = null;
this.setNativeView(null);
this._androidView = null;
this._iosView = null;
this._context = null;
}

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

@@ -37,7 +37,8 @@ export class View extends ViewCommon implements ViewDefinition {
*/
private _modalAnimatedOptions: Array<boolean>;
private _isLaidOut = false;
private _hasTransfrom = false;
private _hasTransform = false;
private _hasPendingTransform = false;
private _privateFlags: number = PFLAG_LAYOUT_REQUIRED | PFLAG_FORCE_LAYOUT;
private _cachedFrame: CGRect;
private _suspendCATransaction = false;
@@ -63,6 +64,15 @@ export class View extends ViewCommon implements ViewDefinition {
this.once(View.loadedEvent, () => setupAccessibleView(this));
}
disposeNativeView() {
super.disposeNativeView();
this._cachedFrame = null;
this._isLaidOut = false;
this._hasTransform = false;
this._hasPendingTransform = false;
}
public requestLayout(): void {
super.requestLayout();
this._privateFlags |= PFLAG_FORCE_LAYOUT;
@@ -119,6 +129,10 @@ export class View extends ViewCommon implements ViewDefinition {
}
this.updateBackground(sizeChanged);
if (this._hasPendingTransform) {
this.updateNativeTransform();
this._hasPendingTransform = false;
}
this._privateFlags &= ~PFLAG_FORCE_LAYOUT;
}
@@ -175,7 +189,7 @@ export class View extends ViewCommon implements ViewDefinition {
this._cachedFrame = frame;
let adjustedFrame = null;
let transform = null;
if (this._hasTransfrom) {
if (this._hasTransform) {
// Always set identity transform before setting frame;
transform = nativeView.layer.transform;
nativeView.layer.transform = CATransform3DIdentity;
@@ -189,7 +203,7 @@ export class View extends ViewCommon implements ViewDefinition {
nativeView.frame = adjustedFrame;
}
if (this._hasTransfrom) {
if (this._hasTransform) {
// re-apply the transform after the frame is adjusted
nativeView.layer.transform = transform;
}
@@ -363,6 +377,11 @@ export class View extends ViewCommon implements ViewDefinition {
}
public updateNativeTransform() {
if (!this.isLayoutValid) {
this._hasPendingTransform = true;
return;
}
const scaleX = this.scaleX || 1e-6;
const scaleY = this.scaleY || 1e-6;
const perspective = this.perspective || 300;
@@ -378,12 +397,12 @@ export class View extends ViewCommon implements ViewDefinition {
transform = iOSNativeHelper.applyRotateTransform(transform, this.rotateX, this.rotateY, this.rotate);
transform = CATransform3DScale(transform, scaleX, scaleY, 1);
if (!CATransform3DEqualToTransform(this.nativeViewProtected.layer.transform, transform)) {
const updateSuspended = this._isPresentationLayerUpdateSuspeneded();
const updateSuspended = this._isPresentationLayerUpdateSuspended();
if (!updateSuspended) {
CATransaction.begin();
}
this.nativeViewProtected.layer.transform = transform;
this._hasTransfrom = this.nativeViewProtected && !CATransform3DEqualToTransform(this.nativeViewProtected.transform3D, CATransform3DIdentity);
this._hasTransform = this.nativeViewProtected && !CATransform3DEqualToTransform(this.nativeViewProtected.transform3D, CATransform3DIdentity);
if (!updateSuspended) {
CATransaction.commit();
}
@@ -409,7 +428,7 @@ export class View extends ViewCommon implements ViewDefinition {
this._suspendCATransaction = false;
}
public _isPresentationLayerUpdateSuspeneded(): boolean {
public _isPresentationLayerUpdateSuspended(): boolean {
return this._suspendCATransaction || this._suspendNativeUpdatesCount > 0;
}
@@ -689,7 +708,7 @@ export class View extends ViewCommon implements ViewDefinition {
}
[opacityProperty.setNative](value: number) {
const nativeView = this.nativeViewProtected;
const updateSuspended = this._isPresentationLayerUpdateSuspeneded();
const updateSuspended = this._isPresentationLayerUpdateSuspended();
if (!updateSuspended) {
CATransaction.begin();
}
@@ -845,7 +864,7 @@ export class View extends ViewCommon implements ViewDefinition {
}
_redrawNativeBackground(value: UIColor | Background): void {
const updateSuspended = this._isPresentationLayerUpdateSuspeneded();
const updateSuspended = this._isPresentationLayerUpdateSuspended();
if (!updateSuspended) {
CATransaction.begin();
}

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

@@ -101,7 +101,7 @@ class UILayoutViewController extends UIViewController {
IOSHelper.updateAutoAdjustScrollInsets(this, owner);
if (!owner.parent) {
if (!owner.isLoaded && !owner.parent) {
owner.callLoaded();
}
}
@@ -109,7 +109,7 @@ class UILayoutViewController extends UIViewController {
public viewDidDisappear(animated: boolean): void {
super.viewDidDisappear(animated);
const owner = this.owner.get();
if (owner && !owner.parent) {
if (owner && owner.isLoaded && !owner.parent) {
owner.callUnloaded();
}
}