javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't apply css on unloaded

Browse Source
This commit is contained in:
vakrilov
2016-10-31 09:45:57 +02:00
parent 667f33b47e
commit ddd074b333
3 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
tns-core-modules/ui/core/view-common.ts
View File

@ -10,13 +10,13 @@ import utils = require("utils/utils");
import color = require("color"); import color = require("color");
import observable = require("data/observable"); import observable = require("data/observable");
import keyframeAnimationModule = require("ui/animation/keyframe-animation"); import keyframeAnimationModule = require("ui/animation/keyframe-animation");
import {PropertyMetadata, ProxyObject} from "ui/core/proxy"; import { PropertyMetadata, ProxyObject } from "ui/core/proxy";
import {PropertyMetadataSettings, PropertyChangeData, Property, ValueSource, PropertyMetadata as doPropertyMetadata} from "ui/core/dependency-observable"; import { PropertyMetadataSettings, PropertyChangeData, Property, ValueSource, PropertyMetadata as doPropertyMetadata } from "ui/core/dependency-observable";
import {registerSpecialProperty} from "ui/builder/special-properties"; import { registerSpecialProperty } from "ui/builder/special-properties";
import {CommonLayoutParams, nativeLayoutParamsProperty} from "ui/styling/style"; import { CommonLayoutParams, nativeLayoutParamsProperty } from "ui/styling/style";
import * as animModule from "ui/animation"; import * as animModule from "ui/animation";
import {CssState} from "ui/styling/style-scope"; import { CssState } from "ui/styling/style-scope";
import {Source} from "utils/debug"; import { Source } from "utils/debug";
registerSpecialProperty("class", (instance: definition.View, propertyValue: string) => { registerSpecialProperty("class", (instance: definition.View, propertyValue: string) => {
instance.className = propertyValue; instance.className = propertyValue;
@ -99,7 +99,7 @@ export function getAncestor(view: View, criterion: string | Function): definitio
return null; return null;
} }
export function PseudoClassHandler(... pseudoClasses: string[]): MethodDecorator { export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator {
let stateEventNames = pseudoClasses.map(s => ":" + s); let stateEventNames = pseudoClasses.map(s => ":" + s);
let listeners = Symbol("listeners"); let listeners = Symbol("listeners");
return <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => { return <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => {
@ -555,7 +555,7 @@ export class View extends ProxyObject implements definition.View {
if (value === false) { if (value === false) {
this._goToVisualState('disabled'); this._goToVisualState('disabled');
} else { } else {
this._goToVisualState('normal'); this._goToVisualState('normal');
} }
} }
@ -647,8 +647,7 @@ export class View extends ProxyObject implements definition.View {
} }
public onUnloaded() { public onUnloaded() {
this._onCssStateChange(this._cssState, null); this._setCssState(null);
this._cssState = null;
this._unloadEachChildView(); this._unloadEachChildView();
@ -734,8 +733,8 @@ export class View extends ProxyObject implements definition.View {
public getMeasuredState(): number { public getMeasuredState(): number {
return (this._measuredWidth & utils.layout.MEASURED_STATE_MASK) return (this._measuredWidth & utils.layout.MEASURED_STATE_MASK)
| ((this._measuredHeight >> utils.layout.MEASURED_HEIGHT_STATE_SHIFT) | ((this._measuredHeight >> utils.layout.MEASURED_HEIGHT_STATE_SHIFT)
& (utils.layout.MEASURED_STATE_MASK >> utils.layout.MEASURED_HEIGHT_STATE_SHIFT)); & (utils.layout.MEASURED_STATE_MASK >> utils.layout.MEASURED_HEIGHT_STATE_SHIFT));
} }
public setMeasuredDimension(measuredWidth: number, measuredHeight: number): void { public setMeasuredDimension(measuredWidth: number, measuredHeight: number): void {
@ -1010,7 +1009,7 @@ export class View extends ProxyObject implements definition.View {
} }
protected static adjustChildLayoutParams(view: View, widthMeasureSpec: number, heightMeasureSpec: number): void { protected static adjustChildLayoutParams(view: View, widthMeasureSpec: number, heightMeasureSpec: number): void {
if(!view) { if (!view) {
return; return;
} }
@ -1020,39 +1019,39 @@ export class View extends ProxyObject implements definition.View {
let availableHeight = utils.layout.getMeasureSpecSize(heightMeasureSpec); let availableHeight = utils.layout.getMeasureSpecSize(heightMeasureSpec);
let heightSpec = utils.layout.getMeasureSpecMode(heightMeasureSpec); let heightSpec = utils.layout.getMeasureSpecMode(heightMeasureSpec);
let lp: CommonLayoutParams = view.style._getValue(style.nativeLayoutParamsProperty); let lp: CommonLayoutParams = view.style._getValue(style.nativeLayoutParamsProperty);
if (widthSpec !== utils.layout.UNSPECIFIED) { if (widthSpec !== utils.layout.UNSPECIFIED) {
if (lp.widthPercent > 0) { if (lp.widthPercent > 0) {
lp.width = Math.round(availableWidth * lp.widthPercent); lp.width = Math.round(availableWidth * lp.widthPercent);
} }
if (lp.leftMarginPercent > 0) { if (lp.leftMarginPercent > 0) {
lp.leftMargin = Math.round(availableWidth * lp.leftMarginPercent); lp.leftMargin = Math.round(availableWidth * lp.leftMarginPercent);
} }
if (lp.rightMarginPercent > 0) { if (lp.rightMarginPercent > 0) {
lp.rightMargin = Math.round(availableWidth * lp.rightMarginPercent); lp.rightMargin = Math.round(availableWidth * lp.rightMarginPercent);
} }
} }
if (heightSpec !== utils.layout.UNSPECIFIED) { if (heightSpec !== utils.layout.UNSPECIFIED) {
if (lp.heightPercent > 0) { if (lp.heightPercent > 0) {
lp.height = Math.round(availableHeight * lp.heightPercent); lp.height = Math.round(availableHeight * lp.heightPercent);
} }
if (lp.topMarginPercent > 0) { if (lp.topMarginPercent > 0) {
lp.topMargin = Math.round(availableHeight * lp.topMarginPercent); lp.topMargin = Math.round(availableHeight * lp.topMarginPercent);
} }
if (lp.bottomMarginPercent > 0) { if (lp.bottomMarginPercent > 0) {
lp.bottomMargin = Math.round(availableHeight * lp.bottomMarginPercent); lp.bottomMargin = Math.round(availableHeight * lp.bottomMarginPercent);
} }
} }
} }
protected static restoreChildOriginalParams(view: View): void { protected static restoreChildOriginalParams(view: View): void {
if(!view) { if (!view) {
return; return;
} }
let lp: CommonLayoutParams = view.style._getValue(style.nativeLayoutParamsProperty); let lp: CommonLayoutParams = view.style._getValue(style.nativeLayoutParamsProperty);
@ -1180,8 +1179,7 @@ export class View extends ProxyObject implements definition.View {
if (!view) { if (!view) {
throw new Error("Expecting a valid View instance."); throw new Error("Expecting a valid View instance.");
} }
if(!(view instanceof View)) if (!(view instanceof View)) {
{
throw new Error(view + " is not a valid View instance."); throw new Error(view + " is not a valid View instance.");
} }
if (view._parent) { if (view._parent) {
@ -1439,7 +1437,9 @@ export class View extends ProxyObject implements definition.View {
} }
// TODO: Make sure the state is set to null and this is called on unloaded to clean up change listeners... // TODO: Make sure the state is set to null and this is called on unloaded to clean up change listeners...
_onCssStateChange(previous: CssState, next: CssState): void { _setCssState(next: CssState): void {
const previous = this._cssState;
this._cssState = next;
if (!this._invalidateCssHandler) { if (!this._invalidateCssHandler) {
this._invalidateCssHandler = () => { this._invalidateCssHandler = () => {

2
tns-core-modules/ui/core/view.d.ts vendored
View File

@ -605,7 +605,7 @@ declare module "ui/core/view" {
_domId: number; _domId: number;
_cssState: any /* "ui/styling/style-scope" */; _cssState: any /* "ui/styling/style-scope" */;
_onCssStateChange(previous: any /* "ui/styling/style-scope" */, any /* "ui/styling/style-scope" */); _setCssState(next: any /* "ui/styling/style-scope" */);
_registerAnimation(animation: keyframeAnimationModule.KeyframeAnimation); _registerAnimation(animation: keyframeAnimationModule.KeyframeAnimation);
_unregisterAnimation(animation: keyframeAnimationModule.KeyframeAnimation); _unregisterAnimation(animation: keyframeAnimationModule.KeyframeAnimation);

4
tns-core-modules/ui/styling/style-scope.ts
View File

@ -201,10 +201,8 @@ export class StyleScope {
let state = this._selectors.query(view); let state = this._selectors.query(view);
let previousState = view._cssState;
let nextState = new CssState(view, state); let nextState = new CssState(view, state);
view._cssState = nextState; view._setCssState(nextState);
view._onCssStateChange(previousState, nextState);
} }
public query(node: Node): SelectorCore[] { public query(node: Node): SelectorCore[] {