@acellera/pm-rjsf 0.0.6 → 0.0.7

package/dist/pm-rjsf.js

@@ -1,7 +1,7 @@
 import A from "react";
 import V from "@rjsf/mui";
 import { getTemplate as H, getUiOptions as X, ADDITIONAL_PROPERTY_FLAG as $, canExpand as J, getDefaultFormState as Y } from "@rjsf/utils";
-import { Accordion as Q, AccordionSummary as Z, AccordionDetails as ee, FormLabel as G, Box as B, TextField as te, Grid as v, Tooltip as F, Typography as ne, IconButton as ie, Button as w, ButtonGroup as re, Menu as oe, MenuItem as _, ListItemIcon as R, ListItemText as N, ThemeProvider as le, createTheme as se } from "@mui/material";
+import { Accordion as Q, AccordionSummary as Z, AccordionDetails as ee, FormLabel as G, Box as B, TextField as te, Grid as T, Tooltip as F, Typography as ne, IconButton as ie, Button as w, ButtonGroup as re, Menu as oe, MenuItem as _, ListItemIcon as R, ListItemText as N, ThemeProvider as le, createTheme as se } from "@mui/material";
 import { customizeValidator as ae } from "@rjsf/validator-ajv8";
 import ce from "ajv/dist/2020";
 import { ExpandMore as de, Delete as ue, DriveFolderUpload as me, CloudDownload as fe, ArrowDropDown as pe } from "@mui/icons-material";
@@ -187,7 +187,7 @@ function Se(e) {
   } = e;
   if (!($ in d))
     return s("div", { className: i, style: n }, t);
