onekijs-ui 0.19.5 → 0.19.6

package/dist/index.js

@@ -1495,11 +1495,12 @@ const TooltipContent = ({ code, fields }) => {
     if (code <= onekijsFramework.ValidationCode.Error) {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", null,
-                "Some fields are in ",
+                "Some fields are ",
                 code === onekijsFramework.ValidationCode.Error ? 'in error' : 'loading'),
             Object.keys(fields).map((fieldName, index) => (React.createElement("div", { key: `error-${index}` },
-                React.createElement("b", null, fieldName),
-                ": ",
+                fieldName !== onekijsFramework.FORM_GLOBAL_VALIDATION_KEY ? React.createElement(React.Fragment, null,
+                    React.createElement("b", null, "fieldName"),
+                    ":") : '',
                 fields[fieldName])))));
     }
     return null;
@@ -1508,19 +1509,26 @@ const SubmitButton = React.memo((opts) => {
     const { submitting, code, fields } = onekijsFramework.useSubmit();
     const { showErrors, type = 'submit', ...props } = opts;
     let disabled = props.disabled || false;
+    let loading = false;
+    let kind = props.kind || 'primary';
     let errors = [];
     if (code <= onekijsFramework.ValidationCode.Error) {
         disabled = true;
         if (showErrors) {
             errors = Object.keys(fields);
         }
+        kind = 'danger';
+    }
+    if (code === onekijsFramework.ValidationCode.Loading) {
+        loading = true;
+        kind = 'dark';
     }
     // eslint-disable-next-line react/prop-types
-    if (submitting) {
+    if (submitting || loading) {
         disabled = true;
     }
-    return (React.createElement(Tooltip, { content: errors.length > 0 ? React.createElement(TooltipContent, { code: code, fields: fields }) : undefined, placement: "top", kind: "danger", delayHide: 0 },
-        React.createElement(Button, { ...props, disabled: disabled, type: type, loading: submitting }, props.children ? props.children : 'Submit')));
+    return (React.createElement(Tooltip, { content: errors.length > 0 && !loading ? React.createElement(TooltipContent, { code: code, fields: fields }) : undefined, placement: "top", kind: kind, delayHide: 0 },
+        React.createElement(Button, { ...props, kind: kind, disabled: disabled, type: type, loading: submitting || loading }, props.children ? props.children : 'Submit')));
 });
 SubmitButton.displayName = 'SubmitButton';