Skip to content

fix(ios): Shadow layer origin point update #10376

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 1 commit into from
Sep 7, 2023
Merged

fix(ios): Shadow layer origin point update #10376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 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 @@ -169,8 +169,9 @@ export class View extends ViewCommon implements ViewDefinition {
CATransaction.setDisableActions(true);

if (nativeView.outerShadowContainerLayer) {
const { x: originX, y: originY }: CGPoint = nativeView.outerShadowContainerLayer.anchorPoint;
nativeView.outerShadowContainerLayer.bounds = nativeView.bounds;
nativeView.outerShadowContainerLayer.position = CGPointMake(frame.origin.x + frame.size.width / 2, frame.origin.y + frame.size.height / 2);
nativeView.outerShadowContainerLayer.position = CGPointMake(frame.origin.x + frame.size.width * originX, frame.origin.y + frame.size.height * originY);
}

CATransaction.setDisableActions(false);
Expand Down Expand Up @@ -450,11 +451,27 @@ export class View extends ViewCommon implements ViewDefinition {
}

public updateOriginPoint(originX: number, originY: number) {
const nativeView: NativeScriptUIView = <NativeScriptUIView>this.nativeViewProtected;
const newPoint = CGPointMake(originX, originY);
this.nativeViewProtected.layer.anchorPoint = newPoint;

// Disable CALayer animatable property changes
CATransaction.setDisableActions(true);

nativeView.layer.anchorPoint = newPoint;
if (this._cachedFrame) {
this._setNativeViewFrame(this.nativeViewProtected, this._cachedFrame);
this._setNativeViewFrame(nativeView, this._cachedFrame);
}

// Make sure new origin also applies to outer shadow layers
if (nativeView.outerShadowContainerLayer) {
// This is the new frame after view origin point update
const frame = nativeView.frame;

nativeView.outerShadowContainerLayer.anchorPoint = newPoint;
nativeView.outerShadowContainerLayer.position = CGPointMake(frame.origin.x + frame.size.width * originX, frame.origin.y + frame.size.height * originY);
}

CATransaction.setDisableActions(false);
}

// By default we update the view's presentation layer when setting backgroundColor and opacity properties.
Expand Down
7 changes: 5 additions & 2 deletions packages/core/ui/styling/background.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,9 +1125,12 @@ function drawBoxShadow(view: View): void {
}
}

// Since shadow layer is added to view layer's superlayer, we have to be more specific about shadow layer position
outerShadowContainerLayer.bounds = bounds;
outerShadowContainerLayer.position = CGPointMake(viewFrame.origin.x + viewFrame.size.width / 2, viewFrame.origin.y + viewFrame.size.height / 2);
outerShadowContainerLayer.anchorPoint = layer.anchorPoint;

// Since shadow uses superlayer's coordinate system, we have to be more specific about shadow layer position
const { x: originX, y: originY }: CGPoint = outerShadowContainerLayer.anchorPoint;
outerShadowContainerLayer.position = CGPointMake(viewFrame.origin.x + viewFrame.size.width * originX, viewFrame.origin.y + viewFrame.size.height * originY);

// Inherit view visibility values
outerShadowContainerLayer.opacity = layer.opacity;
Expand Down