-  const y = b.templates.ButtonTemplates.RemoveButton, g = f && f["ui:options"] && f["ui:options"].keyLabel || c + " Key", T = o + "-key", I = /^newKey(-\d+)?$/.test(c || ""), k = d && d.description ? String(d.description) : "";
+  const y = b.templates.ButtonTemplates.RemoveButton, g = o + "-key", k = /^newKey(-\d+)?$/.test(c || ""), I = f && f["ui:options"] && f["ui:options"].keyLabel || (k ? "Key" : c + " Key"), x = d && d.description ? String(d.description) : "";
   return s(
     B,
     { sx: K },
@@ -198,13 +198,13 @@ function Se(e) {
         "div",
         { style: { flex: "0 0 34%" } },
         E(
-          k,
+          x,
           s(te, {
-            id: T,
-            label: g,
+            id: g,
+            label: I,
             size: "small",
             fullWidth: !0,
-            defaultValue: I ? "" : c,
+            defaultValue: k ? "" : c,
             disabled: r || u,
             onBlur: (C) => {
               const p = C.target.value.trim();
@@ -284,18 +284,18 @@ function Ce(e) {
     readonly: b,
     uiSchema: y,
     registry: g
-  } = e, { CopyButton: T, MoveDownButton: I, MoveUpButton: k, RemoveButton: C } = g.templates.ButtonTemplates, p = { flex: 1, paddingLeft: 6, paddingRight: 6, fontWeight: "bold", minWidth: 0 };
+  } = e, { CopyButton: k, MoveDownButton: I, MoveUpButton: x, RemoveButton: C } = g.templates.ButtonTemplates, p = { flex: 1, paddingLeft: 6, paddingRight: 6, fontWeight: "bold", minWidth: 0 };
   return s(
     B,
     { sx: K },
     s(
-      v,
+      T,
       { container: !0, alignItems: "center", wrap: "nowrap" },
-      s(v, { item: !0, xs: !0, style: { minWidth: 0 } }, t),
+      s(T, { item: !0, xs: !0, style: { minWidth: 0 } }, t),
       i && s(
-        v,
+        T,
         { item: !0 },
-        (o || r) && s(k, {
+        (o || r) && s(x, {
           style: p,
           disabled: f || b || !o,
           onClick: d(l, l - 1),
@@ -309,7 +309,7 @@ function Ce(e) {
           uiSchema: y,
           registry: g
         }),
-        n && s(T, {
+        n && s(k, {
           style: p,
           disabled: f || b,
           onClick: m(l),
@@ -340,23 +340,23 @@ const Oe = {
   { key: "datacenter", label: "From datacenter", isInput: !1, Icon: fe }
 ];
 function je(e) {
-  const { value: t, onChange: i, disabled: n = !1, readonly: r = !1, label: o, required: c } = e, l = /_\d+$/.test(e.id || ""), m = n || r, [u, d] = A.useState(null), [f, b] = A.useState(0), y = !!u, g = t ? String(t).split("/").pop() : "", T = (S) => S && i(S.name), I = () => i(void 0), k = L[f], C = o && !l ? a(
-    v,
+  const { value: t, onChange: i, disabled: n = !1, readonly: r = !1, label: o, required: c } = e, l = /_\d+$/.test(e.id || ""), m = n || r, [u, d] = A.useState(null), [f, b] = A.useState(0), y = !!u, g = t ? String(t).split("/").pop() : "", k = (v) => v && i(v.name), I = () => i(void 0), x = L[f], C = o && !l ? a(
+    T,
     { item: !0, zeroMinWidth: !0 },
     a(G, null, o, c ? " *" : null)
   ) : null, p = t ? a(
-    v,
+    T,
     { item: !0, xs: !0, zeroMinWidth: !0 },
     a(
       F,
       { title: g, arrow: !0, placement: "top" },
       a(ne, { style: { textOverflow: "ellipsis", overflow: "hidden" } }, g)
     )
-  ) : a(v, { item: !0, xs: !0 }, null);
-  let x;
+  ) : a(T, { item: !0, xs: !0 }, null);
+  let S;
   if (t)
-    x = a(
-      v,
+    S = a(
+      T,
       { item: !0, xs: "auto" },
       a(
         F,
@@ -373,33 +373,33 @@ function je(e) {
       )
     );
   else {
-    const S = k.isInput ? a(
+    const v = x.isInput ? a(
       w,
       {
         component: "label",
         disabled: m,
-        endIcon: a(k.Icon, null),
+        endIcon: a(x.Icon, null),
         sx: { px: 1.2, borderRadius: "4px 0 0 4px", borderRight: 0 }
       },
       "Select",
       a("input", {
         type: "file",
         hidden: !0,
-        onChange: (h) => T(h.target.files && h.target.files[0])
+        onChange: (h) => k(h.target.files && h.target.files[0])
       })
     ) : a(
       w,
       {
         disabled: m,
-        endIcon: a(k.Icon, null),
+        endIcon: a(x.Icon, null),
         sx: { px: 1.2, borderRadius: "4px 0 0 4px", borderRight: 0 },
         onClick: () => {
         }
       },
       "Select"
     );
-    x = a(
-      v,
+    S = a(
+      T,
       { item: !0, xs: "auto" },
       a(
         re,
@@ -408,7 +408,7 @@ function je(e) {
           disabled: m,
           sx: { "& .MuiButtonGroup-grouped": { minWidth: 0 } }
         },
-        S,
+        v,
         a(
           w,
           {
@@ -432,7 +432,7 @@ function je(e) {
               type: "file",
               hidden: !0,
               onChange: (D) => {
-                b(O), d(null), T(D.target.files && D.target.files[0]);
+                b(O), d(null), k(D.target.files && D.target.files[0]);
               }
             })
           ) : a(
@@ -452,7 +452,7 @@ function je(e) {
     );
   }
   return a(
-    v,
+    T,
     {
       container: !0,
       direction: "row",
@@ -464,7 +464,7 @@ function je(e) {
     },
     C,
     p,
-    x
+    S
   );
 }
 const we = `
@@ -549,14 +549,14 @@ function qe({ schema: e, uiSchema: t, widgets: i, formData: n, onChange: r, onSu
   const l = A.useMemo(() => be(e), [e]), m = A.useMemo(() => Be(l), [l]), u = A.useMemo(() => Ee(e), [e]), d = A.useMemo(
     () => Y(z, l, void 0, l, !1, q),
     [l]
-  ), [f, b] = A.useState(n !== void 0 ? n : d), y = n !== void 0 ? n : f, g = (p, x) => {
-    b(p.formData), r && r(p, x);
-  }, T = De(t, y), I = { file: je, ...i || {} }, k = (p) => p.filter((x) => {
-    const S = (x.property || "").split(".").filter(Boolean)[0];
-    if (!S || !u.has(S)) return !0;
-    const h = y ? y[S] : void 0;
-    return !(h === void 0 || M(h, d[S]));
-  }), C = o ? (p, x) => o({ ...p, formData: U(p.formData, d, m) ?? {} }, x) : void 0;
+  ), [f, b] = A.useState(n !== void 0 ? n : d), y = n !== void 0 ? n : f, g = (p, S) => {
+    b(p.formData), r && r(p, S);
+  }, k = De(t, y), I = { file: je, ...i || {} }, x = (p) => p.filter((S) => {
+    const v = (S.property || "").split(".").filter(Boolean)[0];
+    if (!v || !u.has(v)) return !0;
+    const h = y ? y[v] : void 0;
+    return !(h === void 0 || M(h, d[v]));
+  }), C = o ? (p, S) => o({ ...p, formData: U(p.formData, d, m) ?? {} }, S) : void 0;
   return A.createElement(
     le,
     { theme: Me },
@@ -565,14 +565,14 @@ function qe({ schema: e, uiSchema: t, widgets: i, formData: n, onChange: r, onSu
       { sx: { color: "text.primary" } },
       A.createElement(V, {
         schema: l,
-        uiSchema: T,
+        uiSchema: k,
         validator: z,
         templates: Oe,
         widgets: I,
         formData: y,
         onChange: g,
         onSubmit: C,
-        transformErrors: k,
+        transformErrors: x,
         // RJSF owns validation + error display. Native HTML5 validation hard-
         // blocks submit when a `required` control is non-focusable (e.g. inside a
         // collapsed accordion) and does so SILENTLY -- onSubmit never fires and

package/dist/pm-rjsf.preview.js

@@ -27770,7 +27770,7 @@ function vK(e) {
   } = e;
   if (!(tn in u))
     return Ie("div", { className: r, style: n }, t);
-  const m = f.templates.ButtonTemplates.RemoveButton, _ = d && d["ui:options"] && d["ui:options"].keyLabel || a + " Key", h = i + "-key", g = /^newKey(-\d+)?$/.test(a || ""), p = u && u.description ? String(u.description) : "";
+  const m = f.templates.ButtonTemplates.RemoveButton, _ = i + "-key", h = /^newKey(-\d+)?$/.test(a || ""), g = d && d["ui:options"] && d["ui:options"].keyLabel || (h ? "Key" : a + " Key"), p = u && u.description ? String(u.description) : "";
   return Ie(
     vr,
     { sx: Yx },
@@ -27783,11 +27783,11 @@ function vK(e) {
         Lg(
           p,
           Ie(gc, {
-            id: h,
-            label: _,
+            id: _,
+            label: g,
             size: "small",
             fullWidth: !0,
-            defaultValue: g ? "" : a,
+            defaultValue: h ? "" : a,
             disabled: o || c,
             onBlur: (y) => {
               const b = y.target.value.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acellera/pm-rjsf",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Shared RJSF renderer for PlayMolecule v2 (JSON Schema) manifests — used by pmview and the pmmanifest preview.",
   "type": "module",
   "license": "MIT",