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

fix(ios): add/remove shadow for reusable views (#10409)

Browse Source
This commit is contained in:
Dimitris-Rafail Katsampas
2023-10-15 00:25:37 +03:00
committed by GitHub
parent c23695c477
commit ee87b52ac3
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ import { Trace } from '../../../trace';
import { layout, iOSNativeHelper } from '../../../utils'; import { layout, iOSNativeHelper } from '../../../utils';
import { isNumber } from '../../../utils/types'; import { isNumber } from '../../../utils/types';
import { IOSHelper } from './view-helper'; import { IOSHelper } from './view-helper';
import { ios as iosBackground, Background, BackgroundClearFlags } from '../../styling/background'; import { ios as iosBackground, Background } from '../../styling/background';
import { perspectiveProperty, visibilityProperty, opacityProperty, rotateProperty, rotateXProperty, rotateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, zIndexProperty, backgroundInternalProperty } from '../../styling/style-properties'; import { perspectiveProperty, visibilityProperty, opacityProperty, rotateProperty, rotateXProperty, rotateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, zIndexProperty, backgroundInternalProperty } from '../../styling/style-properties';
import { profile } from '../../../profiling'; import { profile } from '../../../profiling';
import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLanguageProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties'; import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLanguageProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties';
@ -73,15 +73,6 @@ export class View extends ViewCommon implements ViewDefinition {
this._isLaidOut = false; this._isLaidOut = false;
this._hasTransform = false; this._hasTransform = false;
this._hasPendingTransform = false; this._hasPendingTransform = false;
// If native view extends UIView, perform a background cleanup to get rid of shadow layers
if (this.nativeViewProtected instanceof UIView) {
// Make sure shadows get removed
this.style.backgroundInternal.clearFlags |= BackgroundClearFlags.CLEAR_BOX_SHADOW;
// Perform background cleanup
iosBackground.clearBackgroundVisualEffects(this);
}
} }
public requestLayout(): void { public requestLayout(): void {
@ -1096,7 +1087,7 @@ export class CustomLayoutView extends ContainerView {
super._addViewToNativeVisualTree(child, atIndex); super._addViewToNativeVisualTree(child, atIndex);
const parentNativeView = this.nativeViewProtected; const parentNativeView = this.nativeViewProtected;
const childNativeView = child.nativeViewProtected; const childNativeView: NativeScriptUIView = <NativeScriptUIView>child.nativeViewProtected;
if (parentNativeView && childNativeView) { if (parentNativeView && childNativeView) {
if (typeof atIndex !== 'number' || atIndex >= parentNativeView.subviews.count) { if (typeof atIndex !== 'number' || atIndex >= parentNativeView.subviews.count) {
@ -1105,6 +1096,11 @@ export class CustomLayoutView extends ContainerView {
parentNativeView.insertSubviewAtIndex(childNativeView, atIndex); parentNativeView.insertSubviewAtIndex(childNativeView, atIndex);
} }
// Add outer shadow layer manually as it belongs to parent layer tree (this is needed for reusable views)
if (childNativeView.outerShadowContainerLayer && !childNativeView.outerShadowContainerLayer.superlayer) {
parentNativeView.layer.insertSublayerBelow(childNativeView.outerShadowContainerLayer, childNativeView.layer);
}
return true; return true;
} }
@ -1115,7 +1111,14 @@ export class CustomLayoutView extends ContainerView {
super._removeViewFromNativeVisualTree(child); super._removeViewFromNativeVisualTree(child);
if (child.nativeViewProtected) { if (child.nativeViewProtected) {
child.nativeViewProtected.removeFromSuperview(); const nativeView: NativeScriptUIView = <NativeScriptUIView>child.nativeViewProtected;
// Remove outer shadow layer manually as it belongs to parent layer tree
if (nativeView.outerShadowContainerLayer) {
nativeView.outerShadowContainerLayer.removeFromSuperlayer();
}
nativeView.removeFromSuperview();
} }
} }
} }