Merge branch 'faster_style_scope' of github.com:Akylas/NativeScript

# Conflicts:
#	packages/core/ui/styling/style-scope.ts
This commit is contained in:
Martin Guillon
2020-12-06 14:45:47 +01:00

View File

@ -387,7 +387,7 @@ if (application.hasLaunched()) {
export class CssState { export class CssState {
static emptyChangeMap: Readonly<ChangeMap<ViewBase>> = Object.freeze(new Map()); static emptyChangeMap: Readonly<ChangeMap<ViewBase>> = Object.freeze(new Map());
static emptyPropertyBag: Readonly<Record<string, unknown>> = Object.freeze({}); static emptyPropertyBag: Record<string, unknown> = {};
static emptyAnimationArray: ReadonlyArray<kam.KeyframeAnimation> = Object.freeze([]); static emptyAnimationArray: ReadonlyArray<kam.KeyframeAnimation> = Object.freeze([]);
static emptyMatch: Readonly<SelectorsMatch<ViewBase>> = { static emptyMatch: Readonly<SelectorsMatch<ViewBase>> = {
selectors: [], selectors: [],
@ -399,7 +399,7 @@ export class CssState {
_onDynamicStateChangeHandler: () => void; _onDynamicStateChangeHandler: () => void;
_appliedChangeMap: Readonly<ChangeMap<ViewBase>>; _appliedChangeMap: Readonly<ChangeMap<ViewBase>>;
_appliedPropertyValues: Record<string, unknown>; private _appliedPropertyValues: Record<string, unknown> = CssState.emptyPropertyBag;
_appliedAnimations: ReadonlyArray<kam.KeyframeAnimation>; _appliedAnimations: ReadonlyArray<kam.KeyframeAnimation>;
_appliedSelectorsVersion: number; _appliedSelectorsVersion: number;
@ -664,7 +664,6 @@ export class CssState {
} }
} }
CssState.prototype._appliedChangeMap = CssState.emptyChangeMap; CssState.prototype._appliedChangeMap = CssState.emptyChangeMap;
CssState.prototype._appliedPropertyValues = CssState.emptyPropertyBag;
CssState.prototype._appliedAnimations = CssState.emptyAnimationArray; CssState.prototype._appliedAnimations = CssState.emptyAnimationArray;
CssState.prototype._matchInvalid = true; CssState.prototype._matchInvalid = true;