@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

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

@@ -1,10 +1,11 @@
 .nut-button {
   position: relative;
   display: flex;
-  /* #ifdef rn harmony*/
+  display: inline-block;
+  /* #ifdef harmony*/
   width: 80px;
   /* #endif */
-  /* #ifndef rn harmony*/
+  /* #ifndef harmony*/
   width: auto;
   /* #endif */
   flex-direction: row;
@@ -16,7 +17,7 @@
   padding: 0;
   height: $button-default-height;
   font-size: $button-default-font-size;
-  font-weight: $button-default-font-weight;
+  font-weight: $font-weight;
   text-align: center;
   cursor: pointer;
   transition: $button-transition;
@@ -71,7 +72,7 @@
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    /* #ifndef rn harmony */
+    /* #ifndef harmony */
     background: initial;
     /* #endif */
     .nut-icon {
@@ -101,7 +102,10 @@
   &-round {
     border-radius: $button-border-radius;
 
-    &-xlarge,
+    &-xlarge {
+      border-radius: $button-xlarge-border-radius;
+    }
+
     &-large {
       border-radius: $button-large-border-radius;
     }
@@ -151,7 +155,6 @@
     height: $button-xlarge-height;
     padding: $button-xlarge-padding;
     font-size: $button-xlarge-font-size;
-    font-weight: $button-large-font-weight;
     border-radius: $radius-base;
 
     .nut-button-text {
@@ -168,7 +171,6 @@
     }
     &-children {
       font-size: $button-xlarge-font-size;
-      font-weight: $button-large-font-weight;
     }
   }
 
@@ -176,8 +178,7 @@
     height: $button-large-height;
     padding: $button-large-padding;
     font-size: $button-large-font-size;
-    font-weight: $button-large-font-weight;
-    border-radius: $radius-base;
+    border-radius: $radius-s;
 
     .nut-button-text {
       margin-left: $button-xlarge-text-icon-margin;
@@ -194,7 +195,6 @@
 
     &-children {
       font-size: $button-large-font-size;
-      font-weight: $button-large-font-weight;
     }
   }
 
@@ -202,7 +202,7 @@
     height: $button-small-height;
     padding: $button-small-padding;
     font-size: $button-small-font-size;
-    border-radius: $radius-s;
+    border-radius: $radius-xs;
 
     .nut-icon {
       font-size: $button-small-font-size;
@@ -219,7 +219,7 @@
     height: $button-mini-height;
     padding: $button-mini-padding;
     font-size: $button-mini-font-size;
-    border-radius: $radius-s;
+    border-radius: $radius-xs;
 
     .nut-icon {
       font-size: $button-mini-font-size;
@@ -245,9 +245,15 @@
       background: $button-primary-background-color;
       color: $button-primary-color;
       border-color: transparent;
+      font-weight: $font-weight-bold;
+      &.nut-button-small,
+      &.nut-button-mini {
+        font-weight: $font-weight;
+      }
     }
 
     &-disabled,
+    &-disabled.nut-button-icononly,
     &-solid-disabled {
       color: $button-primary-color;
       background: $button-primary-disabled;
@@ -282,6 +288,9 @@
       }
     }
   }
+  &-primary.nut-button-solid.nut-button-normal {
+    font-weight: $font-weight-bold;
+  }
 
   &-success {
     color: $button-success-color;

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

@@ -5,10 +5,11 @@
 .nut-button {
   position: relative;
   display: flex;
-  /* #ifdef rn harmony*/
+  display: inline-block;
+  /* #ifdef harmony*/
   width: 80px;
   /* #endif */
-  /* #ifndef rn harmony*/
+  /* #ifndef harmony*/
   width: auto;
   /* #endif */
   flex-direction: row;
@@ -19,8 +20,8 @@
   margin: 0;
   padding: 0;
   height: var(--nutui-button-default-height, 32px);
-  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));
+  font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
+  font-weight: var(--nutui-font-weight, 400);
   text-align: center;
   cursor: pointer;
   transition: opacity 0.2s;
@@ -30,7 +31,7 @@
   -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);
