phoenix_duskmoon 9.16.13 → 9.16.15

package/assets/js/react_chat/state.js

@@ -1,7 +1,10 @@
-export function initialState(conversationId, messages = []) {
+export function initialState(conversationId, messages = [], application = {}) {
 	return {
 		conversationId,
 		messages,
+		metadata: application.metadata || {},
+		runtime: application.runtime || {},
+		admission: application.admission || {},
 		sequences: {},
 		error: null,
 		needsSync: false,
@@ -12,7 +15,7 @@ export function reduceChat(state, event) {
 	if (event?.conversation_id !== state.conversationId) return state;
 	if (["chat.snapshot", "chat.reset"].includes(event.type)) {
 		return {
-			...initialState(state.conversationId, event.messages || []),
+			...initialState(state.conversationId, event.messages || [], event),
 			sequences: event.sequences || {},
 		};
 	}
@@ -79,6 +82,9 @@ export function reduceChat(state, event) {
 	return {
 		...state,
 		messages,
+		metadata: event.metadata ?? state.metadata,
+		runtime: event.runtime ?? state.runtime,
+		admission: event.admission ?? state.admission,
 		sequences: { ...state.sequences, [event.message_id]: event.sequence },
 	};
 }

package/assets/js/react_form/component.js

@@ -10,30 +10,41 @@ const h = React.createElement;
 export function ReactField({ config, value, errors, disabled, onChange }) {
   const errorId = useId();
   const label = config.label || (Array.isArray(config.name) ? config.name.join(".") : config.name);
-  const common = { disabled, "aria-label": label, "aria-invalid": errors?.length ? "true" : undefined, "aria-describedby": errors?.length ? errorId : undefined };
+  const common = { disabled: Boolean(disabled || config.disabled), "aria-label": label, "aria-invalid": errors?.length ? "true" : undefined, "aria-describedby": errors?.length ? errorId : undefined };
+  const textAttributes = { placeholder: config.placeholder ?? undefined, autoComplete: config.autocomplete ?? undefined, required: config.required, readOnly: config.readonly };
   let control;
 
   switch (config.type) {
     case "checkbox":
-      control = h(Checkbox, { ...common, checked: Boolean(value), onChange: (event) => onChange(event.target.checked) });
+      control = h(Checkbox, { ...common, required: config.required, checked: Boolean(value), onChange: (event) => onChange(event.target.checked) });
       break;
     case "number":
-      control = h(InputNumber, { ...common, value: value ?? null, onChange });
+      // TODO(upstream): duskmoon-dev/duskmoon-react#82
+      // WORKAROUND(upstream): duskmoon-dev/duskmoon-react#82 — readOnly does not guard upstream stepping.
+      control = h(InputNumber, { ...common, ...textAttributes, min: config.min ?? undefined, max: config.max ?? undefined, step: config.step ?? undefined,
+        controls: config.readonly ? false : undefined, keyboard: config.readonly ? false : undefined, value: value ?? null, onChange });
       break;
     case "select":
     case "multiselect":
-      control = h(Select, { ...common, value: value ?? undefined, mode: config.type === "multiselect" ? "multiple" : undefined,
+      // TODO(upstream): duskmoon-dev/duskmoon-react#83
+      // WORKAROUND(upstream): duskmoon-dev/duskmoon-react#83 — only the mounted trigger can receive required ARIA in 0.5.0.
+      control = h(Select, { ...common, placeholder: config.placeholder ?? undefined, ref: (container) => {
+        const trigger = container?.querySelector('button[aria-haspopup="listbox"]');
+        if (config.required) trigger?.setAttribute("aria-required", "true");
+        else trigger?.removeAttribute("aria-required");
+      }, value: value ?? undefined, mode: config.type === "multiselect" ? "multiple" : undefined,
         options: config.options || [], showSearch: true, allowClear: true, onChange: (next) => onChange(next ?? null) });
       break;
     case "textarea":
-      control = h("textarea", { ...common, className: "textarea", value: value ?? "", onChange: (event) => onChange(event.target.value) });
+      control = h("textarea", { ...common, ...textAttributes, rows: config.rows ?? undefined, className: "textarea", value: value ?? "", onChange: (event) => onChange(event.target.value) });
       break;
     default:
-      control = h(Input, { ...common, type: config.type, value: value ?? "", onChange: (event) => onChange(event.target.value) });
+      control = h(Input, { ...common, ...textAttributes, type: config.type, value: value ?? "", onChange: (event) => onChange(event.target.value) });
   }
 
   return h(Form.Item, {
     label,
+    required: config.required,
     className: errors?.length ? "form-item-error" : undefined,
     help: errors?.length ? h(Form.ErrorList, { id: errorId, errors, role: "alert" }) : undefined,
   }, control);

package/assets/js/react_form/index.js

@@ -3,7 +3,7 @@ import { createRoot } from "react-dom/client";
 import { ReactField } from "./component.js";
 import { compileForm } from "@duskmoon-dev/components/json-schema-form";
 import { ReactSchemaForm, changedPath, schemaErrors } from "./schema.js";
-import { collectValues, fieldKey, getAt, pathOf, setAt } from "./values.js";
+import { collectValues, fieldKey, getAt, nativeValue, pathOf, setAt, setNativeValue } from "./values.js";
 function parseJSON(value, fallback = {}) { try { return JSON.parse(value); } catch { return fallback; } }
 function flattenErrors(errors, prefix = [], result = {}) {
   Object.entries(errors || {}).forEach(([key, value]) => {
@@ -26,10 +26,10 @@ export const DuskmoonReactForm = {
   },
   mountForm() {
     this.form = this.el.querySelector("[data-dm-react-form]");
-    const nativeValues = collectValues([...this.form.querySelectorAll("[name]")]);
+    this.fields = [...this.el.querySelectorAll("[data-dm-react-field]")];
+    const nativeValues = collectValues(this.nativeControls());
     this.values = { ...nativeValues, ...parseJSON(this.el.dataset.initialValues) };
     this.initialValues = structuredClone(this.values);
-    this.fields = [...this.el.querySelectorAll("[data-dm-react-field]")];
     const fieldKeys = this.fields.map((element) => fieldKey(parseJSON(element.dataset.dmReactField).name));
     if (new Set(fieldKeys).size !== fieldKeys.length) throw new Error("React form field names must be unique");
     this.mountFields(); this.bindNative(); this.bindForm();
@@ -42,6 +42,7 @@ export const DuskmoonReactForm = {
     this.renderSchema();
   },
   renderSchema() {
+    // TODO(upstream): duskmoon-dev/duskmoon-react#85 - JsonSchemaForm has no native form class prop.
     this.schemaRoot.render(React.createElement(ReactSchemaForm, {
       key: this.schemaRevision, compiled: this.compiledSchema, value: this.values,
       defaultValue: this.initialValues, errors: this.errors, disabled: this.disconnectedState,
@@ -68,18 +69,23 @@ export const DuskmoonReactForm = {
       onChange: (value) => this.change(config.name, value),
     }));
   },
-  bindNative() {
-    this.native = [...this.form.querySelectorAll("[name]")].filter((element) => !element.closest("[data-dm-react-field]"));
-    this.native.forEach((element) => {
-      const handler = () => this.change(element.name, this.nativeValue(element));
-      element.addEventListener("input", handler); element.addEventListener("change", handler); element.__dmReactHandler = handler;
+  nativeControls() {
+    const managedPaths = this.fields.map((element) => pathOf(parseJSON(element.dataset.dmReactField).name).map(String));
+    return [...this.form.querySelectorAll("input[name], select[name], textarea[name]")].filter((element) => {
+      if (element.closest("[data-dm-react-field]")) return false;
+      const path = pathOf(element.name).map(String);
+      return !managedPaths.some((managed) => managed.slice(0, Math.min(path.length, managed.length)).every((key, index) => key === path[index]));
     });
   },
+  bindNative() {
+    this.nativeHandler = (event) => {
+      const controls = this.nativeControls(); const element = event.target;
+      if (controls.includes(element)) this.change(element.name, nativeValue(element, controls));
+    };
+    this.form.addEventListener("input", this.nativeHandler); this.form.addEventListener("change", this.nativeHandler);
+  },
   nativeValue(element) {
-    if (element.type === "checkbox") return element.checked;
-    if (element.type === "number") return element.value === "" ? null : Number(element.value);
-    if (element.multiple) return [...element.selectedOptions].map((option) => option.value);
-    return element.value;
+    return nativeValue(element, this.nativeControls());
   },
   bindForm() {
     this.submitHandler = (event) => { event.preventDefault(); this.submit(); };
@@ -94,7 +100,15 @@ export const DuskmoonReactForm = {
     const event = this.el.getAttribute("phx-change"); if (!event || this.disconnectedState) return;
     clearTimeout(this.changeTimer); this.changeTimer = setTimeout(() => this.send(event, name), Number(this.el.getAttribute("phx-debounce") || 0));
   },
-  submit() { clearTimeout(this.changeTimer); const event = this.el.getAttribute("phx-submit"); if (event && !this.disconnectedState) this.send(event); },
+  submit() {
+    clearTimeout(this.changeTimer); const event = this.el.getAttribute("phx-submit"); if (!event || this.disconnectedState) return;
+    if (this.form) {
+      if (this.form.noValidate === false && !this.form.reportValidity()) return;
+      const controls = this.nativeControls();
+      controls.forEach((element) => { this.values = setAt(this.values, element.name, nativeValue(element, controls)); });
+    }
+    this.send(event);
+  },
   send(event, changed) {
     const revision = ++this.revision; const values = this.values;
     const payload = { id: this.el.id, values, revision, ...(changed ? { changed: pathOf(changed) } : {}) };
@@ -109,9 +123,9 @@ export const DuskmoonReactForm = {
     clearTimeout(this.changeTimer);
     this.values = structuredClone(values); this.errors = {}; this.revision++;
     if (this.schemaRoot) { this.schemaRevision++; this.renderAll(); return; }
-    this.native.forEach((element) => { if (element.type === "checkbox") element.checked = Boolean(getAt(this.values, element.name)); else element.value = getAt(this.values, element.name) ?? ""; }); this.renderAll();
+    this.nativeControls().forEach((element) => setNativeValue(element, getAt(this.values, element.name))); this.renderAll();
   },
   disconnected() { clearTimeout(this.changeTimer); this.disconnectedState = true; this.renderAll(); },
   reconnected() { this.disconnectedState = false; this.renderAll(); },
-  destroyed() { this.destroyedState = true; clearTimeout(this.changeTimer); this.schemaRoot?.unmount(); this.form?.removeEventListener("submit", this.submitHandler); this.form?.removeEventListener("reset", this.resetHandler); this.native?.forEach((element) => { element.removeEventListener("input", element.__dmReactHandler); element.removeEventListener("change", element.__dmReactHandler); }); this.roots.forEach(({ root }) => root.unmount()); },
+  destroyed() { this.destroyedState = true; clearTimeout(this.changeTimer); this.schemaRoot?.unmount(); this.form?.removeEventListener("submit", this.submitHandler); this.form?.removeEventListener("reset", this.resetHandler); this.form?.removeEventListener("input", this.nativeHandler); this.form?.removeEventListener("change", this.nativeHandler); this.roots.forEach(({ root }) => root.unmount()); },
 };

package/assets/js/react_form/values.js

@@ -17,13 +17,27 @@ export function setAt(values, name, value) {
   return result;
 }
 
+function isCheckboxGroup(element) {
+  return element.type === "checkbox" && element.name.endsWith("[]");
+}
+
+export function nativeValue(element, elements = [element]) {
+  if (isCheckboxGroup(element)) {
+    return elements.filter((control) => control.type === "checkbox" && control.name === element.name && control.checked)
+      .map((control) => control.value);
+  }
+  if (element.type === "checkbox") return Boolean(element.checked);
+  if (element.type === "number") return element.value === "" ? null : Number(element.value);
+  if (element.multiple) return [...element.selectedOptions].map((option) => option.value);
+  return element.value;
+}
+
+export function setNativeValue(element, value) {
+  if (element.type === "checkbox") {
+    element.checked = isCheckboxGroup(element) ? Array.isArray(value) && value.includes(element.value) : Boolean(value);
+  } else element.value = value ?? "";
+}
+
 export function collectValues(elements) {
-  return elements.reduce((values, element) => {
-    let value;
-    if (element.type === "checkbox") value = Boolean(element.checked);
-    else if (element.type === "number") value = element.value === "" ? null : Number(element.value);
-    else if (element.multiple) value = [...element.selectedOptions].map((option) => option.value);
-    else value = element.value;
-    return setAt(values, element.name, value);
-  }, {});
+  return elements.reduce((values, element) => setAt(values, element.name, nativeValue(element, elements)), {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix_duskmoon",
-  "version": "9.16.13",
+  "version": "9.16.15",
   "type": "module",
   "exports": {
     ".": "./priv/static/assets/js/phoenix_duskmoon.js",
@@ -37,18 +37,18 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@duskmoon-dev/art-elements": "1.9.0",
-    "@duskmoon-dev/components": "0.4.1",
-    "@duskmoon-dev/core": "1.20.3",
-    "@duskmoon-dev/css-art": "1.20.3",
-    "@duskmoon-dev/elements": "1.9.0",
+    "@duskmoon-dev/art-elements": "1.9.1",
+    "@duskmoon-dev/components": "0.5.0",
+    "@duskmoon-dev/core": "1.20.4",
+    "@duskmoon-dev/css-art": "1.20.4",
+    "@duskmoon-dev/elements": "1.9.1",
     "react": "19.3.0",
     "react-dom": "19.3.0"
   },
   "devDependencies": {
     "@mdi/svg": "7.4.47",
-    "bootstrap-icons": "1.13.1",
-    "postcss": "8.5.28"
+    "bootstrap-icons": "1.13.2",
+    "postcss": "8.5.29"
   },
   "peerDependencies": {
     "tailwindcss": "^4.3.2"