4396953624

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/cocopon/tweakpane/commit/<a class=hub.com/cocopon/tweakpane/commit/a2a1d4421b53732e73ec5cffa47b1f2bc814cdba">a2a1d4421<a href="https://github.com/cocopon/tweakpane/commit/a2a1d4421b53732e73ec5cffa47b1f2bc814cdba">">Merge </a><a class="double-link" href="https://github.com/cocopon/tweakpane/commit/<a class="double-link" href="https://github.com/cocopon/tweakpane/commit/217da5f2e4c5c456ebfa11fa2ea2b7c4bc455432">217da5f2e</a>">217da5f2e</a><a href="https://github.com/cocopon/tweakpane/commit/a2a1d4421b53732e73ec5cffa47b1f2bc814cdba"> into b9cc0553f">b9cc0553f</a>

Pull Request Pull Request #519: Fix bug that alpha is changed when updating picker with hex color

Run Details

1315 of 1725 branches covered (76.23%)

Branch coverage included in aggregate %.

24 of 24 new or added lines in 6 files covered. (100.0%)

4617 of 5043 relevant lines covered (91.55%)

712.64 hits per line

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

91.43

/packages/core/src/input-binding/color/controller/color-picker.ts

import {DefiniteRangeConstraint} from '../../../common/constraint/definite-range';
import {ValueController} from '../../../common/controller/value';
import {
        createNumberFormatter,
        parseNumber,
} from '../../../common/converter/number';
import {Value} from '../../../common/model/value';
import {ValueMap} from '../../../common/model/value-map';
import {connectValues} from '../../../common/model/value-sync';
import {createValue} from '../../../common/model/values';
import {ViewProps} from '../../../common/model/view-props';
import {NumberTextController} from '../../../common/number/controller/number-text';
import {ColorType} from '../model/color-model';
import {IntColor} from '../model/int-color';
import {ColorPickerView} from '../view/color-picker';
import {APaletteController} from './a-palette';
import {ColorTextsController} from './color-texts';
import {HPaletteController} from './h-palette';
import {SvPaletteController} from './sv-palette';

interface Config {
        colorType: ColorType;
        supportsAlpha: boolean;
        value: Value<IntColor>;
        viewProps: ViewProps;
}

/**
 * @hidden
 */
export class ColorPickerController
        implements ValueController<IntColor, ColorPickerView>
{
        public readonly value: Value<IntColor>;
        public readonly view: ColorPickerView;
        public readonly viewProps: ViewProps;
        private readonly alphaIcs_: {
                palette: APaletteController;
                text: NumberTextController;
        } | null;
        private readonly hPaletteC_: HPaletteController;
        private readonly svPaletteC_: SvPaletteController;
        private readonly textsC_: ColorTextsController;

        constructor(doc: Document, config: Config) {
                this.value = config.value;
                this.viewProps = config.viewProps;

                this.hPaletteC_ = new HPaletteController(doc, {
                        value: this.value,
                        viewProps: this.viewProps,
                });
                this.svPaletteC_ = new SvPaletteController(doc, {
                        value: this.value,
                        viewProps: this.viewProps,
                });
                this.alphaIcs_ = config.supportsAlpha
                        ? {
                                        palette: new APaletteController(doc, {
                                                value: this.value,
                                                viewProps: this.viewProps,
                                        }),
                                        text: new NumberTextController(doc, {
                                                parser: parseNumber,
                                                props: ValueMap.fromObject({
                                                        pointerScale: 0.01,
                                                        keyScale: 0.1,
                                                        formatter: createNumberFormatter(2),
                                                }),
                                                value: createValue(0, {
                                                        constraint: new DefiniteRangeConstraint({min: 0, max: 1}),
                                                }),
                                                viewProps: this.viewProps,
                                        }),
                          }
                        : null;
                if (this.alphaIcs_) {
                        connectValues({
                                primary: this.value,
                                secondary: this.alphaIcs_.text.value,
                                forward: (p) => p.getComponents()[3],
                                backward: (p, s) => {
                                        const comps = p.getComponents();
                                        comps[3] = s;
                                        return new IntColor(comps, p.mode);
                                },
                        });
                }
                this.textsC_ = new ColorTextsController(doc, {
                        colorType: config.colorType,
                        value: this.value,
                        viewProps: this.viewProps,
                });

                this.view = new ColorPickerView(doc, {
                        alphaViews: this.alphaIcs_
                                ? {
                                                palette: this.alphaIcs_.palette.view,
                                                text: this.alphaIcs_.text.view,
                                  }
                                : null,
                        hPaletteView: this.hPaletteC_.view,
                        supportsAlpha: config.supportsAlpha,
                        svPaletteView: this.svPaletteC_.view,
                        textsView: this.textsC_.view,
                        viewProps: this.viewProps,
                });
        }

        get textsController(): ColorTextsController {
                return this.textsC_;
        }
}

1	import {DefiniteRangeConstraint} from '../../../common/constraint/definite-range';	1✔
2	import {ValueController} from '../../../common/controller/value';
3	import {	1✔
4	createNumberFormatter,
5	parseNumber,
6	} from '../../../common/converter/number';
7	import {Value} from '../../../common/model/value';
8	import {ValueMap} from '../../../common/model/value-map';	1✔
9	import {connectValues} from '../../../common/model/value-sync';	1✔
10	import {createValue} from '../../../common/model/values';	1✔
11	import {ViewProps} from '../../../common/model/view-props';
12	import {NumberTextController} from '../../../common/number/controller/number-text';	1✔
13	import {ColorType} from '../model/color-model';
14	import {IntColor} from '../model/int-color';	1✔
15	import {ColorPickerView} from '../view/color-picker';	1✔
16	import {APaletteController} from './a-palette';	1✔
17	import {ColorTextsController} from './color-texts';	1✔
18	import {HPaletteController} from './h-palette';	1✔
19	import {SvPaletteController} from './sv-palette';	1✔
20
21	interface Config {
22	colorType: ColorType;
23	supportsAlpha: boolean;
24	value: Value<IntColor>;
25	viewProps: ViewProps;
26	}
27
28	/**
29	* @hidden
30	*/
31	export class ColorPickerController	1✔
32	implements ValueController<IntColor, ColorPickerView>
33	{
34	public readonly value: Value<IntColor>;
35	public readonly view: ColorPickerView;
36	public readonly viewProps: ViewProps;
37	private readonly alphaIcs_: {
38	palette: APaletteController;
39	text: NumberTextController;
40	} \| null;
41	private readonly hPaletteC_: HPaletteController;
42	private readonly svPaletteC_: SvPaletteController;
43	private readonly textsC_: ColorTextsController;
44
45	constructor(doc: Document, config: Config) {
46	this.value = config.value;	17✔
47	this.viewProps = config.viewProps;	17✔
48
49	this.hPaletteC_ = new HPaletteController(doc, {	17✔
50	value: this.value,
51	viewProps: this.viewProps,
52	});
53	this.svPaletteC_ = new SvPaletteController(doc, {	17✔
54	value: this.value,
55	viewProps: this.viewProps,
56	});
57	this.alphaIcs_ = config.supportsAlpha	17✔
58	? {
59	palette: new APaletteController(doc, {
60	value: this.value,
61	viewProps: this.viewProps,
62	}),
63	text: new NumberTextController(doc, {
64	parser: parseNumber,
65	props: ValueMap.fromObject({
66	pointerScale: 0.01,
67	keyScale: 0.1,
68	formatter: createNumberFormatter(2),
69	}),
70	value: createValue(0, {
71	constraint: new DefiniteRangeConstraint({min: 0, max: 1}),
72	}),
73	viewProps: this.viewProps,
74	}),
75	}
76	: null;
77	if (this.alphaIcs_) {	17✔
78	connectValues({	6✔
79	primary: this.value,
80	secondary: this.alphaIcs_.text.value,
81	forward: (p) => p.getComponents()[3],	10✔
82	backward: (p, s) => {
83	const comps = p.getComponents();	×
84	comps[3] = s;	×
85	return new IntColor(comps, p.mode);	×
86	},
87	});
88	}
89	this.textsC_ = new ColorTextsController(doc, {	17✔
90	colorType: config.colorType,
91	value: this.value,
92	viewProps: this.viewProps,
93	});
94
95	this.view = new ColorPickerView(doc, {	17✔
96	alphaViews: this.alphaIcs_	17✔
97	? {
98	palette: this.alphaIcs_.palette.view,
99	text: this.alphaIcs_.text.view,
100	}
101	: null,
102	hPaletteView: this.hPaletteC_.view,
103	supportsAlpha: config.supportsAlpha,
104	svPaletteView: this.svPaletteC_.view,
105	textsView: this.textsC_.view,
106	viewProps: this.viewProps,
107	});
108	}
109
110	get textsController(): ColorTextsController {	1✔
111	return this.textsC_;	4✔
112	}
113	}	1✔

cocopon / tweakpane / 4396953624

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