@cosmicdrift/kumiko-renderer 0.221.0 → 0.222.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-renderer",
-  "version": "0.221.0",
+  "version": "0.222.0",
   "description": "Platform-agnostic React renderer for Kumiko screens. Contains the shared logic — primitives-contract, hooks, KumikoScreen, navigation & SSE abstractions — that any platform-specific renderer (web, native) composes. No DOM, no EventSource, no react-dom.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -15,8 +15,8 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-framework": "0.221.0",
-    "@cosmicdrift/kumiko-headless": "0.221.0",
+    "@cosmicdrift/kumiko-framework": "0.222.0",
+    "@cosmicdrift/kumiko-headless": "0.222.0",
     "react": "^19.2.6",
     "temporal-polyfill": "^0.3.2",
     "zod": "^4.4.3"
@@ -25,7 +25,7 @@
     "@testing-library/react": "^16.3.2",
     "@types/react": "^19.2.14",
     "jsdom": "^29.1.1",
-    "@cosmicdrift/kumiko-locale-de": "0.221.0"
+    "@cosmicdrift/kumiko-locale-de": "0.222.0"
   },
   "repository": {
     "type": "git",

package/src/app/extension-form-submit.tsx

@@ -42,13 +42,18 @@ export const ExtensionFormRegistryProvider = ExtensionFormRegistryContext.Provid
 // Host-Seite (render-edit): hält die Registrierungen in einem ref, meldet den
 // aggregierten dirty-State via onDirtyChange hoch (damit der Save-Button
 // re-rendert) und liefert runAll() zum Ausführen aller Handler beim Submit.
-export function useExtensionFormHost(onDirtyChange: (anyDirty: boolean) => void): {
+export type ExtensionFormHostStatus = {
+  readonly anyDirty: boolean;
+  readonly hasRegistrations: boolean;
+};
+
+export function useExtensionFormHost(onStatusChange: (status: ExtensionFormHostStatus) => void): {
   readonly registry: ExtensionFormRegistry;
   readonly runAll: (ctx: ExtensionSubmitContext) => Promise<readonly ExtensionSubmitResult[]>;
 } {
   const regsRef = useRef<Map<string, Registration>>(new Map());
-  const onDirtyRef = useRef(onDirtyChange);
-  onDirtyRef.current = onDirtyChange;
+  const onStatusRef = useRef(onStatusChange);
+  onStatusRef.current = onStatusChange;
 
   const registry = useMemo<ExtensionFormRegistry>(() => {
     const emitDirty = (): void => {
@@ -59,7 +64,7 @@ export function useExtensionFormHost(onDirtyChange: (anyDirty: boolean) => void)
           break;
         }
       }
-      onDirtyRef.current(any);
+      onStatusRef.current({ anyDirty: any, hasRegistrations: regsRef.current.size > 0 });
     };
     return {
       upsert: (reg) => {

package/src/components/__tests__/render-edit-action-button.test.tsx

@@ -34,7 +34,16 @@ const TestDialog: ComponentType<DialogProps> = ({
       {description !== undefined && (
         <span data-testid={`${testId}-description`}>{description}</span>
       )}
-      <button type="button" data-testid={`${testId}-confirm`} onClick={() => void onConfirm()}>
+      <button
+        type="button"
+        data-testid={`${testId}-confirm`}
+        onClick={() => {
+          void (async () => {
+            await onConfirm();
+            onOpenChange(false);
+          })();
+        }}
+      >
         {confirmLabel ?? "Confirm"}
       </button>
       <button type="button" data-testid={`${testId}-cancel`} onClick={() => onOpenChange(false)}>
@@ -98,6 +107,9 @@ describe("RenderEditActionButton", () => {
     fireEvent.click(rtlScreen.getByTestId("render-edit-action-archive"));
     fireEvent.click(rtlScreen.getByTestId("render-edit-action-archive-dialog-confirm"));
     await waitFor(() => expect(pressed).toBe(1));
+    await waitFor(() =>
+      expect(rtlScreen.queryByTestId("render-edit-action-archive-dialog")).toBeNull(),
+    );
   });
 
   test("danger style forces confirm dialog even without confirm text", async () => {

package/src/components/__tests__/render-field-money-roundtrip.test.tsx

@@ -192,6 +192,20 @@ describe("RenderField money round-trip (kumiko-framework#1923)", () => {
     expect(result.data?.["price"]).toEqual({ amount: 500, currency: "JPY" });
   });
 
+  test("record currency differs from entity.defaultCurrency (#1930)", () => {
+    const entity = buildEntity("EUR");
+    let payload: unknown;
+    const field = renderMoneyField(entity, { price: { amount: 500, currency: "JPY" } }, (v) => {
+      payload = v;
+    });
+    if (field.kind !== "money") throw new Error("expected money kind");
+    // Prefer the value's own currency over entity.defaultCurrency (EUR=2dp).
+    expect(field.currency).toBe("JPY");
+    expect(field.value).toBe(500);
+    field.onChange(500);
+    expect(payload).toEqual({ amount: 500, currency: "JPY" });
+  });
+
   test("server schema strips an unexpected amountMinor key instead of rejecting the payload", () => {
     const entity = buildEntity("USD");
     const result = buildUpdateSchema(entity).safeParse({

package/src/components/__tests__/render-field-unit-format.test.tsx

@@ -99,4 +99,9 @@ describe("RenderField — App-Locale an FieldRendererOutput durchreichen (fw#218
     renderUnderLocale("de-DE", livingSpaceField({ format: "number" }, 1234.5));
     expect(captured?.children).toBe("1.234,5");
   });
+
+  test("explicit locale: undefined still falls back to App-Locale (#2332)", () => {
+    renderUnderLocale("de-DE", livingSpaceField({ format: "number", locale: undefined }, 1234.5));
+    expect(captured?.children).toBe("1.234,5");
+  });
 });

package/src/components/render-edit.tsx

@@ -277,9 +277,14 @@ export function RenderEdit<TValues extends FormValues, TCtx = unknown>(
   // never enters `fields`/`controller.getSnapshot().values` — there is no
   // draft-blob-covered state left for persistExtensions() to compete over.
   const [extensionDirty, setExtensionDirty] = useState(false);
+  const [hasExtensionRegistrations, setHasExtensionRegistrations] = useState(false);
   const [extensionErrorKey, setExtensionErrorKey] = useState<string | null>(null);
-  const { registry: extensionFormRegistry, runAll: runExtensionSubmits } =
-    useExtensionFormHost(setExtensionDirty);
+  const { registry: extensionFormRegistry, runAll: runExtensionSubmits } = useExtensionFormHost(
+    ({ anyDirty, hasRegistrations }) => {
+      setExtensionDirty(anyDirty);
+      setHasExtensionRegistrations(hasRegistrations);
+    },
+  );
   const {
     Button,
     Banner,
@@ -971,7 +976,7 @@ export function RenderEdit<TValues extends FormValues, TCtx = unknown>(
           {translate("kumiko.actions.next")}
         </Button>
       )}
-      {isFormEditable && (!isWizard || isLastWizardStep) && (
+      {(isFormEditable || hasExtensionRegistrations) && (!isWizard || isLastWizardStep) && (
         <Button
           type="submit"
           disabled={(snapshot.isUnchanged && !extensionDirty) || isSubmitting || disabled}
@@ -1103,6 +1108,19 @@ export function RenderEdit<TValues extends FormValues, TCtx = unknown>(
           // navigating past its step — otherwise Finish only ran the last
           // mounted step's handler and silently dropped earlier steps' writes.
           const stepHidden = isWizard && sectionIndex !== currentStep;
+          const wrapWizardStep = (key: string, el: ReactNode): ReactNode => {
+            if (!isWizard) return el;
+            if (WizardStepGroup === undefined) {
+              throw new Error(
+                "RenderEdit: wizard layout requires primitives.WizardStepGroup, but none is registered.",
+              );
+            }
+            return (
+              <WizardStepGroup key={key} hidden={stepHidden}>
+                {el}
+              </WizardStepGroup>
+            );
+          };
           // Off-screen wizard steps stay mounted (see comment above) but must
           // not participate in native constraint validation, or the Next
           // button's `type="submit"` triggers the browser's full-form check
@@ -1129,18 +1147,7 @@ export function RenderEdit<TValues extends FormValues, TCtx = unknown>(
                 validate={scopedValidate}
               />
             );
-            if (!isWizard) return mount;
-            if (WizardStepGroup === undefined) {
-              // Both silent fallbacks are unsafe here — render-visible-all-steps or unmount-drops-registry.
-              throw new Error(
-                "RenderEdit: wizard layout requires primitives.WizardStepGroup, but none is registered.",
-              );
-            }
-            return (
-              <WizardStepGroup key={section.title} hidden={stepHidden}>
-                {mount}
-              </WizardStepGroup>
-            );
+            return wrapWizardStep(section.title, mount);
           }
           if (section.kind === "relatedList") {
             // parentId is the displayed record's id — without it there's no
@@ -1198,17 +1205,7 @@ export function RenderEdit<TValues extends FormValues, TCtx = unknown>(
               </Grid>
             </Section>
           );
-          if (!isWizard) return sectionEl;
-          if (WizardStepGroup === undefined) {
-            throw new Error(
-              "RenderEdit: wizard layout requires primitives.WizardStepGroup, but none is registered.",
-            );
-          }
-          return (
-            <WizardStepGroup key={sectionKey} hidden={stepHidden}>
-              {sectionEl}
-            </WizardStepGroup>
-          );
+          return wrapWizardStep(sectionKey, sectionEl);
         })}
         {formError !== null && (
           <Banner

package/src/components/render-field.tsx

@@ -359,12 +359,18 @@ function FieldRendererOutput({
     // App locale as default when the FormatSpec declares none of its own —
     // otherwise locale-sensitive formats (timestamp/date/number/decimal/
     // bigInt/unit) fell back to Intl's runtime default instead of the app
-    // language chosen via LocaleProvider (fw#2187). An explicit
-    // `renderer.locale` still wins, same pattern as dateLocale vs. appLocale
-    // further below in readOnlyDisplayText.
+    // language chosen via LocaleProvider (fw#2187). Prefer renderer.locale
+    // when set; coalesce undefined (spread override) back to appLocale (#2332).
     return (
       <Text testId={`field-value-${field.field}`}>
-        {applyFormatSpec({ locale: appLocale, ...renderer }, field.value, t)}
+        {applyFormatSpec(
+          {
+            ...renderer,
+            locale: (renderer as { locale?: string }).locale ?? appLocale,
+          },
+          field.value,
+          t,
+        )}
       </Text>
     );
   }
@@ -520,7 +526,7 @@ function renderInput({
       );
     }
     case "money": {
-      const currency = field.currency ?? "EUR";
+      const currency = resolveMoneyCurrency(field.value, field.currency);
       return (
         <Input
           kind="money"
@@ -692,6 +698,17 @@ function numberValue(v: unknown): number | "" {
 // stored-config coercion) is MAJOR units too — every producer in this repo
 // hands rehydrateMoney's `{amount,…}` shape or a raw major-unit number, never
 // pre-scaled minor units.
+function resolveMoneyCurrency(value: unknown, fieldCurrency: string | undefined): string {
+  if (
+    typeof value === "object" &&
+    value !== null &&
+    typeof (value as { currency?: unknown }).currency === "string"
+  ) {
+    return (value as { currency: string }).currency;
+  }
+  return fieldCurrency ?? "EUR";
+}
+
 function moneyMinorValue(v: unknown, currency: string): number | "" {
   if (v === undefined || v === null || v === "") return "";
   if (typeof v === "number") return Math.round(v * 10 ** currencyDecimals(currency));
@@ -756,7 +773,7 @@ function readOnlyDisplayText(field: EditFieldViewModel, appLocale: string): stri
       return n === "" ? "—" : new Intl.NumberFormat(appLocale).format(n);
     }
     case "money": {
-      const currency = field.currency ?? "EUR";
+      const currency = resolveMoneyCurrency(value, field.currency);
       const minor = moneyMinorValue(value, currency);
       if (minor === "") return "—";
       const major = minor / 10 ** currencyDecimals(currency);