@nutui/nutui-react 3.0.0-beta.3 → 3.0.0-beta.5

package/dist/es/packages/button/style/style.css

@@ -1,7 +1,6 @@
 .nut-button {
   position: relative;
   display: flex;
-  display: inline-block;
   /* #ifdef rn harmony*/
   width: 80px;
   /* #endif */
@@ -16,14 +15,14 @@
   margin: 0;
   padding: 0;
   height: var(--nutui-button-default-height, 32px);
-  font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
   font-weight: var(--nutui-button-default-font-weight, var(--nutui-font-weight, 400));
   text-align: center;
   cursor: pointer;
   transition: opacity 0.2s;
-  -webkit-appearance: none;
   user-select: none;
   touch-action: manipulation;
+  -webkit-appearance: none;
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
   background: var(--nutui-button-default-background-color, transparent);
@@ -72,9 +71,9 @@
   /* #endif */
 }
 .nut-button-wrap .nut-icon {
-  font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
-  width: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
-  height: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
+  width: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
+  height: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
 }
 .nut-button-loading::before, .nut-button-disabled::before {
   display: none;
@@ -87,6 +86,18 @@
   width: var(--nutui-button-default-height, 32px);
   padding: 0;
 }
+.nut-button-round {
+  border-radius: var(--nutui-button-border-radius, 8px);
+}
+.nut-button-round-xlarge, .nut-button-round-large {
+  border-radius: var(--nutui-button-large-border-radius, 12px);
+}
+.nut-button-round-small {
+  border-radius: var(--nutui-button-small-border-radius, 8px);
+}
+.nut-button-round-mini {
+  border-radius: var(--nutui-button-mini-border-radius, 6px);
+}
 .nut-button-default {
   padding: var(--nutui-button-default-padding, 0px 12px);
   border-style: solid;
@@ -111,37 +122,52 @@
 .nut-button-xlarge {
   height: var(--nutui-button-xlarge-height, 48px);
   padding: var(--nutui-button-xlarge-padding, 0px 24px);
-  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
+  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
+  border-radius: var(--nutui-radius-base, 8px);
+}
+.nut-button-xlarge .nut-button-text {
+  margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
+}
+.nut-button-xlarge .nut-button-text-right {
+  margin-right: var(--nutui-button-xlarge-text-icon-margin, 6px);
 }
 .nut-button-xlarge .nut-icon {
-  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
-  width: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
-  height: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
+  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
+  width: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
+  height: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-button-xlarge-children {
-  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
+  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-button-large {
   height: var(--nutui-button-large-height, 40px);
   padding: var(--nutui-button-large-padding, 0px 16px);
-  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
+  border-radius: var(--nutui-radius-base, 8px);
+}
+.nut-button-large .nut-button-text {
+  margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
+}
+.nut-button-large .nut-button-text-right {
+  margin-right: var(--nutui-button-xlarge-text-icon-margin, 6px);
 }
 .nut-button-large .nut-icon {
-  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  width: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  height: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
+  width: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
+  height: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-button-large-children {
-  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-button-small {
   height: var(--nutui-button-small-height, 28px);
   padding: var(--nutui-button-small-padding, 0px 8px);
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
+  border-radius: var(--nutui-radius-s, 6px);
 }
 .nut-button-small .nut-icon {
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -154,15 +180,16 @@
 .nut-button-mini {
   height: var(--nutui-button-mini-height, 24px);
   padding: var(--nutui-button-mini-padding, 0px 8px);
-  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
+  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
+  border-radius: var(--nutui-radius-s, 6px);
 }
 .nut-button-mini .nut-icon {
-  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
-  width: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
-  height: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
+  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
+  width: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
+  height: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
 }
 .nut-button-mini-children {
-  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
+  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
 }
 .nut-button-primary {
   color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
@@ -173,7 +200,7 @@
   color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
 }
 .nut-button-primary-solid {
-  background: var(--nutui-color-primary, #ff0f23);
+  background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
   color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
   border-color: transparent;
 }
@@ -333,18 +360,6 @@
   cursor: default;
   opacity: 0.9;
 }
-.nut-button-round {
-  border-radius: var(--nutui-button-border-radius, 8px);
-}
-.nut-button-round-xlarge, .nut-button-round-large {
-  border-radius: var(--nutui-button-large-border-radius, 12px);
-}
-.nut-button-round-small {
-  border-radius: var(--nutui-button-small-border-radius, 8px);
-}
-.nut-button-round-mini {
-  border-radius: var(--nutui-button-mini-border-radius, 6px);
-}
 .nut-button-square {
   border-radius: var(--nutui-button-square-border-radius, 0);
 }

package/dist/es/packages/calendar/style/style.css

@@ -583,7 +583,7 @@
   height: 44px;
   margin: 10px 18px;
   border-radius: 22px;
-  background: var(--nutui-color-primary, #ff0f23);
+  background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
   color: var(--nutui-color-primary-text, #ffffff);
   text-align: center;
   line-height: 44px;

package/dist/es/packages/card/card.d.ts

@@ -1,60 +1,16 @@
 import React, { FunctionComponent } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export interface CardProps extends BasicComponent {
-    /**
-    * 左侧图片 Url
-    * @default -
-    */
-    src: string
-    /**
-    * 标题
-    * @default -
-    */
-    title: string
-    /**
-    * 商品价格
-    * @default -
-    */
-    price: string
-    /**
-    * 会员价格
-    * @default -
-    */
-    vipPrice: string
-    /**
-    * 店铺介绍
-    * @default -
-    */
-    shopDescription: string
-    /**
-    * 配送方式
-    * @default -
-    */
-    delivery: string
-    /**
-    * 店铺名称
-    * @default -
-    */
-    shopName: string
-    /**
-    * 自定义商品介绍
-    * @default -
-    */
-    description: React.ReactNode
-    /**
-    * 店铺介绍自定义
-    * @default -
-    */
-    tag: React.ReactNode
-    /**
-    * 价格后方自定义内容
-    * @default -
-    */
-    priceTag: React.ReactNode
-    /**
-    * 右下角内容自定义
-    * @default -
-    */
-    extra: React.ReactNode
+    src: string;
+    title: string;
+    price: string;
+    vipPrice: string;
+    shopDescription: string;
+    delivery: string;
+    shopName: string;
+    description: React.ReactNode;
+    tag: React.ReactNode;
+    priceTag: React.ReactNode;
+    extra: React.ReactNode;
 }
 export declare const Card: FunctionComponent<Partial<CardProps> & React.HTMLAttributes<HTMLDivElement>>;

package/dist/es/packages/card/style/card.scss

@@ -37,28 +37,13 @@
       line-height: 18px;
       margin-top: 9px;
 
-      .nut-price {
-        .nut-price-big {
-          font-size: 18px;
-        }
-
-        .nut-price-symbol,
-        .nut-price-point,
-        .nut-price-small {
-          font-size: 12px;
-        }
-      }
-
       &-origin {
         &.nut-price {
           margin-left: 2px;
-          color: #d2a448;
-
-          .nut-price-big,
           .nut-price-symbol,
-          .nut-price-point,
-          .nut-price-small {
-            font-size: 12px;
+          .nut-price-integer,
+          .nut-price-decimal {
+            color: #d2a448;
           }
         }
       }

package/dist/es/packages/card/style/style.css

@@ -61,6 +61,7 @@
 .nut-tag .nut-icon {
   vertical-align: middle;
   margin-left: 4px;
+  color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text {
   font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
@@ -153,23 +154,13 @@
   line-height: 18px;
   margin-top: 9px;
 }
-.nut-card-right-price .nut-price .nut-price-big {
-  font-size: 18px;
-}
-.nut-card-right-price .nut-price .nut-price-symbol,
-.nut-card-right-price .nut-price .nut-price-point,
-.nut-card-right-price .nut-price .nut-price-small {
-  font-size: 12px;
-}
 .nut-card-right-price-origin.nut-price {
   margin-left: 2px;
-  color: #d2a448;
 }
-.nut-card-right-price-origin.nut-price .nut-price-big,
 .nut-card-right-price-origin.nut-price .nut-price-symbol,
-.nut-card-right-price-origin.nut-price .nut-price-point,
-.nut-card-right-price-origin.nut-price .nut-price-small {
-  font-size: 12px;
+.nut-card-right-price-origin.nut-price .nut-price-integer,
+.nut-card-right-price-origin.nut-price .nut-price-decimal {
+  color: #d2a448;
 }
 .nut-card-right-other {
   display: flex;

package/dist/es/packages/checkbox/checkbox.d.ts

@@ -1,5 +1,4 @@
 import React, { FunctionComponent, ReactNode } from 'react';
-import CheckboxGroup from "../checkboxgroup";
 import { BasicComponent } from "../../utils/typings";
 import { CheckboxLabelPosition } from "../checkboxgroup/types";
 export type CheckboxShape = 'button' | 'round';
@@ -17,6 +16,4 @@ export interface CheckboxProps extends BasicComponent {
     label: ReactNode;
     onChange: (value: boolean) => void;
 }
-export declare const Checkbox: FunctionComponent<Partial<CheckboxProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>> & {
-    Group: typeof CheckboxGroup;
-};
+export declare const Checkbox: FunctionComponent<Partial<CheckboxProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>>;

package/dist/es/packages/checkbox/checkbox.js

@@ -4,9 +4,8 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useContext, useEffect, useState } from "react";
-import { Checked, CheckDisabled, CheckNormal } from "@nutui/icons-react";
+import { CheckDisabled, Checked, CheckNormal } from "@nutui/icons-react";
 import classNames from "classnames";
-import CheckboxGroup from "../checkboxgroup";
 import { ComponentDefaults } from "../../utils/typings";
 import Context from "../checkboxgroup/context";
 import { usePropsValue } from "../../utils/use-props-value";
@@ -162,4 +161,3 @@ export var Checkbox = function(props) {
     }), renderCheckboxItem());
 };
 Checkbox.displayName = 'NutCheckBox';
-Checkbox.Group = CheckboxGroup;

package/dist/es/packages/checkbox/index.d.ts

@@ -1,3 +1,8 @@
-import { Checkbox } from './checkbox';
+import { CheckboxProps } from './checkbox';
+import { CheckboxGroup } from '../checkboxgroup/checkboxgroup';
 export type { CheckboxProps, CheckboxShape } from './checkbox';
-export default Checkbox;
+type CompoundedComponent = React.FC<Partial<CheckboxProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>> & {
+    Group: typeof CheckboxGroup;
+};
+declare const InnerCheckbox: CompoundedComponent;
+export default InnerCheckbox;

package/dist/es/packages/checkbox/index.js

@@ -1,2 +1,5 @@
 import { Checkbox } from "./checkbox";
-export default Checkbox;
+import { CheckboxGroup } from "../checkboxgroup/checkboxgroup";
+var InnerCheckbox = Checkbox;
+InnerCheckbox.Group = CheckboxGroup;
+export default InnerCheckbox;

package/dist/es/packages/checkbox/style/style.css

@@ -1,6 +1,10 @@
 .nut-checkboxgroup .nut-checkbox-button {
   background-color: var(--nutui-color-background, #f5f6fa);
 }
+.nut-checkboxgroup-vertical {
+  display: flex;
+  flex-direction: column;
+}
 .nut-checkboxgroup-vertical .nut-checkbox {
   margin-bottom: 5px;
 }
@@ -12,8 +16,14 @@
   border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
 }
+.nut-checkboxgroup-horizontal {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
 .nut-checkboxgroup-horizontal .nut-checkbox {
   display: inline-flex;
+  flex: 1;
   margin-right: 20px;
 }
 .nut-checkboxgroup-horizontal .nut-checkbox-button-active {

package/dist/es/packages/checkboxgroup/checkboxgroup.d.ts

@@ -2,56 +2,16 @@ import React from 'react';
 import { RadioGroupOption } from "../radiogroup/types";
 import { CheckboxDirection, CheckboxLabelPosition, CheckboxLimit } from "./types";
 export interface CheckboxGroupProps {
-    /**
-    * 是否禁用选择,将用于其下的全部复选框
-    * @default false
-    */
-    disabled?: boolean
-    /**
-    * 当前选中项的标识符
-    * @default -
-    */
-    value?: string[]
-    /**
-    * 初始选中项的标识符
-    * @default -
-    */
-    defaultValue?: string[]
-    /**
-    * 列表模式
-    * @default false
-    */
-    list: boolean
-    /**
-    * 限制最大可选数
-    * @default -
-    */
-    max: number | undefined
-    /**
-    * 限制至少选择数
-    * @default -
-    */
-    min: number | undefined
-    /**
-    * 文本所在的位置
-    * @default right
-    */
-    labelPosition: CheckboxLabelPosition
-    /**
-    * 使用横纵方向 可选值 horizontal、vertical
-    * @default vertical
-    */
-    direction: CheckboxDirection
-    /**
-    * 配置 options 渲染复选按钮
-    * @default -
-    */
-    options: RadioGroupOption[]
-    /**
-    * 值变化时触发
-    * @default -
-    */
-    onChange: (value: string[]) => void
+    disabled?: boolean;
+    value?: string[];
+    defaultValue?: string[];
+    list: boolean;
+    max: number | undefined;
+    min: number | undefined;
+    labelPosition: CheckboxLabelPosition;
+    direction: CheckboxDirection;
+    options: RadioGroupOption[];
+    onChange: (value: string[]) => void;
     onLimit: (type: CheckboxLimit) => void;
 }
 export declare const CheckboxGroup: React.ForwardRefExoticComponent<Partial<CheckboxGroupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onChange"> & React.RefAttributes<unknown>>;

package/dist/es/packages/checkboxgroup/style/checkboxgroup.scss

@@ -6,6 +6,9 @@
   }
 
   &-vertical {
+    display: flex;
+    flex-direction: column;
+
     .nut-checkbox {
       margin-bottom: 5px;
 
@@ -22,8 +25,13 @@
   }
 
   &-horizontal {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+
     .nut-checkbox {
       display: inline-flex;
+      flex: 1;
       margin-right: 20px;
 
       &-button-active {

package/dist/es/packages/checkboxgroup/style/style.css

@@ -1,6 +1,10 @@
 .nut-checkboxgroup .nut-checkbox-button {
   background-color: var(--nutui-color-background, #f5f6fa);
 }
+.nut-checkboxgroup-vertical {
+  display: flex;
+  flex-direction: column;
+}
 .nut-checkboxgroup-vertical .nut-checkbox {
   margin-bottom: 5px;
 }
@@ -12,8 +16,14 @@
   border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
 }
+.nut-checkboxgroup-horizontal {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
 .nut-checkboxgroup-horizontal .nut-checkbox {
   display: inline-flex;
+  flex: 1;
   margin-right: 20px;
 }
 .nut-checkboxgroup-horizontal .nut-checkbox-button-active {