Synchronize constraint values with list options

cocopon · Jan 15, 2023 · cff2710 · cff2710
1 parent 409ae7f
commit cff2710
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 46 deletions.
diff --git a/packages/core/src/common/controller/list-test.ts b/packages/core/src/common/controller/list-test.ts
@@ -7,7 +7,6 @@ import {ListConstraint} from '../constraint/list';
 import {ValueMap} from '../model/value-map';
 import {createValue} from '../model/values';
 import {ViewProps} from '../model/view-props';
-import {findListItems} from '../util';
 import {ListController} from './list';
 
 describe(ListController.name, () => {
@@ -22,8 +21,8 @@ describe(ListController.name, () => {
 		});
 		const doc = createTestWindow().document;
 		const c = new ListController(doc, {
-			props: ValueMap.fromObject({
-				options: findListItems(constraint) ?? [],
+			props: new ValueMap({
+				options: constraint.values.value('options'),
 			}),
 			value: value,
 			viewProps: ViewProps.create(),
@@ -44,8 +43,8 @@ describe(ListController.name, () => {
 		const win = createTestWindow();
 		const doc = win.document;
 		const c = new ListController(doc, {
-			props: ValueMap.fromObject({
-				options: findListItems(constraint) ?? [],
+			props: new ValueMap({
+				options: constraint.values.value('options'),
 			}),
 			value: value,
 			viewProps: ViewProps.create(),
@@ -68,8 +67,8 @@ describe(ListController.name, () => {
 		});
 		const doc = createTestWindow().document;
 		const c = new ListController(doc, {
-			props: ValueMap.fromObject({
-				options: findListItems(constraint) ?? [],
+			props: new ValueMap({
+				options: constraint.values.value('options'),
 			}),
 			value: value,
 			viewProps: ViewProps.create(),

diff --git a/packages/core/src/common/util.ts b/packages/core/src/common/util.ts
@@ -78,22 +78,6 @@ export function createListConstraint<T>(
 		: null;
 }
 
-/**
- * @hidden
- */
-export function findListItems<T>(
-	constraint: Constraint<T> | undefined,
-): ListItem<T>[] | null {
-	const c = constraint
-		? findConstraint<ListConstraint<T>>(constraint, ListConstraint)
-		: null;
-	if (!c) {
-		return null;
-	}
-
-	return c.options;
-}
-
 function findStep(constraint: Constraint<number> | undefined): number | null {
 	const c = constraint ? findConstraint(constraint, StepConstraint) : null;
 	if (!c) {

diff --git a/packages/core/src/input-binding/boolean/plugin.ts b/packages/core/src/input-binding/boolean/plugin.ts
@@ -10,11 +10,7 @@ import {ValueMap} from '../../common/model/value-map';
 import {BaseInputParams, ListParamsOptions} from '../../common/params';
 import {ParamsParsers, parseParams} from '../../common/params-parsers';
 import {writePrimitive} from '../../common/primitive';
-import {
-	createListConstraint,
-	findListItems,
-	parseListOptions,
-} from '../../common/util';
+import {createListConstraint, parseListOptions} from '../../common/util';
 import {InputBindingPlugin} from '../plugin';
 import {CheckboxController} from './controller/checkbox';
 
@@ -68,10 +64,11 @@ export const BooleanInputPlugin: InputBindingPlugin<
 		const value = args.value;
 		const c = args.constraint;
 
-		if (c && findConstraint(c, ListConstraint)) {
+		const lc = c && findConstraint<ListConstraint<boolean>>(c, ListConstraint);
+		if (lc) {
 			return new ListController(doc, {
-				props: ValueMap.fromObject({
-					options: findListItems(c) ?? [],
+				props: new ValueMap({
+					options: lc.values.value('options'),
 				}),
 				value: value,
 				viewProps: args.viewProps,

diff --git a/packages/core/src/input-binding/number/plugin.ts b/packages/core/src/input-binding/number/plugin.ts
@@ -26,7 +26,6 @@ import {
 import {writePrimitive} from '../../common/primitive';
 import {
 	createListConstraint,
-	findListItems,
 	getBaseStep,
 	getSuitableDecimalDigits,
 	getSuitableDraggingScale,
@@ -164,10 +163,11 @@ export const NumberInputPlugin: InputBindingPlugin<
 		const value = args.value;
 		const c = args.constraint;
 
-		if (c && findConstraint(c, ListConstraint)) {
+		const lc = c && findConstraint<ListConstraint<number>>(c, ListConstraint);
+		if (lc) {
 			return new ListController(args.document, {
-				props: ValueMap.fromObject({
-					options: findListItems(c) ?? [],
+				props: new ValueMap({
+					options: lc.values.value('options'),
 				}),
 				value: value,
 				viewProps: args.viewProps,

diff --git a/packages/core/src/input-binding/string/plugin.ts b/packages/core/src/input-binding/string/plugin.ts
@@ -11,11 +11,7 @@ import {ValueMap} from '../../common/model/value-map';
 import {BaseInputParams, ListParamsOptions} from '../../common/params';
 import {ParamsParsers, parseParams} from '../../common/params-parsers';
 import {writePrimitive} from '../../common/primitive';
-import {
-	createListConstraint,
-	findListItems,
-	parseListOptions,
-} from '../../common/util';
+import {createListConstraint, parseListOptions} from '../../common/util';
 import {InputBindingPlugin} from '../plugin';
 
 export interface StringInputParams extends BaseInputParams {
@@ -68,10 +64,11 @@ export const StringInputPlugin: InputBindingPlugin<
 		const value = args.value;
 		const c = args.constraint;
 
-		if (c && findConstraint(c, ListConstraint)) {
+		const lc = c && findConstraint<ListConstraint<string>>(c, ListConstraint);
+		if (lc) {
 			return new ListController(doc, {
-				props: ValueMap.fromObject({
-					options: findListItems(c) ?? [],
+				props: new ValueMap({
+					options: lc.values.value('options'),
 				}),
 				value: value,
 				viewProps: args.viewProps,

diff --git a/packages/tweakpane/src/main/ts/blade/list/plugin.ts b/packages/tweakpane/src/main/ts/blade/list/plugin.ts
@@ -3,6 +3,7 @@ import {
 	BladePlugin,
 	createValue,
 	LabeledValueController,
+	ListConstraint,
 	ListController,
 	ListParamsOptions,
 	normalizeListOptions,
@@ -41,11 +42,17 @@ export const ListBladePlugin = (function <T>(): BladePlugin<
 			return result ? {params: result} : null;
 		},
 		controller(args) {
+			const lc = new ListConstraint(
+				normalizeListOptions<T>(args.params.options),
+			);
+			const value = createValue(args.params.value, {
+				constraint: lc,
+			});
 			const ic = new ListController(args.document, {
-				props: ValueMap.fromObject({
-					options: normalizeListOptions<T>(args.params.options),
+				props: new ValueMap({
+					options: lc.values.value('options'),
 				}),
-				value: createValue(args.params.value),
+				value: value,
 				viewProps: args.viewProps,
 			});
 			return new LabeledValueController<T, ListController<T>>(args.document, {