3995379422

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/cocopon/tweakpane/commit/<a class=hub.com/cocopon/tweakpane/commit/870e16a1f5ab3efbdc730a45021c50f69b3df766">870e16a1f<a href="https://github.com/cocopon/tweakpane/commit/870e16a1f5ab3efbdc730a45021c50f69b3df766">">Merge </a><a class="double-link" href="https://github.com/cocopon/tweakpane/commit/<a class="double-link" href="https://github.com/cocopon/tweakpane/commit/bd29f0df28f9d2443786eee893d185527eeecc0c">bd29f0df2</a>">bd29f0df2</a><a href="https://github.com/cocopon/tweakpane/commit/870e16a1f5ab3efbdc730a45021c50f69b3df766"> into cca03a68f">cca03a68f</a>

Pull Request Pull Request #460: Make `disabled` structure more strict

Run Details

1232 of 1663 branches covered (74.08%)

Branch coverage included in aggregate %.

84 of 84 new or added lines in 15 files covered. (100.0%)

4321 of 4824 relevant lines covered (89.57%)

722.85 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

95.6

/packages/core/src/common/model/view-props.ts

import {ClassName} from '../view/class-name';
import {valueToClassName} from '../view/reactive';
import {bindValueMap} from './reactive';
import {ReadonlyValue, SetRawValue} from './readonly-value';
import {Value, ValueEvents} from './value';
import {ValueMap, ValueMapEvents} from './value-map';
import {createValue} from './values';

export type ViewPropsObject = {
        disabled: boolean;
        disposed: boolean;
        hidden: boolean;
        parent: ViewProps | null;
};

export type ViewPropsEvents = ValueMapEvents<ViewPropsObject>;

const className = ClassName('');
function valueToModifier(
        elem: HTMLElement,
        modifier: string,
): (value: boolean) => void {
        return valueToClassName(elem, className(undefined, modifier));
}

interface Disableable {
        disabled: boolean;
}

export class ViewProps extends ValueMap<ViewPropsObject> {
        private readonly globalDisabled_: ReadonlyValue<boolean>;
        private readonly setGlobalDisabled_: SetRawValue<boolean>;

        constructor(valueMap: {
                [Key in keyof ViewPropsObject]: Value<ViewPropsObject[Key]>;
        }) {
                super(valueMap);

                this.onDisabledChange_ = this.onDisabledChange_.bind(this);
                this.onParentChange_ = this.onParentChange_.bind(this);
                this.onParentGlobalDisabledChange_ =
                        this.onParentGlobalDisabledChange_.bind(this);

                [this.globalDisabled_, this.setGlobalDisabled_] = ReadonlyValue.create(
                        createValue(this.getGlobalDisabled_()),
                );

                this.value('disabled').emitter.on('change', this.onDisabledChange_);
                this.value('parent').emitter.on('change', this.onParentChange_);
                this.get('parent')?.globalDisabled.emitter.on(
                        'change',
                        this.onParentGlobalDisabledChange_,
                );
        }

        public static create(opt_initialValue?: Partial<ViewPropsObject>): ViewProps {
                const initialValue: Partial<ViewPropsObject> = opt_initialValue ?? {};
                return new ViewProps(
                        ValueMap.createCore<ViewPropsObject>({
                                disabled: initialValue.disabled ?? false,
                                disposed: false,
                                hidden: initialValue.hidden ?? false,
                                parent: initialValue.parent ?? null,
                        }),
                );
        }

        get globalDisabled(): ReadonlyValue<boolean> {
                return this.globalDisabled_;
        }

        public bindClassModifiers(elem: HTMLElement): void {
                this.globalDisabled_.emitter.on('change', (ev) =>
                        valueToModifier(elem, 'disabled')(ev.rawValue),
                );

                bindValueMap(this, 'hidden', valueToModifier(elem, 'hidden'));
        }

        public bindDisabled(target: Disableable): void {
                this.globalDisabled_.emitter.on('change', (ev) => {
                        target.disabled = ev.rawValue;
                });
        }

        public bindTabIndex(elem: HTMLOrSVGElement): void {
                this.globalDisabled_.emitter.on('change', (ev) => {
                        elem.tabIndex = ev.rawValue ? -1 : 0;
                });
        }

        public handleDispose(callback: () => void): void {
                this.value('disposed').emitter.on('change', (disposed) => {
                        if (disposed) {
                                callback();
                        }
                });
        }

        /**
         * Gets a global disabled of the view.
         * Disabled of the view will be affected by its disabled and its parent disabled.
         */
        private getGlobalDisabled_(): boolean {
                const parent = this.get('parent');
                const parentDisabled = parent ? parent.globalDisabled.rawValue : false;
                return parentDisabled || this.get('disabled');
        }

        private updateGlobalDisabled_(): void {
                this.setGlobalDisabled_(this.getGlobalDisabled_());
        }

        private onDisabledChange_(): void {
                this.updateGlobalDisabled_();
        }

        private onParentGlobalDisabledChange_(): void {
                this.updateGlobalDisabled_();
        }

        private onParentChange_(ev: ValueEvents<ViewProps | null>['change']): void {
                const prevParent = ev.previousRawValue;
                prevParent?.globalDisabled.emitter.off(
                        'change',
                        this.onParentGlobalDisabledChange_,
                );
                this.get('parent')?.globalDisabled.emitter.on(
                        'change',
                        this.onParentGlobalDisabledChange_,
                );

                this.updateGlobalDisabled_();
        }
}

