@nutui/nutui-react 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -2,20 +2,21 @@
   width: $navbar-width;
   position: relative;
   display: flex;
+  flex-direction: row;
+  justify-content: space-between;
   align-items: center;
   height: $navbar-height;
   box-sizing: border-box;
-  background: $navbar-background;
-  box-shadow: $navbar-box-shadow;
   font-size: $navbar-font-size;
   color: $navbar-color;
-  margin-bottom: $navbar-margin-bottom;
   overflow: hidden;
+  padding: 0 16px;
 
   &-fixed {
     position: fixed;
     top: 0;
     left: 0;
+    right: 0;
     width: 100%;
   }
 
@@ -24,27 +25,29 @@
     width: 100%;
   }
 
+  &-safe-area-inset-top {
+    padding-top: constant(safe-area-inset-top);
+    padding-top: env(safe-area-inset-top);
+  }
+
+  &-title-wrapper {
+    justify-content: space-between;
+  }
+
   &-title {
-    min-width: 53%;
-    margin: 0 auto;
+    height: 100%;
     text-align: center;
     display: flex;
+    flex: 1;
+    flex-direction: row;
     align-items: center;
-    justify-content: center;
     font-size: $navbar-title-font-size;
     font-weight: $navbar-title-font-weight;
     color: $navbar-title-font-color;
 
-    .nut-tabs-titles {
-      background: transparent;
-
-      &-item-text {
-        color: $color-title;
-      }
-    }
-
-    .nut-tabpane {
-      display: none;
+    &-center {
+      max-width: 129px;
+      justify-content: center;
     }
   }
 
@@ -54,130 +57,64 @@
 
   &-left,
   &-right {
-    position: absolute;
-    top: 0;
-    bottom: 0;
     display: flex;
     align-items: center;
+    flex-direction: row;
+    max-width: 124px;
+    height: 100%;
     cursor: pointer;
-    padding: 0 14px;
-
+    /* #ifndef rn harmony jd h5 weapp*/
     .nut-icon,
     .nutui-iconfont {
       width: 20px;
       height: 20px;
       font-size: 20px;
     }
+
+    /* #endif */
+    &-maxwidth {
+      box-sizing: border-box;
+      width: calc(124px - 16px);
+    }
   }
 
   &-left {
-    left: 0;
+    padding-right: 16px;
+    gap: 16px;
+
+    &-rtl {
+      padding-right: 0;
+      padding-left: 16px;
+    }
 
     &-back {
       display: flex;
+      flex-direction: row;
       align-items: center;
       justify-content: center;
-      margin-right: 10px;
+      gap: 16px;
     }
-  }
-
-  &-right {
-    right: 0;
-
-    .nut-icon {
-      margin-left: 12px;
 
-      &:first-child {
-        margin-left: 0;
-      }
+    &-hidden {
+      padding-left: 0;
+      padding-right: 0;
     }
   }
 
-  &-title-align-left {
-    padding-left: 14px;
-
-    .nut-navbar-left {
-      position: static;
-      padding: 0;
-
-      .nut-icon {
-        margin-left: 12px;
+  &-right {
+    padding-left: 16px;
+    justify-content: flex-end;
+    gap: 16px;
 
-        &:first-child {
-          margin-left: 0;
-        }
-      }
-    }
-    .nut-navbar-right {
-      position: static;
-      display: inline-flex;
-      white-space: nowrap;
+    &-rtl {
+      padding-right: 16px;
       padding-left: 0;
     }
-    .nut-navbar-left-back {
-      margin-right: 0;
-    }
-
-    .nut-navbar-title {
-      min-width: 0;
-      margin: 0;
-      flex: 1;
-      justify-content: flex-start;
-      padding: 0 8px;
-      text-align: left;
-    }
-  }
-}
-
-[dir='rtl'] .nut-navbar,
-.nut-rtl .nut-navbar {
-  &-fixed {
-    left: auto;
-    right: 0;
   }
 
-  &-left {
-    left: auto;
-    right: 0;
+  &-rtl {
     .nut-icon-ArrowLeft {
       transform: rotateY(180deg);
     }
-    &-back {
-      margin-right: 0;
-      margin-left: 10px;
-    }
-  }
-
-  &-right {
-    right: auto;
-    left: 0;
-    .nut-icon {
-      margin-left: 0;
-      margin-right: 12px;
-
-      &:first-child {
-        margin-left: 0;
-        margin-right: 0;
-      }
-    }
-  }
-
-  &-title-align-left {
-    .nut-navbar-left {
-      .nut-icon-ArrowLeft {
-        margin-left: 0;
-        margin-right: 12px;
-
-        &:first-child {
-          margin-left: 0;
-          margin-right: 0;
-        }
-      }
-    }
-
-    .nut-navbar-left-back {
-      margin-right: 0;
-      margin-left: 0;
-    }
   }
 }

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

@@ -1,58 +1,66 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-navbar {
   width: var(--nutui-navbar-width, 100%);
   position: relative;
   display: flex;
+  flex-direction: row;
+  justify-content: space-between;
   align-items: center;
   height: var(--nutui-navbar-height, 44px);
   box-sizing: border-box;
-  background: var(--nutui-navbar-background, var(--nutui-color-background, #f5f6fa));
-  box-shadow: var(--nutui-navbar-box-shadow, 0px);
   font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
-  margin-bottom: var(--nutui-navbar-margin-bottom, 20px);
+  color: var(--nutui-navbar-color, var(--nutui-gray-7));
   overflow: hidden;
+  padding: 0 16px;
 }
 .nut-navbar-fixed {
   position: fixed;
   top: 0;
   left: 0;
+  right: 0;
   width: 100%;
 }
 .nut-navbar-placeholder {
   display: inline-block;
   width: 100%;
 }
+.nut-navbar-safe-area-inset-top {
+  padding-top: constant(safe-area-inset-top);
+  padding-top: env(safe-area-inset-top);
+}
+.nut-navbar-title-wrapper {
+  justify-content: space-between;
+}
 .nut-navbar-title {
-  min-width: 53%;
-  margin: 0 auto;
+  height: 100%;
   text-align: center;
   display: flex;
+  flex: 1;
+  flex-direction: row;
   align-items: center;
-  justify-content: center;
   font-size: var(--nutui-navbar-title-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-navbar-title-font-weight, var(--nutui-font-weight-bold, 600));
-  color: var(--nutui-navbar-title-font-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-navbar-title-font-color, var(--nutui-gray-7));
 }
-.nut-navbar-title .nut-tabs-titles {
-  background: transparent;
-}
-.nut-navbar-title .nut-tabs-titles-item-text {
-  color: var(--nutui-color-title, #1a1a1a);
-}
-.nut-navbar-title .nut-tabpane {
-  display: none;
+.nut-navbar-title-center {
+  max-width: 129px;
+  justify-content: center;
 }
 .nut-navbar-title ::-webkit-scrollbar {
   display: none;
 }
 .nut-navbar-left, .nut-navbar-right {
-  position: absolute;
-  top: 0;
-  bottom: 0;
   display: flex;
   align-items: center;
+  flex-direction: row;
+  max-width: 124px;
+  height: 100%;
   cursor: pointer;
-  padding: 0 14px;
+  /* #ifndef rn harmony jd h5 weapp*/
+  /* #endif */
 }
 .nut-navbar-left .nut-icon,
 .nut-navbar-left .nutui-iconfont, .nut-navbar-right .nut-icon,
@@ -61,101 +69,38 @@
   height: 20px;
   font-size: 20px;
 }
+.nut-navbar-left-maxwidth, .nut-navbar-right-maxwidth {
+  box-sizing: border-box;
+  width: 108px;
+}
 .nut-navbar-left {
-  left: 0;
+  padding-right: 16px;
+  gap: 16px;
+}
+.nut-navbar-left-rtl {
+  padding-right: 0;
+  padding-left: 16px;
 }
 .nut-navbar-left-back {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
-  margin-right: 10px;
-}
-.nut-navbar-right {
-  right: 0;
+  gap: 16px;
 }
-.nut-navbar-right .nut-icon {
-  margin-left: 12px;
-}
-.nut-navbar-right .nut-icon:first-child {
-  margin-left: 0;
-}
-.nut-navbar-title-align-left {
-  padding-left: 14px;
-}
-.nut-navbar-title-align-left .nut-navbar-left {
-  position: static;
-  padding: 0;
-}
-.nut-navbar-title-align-left .nut-navbar-left .nut-icon {
-  margin-left: 12px;
-}
-.nut-navbar-title-align-left .nut-navbar-left .nut-icon:first-child {
-  margin-left: 0;
-}
-.nut-navbar-title-align-left .nut-navbar-right {
-  position: static;
-  display: inline-flex;
-  white-space: nowrap;
+.nut-navbar-left-hidden {
   padding-left: 0;
+  padding-right: 0;
 }
-.nut-navbar-title-align-left .nut-navbar-left-back {
-  margin-right: 0;
-}
-.nut-navbar-title-align-left .nut-navbar-title {
-  min-width: 0;
-  margin: 0;
-  flex: 1;
-  justify-content: flex-start;
-  padding: 0 8px;
-  text-align: left;
-}
-
-[dir=rtl] .nut-navbar-fixed,
-.nut-rtl .nut-navbar-fixed {
-  left: auto;
-  right: 0;
+.nut-navbar-right {
+  padding-left: 16px;
+  justify-content: flex-end;
+  gap: 16px;
 }
-[dir=rtl] .nut-navbar-left,
-.nut-rtl .nut-navbar-left {
-  left: auto;
-  right: 0;
+.nut-navbar-right-rtl {
+  padding-right: 16px;
+  padding-left: 0;
 }
-[dir=rtl] .nut-navbar-left .nut-icon-ArrowLeft,
-.nut-rtl .nut-navbar-left .nut-icon-ArrowLeft {
+.nut-navbar-rtl .nut-icon-ArrowLeft {
   transform: rotateY(180deg);
-}
-[dir=rtl] .nut-navbar-left-back,
-.nut-rtl .nut-navbar-left-back {
-  margin-right: 0;
-  margin-left: 10px;
-}
-[dir=rtl] .nut-navbar-right,
-.nut-rtl .nut-navbar-right {
-  right: auto;
-  left: 0;
-}
-[dir=rtl] .nut-navbar-right .nut-icon,
-.nut-rtl .nut-navbar-right .nut-icon {
-  margin-left: 0;
-  margin-right: 12px;
-}
-[dir=rtl] .nut-navbar-right .nut-icon:first-child,
-.nut-rtl .nut-navbar-right .nut-icon:first-child {
-  margin-left: 0;
-  margin-right: 0;
-}
-[dir=rtl] .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft,
-.nut-rtl .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft {
-  margin-left: 0;
-  margin-right: 12px;
-}
-[dir=rtl] .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft:first-child,
-.nut-rtl .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft:first-child {
-  margin-left: 0;
-  margin-right: 0;
-}
-[dir=rtl] .nut-navbar-title-align-left .nut-navbar-left-back,
-.nut-rtl .nut-navbar-title-align-left .nut-navbar-left-back {
-  margin-right: 0;
-  margin-left: 0;
 }

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-noticebar {
   width: 100%;
 }

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

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 /*入场动画开始*/
 .fade-enter {
   opacity: 0;
@@ -69,17 +73,17 @@
   bottom: 0;
 }
 .nut-notify-base {
-  background: var(--nutui-notify-base-background-color, var(--nutui-color-primary, #ff0f23));
+  background: var(--nutui-notify-base-background-color, var(--nutui-brand-6));
 }
 .nut-notify-primary {
   background: var(--nutui-notify-primary-background-color, var(--nutui-color-info, #0073ff));
 }
 .nut-notify-success {
-  background: var(--nutui-notify-success-background-color, var(--nutui-color-success, #00d900));
+  background: var(--nutui-notify-success-background-color, var(--nutui-green-2));
 }
 .nut-notify-danger {
-  background: var(--nutui-notify-danger-background-color, var(--nutui-color-primary, #ff0f23));
+  background: var(--nutui-notify-danger-background-color, var(--nutui-brand-6));
 }
 .nut-notify-warning {
-  background: var(--nutui-notify-warning-background-color, var(--nutui-color-warning, #ffbf00));
+  background: var(--nutui-notify-warning-background-color, var(--nutui-yellow-2));
 }

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

@@ -1,55 +1,15 @@
 import React, { FunctionComponent, ReactNode } from 'react';
 import { PopupProps } from "../popup/popup";
 export interface NumberKeyboardProps extends PopupProps {
-    /**
-    * 是否显示键盘
-    * @default false
-    */
-    visible: boolean
-    /**
-    * 标题右侧内容
-    * @default -
-    */
-    rightActions: ReactNode
-    /**
-    * 自定义完成按钮文字，如"支付"，"下一步"，"提交"等，搭配 rightColumn 使用
-    * @default 完成
-    */
-    confirmText?: string
-    /**
-    * 键盘模式, default：默认样式 rightColumn：带右侧栏
-    * @default default
-    */
-    type: 'default' | 'rightColumn'
-    /**
-    * 自定义键盘额外的键, 数组形式最多支持添加 2 个, 超出默认取前 2 项
-    * @default -
-    */
-    custom: Array<string>
-    /**
-    * 随机数
-    * @default false
-    */
-    random: boolean
-    /**
-    * 点击按键时触发
-    * @default -
-    */
-    onChange?: (value: string) => void
-    /**
-    * 点击删除键时触发
-    * @default -
-    */
-    onDelete?: () => void
-    /**
-    * 点击关闭按钮或非键盘区域时触发
-    * @default -
-    */
-    onClose: () => void
-    /**
-    * 点击确定按钮时触发
-    * @default -
-    */
-    onConfirm?: () => void
+    visible: boolean;
+    rightActions: ReactNode;
+    confirmText?: string;
+    type: 'default' | 'rightColumn';
+    custom: Array<string>;
+    random: boolean;
+    onChange?: (value: string) => void;
+    onDelete?: () => void;
+    onClose: () => void;
+    onConfirm?: () => void;
 }
 export declare const NumberKeyboard: FunctionComponent<Partial<NumberKeyboardProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange' | 'onClick' | 'title'>>;

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

@@ -17,12 +17,15 @@
     &-title {
       color: $color-title;
       display: inline-block;
+      font-size: $popup-title-font-size;
     }
 
     &-close {
       position: absolute;
       display: block;
       right: 0;
+      top: 50%;
+      transform: translateY(-50%);
       padding: $numberkeyboard-header-close-padding;
       color: $numberkeyboard-header-close-color;
       font-size: $numberkeyboard-header-close-font-size;
@@ -45,7 +48,12 @@
     &-wrapper {
       position: relative;
       flex: 1;
+      /* #ifdef harmony */
+      width: 33%;
+      /* #endif */
+      /* #ifndef harmony */
       flex-basis: 33%;
+      /* #endif */
       box-sizing: border-box;
       padding: 0 6px 6px 0;
       background-color: $numberkeyboard-wrapper-background-color;
@@ -74,9 +82,10 @@
   &-sidebar {
     display: flex;
     flex: 1;
+    flex-basis: 33%;
     flex-direction: column;
-
     .nut-numberkeyboard-body-wrapper {
+      width: 100%;
       .key {
         position: absolute;
         top: 0;