shelving 1.258.7 → 1.258.9

package/package.json

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

package/sequence/InspectSequence.js

@@ -92,7 +92,7 @@ export class InspectSequence extends ThroughSequence {
     /** Capture a result. */
     _inspect(result) {
         if (!result.done) {
-            if (this.first === undefined)
+            if (this._first === _NOVALUE)
                 this._first = result.value;
             this._last = result.value;
             this._count++;

package/ui/form/CheckboxInput.d.ts

@@ -17,4 +17,4 @@ export interface CheckboxProps extends ValueInputProps<boolean>, OptionalChildPr
  * @example <CheckboxInput name="agree" value={agree} onValue={setAgree}>I agree</CheckboxInput>
  * @see https://shelving.cc/ui/CheckboxInput
  */
-export declare function CheckboxInput({ name, title, placeholder, required, disabled, message, value, onValue, children, ...variants }: CheckboxProps): ReactElement;
+export declare function CheckboxInput({ name, title, placeholder, required, disabled, message, value, onValue, children, ...props }: CheckboxProps): ReactElement;

package/ui/form/CheckboxInput.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { notNullish } from "../../util/null.js";
 import { getFlexClass } from "../style/Flex.js";
 import { getClass, getModuleClass } from "../util/css.js";
 import { getInputClass } from "./Input.js";
@@ -14,8 +13,7 @@ const INPUT_PLACEHOLDER_CLASS = getModuleClass(INPUT_CSS, "placeholder");
  * @example <CheckboxInput name="agree" value={agree} onValue={setAgree}>I agree</CheckboxInput>
  * @see https://shelving.cc/ui/CheckboxInput
  */
-export function CheckboxInput({ name, title, placeholder = "Yes", required = false, disabled = false, message = "", value = false, onValue, children = title, ...variants }) {
-    const hasChildren = notNullish(children);
-    return (_jsxs("label", { className: getClass(getInputClass(variants), //
-        getFlexClass(variants), INPUT_LABEL_CLASS, !hasChildren && INPUT_PLACEHOLDER_CLASS), "aria-invalid": !!message, children: [_jsx("input", { name: name, type: "checkbox", defaultChecked: !!value, onChange: e => onValue?.(!!e.currentTarget.checked), required: required, disabled: disabled, title: message, className: getModuleClass(INPUT_CSS, "radio") }), _jsx("span", { children: hasChildren ? children : placeholder })] }));
+export function CheckboxInput({ name, title, placeholder = title || "Yes", required = false, disabled = false, message = "", value = false, onValue, children = placeholder, ...props }) {
+    return (_jsxs("label", { className: getClass(getInputClass(props), //
+        getFlexClass(props), INPUT_LABEL_CLASS), children: [_jsx("input", { className: getModuleClass(INPUT_CSS, "radio"), type: "checkbox", name: name, defaultChecked: !!value, onChange: e => onValue?.(!!e.currentTarget.checked), disabled: disabled, required: required, title: message, "aria-invalid": !!message }), _jsx("span", { children: children })] }));
 }

package/ui/form/CheckboxInput.tsx

@@ -1,5 +1,4 @@
 import type { ReactElement } from "react";
-import { notNullish } from "../../util/null.js";
 import { type FlexVariants, getFlexClass } from "../style/Flex.js";
 import { getClass, getModuleClass } from "../util/css.js";
 import type { OptionalChildProps } from "../util/props.js";
@@ -27,37 +26,35 @@ export interface CheckboxProps extends ValueInputProps<boolean>, OptionalChildPr
 export function CheckboxInput({
 	name,
 	title,
-	placeholder = "Yes",
+	placeholder = title || "Yes",
 	required = false,
 	disabled = false,
 	message = "",
 	value = false,
 	onValue,
-	children = title,
-	...variants
+	children = placeholder,
+	...props
 }: CheckboxProps): ReactElement {
-	const hasChildren = notNullish(children);
 	return (
 		<label
 			className={getClass(
-				getInputClass(variants), //
-				getFlexClass(variants),
+				getInputClass(props), //
+				getFlexClass(props),
 				INPUT_LABEL_CLASS,
-				!hasChildren && INPUT_PLACEHOLDER_CLASS,
 			)}
-			aria-invalid={!!message}
 		>
 			<input
-				name={name}
+				className={getModuleClass(INPUT_CSS, "radio")}
 				type="checkbox"
+				name={name}
 				defaultChecked={!!value}
 				onChange={e => onValue?.(!!e.currentTarget.checked)}
-				required={required}
 				disabled={disabled}
+				required={required}
 				title={message}
-				className={getModuleClass(INPUT_CSS, "radio")}
+				aria-invalid={!!message}
 			/>
-			<span>{hasChildren ? children : placeholder}</span>
+			<span>{children}</span>
 		</label>
 	);
 }

package/ui/form/RadioInput.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { notNullish } from "../../util/null.js";
 import { getFlexClass } from "../style/Flex.js";
 import { getClass, getModuleClass } from "../util/css.js";
 import { getInputClass } from "./Input.js";
@@ -14,8 +13,7 @@ const INPUT_PLACEHOLDER_CLASS = getModuleClass(INPUT_CSS, "placeholder");
  * @example <RadioInput name="plan" value={isPro} onValue={selectPro}>Pro</RadioInput>
  * @see https://shelving.cc/ui/RadioInput
  */
-export function RadioInput({ name, title, placeholder = "Choose", required = false, disabled = false, message = "", value = false, onValue, children = title, ...props }) {
-    const hasChildren = notNullish(children);
+export function RadioInput({ name, title, placeholder = title || "Choose", required = false, disabled = false, message = "", value = false, onValue, children = placeholder, ...props }) {
     return (_jsxs("label", { className: getClass(getInputClass(props), //
-        getFlexClass(props), INPUT_LABEL_CLASS, !hasChildren && INPUT_PLACEHOLDER_CLASS), children: [_jsx("input", { className: getModuleClass(INPUT_CSS, "radio"), type: "radio", name: name, defaultChecked: value, onChange: () => onValue(true), disabled: disabled, required: required, "aria-invalid": !!message }), hasChildren ? children : placeholder] }));
+        getFlexClass(props), INPUT_LABEL_CLASS), children: [_jsx("input", { className: getModuleClass(INPUT_CSS, "radio"), type: "radio", name: name, defaultChecked: !!value, onChange: () => onValue(true), disabled: disabled, required: required, title: message, "aria-invalid": !!message }), _jsx("span", { children: children })] }));
 }

package/ui/form/RadioInput.tsx

@@ -1,5 +1,4 @@
 import type { ReactElement } from "react";
-import { notNullish } from "../../util/null.js";
 import { type FlexVariants, getFlexClass } from "../style/Flex.js";
 import { getClass, getModuleClass } from "../util/css.js";
 import type { OptionalChildProps } from "../util/props.js";
@@ -27,36 +26,35 @@ export interface RadioInputProps extends ValueInputProps<boolean>, OptionalChild
 export function RadioInput({
 	name,
 	title,
-	placeholder = "Choose",
+	placeholder = title || "Choose",
 	required = false,
 	disabled = false,
 	message = "",
 	value = false,
 	onValue,
-	children = title,
+	children = placeholder,
 	...props
 }: RadioInputProps): ReactElement {
-	const hasChildren = notNullish(children);
 	return (
 		<label
 			className={getClass(
 				getInputClass(props), //
 				getFlexClass(props),
 				INPUT_LABEL_CLASS,
-				!hasChildren && INPUT_PLACEHOLDER_CLASS,
 			)}
 		>
 			<input
 				className={getModuleClass(INPUT_CSS, "radio")}
 				type="radio"
 				name={name}
-				defaultChecked={value}
+				defaultChecked={!!value}
 				onChange={() => onValue(true)}
 				disabled={disabled}
 				required={required}
+				title={message}
 				aria-invalid={!!message}
 			/>
-			{hasChildren ? children : placeholder}
+			<span>{children}</span>
 		</label>
 	);
 }