1	import {ClassName} from '../view/class-name';	1✔
2	import {valueToClassName} from '../view/reactive';	1✔
3	import {bindValueMap} from './reactive';	1✔
4	import {ReadonlyValue, SetRawValue} from './readonly-value';	1✔
5	import {Value, ValueEvents} from './value';
6	import {ValueMap, ValueMapEvents} from './value-map';	1✔
7	import {createValue} from './values';	1✔
8
9	export type ViewPropsObject = {
10	disabled: boolean;
11	disposed: boolean;
12	hidden: boolean;
13	parent: ViewProps \| null;
14	};
15
16	export type ViewPropsEvents = ValueMapEvents<ViewPropsObject>;
17
18	const className = ClassName('');	1✔
19	function valueToModifier(
20	elem: HTMLElement,
21	modifier: string,
22	): (value: boolean) => void {
23	return valueToClassName(elem, className(undefined, modifier));	734✔
24	}
25
26	interface Disableable {
27	disabled: boolean;
28	}
29
30	export class ViewProps extends ValueMap<ViewPropsObject> {	1✔
31	private readonly globalDisabled_: ReadonlyValue<boolean>;
32	private readonly setGlobalDisabled_: SetRawValue<boolean>;
33
34	constructor(valueMap: {	389✔
35	[Key in keyof ViewPropsObject]: Value<ViewPropsObject[Key]>;
36	}) {
37	super(valueMap);	389✔
38
39	this.onDisabledChange_ = this.onDisabledChange_.bind(this);	389✔
40	this.onParentChange_ = this.onParentChange_.bind(this);	389✔
41	this.onParentGlobalDisabledChange_ =	389✔
42	this.onParentGlobalDisabledChange_.bind(this);
43
44	[this.globalDisabled_, this.setGlobalDisabled_] = ReadonlyValue.create(	389✔
45	createValue(this.getGlobalDisabled_()),
46	);
47
48	this.value('disabled').emitter.on('change', this.onDisabledChange_);	389✔
49	this.value('parent').emitter.on('change', this.onParentChange_);	389✔
50	this.get('parent')?.globalDisabled.emitter.on(	389✔
51	'change',
52	this.onParentGlobalDisabledChange_,
53	);
54	}
55
56	public static create(opt_initialValue?: Partial<ViewPropsObject>): ViewProps {	1✔
57	const initialValue: Partial<ViewPropsObject> = opt_initialValue ?? {};	389✔
58	return new ViewProps(	389✔
59	ValueMap.createCore<ViewPropsObject>({
60	disabled: initialValue.disabled ?? false,	1,167✔
61	disposed: false,
62	hidden: initialValue.hidden ?? false,	1,167✔
63	parent: initialValue.parent ?? null,	1,167✔
64	}),
65	);
66	}
67
68	get globalDisabled(): ReadonlyValue<boolean> {	1✔
69	return this.globalDisabled_;	429✔
70	}
71
72	public bindClassModifiers(elem: HTMLElement): void {	1✔
73	this.globalDisabled_.emitter.on('change', (ev) =>	716✔
74	valueToModifier(elem, 'disabled')(ev.rawValue),	18✔
75	);
76
77	bindValueMap(this, 'hidden', valueToModifier(elem, 'hidden'));	716✔
78	}
79
80	public bindDisabled(target: Disableable): void {	1✔
81	this.globalDisabled_.emitter.on('change', (ev) => {	392✔
82	target.disabled = ev.rawValue;	12✔
83	});
84	}
85
86	public bindTabIndex(elem: HTMLOrSVGElement): void {	1✔
87	this.globalDisabled_.emitter.on('change', (ev) => {	48✔
88	elem.tabIndex = ev.rawValue ? -1 : 0;	×
89	});
90	}
91
92	public handleDispose(callback: () => void): void {	1✔
93	this.value('disposed').emitter.on('change', (disposed) => {	684✔
94	if (disposed) {	74!
95	callback();	74✔
96	}
97	});
98	}
99
100	/**
101	* Gets a global disabled of the view.
102	* Disabled of the view will be affected by its disabled and its parent disabled.
103	*/
104	private getGlobalDisabled_(): boolean {	1✔
105	const parent = this.get('parent');	623✔
106	const parentDisabled = parent ? parent.globalDisabled.rawValue : false;	623✔
107	return parentDisabled \|\| this.get('disabled');	623✔
108	}
109
110	private updateGlobalDisabled_(): void {	1✔
111	this.setGlobalDisabled_(this.getGlobalDisabled_());	234✔
112	}
113
114	private onDisabledChange_(): void {	1✔
115	this.updateGlobalDisabled_();	9✔
116	}
117
118	private onParentGlobalDisabledChange_(): void {	1✔
119	this.updateGlobalDisabled_();	3✔
120	}
121
122	private onParentChange_(ev: ValueEvents<ViewProps \| null>['change']): void {	1✔
123	const prevParent = ev.previousRawValue;	222✔
124	prevParent?.globalDisabled.emitter.off(	222✔
125	'change',
126	this.onParentGlobalDisabledChange_,
127	);
128	this.get('parent')?.globalDisabled.emitter.on(	222✔
129	'change',
130	this.onParentGlobalDisabledChange_,
131	);
132
133	this.updateGlobalDisabled_();	222✔
134	}
135	}	1✔

cocopon / tweakpane / 3995379422

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous