@nutui/nutui-react-taro 3.0.0-beta.1 → 3.0.0-beta.10

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/noticebar.d.ts

@@ -36,7 +36,7 @@ export interface NoticeBarProps extends BasicComponent {
     */
     leftIcon: ReactNode
     /**
-    * closeable 模式下，默认为 <Close />
+    * 右边的 icon，在 closeable 模式下默认为 <Close />
     * @default -
     */
     rightIcon: ReactNode

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/numberkeyboard.js

@@ -10,6 +10,7 @@ import { View } from "@tarojs/components";
 import Popup from "../popup/index";
 import { useConfig } from "../configprovider/configprovider";
 import { ComponentDefaults } from "../../utils/typings";
+import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,
     rightActions: '',
@@ -20,7 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 export var NumberKeyboard = function(props) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps, props), title = _ref.title, rightActions = _ref.rightActions, confirmText = _ref.confirmText, visible = _ref.visible, type = _ref.type, custom = _ref.custom, random = _ref.random, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onDelete = _ref.onDelete, onClose = _ref.onClose, onConfirm = _ref.onConfirm, rest = _object_without_properties(_ref, [
+    var _mergeProps = mergeProps(defaultProps, props), title = _mergeProps.title, rightActions = _mergeProps.rightActions, confirmText = _mergeProps.confirmText, visible = _mergeProps.visible, type = _mergeProps.type, custom = _mergeProps.custom, random = _mergeProps.random, style = _mergeProps.style, className = _mergeProps.className, onChange = _mergeProps.onChange, onDelete = _mergeProps.onDelete, onClose = _mergeProps.onClose, onConfirm = _mergeProps.onConfirm, rest = _object_without_properties(_mergeProps, [
         "title",
         "rightActions",
         "confirmText",
@@ -88,8 +89,8 @@ export var NumberKeyboard = function(props) {
         var style = {
             background: "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAnCAYAAABJ0cukAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozOUNBQTQ0MkY3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozOUNBQTQ0M0Y3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjM5Q0FBNDQwRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjM5Q0FBNDQxRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T12ahwAABClJREFUeNrUWVtIFFEY3pkdrbaCiAINK81VW3d2102pjKLtoXoJrNAswoeEXoyilx7sJXvIh6CHAoMg6yEfSpdECIqE0jCMbMm9qCVYUmR5S8huXmZO39nWOI7mzsy6uzqgM/vvzNnv+y/n/84ZjhBiWMwHF+kA+fn5y0ZHRzNwuTomgDnui9/vfzMvBJxWa7bE87W4tMbY8S8MhNz0BQLVugnY7fZdGORZPNNHJmSPUSf47QD/PN75z3NcpqD1IVEU8wC+dZojDIajyMu6WAG322zBmQf/7LzGnHeAdRtjmuAIKYoleMWxQnUEHA6HVZLldsb0m3oehdQQzzQSVILPJLIcYEw/4HkK/kG86yAsAZvNtgng3059hte/Gf56/uFCaGR8mIJdj3m2hzGNGAkpRM4vCPBzErBYLMko2A//DIQMoQ0WtgcCjWFnCVGswEzxCecqLc0y9Nyww2ariYhAbm7umgRB6GNM/QTgfT7fEzWD4t7dOK0D4TKAcrtcLkENeNx/gUoSpOnx4Gc9BHJyclZNjI8PMqY+judp2jSr1iuENDPi5fDX4WG32WxeogL81NGRIEk3NBNAh10uS9IIY/oIbxR6vd4WLXmJAq9Ayl1kTAUmk8mNyJrUgDfK8hFPV9dnTQSCHiLkO/Ndb8jzrXqKawYJQg4gsu6srKyV4cC/7ujo1CqneRSPxNh74PligPdE3PYVIDHuY6PRWCxPTp7VC35KSvwjwBpwdPP4gXYc86ZdZnr6Pf7S9HqexUs9z0qBLprz8wn+PzWRFknaKGsgjwlvCdLGH42GQ0lg+dqkMP+Enj+lF/yMWYgnJD1qEhhphOWgS2E2yQZDJWa/lEgIvGIa0D2HKJZGA7yiBgaZqO9AermdFstGXQR8fn+BootW4wfPRBE8zXmXoia2SYLgpsJRVwqBBJ2N+pnueRVhPR8l8MGCnaWw8wDCDSWQoasGQCKJnpjGcwkkKqMBfo7ZyQklQCOxWVcRg4QDXmhkSJRjsGvRAD8HCTuNhNPpXKtLzHn9/n0orBqm052GvL2lcfepTMs8PwsJqyRJRbrlNFpBCUBcYWaKE2h4tampqUtV6pP60HNtapuUksTY2NidiLcWUQPnMOhlxvQoITGxxOPxDIVdR2dnb/V2dr7Umn50/Q31261JC4UhUQYSVUxdtPCCUAK10RuvZeQ0LRQ2tD7fddxdyuT3TijJehATF/yinqmJ2wB+jCGRA11TH9xiXAwEQpG4i0gcZHLPjHSqF0Vx76IgEIpEA9a7+3H5K2RK4jnuPvTToXgR0LW9Htpap71iAzPVNsUIMH0XMdXkfLrfD9BdanifksiKW/5w3Emj3mcHBgb6kpKTn6KYzfBCehzg10H6lHPzMdIWq9U8znEpsXE6N4rTO9TjSGgPanG/pfwjwABn1PZcM5XI0AAAAABJRU5ErkJggg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLTkwMjA5MzIyMjIxMzkzMzc2NzAwNjg0MC0tDQo=') no-repeat center",
             backgroundSize: '100% 100%',
-            width: '28px',
-            height: '24px'
+            width: 28,
+            height: 24
         };
         return /*#__PURE__*/ React.createElement(View, {
             style: style
@@ -125,7 +126,7 @@ export var NumberKeyboard = function(props) {
             switch(item.type){
                 case 'num':
                 case 'custom':
-                    return /*#__PURE__*/ React.createElement(View, null, item.id);
+                    return /*#__PURE__*/ React.createElement(React.Fragment, null, item.id);
                 case 'delete':
                     return /*#__PURE__*/ React.createElement(DeleteIcon, null);
                 case 'close':
@@ -176,7 +177,7 @@ export var NumberKeyboard = function(props) {
         className: "".concat(classPrefix, "-header")
     }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-header-title")
-    }, title), type === 'default' && /*#__PURE__*/ React.createElement("span", {
+    }, title), type === 'default' && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-header-close"),
         onClick: onConfirm
     }, rightActions || locale.done)), /*#__PURE__*/ React.createElement(View, {

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;