Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 2 commits into from
Oct 14, 2023
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de12a0
fix(ios): Add/remove shadow for reusable views
CatchABus Oct 14, 2023
1d45cfe
Merge branch 'main' into ios-shadow-reusable-fix
NathanWalker Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions packages/core/ui/core/view/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Trace } from '../../../trace';
import { layout, iOSNativeHelper } from '../../../utils';
import { isNumber } from '../../../utils/types';
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 { profile } from '../../../profiling';
import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLanguageProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties';
Expand Down Expand Up @@ -73,15 +73,6 @@ export class View extends ViewCommon implements ViewDefinition {
this._isLaidOut = false;
this._hasTransform = 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 {
Expand Down Expand Up @@ -1096,7 +1087,7 @@ export class CustomLayoutView extends ContainerView {
super._addViewToNativeVisualTree(child, atIndex);

const parentNativeView = this.nativeViewProtected;
const childNativeView = child.nativeViewProtected;
const childNativeView: NativeScriptUIView = <NativeScriptUIView>child.nativeViewProtected;

if (parentNativeView && childNativeView) {
if (typeof atIndex !== 'number' || atIndex >= parentNativeView.subviews.count) {
Expand All @@ -1105,6 +1096,11 @@ export class CustomLayoutView extends ContainerView {
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;
}

Expand All @@ -1115,7 +1111,14 @@ export class CustomLayoutView extends ContainerView {
super._removeViewFromNativeVisualTree(child);

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();
}
}
}