FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat(ios): background and clipping improvements by CatchABus · Pull Request #11454 · NativeScript/NativeScript · GitHub

  1. NativeScript
  2. NativeScript

Repository navigation

feat(ios): background and clipping improvements #11454

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

Draft
CatchABus wants to merge 3 commits into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 2 Commits 3 Checks 5 Files changed
Draft

feat(ios): background and clipping improvements #11454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6967d7
feat(ios): view clipping improvements
CatchABus Aug 1, 2026
5d10459
ref: removed unneeded explicit animations
CatchABus Aug 2, 2026
3ea206d
chore: removed unused type
CatchABus Sep 2, 2026
File filter

Filter by extension

Filter by extension .ts  (15) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
146 changes: 1 addition & 145 deletions packages/core/ui/animation/index.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Trace } from '../../trace';
import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty } from '../styling/style-properties';
import { PercentLength } from '../styling/length-shared';
import { ios as iosBackground } from '../styling/background';
import { ios as iosViewUtils, NativeScriptUIView } from '../utils';
import { NativeScriptUIView } from '../utils';

import { ios as iosHelper } from '../../utils/native-helper';

Expand Down Expand Up @@ -249,10 +249,6 @@ export class Animation extends AnimationBase {

// Shadow animations
if (nativeView.outerShadowContainerLayer) {
if (nativeView.outerShadowContainerLayer.mask) {
nativeView.outerShadowContainerLayer.mask.removeAllAnimations();
}

const outerShadowLayers = nativeView.outerShadowContainerLayer.sublayers;
if (outerShadowLayers?.count) {
for (let i = 0, count = outerShadowLayers.count; i < count; i++) {
Expand Down Expand Up @@ -501,13 +497,6 @@ export class Animation extends AnimationBase {
if (args.propertyNameToAnimate === 'bounds') {
this.animateNestedLayerSizeUsingBasicAnimation(nativeView, args.toValue.CGRectValue, animation, args, nativeAnimation);
}

// Shadow container layer belongs to the parent view layer, so animate all its properties (except for colors) separately
if (args.propertyNameToAnimate && !args.propertyNameToAnimate.endsWith('Color')) {
if (nativeView.outerShadowContainerLayer) {
nativeView.outerShadowContainerLayer.addAnimationForKey(nativeAnimation, args.propertyNameToAnimate);
}
}
}
let callback = undefined;
if (index + 1 < propertyAnimations.length) {
Expand Down Expand Up @@ -621,11 +610,6 @@ export class Animation extends AnimationBase {
animation._originalValue = nativeView.layer.transform;
nativeView.layer.setValueForKey(args.toValue, args.propertyNameToAnimate);

// Shadow container layer belongs to the parent view layer, so animate its transform separately
if (nativeView.outerShadowContainerLayer) {
nativeView.outerShadowContainerLayer.setValueForKey(args.toValue, args.propertyNameToAnimate);
}

animation._propertyResetCallback = function (value) {
nativeView.layer.transform = value;
};
Expand Down Expand Up @@ -763,135 +747,7 @@ export class Animation extends AnimationBase {
nativeView.gradientLayer.addAnimationForKey(nativeAnimation, 'bounds');
}

let clipPath; // This is also used for animating shadow

// Clipping mask animation
if (nativeView.layer.mask instanceof CAShapeLayer) {
let toValue;

if (nativeView.maskType === iosViewUtils.LayerMask.BORDER) {
toValue = iosBackground.generateNonUniformBorderOuterClipRoundedPath(view, bounds);
} else if (nativeView.maskType === iosViewUtils.LayerMask.CLIP_PATH) {
clipPath = iosBackground.generateClipPath(view, bounds);
toValue = clipPath;
} else {
Trace.write('Unknown mask on animating view: ' + view, Trace.categories.Animation, Trace.messageType.info);
}

if (toValue) {
nativeView.layer.mask.addAnimationForKey(
this._createBasicAnimation(
{
...args,
propertyNameToAnimate: 'path',
fromValue: nativeView.layer.mask.path,
toValue,
},
animation,
),
'path',
);
}
}

// Border animations (uniform and non-uniform)
if (nativeView.hasNonUniformBorder) {
if (nativeView.borderLayer) {
const innerClipPath = iosBackground.generateNonUniformBorderInnerClipRoundedPath(animation.target, bounds);

if (nativeView.hasNonUniformBorderColor) {
const borderMask = nativeView.borderLayer.mask;
if (borderMask instanceof CAShapeLayer) {
borderMask.addAnimationForKey(
this._createBasicAnimation(
{
...args,
propertyNameToAnimate: 'path',
fromValue: borderMask.path,
toValue: innerClipPath,
},
animation,
),
'path',
);
}

const borderLayers = nativeView.borderLayer.sublayers;
if (borderLayers?.count) {
const paths = iosBackground.generateNonUniformMultiColorBorderRoundedPaths(animation.target, bounds);

for (let i = 0, count = borderLayers.count; i < count; i++) {
const layer = nativeView.borderLayer.sublayers[i];
if (layer instanceof CAShapeLayer) {
layer.addAnimationForKey(
this._createBasicAnimation(
{
...args,
propertyNameToAnimate: 'path',
fromValue: layer.path,
toValue: paths[i],
},
animation,
),
'path',
);
}
}
}
} else {
nativeView.borderLayer.addAnimationForKey(
this._createBasicAnimation(
{
...args,
propertyNameToAnimate: 'path',
fromValue: nativeView.borderLayer.path,
toValue: innerClipPath,
},
animation,
),
'path',
);
}
}
} else {
// TODO: Animate border width when borders get support for percentage values
// Uniform corner radius also relies on view size
if (nativeView.layer.cornerRadius) {
nativeView.layer.addAnimationForKey(
this._createBasicAnimation(
{
...args,
propertyNameToAnimate: 'cornerRadius',
fromValue: nativeView.layer.cornerRadius,
toValue: iosBackground.getUniformBorderRadius(animation.target, bounds),
},
animation,
),
'cornerRadius',
);
}
}

// Shadow container layer belongs to the parent view layer, so animate its properties separately
if (nativeView.outerShadowContainerLayer) {
const shadowClipMask = nativeView.outerShadowContainerLayer.mask;

// This is for animating view clip path on shadow
if (clipPath && shadowClipMask instanceof CAShapeLayer) {
shadowClipMask.addAnimationForKey(
this._createBasicAnimation(
{
...args,
propertyNameToAnimate: 'path',
fromValue: shadowClipMask.path,
toValue: clipPath,
},
animation,
),
'path',
);
}

const outerShadowLayers = nativeView.outerShadowContainerLayer.sublayers;
if (outerShadowLayers?.count) {
const { maskPath, shadowPath } = iosBackground.generateShadowLayerPaths(view, bounds);
Expand Down
4 changes: 0 additions & 4 deletions packages/core/ui/core/view/index.d.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1055,10 +1055,6 @@ export abstract class View extends ViewCommon {
* androidx.fragment.app.FragmentManager
*/
_manager: any;
/**
* @private
*/
_setNativeClipToBounds(): void;
/**
* Called by measure method to cache measureSpecs.
* @private
Expand Down
Loading
Loading
Back | FazBrowse Home | New Git URL