-  border-width: var(--nutui-button-border-width, 1px);
+  border-width: var(--nutui-button-border-width, 0.5px);
 }
 .nut-button-text {
   margin-left: var(--nutui-button-text-icon-margin, 4px);
@@ -70,14 +71,14 @@
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  /* #ifndef rn harmony */
+  /* #ifndef harmony */
   background: initial;
   /* #endif */
 }
 .nut-button-wrap .nut-icon {
-  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));
+  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));
 }
 .nut-button-loading::before, .nut-button-disabled::before {
   display: none;
@@ -91,24 +92,27 @@
   padding: 0;
 }
 .nut-button-round {
-  border-radius: var(--nutui-button-border-radius, 8px);
+  border-radius: var(--nutui-button-border-radius, var(--nutui-radius-s, 6px));
 }
-.nut-button-round-xlarge, .nut-button-round-large {
-  border-radius: var(--nutui-button-large-border-radius, 12px);
+.nut-button-round-xlarge {
+  border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
+}
+.nut-button-round-large {
+  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-round-small {
-  border-radius: var(--nutui-button-small-border-radius, 8px);
+  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
 }
 .nut-button-round-mini {
-  border-radius: var(--nutui-button-mini-border-radius, 6px);
+  border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
 }
 .nut-button-default {
   padding: var(--nutui-button-default-padding, 0px 12px);
   border-style: solid;
-  border-color: var(--nutui-button-default-border-color, var(--nutui-color-text, #505259));
+  border-color: var(--nutui-button-default-border-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-default-disabled, .nut-button-default-solid-disabled {
-  color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-primary-color, #ffffff);
   background: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
   border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
@@ -127,7 +131,6 @@
   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-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 {
@@ -143,14 +146,12 @@
 }
 .nut-button-xlarge-children {
   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-base, 14px));
-  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
-  border-radius: var(--nutui-radius-base, 8px);
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
+  border-radius: var(--nutui-radius-s, 6px);
 }
 .nut-button-large .nut-button-text {
   margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -159,19 +160,18 @@
   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-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));
+  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));
 }
 .nut-button-large-children {
-  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));
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
 }
 .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);
+  border-radius: var(--nutui-radius-xs, 4px);
 }
 .nut-button-small .nut-icon {
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -185,7 +185,7 @@
   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-xs, 11px));
-  border-radius: var(--nutui-radius-s, 6px);
+  border-radius: var(--nutui-radius-xs, 4px);
 }
 .nut-button-mini .nut-icon {
   font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
@@ -196,20 +196,24 @@
   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));
+  color: var(--nutui-button-primary-color, #ffffff);
   background-origin: border-box;
   border-color: transparent;
 }
 .nut-button-primary-children {
-  color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-primary-color, #ffffff);
 }
 .nut-button-primary-solid {
   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));
+  color: var(--nutui-button-primary-color, #ffffff);
   border-color: transparent;
+  font-weight: var(--nutui-font-weight-bold, 600);
+}
+.nut-button-primary-solid.nut-button-small, .nut-button-primary-solid.nut-button-mini {
+  font-weight: var(--nutui-font-weight, 400);
 }
