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

package/dist/cjs/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%;
   }
 
@@ -29,27 +30,24 @@
     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;
     }
   }
 
@@ -59,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/cjs/packages/navbar/style/style.css

@@ -1,21 +1,26 @@
+/* #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-gray-3, #f5f6fa));
-  box-shadow: var(--nutui-navbar-box-shadow, 0px);
-  font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-navbar-color, var(--nutui-gray-7, #1a1a1a));
-  margin-bottom: var(--nutui-navbar-margin-bottom, 20px);
+  font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
+  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 {
@@ -26,37 +31,36 @@
   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-6, 20px));
-  font-weight: var(--nutui-navbar-title-font-weight, var(--nutui-font-weight-bold, 500));
-  color: var(--nutui-navbar-title-font-color, var(--nutui-gray-7, #1a1a1a));
+  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-gray-7));
 }
-.nut-navbar-title .nut-tabs-titles {
-  background: transparent;
-}
-.nut-navbar-title .nut-tabs-titles-item-text {
-  color: var(--nutui-gray-7, #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,
@@ -65,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/cjs/packages/noticebar/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-noticebar {
   width: 100%;
 }
@@ -7,7 +11,7 @@
   align-items: center;
   height: var(--nutui-noticebar-height, 36px);
   padding: var(--nutui-noticebar-box-padding, 0 16px);
-  font-size: var(--nutui-noticebar-font-size, var(--nutui-font-size-2, 12px));
+  font-size: var(--nutui-noticebar-font-size, var(--nutui-font-size-s, 12px));
   background: var(--nutui-noticebar-background, rgb(251, 248, 220));
   color: var(--nutui-noticebar-color, #d9500b);
   border-radius: var(--nutui-noticebar-border-radius, 0);
@@ -84,7 +88,7 @@
   display: flex;
   justify-content: space-between;
   height: var(--nutui-noticebar-height, 36px);
-  font-size: var(--nutui-noticebar-font-size, var(--nutui-font-size-2, 12px));
+  font-size: var(--nutui-noticebar-font-size, var(--nutui-font-size-s, 12px));
   overflow: hidden;
   padding: var(--nutui-noticebar-box-padding, 0 16px);
   background: var(--nutui-noticebar-background, rgb(251, 248, 220));

package/dist/cjs/packages/notify/notify.js

@@ -32,6 +32,7 @@ var _components = require("@tarojs/components");
 var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
 var _typings = require("../../utils/typings");
 var _usecustomevent = require("../../utils/use-custom-event");
+var _mergeprops = require("../../utils/merge-props");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     id: '',
     duration: 3000,
@@ -43,12 +44,13 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var classPrefix = 'nut-notify';
 var Notify = function Notify(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), id = _$_object_spread.id, children = _$_object_spread.children, style = _$_object_spread.style, type = _$_object_spread.type, className = _$_object_spread.className, position = _$_object_spread.position, visible = _$_object_spread.visible, duration = _$_object_spread.duration, onClose = _$_object_spread.onClose, onClick = _$_object_spread.onClick;
+    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, props), id = _mergeProps.id, children = _mergeProps.children, style = _mergeProps.style, type = _mergeProps.type, className = _mergeProps.className, position = _mergeProps.position, visible = _mergeProps.visible, duration = _mergeProps.duration, onClose = _mergeProps.onClose, onClick = _mergeProps.onClick;
     (0, _usecustomevent.useCustomEvent)(id, function(status) {
         status ? show() : hide();
     });
     var timer;
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), showNotify = _useState[0], setShowNotify = _useState[1];
+    var cssRef = (0, _react.useRef)(null);
     (0, _react.useEffect)(function() {
         if (visible) {
             show();
@@ -83,6 +85,7 @@ var Notify = function Notify(props) {
     var _obj;
     var classes = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-popup-top"), position === 'top'), (0, _define_property._)(_obj, "".concat(classPrefix, "-popup-bottom"), position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(type), true), _obj));
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, _taro.default.getEnv() !== _taro.default.ENV_TYPE.RN ? /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
+        nodeRef: cssRef,
         in: showNotify,
         timeout: 300,
         classNames: "fade",
@@ -112,7 +115,6 @@ function close(selector) {
     var path = (0, _usecustomevent.useCustomEventsPath)(selector);
     _usecustomevent.customEvents.trigger(path, false);
 }
-Notify.defaultProps = defaultProps;
 Notify.displayName = 'NutNotify';
 Notify.open = open;
 Notify.close = close;

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

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 /*入场动画开始*/
 .fade-enter {
   opacity: 0;
@@ -49,7 +53,7 @@
   box-sizing: border-box;
   padding: var(--nutui-notify-padding, 0px 10px);
   color: var(--nutui-notify-text-color, #ffffff);
-  font-size: var(--nutui-notify-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-notify-font-size, var(--nutui-font-size-base, 14px));
   white-space: pre-wrap;
   word-wrap: break-word;
   height: var(--nutui-notify-height, 40px);
@@ -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, #1988fa));
+  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, #2aa32a));
+  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, #c47600));
+  background: var(--nutui-notify-warning-background-color, var(--nutui-yellow-2));
 }

package/dist/cjs/packages/numberkeyboard/numberkeyboard.js

@@ -22,6 +22,7 @@ var _components = require("@tarojs/components");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
 var _configprovider = require("../configprovider/configprovider");
 var _typings = require("../../utils/typings");
+var _mergeprops = require("../../utils/merge-props");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     visible: false,
     rightActions: '',
@@ -32,7 +33,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var NumberKeyboard = function NumberKeyboard(props) {
     var locale = (0, _configprovider.useConfig)().locale;
-    var title = props.title, rightActions = props.rightActions, confirmText = props.confirmText, visible = props.visible, type = props.type, custom = props.custom, random = props.random, style = props.style, className = props.className, onChange = props.onChange, onDelete = props.onDelete, onClose = props.onClose, onConfirm = props.onConfirm, rest = (0, _object_without_properties._)(props, [
+    var _mergeProps = (0, _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 = (0, _object_without_properties._)(_mergeProps, [
         "title",
         "rightActions",
         "confirmText",
@@ -100,8 +101,8 @@ var NumberKeyboard = function NumberKeyboard(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.default.createElement(_components.View, {
             style: style
@@ -115,23 +116,45 @@ var NumberKeyboard = function NumberKeyboard(props) {
         };
         var onTouchEnd = function onTouchEnd(item) {
             setActive(false);
-            if (item.type === 'num' || item.type === 'custom') {
-                onChange && onChange(item.id);
+            switch(item.type){
+                case 'num':
+                case 'custom':
+                    onChange === null || onChange === void 0 ? void 0 : onChange(item.id);
+                    break;
+                case 'close':
+                    onClose === null || onClose === void 0 ? void 0 : onClose();
+                    break;
+                case 'delete':
+                    onDelete === null || onDelete === void 0 ? void 0 : onDelete();
+                    break;
+                case 'confirm':
+                    onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
+                    break;
+                default:
+                    break;
             }
-            if (item.type === 'close') {
-                onClose && onClose();
-            }
-            if (item.type === 'delete') {
-                onDelete && onDelete();
-            }
-            if (item.type === 'confirm') {
-                onConfirm && onConfirm();
+        };
+        var renderContent = function renderContent(item) {
+            switch(item.type){
+                case 'num':
+                case 'custom':
+                    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, item.id);
+                case 'delete':
+                    return /*#__PURE__*/ _react.default.createElement(DeleteIcon, null);
+                case 'close':
+                    return /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.ArrowDown, {
+                        size: 18
+                    });
+                case 'confirm':
+                    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, confirmText || locale.done);
+                default:
+                    return null;
             }
         };
-        return /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             key: item.id,
             className: "".concat(classPrefix, "-body-wrapper")
-        }, /*#__PURE__*/ _react.default.createElement("div", {
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: (0, _classnames.default)({
                 key: true,
                 active: active,
@@ -148,11 +171,9 @@ var NumberKeyboard = function NumberKeyboard(props) {
             onTouchCancel: function onTouchCancel() {
                 return onTouchEnd(item);
             }
-        }, (item.type === 'num' || item.type === 'custom') && /*#__PURE__*/ _react.default.createElement("div", null, item.id), item.type === 'delete' && /*#__PURE__*/ _react.default.createElement(DeleteIcon, null), item.type === 'close' && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.ArrowDown, {
-            size: 18
-        }), item.type === 'confirm' && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, confirmText || locale.done)));
+        }, renderContent(item)));
     };
-    return /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread._)({
+    return /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
         visible: visible,
         position: "bottom",
         onOverlayClick: onClose,
@@ -161,26 +182,26 @@ var NumberKeyboard = function NumberKeyboard(props) {
         overlayStyle: {
             backgroundColor: 'rgba(0, 0, 0, 0)'
         }
-    }, rest), /*#__PURE__*/ _react.default.createElement("div", {
+    }), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)(classPrefix, className),
         style: style
-    }, title && /*#__PURE__*/ _react.default.createElement("div", {
+    }, title && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-header")
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-header-title")
-    }, title), type === 'default' && /*#__PURE__*/ _react.default.createElement("span", {
+    }, title), type === 'default' && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-header-close"),
         onClick: onConfirm
-    }, rightActions || locale.done)), /*#__PURE__*/ _react.default.createElement("div", {
+    }, rightActions || locale.done)), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-body")
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-body-keys")
     }, keysList === null || keysList === void 0 ? void 0 : keysList.map(function(item) {
         return /*#__PURE__*/ _react.default.createElement(NumberKeyboardKey, {
             key: item.id,
             item: item
         });
-    })), type === 'rightColumn' && /*#__PURE__*/ _react.default.createElement("div", {
+    })), type === 'rightColumn' && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-sidebar")
     }, /*#__PURE__*/ _react.default.createElement(NumberKeyboardKey, {
         key: "delete",