shelving 1.290.0 → 1.291.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "shelving",
-	"version": "1.290.0",
+	"version": "1.291.0",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"repository": {
 		"type": "git",

package/schema/ChoiceSchema.d.ts

@@ -40,7 +40,7 @@ export interface ChoiceSchemaOptions<O extends string, I = never> extends Schema
     readonly value?: O | I;
     /**
      * Input control hint for downstream UIs.
-     * - When not set, a UI picks the control from the number of options.
+     * @default "radio" for 8 or fewer options, otherwise "select"
      */
     readonly input?: ChoiceInputType | undefined;
 }
@@ -55,7 +55,7 @@ export interface ChoiceSchemaOptions<O extends string, I = never> extends Schema
 export declare class ChoiceSchema<O extends string, I = never> extends Schema<O> {
     readonly value: O | I | undefined;
     readonly options: ChoiceOptions<O>;
-    readonly input: ChoiceInputType | undefined;
+    readonly input: ChoiceInputType;
     constructor({ one, title, placeholder, options, value, input, ...rest }: ChoiceSchemaOptions<O, I>);
     /**
      * Get an unknown value as one of the allowed choices, or `undefined` if it isn't one.

package/schema/ChoiceSchema.js

@@ -1,5 +1,5 @@
 import { isArray } from "../util/array.js";
-import { isProp } from "../util/object.js";
+import { getKeys, isProp } from "../util/object.js";
 import { Schema } from "./Schema.js";
 /** Get a `ChoiceOptions` object for a set of `PossibleChoiceOptions`. */
 function _getChoiceOptions(options) {
@@ -8,6 +8,8 @@ function _getChoiceOptions(options) {
 function _getChoiceOption(k) {
     return [k, k];
 }
+/** Maximum number of options for which a `ChoiceSchema` defaults to radio inputs. */
+const MAX_RADIO_OPTIONS = 8;
 /**
  * Schema that validates a value against a fixed set of allowed string choices.
  *
@@ -22,7 +24,7 @@ export class ChoiceSchema extends Schema {
     constructor({ one = "choice", title = "Choice", placeholder = `No ${one}`, options, value, input, ...rest }) {
         super({ one, title, value, placeholder, ...rest });
         this.options = _getChoiceOptions(options);
-        this.input = input;
+        this.input = input ?? (getKeys(this.options).length <= MAX_RADIO_OPTIONS ? "radio" : "select");
     }
     /**
      * Get an unknown value as one of the allowed choices, or `undefined` if it isn't one.

package/ui/input/SchemaInput.d.ts

@@ -83,7 +83,6 @@ export interface ChoiceSchemaInputProps extends SchemaInputProps<ChoiceSchema<st
  * Show a choice input for a `ChoiceSchema` — radio inputs or a select.
  *
  * - The schema's `input` picks the control: `"radio"` for radio inputs, `"select"` for a select.
- * - When `input` is not set, it shows radio inputs for up to 8 options, otherwise a select.
  * - The value is normalised through the schema's `get()`, so invalid or sentinel values (e.g. a `CountrySchema`'s `"detect"`) resolve to a real option or fall back to the placeholder rather than mis-selecting the first option.
  *
  * @returns A `ChoiceRadioInputs` or `SelectInput` element bound to the schema.

package/ui/input/SchemaInput.js

@@ -14,7 +14,6 @@ import { isArray } from "../../util/array.js";
 import { isData } from "../../util/data.js";
 import { isDictionary } from "../../util/dictionary.js";
 import { getNumber } from "../../util/number.js";
-import { getKeys } from "../../util/object.js";
 import { getSource, requireSource } from "../../util/source.js";
 import { getString } from "../../util/string.js";
 import { Field } from "../form/Field.js";
@@ -97,7 +96,6 @@ export function NumberSchemaInput({ schema, value, ...props }) {
  * Show a choice input for a `ChoiceSchema` — radio inputs or a select.
  *
  * - The schema's `input` picks the control: `"radio"` for radio inputs, `"select"` for a select.
- * - When `input` is not set, it shows radio inputs for up to 8 options, otherwise a select.
  * - The value is normalised through the schema's `get()`, so invalid or sentinel values (e.g. a `CountrySchema`'s `"detect"`) resolve to a real option or fall back to the placeholder rather than mis-selecting the first option.
  *
  * @returns A `ChoiceRadioInputs` or `SelectInput` element bound to the schema.
@@ -108,8 +106,7 @@ export function NumberSchemaInput({ schema, value, ...props }) {
 export function ChoiceSchemaInput({ schema, value, ...props }) {
     const choice = requireSource(ChoiceSchema, schema);
     const string = choice.get(value);
-    const input = choice.input ?? (getKeys(choice.options).length <= 8 ? "radio" : "select");
-    if (input === "radio")
+    if (choice.input === "radio")
         return _jsx(ChoiceRadioInputs, { ...schema, value: string, ...props });
     return _jsx(SelectInput, { ...schema, value: string, ...props });
 }

package/ui/input/SchemaInput.md

@@ -17,8 +17,8 @@ The schema-to-input mapping:
 | `NumberSchema` | `<NumberInput>` (formatted on blur) |
 | `DateSchema` | `<DateInput>` |
 | `BooleanSchema` | `<CheckboxInput>` |
-| `ChoiceSchema` (`input: "radio"`, or ≤ 8 options) | `<ChoiceRadioInputs>` |
-| `ChoiceSchema` (`input: "select"`, or > 8 options) | `<SelectInput>` |
+| `ChoiceSchema` (`input: "radio"`, the default for ≤ 8 options) | `<ChoiceRadioInputs>` |
+| `ChoiceSchema` (`input: "select"`, the default for > 8 options) | `<SelectInput>` |
 | `ArraySchema` | `<ArrayInput>` |
 | `DictionarySchema` | `<DictionaryInput>` |
 | `DataSchema` | `<DataInput>` |

package/ui/input/SchemaInput.tsx

@@ -15,7 +15,6 @@ import { isArray } from "../../util/array.js";
 import { type Data, isData } from "../../util/data.js";
 import { isDictionary } from "../../util/dictionary.js";
 import { getNumber } from "../../util/number.js";
-import { getKeys } from "../../util/object.js";
 import { getSource, requireSource } from "../../util/source.js";
 import { getString } from "../../util/string.js";
 import type { ValidatorType } from "../../util/validate.js";
@@ -151,7 +150,6 @@ export interface ChoiceSchemaInputProps extends SchemaInputProps<ChoiceSchema<st
  * Show a choice input for a `ChoiceSchema` — radio inputs or a select.
  *
  * - The schema's `input` picks the control: `"radio"` for radio inputs, `"select"` for a select.
- * - When `input` is not set, it shows radio inputs for up to 8 options, otherwise a select.
  * - The value is normalised through the schema's `get()`, so invalid or sentinel values (e.g. a `CountrySchema`'s `"detect"`) resolve to a real option or fall back to the placeholder rather than mis-selecting the first option.
  *
  * @returns A `ChoiceRadioInputs` or `SelectInput` element bound to the schema.
@@ -162,8 +160,7 @@ export interface ChoiceSchemaInputProps extends SchemaInputProps<ChoiceSchema<st
 export function ChoiceSchemaInput({ schema, value, ...props }: ChoiceSchemaInputProps): ReactElement {
 	const choice = requireSource(ChoiceSchema, schema);
 	const string = choice.get(value);
-	const input = choice.input ?? (getKeys(choice.options).length <= 8 ? "radio" : "select");
-	if (input === "radio") return <ChoiceRadioInputs {...schema} value={string} {...props} />;
+	if (choice.input === "radio") return <ChoiceRadioInputs {...schema} value={string} {...props} />;
 	return <SelectInput {...schema} value={string} {...props} />;
 }