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

Merge remote-tracking branch 'origin/main' into feat/transition-tag-custom-animations

Browse Source
This commit is contained in:
Nathan Walker
2023-06-12 20:46:06 -07:00
parent 80f024ecba 0956cb0f91
commit 27e84f02ab
5 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/ui/animation/index.android.ts
View File

@@ -248,7 +248,7 @@ export class Animation extends AnimationBase {
private _onAndroidAnimationCancel() {
// tslint:disable-line
this._propertyResetCallbacks.forEach((v) => v());
this._rejectAnimationFinishedPromise();
this._resolveAnimationFinishedPromise();
if (this._target) {
this._target._removeAnimation(this);

29
packages/core/ui/animation/index.ios.ts
View File

@@ -7,7 +7,7 @@ import { AnimationBase, Properties, CubicBezierAnimationCurve } from './animatio
import { Trace } from '../../trace';
import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty, PercentLength } from '../styling/style-properties';
import { iOSNativeHelper } from '../../utils/native-helper';
import { ios as iosHelper } from '../../utils/native-helper';
import { Screen } from '../../platform';
@@ -168,33 +168,28 @@ export class Animation extends AnimationBase {
this._mergedPropertyAnimations = this._propertyAnimations;
}
const that = this;
const animationFinishedCallback = (cancelled: boolean) => {
if (that._playSequentially) {
if (this._playSequentially) {
// This function will be called by the last animation when done or by another animation if the user cancels them halfway through.
if (cancelled) {
that._rejectAnimationFinishedPromise();
} else {
that._resolveAnimationFinishedPromise();
}
this._resolveAnimationFinishedPromise();
} else {
// This callback will be called by each INDIVIDUAL animation when it finishes or is cancelled.
if (cancelled) {
that._cancelledAnimations++;
this._cancelledAnimations++;
} else {
that._finishedAnimations++;
this._finishedAnimations++;
}
if (that._cancelledAnimations > 0 && that._cancelledAnimations + that._finishedAnimations === that._mergedPropertyAnimations.length) {
if (this._cancelledAnimations > 0 && this._cancelledAnimations + this._finishedAnimations === this._mergedPropertyAnimations.length) {
if (Trace.isEnabled()) {
Trace.write(that._cancelledAnimations + ' animations cancelled.', Trace.categories.Animation);
Trace.write(this._cancelledAnimations + ' animations cancelled.', Trace.categories.Animation);
}
that._rejectAnimationFinishedPromise();
} else if (that._finishedAnimations === that._mergedPropertyAnimations.length) {
this._resolveAnimationFinishedPromise();
} else if (this._finishedAnimations === this._mergedPropertyAnimations.length) {
if (Trace.isEnabled()) {
Trace.write(that._finishedAnimations + ' animations finished.', Trace.categories.Animation);
Trace.write(this._finishedAnimations + ' animations finished.', Trace.categories.Animation);
}
that._resolveAnimationFinishedPromise();
this._resolveAnimationFinishedPromise();
}
}
};
@@ -719,7 +714,7 @@ function calculateTransform(view: View): CATransform3D {
}
expectedTransform = CATransform3DTranslate(expectedTransform, view.translateX, view.translateY, 0);
expectedTransform = iOSNativeHelper.applyRotateTransform(expectedTransform, view.rotateX, view.rotateY, view.rotate);
expectedTransform = iosHelper.applyRotateTransform(expectedTransform, view.rotateX, view.rotateY, view.rotate);
expectedTransform = CATransform3DScale(expectedTransform, scaleX, scaleY, 1);
return expectedTransform;

10
packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
View File

@@ -318,7 +318,10 @@ exports[`angular configuration for android 1`] = `
keep_infinity: true,
drop_console: false,
global_defs: {
__UGLIFIED__: true
__UGLIFIED__: true,
ngDevMode: false,
ngI18nClosureMode: false,
ngJitMode: false
}
},
keep_fnames: true,
@@ -741,7 +744,10 @@ exports[`angular configuration for ios 1`] = `
keep_infinity: true,
drop_console: false,
global_defs: {
__UGLIFIED__: true
__UGLIFIED__: true,
ngDevMode: false,
ngI18nClosureMode: false,
ngJitMode: false
}
},
keep_fnames: true,

2
packages/webpack5/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@nativescript/webpack",
"version": "5.0.14",
"version": "5.0.15",
"private": false,
"main": "dist/index.js",
"files": [

23
packages/webpack5/src/configuration/angular.ts
View File

@@ -13,6 +13,16 @@ import {
getPlatformName,
} from '../helpers/platform';
import base from './base';
// until we can switch to async/await on the webpack config, copy this from '@angular/compiler-cli'
const GLOBAL_DEFS_FOR_TERSER = {
ngDevMode: false,
ngI18nClosureMode: false,
};
const GLOBAL_DEFS_FOR_TERSER_WITH_AOT = {
...GLOBAL_DEFS_FOR_TERSER,
ngJitMode: false,
};
export default function (config: Config, env: IWebpackEnv = _env): Config {
base(config, env);
@@ -269,6 +279,19 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
])
);
config.optimization.minimizer('TerserPlugin').tap((args) => {
args[0].terserOptions ??= {};
args[0].terserOptions.compress ??= {};
args[0].terserOptions.compress.global_defs ??= {};
args[0].terserOptions.compress.global_defs = {
...args[0].terserOptions.compress.global_defs,
...(disableAOT
? GLOBAL_DEFS_FOR_TERSER
: GLOBAL_DEFS_FOR_TERSER_WITH_AOT),
};
return args;
});
// todo: re-visit later, disabling by default now
// config.plugin('DefinePlugin').tap((args) => {
// args[0] = merge(args[0], {