-.nut-button-primary-disabled, .nut-button-primary-solid-disabled {
-  color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
+.nut-button-primary-disabled, .nut-button-primary-disabled.nut-button-icononly, .nut-button-primary-solid-disabled {
+  color: var(--nutui-button-primary-color, #ffffff);
   background: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
   border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
@@ -235,14 +239,17 @@
   color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
   border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
+.nut-button-primary.nut-button-solid.nut-button-normal {
+  font-weight: var(--nutui-font-weight-bold, 600);
+}
 .nut-button-success {
-  color: var(--nutui-button-success-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-success-color, #ffffff);
   background: var(--nutui-button-success-background-color, var(--nutui-color-success, #00d900));
   background-origin: border-box;
   border-color: transparent;
 }
 .nut-button-success-children {
-  color: var(--nutui-button-success-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-success-color, #ffffff);
 }
 .nut-button-success-solid-disabled {
   background: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
@@ -263,13 +270,13 @@
   color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
 }
 .nut-button-info {
-  color: var(--nutui-button-info-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-info-color, #ffffff);
   background: var(--nutui-button-info-background-color, var(--nutui-color-info-background, #0073ff));
   background-origin: border-box;
   border-color: transparent;
 }
 .nut-button-info-children {
-  color: var(--nutui-button-info-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-info-color, #ffffff);
 }
 .nut-button-info-solid-disabled {
   background: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled, #89a6f8));
@@ -290,13 +297,13 @@
   color: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled, #89a6f8));
 }
 .nut-button-danger {
-  color: var(--nutui-button-danger-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-danger-color, #ffffff);
   background: var(--nutui-button-danger-background-color, var(--nutui-color-danger, #ff0f23));
   background-origin: border-box;
   border-color: transparent;
 }
 .nut-button-danger-children {
-  color: var(--nutui-button-danger-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-danger-color, #ffffff);
 }
 .nut-button-danger-solid-disabled {
   background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
@@ -317,16 +324,16 @@
   color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-warning {
-  color: var(--nutui-button-warning-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-warning-color, #ffffff);
   background: var(--nutui-button-warning-background-color, var(--nutui-color-warning, #ffbf00));
   background-origin: border-box;
   border-color: transparent;
 }
 .nut-button-warning-children {
-  color: var(--nutui-button-warning-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-warning-color, #ffffff);
 }
 .nut-button-warning-disabled, .nut-button-warning-solid-disabled {
-  color: var(--nutui-button-warning-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-button-warning-color, #ffffff);
   background: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
   border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
 }

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

@@ -1,140 +1,32 @@
 import React, { ReactNode } from 'react';
 import type { CalendarDay, CalendarType, CalendarRef } from './types';
 export interface CalendarProps {
-    /**
-    * 类型，日期选择'single'，区间选择'range'
-    * @default single
-    */
-    type?: CalendarType
-    /**
-    * 自动回填
-    * @default false
-    */
-    autoBackfill?: boolean
-    /**
-    * 是否弹窗状态展示
-    * @default true
-    */
-    popup?: boolean
-    /**
-    * 是否可见
-    * @default false
-    */
-    visible?: boolean
-    /**
-    * 显示标题
-    * @default 日期选择
-    */
-    title?: string
-    /**
-    * 默认值，日期选择 string 格式，区间选择 Array 格式
-    * @default -
-    */
-    defaultValue?: string | string[]
-    /**
-    * 开始日期， 如果不限制开始日期传 null
-    * @default 今天
-    */
-    startDate?: string
-    /**
-    * 结束日期，如果不限制结束日期传 null
-    * @default 距离今天 365 天
-    */
-    endDate?: string
-    /**
-    * 是否展示今天标记
-    * @default true
-    */
-    showToday?: boolean
-    /**
-    * 范围选择，开始信息文案
-    * @default 开始
-    */
-    startText?: ReactNode
-    /**
-    * 范围选择，结束信息文案
-    * @default 结束
-    */
-    endText?: ReactNode
-    /**
-    * 底部确认按钮文案
-    * @default 确认
-    */
-    confirmText?: ReactNode
-    /**
-    * 是否在展示日历标题
-    * @default true
-    */
-    showTitle?: boolean
-    /**
-    * 是否展示日期标题
-    * @default true
-    */
-    showSubTitle?: boolean
-    /**
-    * 是否启动滚动动画
-    * @default true
-    */
-    scrollAnimation?: boolean
-    /**
-    * 设置周起始日
-    * @default 0
-    */
-    firstDayOfWeek: number
-    /**
-    * 自定义 Icon
-    * @default close
-    */
-    closeIcon?: ReactNode
-    /**
-    * 设置不可选日期
-    * @default -
-    */
-    disableDate: (date: CalendarDay) => boolean
-    /**
-    * 自定义日历标题下部，可用以添加自定义操作
-    * @default -
-    */
-    renderHeaderButtons?: () => string | JSX.Element
-    /**
-    * 自定义日历底部按钮
-    * @default -
-    */
-    renderBottomButton?: () => string | JSX.Element
-    /**
-    * 日期信息
-    * @default -
-    */
-    renderDay?: (date: CalendarDay) => string | JSX.Element
-    /**
-    * 日期顶部信息
-    * @default -
-    */
-    renderDayTop?: (date: CalendarDay) => string | JSX.Element
-    /**
-    * 日期底部信息
-    * @default -
-    */
-    renderDayBottom?: (date: CalendarDay) => string | JSX.Element
-    /**
-    * 关闭时触发
-    * @default -
-    */
-    onClose?: () => void
-    /**
-    * 选择之后或是点击确认按钮触发
-    * @default -
-    */
-    onConfirm?: (param: string) => void
-    /**
-    * 点击/选择后触发
-    * @default -
-    */
-    onDayClick?: (data: string) => void
-    /**
-    * 年月子标题到达顶部时触发
-    * @default -
-    */
-    onPageChange?: (param: string) => void
+    type?: CalendarType;
+    autoBackfill?: boolean;
+    popup?: boolean;
+    visible?: boolean;
+    title?: string;
+    defaultValue?: string | string[];
+    startDate?: string;
+    endDate?: string;
+    showToday?: boolean;
+    startText?: ReactNode;
+    endText?: ReactNode;
+    confirmText?: ReactNode;
+    showTitle?: boolean;
+    showSubTitle?: boolean;
+    scrollAnimation?: boolean;
+    firstDayOfWeek: number;
+    closeIcon?: ReactNode;
+    disableDate: (date: CalendarDay) => boolean;
+    renderHeaderButtons?: () => string | JSX.Element;
+    renderBottomButton?: () => string | JSX.Element;
+    renderDay?: (date: CalendarDay) => string | JSX.Element;
+    renderDayTop?: (date: CalendarDay) => string | JSX.Element;
+    renderDayBottom?: (date: CalendarDay) => string | JSX.Element;
+    onClose?: () => void;
+    onConfirm?: (param: string) => void;
+    onDayClick?: (data: string) => void;
+    onPageChange?: (param: string) => void;
 }
 export declare const Calendar: React.ForwardRefExoticComponent<Partial<CalendarProps> & Omit<React.HTMLAttributes<HTMLDivElement>, ""> & React.RefAttributes<CalendarRef>>;

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

@@ -34,6 +34,10 @@
     display: flex;
     flex-direction: column;
     text-align: center;
+
+    &-buttons {
+      height: $calendar-header-height;
+    }
   }
 
   &-title {
@@ -49,10 +53,6 @@
     font-size: $calendar-sub-title-font-size;
   }
 
-  &-header-buttons {
-    height: $calendar-header-height;
-  }
-
   &-weeks {
     display: flex;
     align-items: center;
@@ -101,12 +101,12 @@
     display: flex;
     flex-direction: column;
     text-align: center;
-  }
 
-  &-month-title {
-    height: 23px;
-    line-height: 23px;
-    margin: 8px 0;
+    &-title {
+      height: 23px;
+      line-height: 23px;
+      margin: 8px 0;
+    }
   }
 
   &-days {
@@ -130,6 +130,7 @@
       color: $color-primary;
     }
 
+    &-info,
     &-info-curr {
       position: absolute;
       bottom: 5px;
@@ -138,14 +139,6 @@
       line-height: 14px;
     }
 
-    &-info {
-      position: absolute;
-      bottom: 5px;
-      width: 100%;
-      font-size: 12px;
-      line-height: 14px;
-    }
-
     &-info-top {
       position: absolute;
       width: 100%;
@@ -188,18 +181,18 @@
       }
     }
 
-    &-choose-disabled {
-      background-color: $calendar-choose-disable-background-color;
-      color: $calendar-disable-color !important;
-
-      .nut-calendar-day-info-curr {
-        display: none;
-      }
-    }
-
     &-choose {
       background-color: $calendar-choose-background-color;
       color: $calendar-choose-color;
+
+      &-disabled {
+        background-color: $calendar-choose-disable-background-color;
+        color: $calendar-disable-color !important;
+
+        .nut-calendar-day-info-curr {
+          display: none;
+        }
+      }
     }
   }
 
@@ -211,13 +204,14 @@
     background-color: $white;
 
     .calendar-confirm-btn {
-      height: 44px;
-      margin: 10px 18px;
-      border-radius: 22px;
+      height: 40px;
+      line-height: 40px;
+      margin: 6px 16px;
+      text-align: center;
+      border-radius: $radius-base;
       background: $button-primary-background-color;
       color: $color-primary-text;
-      text-align: center;
-      line-height: 44px;
+      font-weight: $font-weight-bold;
     }
   }
 }