@invana/blocks 0.0.32 → 0.0.33

package/dist/index.cjs

@@ -759,12 +759,17 @@ var FIELD_TYPE = {
   number: "number",
   text: "text",
   date: "text",
-  select: "select"
+  select: "select",
+  textarea: "textarea",
+  checkbox: "boolean",
+  radio: "radio"
 };
-function boundsRule(f) {
-  if (f.above == null && f.below == null) return void 0;
+var blank = (v) => v == null || typeof v === "string" && v.trim() === "";
+function rules(f) {
+  if (!f.required && f.above == null && f.below == null) return void 0;
   return {
     validate: (v) => {
+      if (f.required && (f.type === "checkbox" ? v !== true : blank(v))) return "Required";
       const n = Number(v);
       if (f.above != null && !(n > f.above)) return `Must be above ${f.above}`;
       if (f.below != null && !(n < f.below)) return `Must be below ${f.below}`;
@@ -772,22 +777,41 @@ function boundsRule(f) {
     }
   };
 }
+function optionsOf(f) {
+  if (f.options) return f.options;
+  if (f.type === "select" && f.default != null) {
+    return [{ value: String(f.default), label: String(f.default) }];
+  }
+  return void 0;
+}
 var toField = (f) => ({
   name: f.name,
   type: FIELD_TYPE[f.type],
+  control: f.type === "checkbox" ? "checkbox" : void 0,
   label: f.label,
   unit: f.unit,
   aside: f.aside,
   description: f.hint,
   group: f.group,
-  rules: boundsRule(f),
-  placeholder: ""
+  options: optionsOf(f),
+  rows: f.rows,
+  disabled: f.disabled,
+  rules: rules(f),
+  placeholder: f.placeholder ?? "",
+  // A long answer takes the row; so does a list of described choices.
+  colSpan: f.type === "textarea" || f.type === "radio" && f.options?.some((o) => o.description) ? 2 : void 0
 });
+var initial = (f) => f.type === "checkbox" ? f.default ?? false : f.default;
 function withUnit(value, unit) {
   if (value == null || value === "") return "\u2014";
   if (!unit) return String(value);
   return /^[A-Za-z]/.test(unit) ? `${value} ${unit}` : `${value}${unit}`;
 }
+function answerOf(f, value) {
+  if (f.type === "checkbox") return value === true ? "Yes" : "No";
+  const picked = f.options?.find((o) => o.value === value);
+  return picked ? picked.label : withUnit(value, f.unit);
+}
 function FormAsk({ spec, state = "pending", value: given, onAction }) {
   const auto = React18__namespace.useId();
   const pending = state === "pending";
@@ -795,14 +819,14 @@ function FormAsk({ spec, state = "pending", value: given, onAction }) {
   const current = given ?? {};
   const top = spec.labels === "top";
   const defaults = Object.fromEntries(
-    spec.fields.map((f) => [f.name, pending ? f.default : current[f.name]])
+    spec.fields.map((f) => [f.name, pending ? initial(f) : current[f.name]])
   );
   const form = reactHookForm.useForm({ defaultValues: { values: defaults }, mode: "onChange" });
   if (!pending && !editing) {
     return /* @__PURE__ */ jsxRuntime.jsx(
       AskSummary,
       {
-        rows: spec.fields.map((f) => ({ label: f.label, value: withUnit(current[f.name], f.unit) })),
+        rows: spec.fields.map((f) => ({ label: f.label, value: answerOf(f, current[f.name]) })),
         change: state === "answered" ? "Change inputs" : void 0,
         onChange: () => setEditing(true)
       }
@@ -1237,7 +1261,7 @@ function MultistepAsk({ spec, state = "pending", value: given, onAction }) {
     setEditing(false);
     setReview(null);
   };
-  const initial = (step2) => editing ? current[step2.id] : "default" in step2 ? step2.default : void 0;
+  const initial2 = (step2) => editing ? current[step2.id] : "default" in step2 ? step2.default : void 0;
   const index = Math.max(0, steps.findIndex((s) => s.id === item));
   const step = steps[index];
   const last = index === steps.length - 1;
@@ -1260,7 +1284,7 @@ function MultistepAsk({ spec, state = "pending", value: given, onAction }) {
             StepItem,
             {
               step: s,
-              value: initial(s),
+              value: initial2(s),
               onStatusChange: (st) => setStatus((now) => ({ ...now, [s.id]: st }))
             },
             s.id