@plasmicpkgs/antd5 0.0.53 → 0.0.55

package/dist/index.js

@@ -63,18 +63,6 @@ function asArray(x) {
     return [x];
   }
 }
-function omit(obj, ...keys) {
-  if (Object.keys(obj).length === 0) {
-    return obj;
-  }
-  const res = {};
-  for (const key of Object.keys(obj)) {
-    if (!keys.includes(key)) {
-      res[key] = obj[key];
-    }
-  }
-  return res;
-}
 function usePrevious(value) {
   const prevValue = React__default.default.useRef(void 0);
   React__default.default.useEffect(() => {
@@ -1160,8 +1148,9 @@ const FormItem = antd.Form.Item;
 const FormList = antd.Form.List;
 const PathContext = React__default.default.createContext({ relativePath: [], fullPath: [] });
 const InternalFormInstanceContext = React__default.default.createContext(void 0);
+const FormLayoutContext = React__default.default.createContext(void 0);
 const Internal = (props) => {
-  var _b, _c;
+  var _b, _c, _d;
   const [form] = antd.Form.useForm();
   const values = form.getFieldsValue(true);
   const lastValue = React__default.default.useRef(values);
@@ -1177,15 +1166,26 @@ const Internal = (props) => {
   React__default.default.useEffect(() => {
     fireOnValuesChange();
   }, []);
+  const formLayout = React__default.default.useMemo(
+    () => {
+      var _a2;
+      return {
+        layout: props.layout,
+        labelSpan: (_a2 = props.labelCol) == null ? void 0 : _a2.span
+      };
+    },
+    [props.layout, (_b = props.labelCol) == null ? void 0 : _b.span]
+  );
   return /* @__PURE__ */ React__default.default.createElement(
     InternalFormInstanceContext.Provider,
     {
       value: {
+        layout: formLayout,
         fireOnValuesChange,
         forceRemount: () => setRemountKey((k) => k + 1)
       }
     },
-    /* @__PURE__ */ React__default.default.createElement(
+    /* @__PURE__ */ React__default.default.createElement(FormLayoutContext.Provider, { value: formLayout }, /* @__PURE__ */ React__default.default.createElement(
       antd.Form,
       __spreadProps$5(__spreadValues$6({}, rest), {
         key: props.initialValues ? JSON.stringify(props.initialValues) : void 0,
@@ -1195,16 +1195,16 @@ const Internal = (props) => {
           extendedOnValuesChange == null ? void 0 : extendedOnValuesChange(args[1]);
         },
         form,
-        labelCol: ((_b = props.labelCol) == null ? void 0 : _b.horizontalOnly) && props.layout !== "horizontal" ? void 0 : props.labelCol,
-        wrapperCol: ((_c = props.wrapperCol) == null ? void 0 : _c.horizontalOnly) && props.layout !== "horizontal" ? void 0 : props.wrapperCol
+        labelCol: ((_c = props.labelCol) == null ? void 0 : _c.horizontalOnly) && props.layout !== "horizontal" ? void 0 : props.labelCol,
+        wrapperCol: ((_d = props.wrapperCol) == null ? void 0 : _d.horizontalOnly) && props.layout !== "horizontal" ? void 0 : props.wrapperCol
       }),
       /* @__PURE__ */ React__default.default.createElement("style", null, `
-        .ant-form-item-explain + div, .ant-form-item-margin-offset {
-          display: none;
-        }
-        `),
+          .ant-form-item-explain + div, .ant-form-item-margin-offset {
+            display: none;
+          }
+          `),
       childrenNode
-    )
+    ))
   );
 };
 function FormWrapper(props) {
@@ -1258,40 +1258,41 @@ const COMMON_ACTIONS = [
   //   },
   // },
 ];
-function registerForm(loader) {
-  const colProp = (displayName, defaultValue) => ({
-    type: "object",
-    displayName,
-    advanced: true,
-    fields: {
-      span: {
-        type: "number",
-        displayName: "Grid columns",
-        description: "The number of grid columns to span (24 columns available)",
-        min: 1,
-        max: 24
-      },
-      offset: {
-        type: "number",
-        displayName: "Offset columns",
-        description: "Number of grid columns to skip from the left",
-        min: 0,
-        max: 23
-      },
-      horizontalOnly: {
-        type: "boolean",
-        displayName: "Horizontal only",
-        description: "Only apply to horizontal layout"
-      }
+const colProp = (displayName, defaultValue, description) => ({
+  type: "object",
+  displayName,
+  advanced: true,
+  fields: {
+    span: {
+      type: "number",
+      displayName: "Width",
+      description: "The number of grid columns to span in width (out of 24 columns total)",
+      min: 1,
+      max: 24
     },
-    defaultValue
-  });
+    offset: {
+      type: "number",
+      displayName: "Offset",
+      description: "Number of grid columns to skip from the left (out of 24 columns total)",
+      min: 0,
+      max: 23
+    },
+    horizontalOnly: {
+      type: "boolean",
+      displayName: "Horizontal only",
+      description: "Only apply to horizontal layout"
+    }
+  },
+  description,
+  defaultValue
+});
+function registerForm(loader) {
   registerComponentHelper(loader, FormWrapper, {
     name: "plasmic-antd5-form",
     displayName: "Form",
     defaultStyles: {
-      display: "plasmic-content-layout",
-      gridRowGap: "10px"
+      layout: "vbox",
+      alignItems: "flex-start"
     },
     props: {
       children: {
@@ -1329,13 +1330,21 @@ function registerForm(loader) {
           },
           {
             type: "component",
-            name: "plasmic-antd5-button",
+            name: "plasmic-antd5-form-item",
             props: {
+              noLabel: true,
               children: {
-                type: "text",
-                value: "Submit"
-              },
-              submitsForm: true
+                type: "component",
+                name: "plasmic-antd5-button",
+                props: {
+                  children: {
+                    type: "text",
+                    value: "Submit"
+                  },
+                  type: "primary",
+                  submitsForm: true
+                }
+              }
             }
           }
         ]
@@ -1352,16 +1361,25 @@ function registerForm(loader) {
         type: "choice",
         options: ["left", "right"],
         defaultValueHint: "right",
-        advanced: true
+        advanced: true,
+        hidden: (ps) => ps.layout !== "horizontal"
       },
-      labelCol: colProp("Label layout", {
-        span: 8,
-        horizontalOnly: true
-      }),
-      wrapperCol: colProp("Field layout", {
-        span: 16,
-        horizontalOnly: true
-      }),
+      labelCol: colProp(
+        "Label layout",
+        {
+          span: 8,
+          horizontalOnly: true
+        },
+        "Set the width and offset of the labels"
+      ),
+      wrapperCol: colProp(
+        "Control layout",
+        {
+          span: 16,
+          horizontalOnly: true
+        },
+        "Set the width and offset of the form controls"
+      ),
       colon: {
         type: "boolean",
         description: `Show a colon after labels by default (only for horizontal layout)`,
@@ -1449,6 +1467,7 @@ function registerForm(loader) {
 }
 function plasmicRulesToAntdRules(plasmicRules, label) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const effectiveLabel = label || "This field";
   const rules = [];
   for (const plasmicRule of plasmicRules) {
     switch (plasmicRule.ruleType) {
@@ -1456,37 +1475,37 @@ function plasmicRulesToAntdRules(plasmicRules, label) {
         rules.push({
           type: "enum",
           enum: (_b = (_a = plasmicRule.options) == null ? void 0 : _a.map((opt) => opt.value)) != null ? _b : [],
-          message: (_c = plasmicRule.message) != null ? _c : `Please specify a valid value`
+          message: (_c = plasmicRule.message) != null ? _c : `${effectiveLabel} must be a valid value`
         });
         break;
       case "required":
         rules.push({
           required: true,
-          message: (_d = plasmicRule.message) != null ? _d : `Please specify ${label || "this field"}`
+          message: (_d = plasmicRule.message) != null ? _d : `${effectiveLabel} is required`
         });
         break;
       case "regex":
         rules.push({
           pattern: new RegExp((_e = plasmicRule.pattern) != null ? _e : ""),
-          message: (_f = plasmicRule.message) != null ? _f : `Please enter a valid value`
+          message: (_f = plasmicRule.message) != null ? _f : `${effectiveLabel} must be a valid value`
         });
         break;
       case "whitespace":
         rules.push({
           whitespace: true,
-          message: (_g = plasmicRule.message) != null ? _g : `Please specify ${label || "this field"}`
+          message: (_g = plasmicRule.message) != null ? _g : `${effectiveLabel} is required`
         });
         break;
       case "min":
         rules.push({
           [plasmicRule.ruleType]: plasmicRule.length,
-          message: (_h = plasmicRule.message) != null ? _h : `Must be at least ${plasmicRule.length} characters`
+          message: (_h = plasmicRule.message) != null ? _h : `${effectiveLabel} must be at least ${plasmicRule.length} characters`
         });
         break;
       case "max":
         rules.push({
           [plasmicRule.ruleType]: plasmicRule.length,
-          message: (_i = plasmicRule.message) != null ? _i : `Must be at most ${plasmicRule.length} characters`
+          message: (_i = plasmicRule.message) != null ? _i : `${effectiveLabel} must be at most ${plasmicRule.length} characters`
         });
         break;
       case "advanced":
@@ -1513,14 +1532,34 @@ function useFormInstanceMaybe() {
   return antd.Form.useFormInstance();
 }
 function FormItemWrapper(props) {
-  var _a, _b;
-  const relativeFormItemName = useFormItemRelativeName(props.name);
-  const fullFormItemName = useFormItemFullName(props.name);
-  const bestEffortLabel = !props.noLabel && reactNodeToString(props.label) || ensureArray(props.name).slice(-1)[0];
-  const rules = props.rules ? plasmicRulesToAntdRules(
-    props.rules,
+  var _b;
+  const _a = props, {
+    rules: plasmicRules,
+    description,
+    noLabel,
+    name,
+    hideValidationMessage,
+    customizeProps,
+    setControlContextData,
+    alignLabellessWithControls = true
+  } = _a, rest = __objRest$5(_a, [
+    "rules",
+    "description",
+    "noLabel",
+    "name",
+    "hideValidationMessage",
+    "customizeProps",
+    "setControlContextData",
+    "alignLabellessWithControls"
+  ]);
+  const relativeFormItemName = useFormItemRelativeName(name);
+  const fullFormItemName = useFormItemFullName(name);
+  const bestEffortLabel = !noLabel && reactNodeToString(props.label) || ensureArray(props.name).slice(-1)[0];
+  const rules = plasmicRules ? plasmicRulesToAntdRules(
+    plasmicRules,
     typeof bestEffortLabel === "number" ? "" + bestEffortLabel : bestEffortLabel
   ) : void 0;
+  const layoutContext = React__default.default.useContext(FormLayoutContext);
   const inCanvas = !!host.usePlasmicCanvasContext();
   if (inCanvas) {
     const form = useFormInstanceMaybe();
@@ -1530,7 +1569,7 @@ function FormItemWrapper(props) {
     });
     const internalFormCtx = React__default.default.useContext(InternalFormInstanceContext);
     const { fireOnValuesChange, forceRemount } = internalFormCtx != null ? internalFormCtx : {};
-    (_a = props.setControlContextData) == null ? void 0 : _a.call(props, {
+    (_b = props.setControlContextData) == null ? void 0 : _b.call(props, {
       internalFormCtx
     });
     React__default.default.useEffect(() => {
@@ -1547,14 +1586,15 @@ function FormItemWrapper(props) {
   }
   return /* @__PURE__ */ React__default.default.createElement(
     FormItem,
-    __spreadValues$6(__spreadProps$5(__spreadValues$6({}, omit(props, "rules")), {
-      label: props.noLabel ? void 0 : props.label,
+    __spreadProps$5(__spreadValues$6({}, rest), {
+      label: noLabel ? void 0 : props.label,
       name: relativeFormItemName,
-      rules
-    }), props.helpTextMode === "extra" ? { extra: props.help } : props.helpTextMode === "help" ? (
-      // Never show validation errors in this mode, even if user didn't specify help
-      { help: (_b = props.help) != null ? _b : "" }
-    ) : {}),
+      rules,
+      extra: description,
+      help: hideValidationMessage ? "" : props.help,
+      colon: noLabel ? false : void 0,
+      wrapperCol: (layoutContext == null ? void 0 : layoutContext.layout) === "horizontal" && noLabel && alignLabellessWithControls && layoutContext.labelSpan ? { offset: layoutContext.labelSpan } : void 0
+    }),
     props.customizeProps ? /* @__PURE__ */ React__default.default.createElement(FormItemForwarder, { formItemProps: props }) : props.children
   );
 }
@@ -1584,13 +1624,18 @@ function registerFormItem(loader) {
     name: "plasmic-antd5-form-item",
     displayName: "Form Item",
     parentComponentName: "plasmic-antd5-form",
+    defaultStyles: {
+      marginBottom: "24px",
+      width: "stretch"
+    },
     props: {
       label: {
         type: "slot",
         defaultValue: {
           type: "text",
           value: "Label"
-        }
+        },
+        hidden: (ps) => !!ps.noLabel
       },
       children: {
         type: "slot",
@@ -1608,10 +1653,26 @@ function registerFormItem(loader) {
       rules: {
         type: "formValidationRules"
       },
+      valuePropName: {
+        type: "string",
+        advanced: true,
+        defaultValueHint: "value",
+        description: "The prop name for specifying the value of the form control component"
+      },
       noLabel: {
         type: "boolean",
         advanced: true
       },
+      alignLabellessWithControls: {
+        type: "boolean",
+        displayName: "Align with controls?",
+        description: "Aligns the content with form controls in the grid",
+        hidden: (ps, ctx) => {
+          var _a;
+          return !ps.noLabel || ((_a = ctx == null ? void 0 : ctx.internalFormCtx) == null ? void 0 : _a.layout.layout) !== "horizontal";
+        },
+        defaultValueHint: true
+      },
       colon: {
         type: "boolean",
         defaultValueHint: true,
@@ -1621,7 +1682,11 @@ function registerFormItem(loader) {
       labelAlign: {
         type: "choice",
         options: ["left", "right"],
-        advanced: true
+        advanced: true,
+        hidden: (ps, ctx) => {
+          var _a;
+          return !!ps.noLabel || ((_a = ctx == null ? void 0 : ctx.internalFormCtx) == null ? void 0 : _a.layout.layout) !== "horizontal";
+        }
       },
       hidden: {
         type: "boolean",
@@ -1645,34 +1710,16 @@ function registerFormItem(loader) {
         displayName: "Dependencies",
         description: "Form items can depend on other form items. This forces it to reevaluate the validation rules when the other form item changes."
       },
-      helpTextMode: {
-        type: "choice",
-        displayName: "Help text",
-        options: [
-          {
-            value: "errors",
-            label: "Validation errors"
-          },
-          {
-            value: "extra",
-            label: "Custom help text and validation errors"
-          },
-          {
-            value: "help",
-            label: "Custom help text, no validation errors"
-          }
-        ],
-        defaultValueHint: "Show validation errors",
-        description: "What to show in the help text. Edit help text by editing the 'help' slot in the outline."
+      hideValidationMessage: {
+        type: "boolean",
+        displayName: "Hide validation message?",
+        description: "If true, will hide the validation error message",
+        defaultValueHint: false,
+        advanced: true
       },
-      help: {
+      description: {
         type: "slot",
-        hidden: (ps) => {
-          var _a;
-          return !["extra", "help"].includes((_a = ps.helpTextMode) != null ? _a : "");
-        },
         hidePlaceholder: true
-        // advanced: true,
       },
       customizeProps: {
         type: "function",
@@ -1690,13 +1737,85 @@ function registerFormItem(loader) {
       },
       noStyle: {
         type: "boolean",
-        displayName: "Field only",
-        description: "Don't render anything but the wrapped field component - so no label, help text, validation error, etc.",
+        displayName: "Field control only",
+        description: "Don't render anything but the field control - so no label, help text, validation error, etc.",
         advanced: true
       }
     },
     importPath: "@plasmicpkgs/antd5/skinny/registerForm",
-    importName: "FormItemWrapper"
+    importName: "FormItemWrapper",
+    templates: {
+      Text: {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-input"
+          }
+        }
+      },
+      "Long Text": {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-textarea"
+          }
+        }
+      },
+      "Select dropdown": {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-select"
+          }
+        }
+      },
+      Number: {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-input-number"
+          }
+        }
+      },
+      Checkbox: {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-checkbox"
+          },
+          valuePropName: "checked",
+          noLabel: true
+        }
+      },
+      Radios: {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-radio-group"
+          }
+        }
+      },
+      Password: {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-input-password"
+          }
+        }
+      },
+      "Submit button": {
+        props: {
+          children: {
+            type: "component",
+            name: "plasmic-antd5-button",
+            props: {
+              type: "primary"
+            }
+          },
+          noLabel: true
+        }
+      }
+    }
   });
 }
 function FormGroup(props) {
@@ -2658,14 +2777,31 @@ function registerRadio(loader) {
         allowedComponents: [
           "plasmic-antd5-radio",
           "plasmic-antd5-radio-button"
+        ],
+        defaultValue: [
+          {
+            type: "component",
+            name: "plasmic-antd5-radio",
+            props: {
+              value: "op1",
+              children: {
+                type: "text",
+                value: "Option 1"
+              }
+            }
+          },
+          {
+            type: "component",
+            name: "plasmic-antd5-radio",
+            props: {
+              value: "op2",
+              children: {
+                type: "text",
+                value: "Option 2"
+              }
+            }
+          }
         ]
-        // Error right now when using default slot content with stateful instances
-        // defaultValue: [
-        //   {
-        //     type: "component",
-        //     name: "plasmic-antd5-radio",
-        //   },
-        // ],
       },
       onChange: {
         type: "eventHandler",