@tidbcloud/uikit 2.0.0-beta.50 → 2.0.0-beta.52

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tidbcloud/uikit
 
+## 2.0.0-beta.52
+
+### Minor Changes
+
+- adjust Dot and DotBadge color
+
+## 2.0.0-beta.51
+
+### Patch Changes
+
+- update form
+
 ## 2.0.0-beta.50
 
 ### Minor Changes

package/dist/biz/Dot/index.cjs

@@ -9,7 +9,7 @@ const Dot = ({ color, size = 8, ...rest }) => {
       sx: (theme) => {
         var _a;
         return {
-          backgroundColor: ((_a = theme.colors[color]) == null ? void 0 : _a[5]) ?? theme.colors.carbon[6],
+          backgroundColor: ((_a = theme.colors[color]) == null ? void 0 : _a[7]) ?? theme.colors.carbon[6],
           height: size,
           width: size,
           borderRadius: "50%"

package/dist/biz/Dot/index.js

@@ -7,7 +7,7 @@ const Dot = ({ color, size = 8, ...rest }) => {
       sx: (theme) => {
         var _a;
         return {
-          backgroundColor: ((_a = theme.colors[color]) == null ? void 0 : _a[5]) ?? theme.colors.carbon[6],
+          backgroundColor: ((_a = theme.colors[color]) == null ? void 0 : _a[7]) ?? theme.colors.carbon[6],
           height: size,
           width: size,
           borderRadius: "50%"

package/dist/biz/DotBadge/index.cjs

@@ -11,7 +11,7 @@ const DotBadge = ({ color = "green", children, ...rest }) => {
       variant: "light",
       styles: (theme) => ({
         root: {
-          backgroundColor: theme.colors[color][0],
+          backgroundColor: theme.colors[color][1],
           borderRadius: theme.defaultRadius,
           textTransform: "none",
           height: 28
@@ -19,7 +19,7 @@ const DotBadge = ({ color = "green", children, ...rest }) => {
       }),
       leftSection: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(index.Dot, { color, size: 8 }),
       ...rest,
-      children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(index$1.Typography, { variant: "body3", c: `${color}.6`, children })
+      children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(index$1.Typography, { size: 14, fw: 500, c: `${color}.8`, children })
     }
   );
 };

package/dist/biz/DotBadge/index.js

@@ -9,7 +9,7 @@ const DotBadge = ({ color = "green", children, ...rest }) => {
       variant: "light",
       styles: (theme) => ({
         root: {
-          backgroundColor: theme.colors[color][0],
+          backgroundColor: theme.colors[color][1],
           borderRadius: theme.defaultRadius,
           textTransform: "none",
           height: 28
@@ -17,7 +17,7 @@ const DotBadge = ({ color = "green", children, ...rest }) => {
       }),
       leftSection: /* @__PURE__ */ jsxRuntimeExports.jsx(Dot, { color, size: 8 }),
       ...rest,
-      children: /* @__PURE__ */ jsxRuntimeExports.jsx(Typography, { variant: "body3", c: `${color}.6`, children })
+      children: /* @__PURE__ */ jsxRuntimeExports.jsx(Typography, { size: 14, fw: 500, c: `${color}.8`, children })
     }
   );
 };

package/dist/biz/Form/Form.cjs

@@ -24,6 +24,8 @@ const _Form = ({
   layout = "vertical",
   layoutProps,
   onError,
+  stopPropagation,
+  preventDefault,
   ...rest
 }) => {
   const [submitError, setSubmitError] = ahooks.useSafeState("");
@@ -51,21 +53,37 @@ const _Form = ({
   const handleDismissErrorMessage = () => {
     setSubmitError("");
   };
-  return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(reactHookForm.FormProvider, { ...methods, children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(Box.Box, { component: "form", ...rest, onSubmit: handleSubmit(submit), children: [
-    /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(FormLayout.FormLayout, { layout, ...layoutProps, children }),
-    withActions && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(jsxRuntime.jsxRuntimeExports.Fragment, { children: [
-      submitError && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(
-        FormErrorMessage.FormErrorMessage,
-        {
-          mt: 24,
-          message: submitError,
-          onDismiss: handleDismissErrorMessage,
-          ...errorMessageProps
+  return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(reactHookForm.FormProvider, { ...methods, children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(
+    Box.Box,
+    {
+      component: "form",
+      ...rest,
+      onSubmit: (e) => {
+        if (stopPropagation) {
+          e == null ? void 0 : e.stopPropagation();
         }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(FormActions.FormActions, { onCancel, loading: submitting, ...actionsProps })
-    ] })
-  ] }) });
+        if (preventDefault) {
+          e == null ? void 0 : e.preventDefault();
+        }
+        return handleSubmit(submit)(e);
+      },
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(FormLayout.FormLayout, { layout, ...layoutProps, children }),
+        withActions && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(jsxRuntime.jsxRuntimeExports.Fragment, { children: [
+          submitError && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(
+            FormErrorMessage.FormErrorMessage,
+            {
+              mt: 24,
+              message: submitError,
+              onDismiss: handleDismissErrorMessage,
+              ...errorMessageProps
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(FormActions.FormActions, { onCancel, loading: submitting, ...actionsProps })
+        ] })
+      ]
+    }
+  ) });
 };
 const Form = _Form;
 Form.Actions = FormActions.FormActions;

package/dist/biz/Form/Form.d.cts

@@ -15,12 +15,14 @@ export interface FormProps<T extends FieldValues = object> extends BoxProps {
     errorMessageProps?: Omit<FormErrorMessageProps, 'message'>;
     layout?: FormLayoutType;
     layoutProps?: Omit<FormLayoutProps, 'layout'>;
+    stopPropagation?: boolean;
+    preventDefault?: boolean;
     onSubmit: SubmitHandler<T>;
     onError?: () => any;
     onCancel?: () => void;
     onFormUnMount?: () => void;
 }
-declare const _Form: <T extends object = {}>({ children, form, formMode, reValidateMode, defaultValues, onSubmit, onFormUnMount, onCancel, withActions, actionsProps, errorMessageProps, layout, layoutProps, onError, ...rest }: FormProps<T>) => import("react/jsx-runtime.js").JSX.Element;
+declare const _Form: <T extends object = {}>({ children, form, formMode, reValidateMode, defaultValues, onSubmit, onFormUnMount, onCancel, withActions, actionsProps, errorMessageProps, layout, layoutProps, onError, stopPropagation, preventDefault, ...rest }: FormProps<T>) => import("react/jsx-runtime.js").JSX.Element;
 type FormType = typeof _Form;
 export declare const Form: FormType & {
     Actions: typeof FormActions;

package/dist/biz/Form/Form.d.ts

@@ -15,12 +15,14 @@ export interface FormProps<T extends FieldValues = object> extends BoxProps {
     errorMessageProps?: Omit<FormErrorMessageProps, 'message'>;
     layout?: FormLayoutType;
     layoutProps?: Omit<FormLayoutProps, 'layout'>;
+    stopPropagation?: boolean;
+    preventDefault?: boolean;
     onSubmit: SubmitHandler<T>;
     onError?: () => any;
     onCancel?: () => void;
     onFormUnMount?: () => void;
 }
-declare const _Form: <T extends object = {}>({ children, form, formMode, reValidateMode, defaultValues, onSubmit, onFormUnMount, onCancel, withActions, actionsProps, errorMessageProps, layout, layoutProps, onError, ...rest }: FormProps<T>) => import("react/jsx-runtime.js").JSX.Element;
+declare const _Form: <T extends object = {}>({ children, form, formMode, reValidateMode, defaultValues, onSubmit, onFormUnMount, onCancel, withActions, actionsProps, errorMessageProps, layout, layoutProps, onError, stopPropagation, preventDefault, ...rest }: FormProps<T>) => import("react/jsx-runtime.js").JSX.Element;
 type FormType = typeof _Form;
 export declare const Form: FormType & {
     Actions: typeof FormActions;

package/dist/biz/Form/Form.js

@@ -22,6 +22,8 @@ const _Form = ({
   layout = "vertical",
   layoutProps,
   onError,
+  stopPropagation,
+  preventDefault,
   ...rest
 }) => {
   const [submitError, setSubmitError] = useSafeState("");
@@ -49,21 +51,37 @@ const _Form = ({
   const handleDismissErrorMessage = () => {
     setSubmitError("");
   };
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormProvider, { ...methods, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(Box, { component: "form", ...rest, onSubmit: handleSubmit(submit), children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { layout, ...layoutProps, children }),
-    withActions && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-      submitError && /* @__PURE__ */ jsxRuntimeExports.jsx(
-        FormErrorMessage,
-        {
-          mt: 24,
-          message: submitError,
-          onDismiss: handleDismissErrorMessage,
-          ...errorMessageProps
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormProvider, { ...methods, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
+    Box,
+    {
+      component: "form",
+      ...rest,
+      onSubmit: (e) => {
+        if (stopPropagation) {
+          e == null ? void 0 : e.stopPropagation();
         }
-      ),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(FormActions, { onCancel, loading: submitting, ...actionsProps })
-    ] })
-  ] }) });
+        if (preventDefault) {
+          e == null ? void 0 : e.preventDefault();
+        }
+        return handleSubmit(submit)(e);
+      },
+      children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { layout, ...layoutProps, children }),
+        withActions && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+          submitError && /* @__PURE__ */ jsxRuntimeExports.jsx(
+            FormErrorMessage,
+            {
+              mt: 24,
+              message: submitError,
+              onDismiss: handleDismissErrorMessage,
+              ...errorMessageProps
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(FormActions, { onCancel, loading: submitting, ...actionsProps })
+        ] })
+      ]
+    }
+  ) });
 };
 const Form = _Form;
 Form.Actions = FormActions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tidbcloud/uikit",
-  "version": "2.0.0-beta.50",
+  "version": "2.0.0-beta.52",
   "description": "tidbcloud uikit",
   "type": "module",
   "main": "dist/primitive/index.cjs",