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

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

@@ -12,7 +12,7 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -25,9 +25,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -63,17 +60,23 @@
 }
 
 .nut-popup {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   min-height: 26%;
   max-height: 100%;
   overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
+  color: var(--nutui-color-title, #1a1a1a);
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
@@ -85,26 +88,30 @@
   left: var(--nutui-popup-title-padding, 16px);
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: var(--nutui-font-weight-bold, 600);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  color: var(--nutui-color-text-help, #888b94);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-right {
-  position: absolute !important;
+  position: absolute;
   z-index: 1;
   cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
+  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
+  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
   display: flex;
   justify-content: center;
   align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #888b94);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,7 +132,9 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  /* #ifndef rn */
   transform: translate(-50%, -50%);
+  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px);
@@ -137,6 +146,9 @@
   bottom: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 300px;
+  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -144,6 +156,10 @@
 .nut-popup-right {
   top: 0;
   right: 0;
+  /* #ifdef rn */
+  width: 100px;
+  height: 100%;
+  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
@@ -151,6 +167,10 @@
 .nut-popup-left {
   top: 0;
   left: 0;
+  /* #ifdef rn */
+  width: 100px;
+  height: 100%;
+  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
   border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
@@ -159,6 +179,9 @@
   top: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 100px;
+  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
   border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
@@ -227,16 +250,22 @@
 }
 @keyframes popup-slide-top-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
+    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
+  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
+  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -248,16 +277,22 @@
 }
 @keyframes popup-slide-right-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
+    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
+    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
+  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
+  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -269,16 +304,22 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
+    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
+  /* #ifndef rn */
   transform: translate(0, 0);
+  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -290,12 +331,16 @@
 }
 @keyframes popup-slide-left-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
+    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -313,7 +358,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -349,7 +394,9 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
+  /* #ifndef rn */
   transform: translate(50%, -50%);
+  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -366,7 +413,7 @@
   width: 100%;
   padding: var(--nutui-numberkeyboard-padding, 0 0 22px 0);
   user-select: none;
-  background-color: var(--nutui-numberkeyboard-background-color, var(--nutui-gray-3, #f5f6fa));
+  background-color: var(--nutui-numberkeyboard-background-color, var(--nutui-color-background, #f5f6fa));
 }
 .nut-numberkeyboard-header {
   position: relative;
@@ -375,11 +422,11 @@
   justify-content: center;
   box-sizing: content-box;
   padding: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  color: var(--nutui-color-title, #1a1a1a);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-numberkeyboard-header-title {
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-color-title, #1a1a1a);
   display: inline-block;
 }
 .nut-numberkeyboard-header-close {
@@ -387,7 +434,7 @@
   display: block;
   right: 0;
   padding: var(--nutui-numberkeyboard-header-close-padding, 0 16px);
-  color: var(--nutui-numberkeyboard-header-close-color, var(--nutui-gray-6, #505259));
+  color: var(--nutui-numberkeyboard-header-close-color, var(--nutui-color-text, #505259));
   font-size: var(--nutui-numberkeyboard-header-close-font-size, 14px);
   background-color: var(--nutui-numberkeyboard-header-close-background-color, transparent);
   border: none;
@@ -408,20 +455,20 @@
   flex-basis: 33%;
   box-sizing: border-box;
   padding: 0 6px 6px 0;
-  background-color: var(--nutui-numberkeyboard-wrapper-background-color, var(--nutui-gray-2, #f7f8fc));
+  background-color: var(--nutui-numberkeyboard-wrapper-background-color, var(--nutui-color-background-sunken, #f7f8fc));
 }
 .nut-numberkeyboard-body-wrapper .key {
   display: flex;
   align-items: center;
   justify-content: center;
   height: var(--nutui-numberkeyboard-key-height, 48px);
-  font-size: var(--nutui-numberkeyboard-key-font-size, var(--nutui-font-size-6, 20px));
+  font-size: var(--nutui-numberkeyboard-key-font-size, var(--nutui-font-size-xl, 18px));
   line-height: var(--nutui-numberkeyboard-key-line-height, 1.5);
   background-color: var(--nutui-numberkeyboard-key-background-color, #fff);
-  color: var(--nutui-numberkeyboard-key-color, var(--nutui-gray-6, #505259));
+  color: var(--nutui-numberkeyboard-key-color, var(--nutui-color-text, #505259));
   border-radius: var(--nutui-numberkeyboard-key-border-radius, 8px);
   border: var(--nutui-numberkeyboard-key-border, none);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  font-weight: var(--nutui-font-weight-bold, 600);
   cursor: pointer;
 }
 .nut-numberkeyboard-body-wrapper .key.active {
@@ -441,7 +488,7 @@
   height: auto;
 }
 .nut-numberkeyboard-sidebar .nut-numberkeyboard-body-wrapper .confirm {
-  font-size: var(--nutui-numberkeyboard-key-confirm-font-size, var(--nutui-font-size-4, 16px));
+  font-size: var(--nutui-numberkeyboard-key-confirm-font-size, var(--nutui-font-size-l, 16px));
   color: var(--nutui-numberkeyboard-key-confirm-color, #fff);
   background-color: var(--nutui-numberkeyboard-key-confirm-background-color, var(--nutui-color-primary, #ff0f23));
 }

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

@@ -23,10 +23,6 @@
 
 .nut-overflow-hidden {
   overflow: hidden !important;
-
-  .taro_page {
-    overflow: hidden !important;
-  }
 }
 
 .nut-overlay-slide {

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

@@ -11,7 +11,7 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -24,9 +24,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {

package/dist/es/packages/overlay/style/style.harmony.css

@@ -1,5 +1,10 @@
 .nut-overlay {
+  /* #ifdef rn */
   position: absolute;
+  /* #endif */
+  /* #ifndef rn */
+  position: fixed;
+  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
@@ -19,9 +24,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {

package/dist/es/packages/pagination/pagination.js

@@ -94,7 +94,6 @@ export var Pagination = function(props) {
         itemSize,
         pageCount
     ]);
-    // 点击选择 page
     var handleSelectPage = function(curPage) {
         if (curPage > pageCount || curPage < 1) return;
         setCurrentPage(curPage);
@@ -126,12 +125,12 @@ export var Pagination = function(props) {
         onClick: function(e) {
             return handleSelectPage(currentPage + 1);
         }
-    }, next || locale.pagination.next)), mode === 'lite' && /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
+    }, next || locale.pagination.next)), mode === 'lite' && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-lite")
     }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-lite-active")
     }, currentPage), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-lite-default")
-    }, pageCount))));
+    }, pageCount)));
 };
 Pagination.displayName = 'NutPagination';

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

@@ -83,13 +83,13 @@
   justify-content: center;
   width: $pagination-lite-height;
   height: $pagination-lite-height;
-  font-size: $font-size-small;
+  font-size: $font-size-s;
   color: $pagination-lite-color;
   font-weight: 400;
 }
 
 .nut-pagination-lite-active {
   border-radius: $pagination-lite-radius;
-  font-size: $font-size-small;
+  font-size: $font-size-s;
   background-color: $pagination-lite-active-background-color;
 }

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

@@ -1,7 +1,7 @@
 .nut-pagination {
   display: flex;
   flex-direction: row;
-  font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-pagination-color, var(--nutui-color-primary, #ff0f23));
 }
 
@@ -15,11 +15,11 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-pagination-color, var(--nutui-color-primary, #ff0f23));
   background: #ffffff;
   border-radius: var(--nutui-pagination-item-border-radius, 2px);
-  border: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   cursor: pointer;
 }
 
@@ -57,12 +57,12 @@
   width: 124px;
   line-height: 39px;
   text-align: center;
-  font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-pagination-color, var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-pagination-simple-border {
-  border-right: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border-right: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 
 .nut-pagination-lite {
@@ -82,13 +82,13 @@
   justify-content: center;
   width: var(--nutui-pagination-lite-height, 20px);
   height: var(--nutui-pagination-lite-height, 20px);
-  font-size: var(--nutui-font-size-2, 12px);
+  font-size: var(--nutui-font-size-s, 12px);
   color: var(--nutui-pagination-lite-color, #ffffff);
   font-weight: 400;
 }
 
 .nut-pagination-lite-active {
   border-radius: var(--nutui-pagination-lite-radius, 6px);
-  font-size: var(--nutui-font-size-2, 12px);
+  font-size: var(--nutui-font-size-s, 12px);
   background-color: var(--nutui-pagination-lite-active-background-color, var(--nutui-black-5));
 }

package/dist/es/packages/picker/picker.js

@@ -259,18 +259,18 @@ var InternalPicker = function(props, ref) {
         }, 0);
     };
     var renderTitleBar = function() {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-control")
-        }, /*#__PURE__*/ React.createElement("span", {
+        }, /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-cancel-btn"),
             onClick: function(e) {
                 e.stopPropagation();
                 onCancel === null || onCancel === void 0 ? void 0 : onCancel();
                 setInnerVisible(false);
             }
-        }, locale === null || locale === void 0 ? void 0 : locale.cancel), /*#__PURE__*/ React.createElement("div", {
+        }, locale === null || locale === void 0 ? void 0 : locale.cancel), /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-title")
-        }, title || ''), /*#__PURE__*/ React.createElement("span", {
+        }, title || ''), /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-confirm-btn"),
             onClick: function(e) {
                 e.stopPropagation();
@@ -317,7 +317,7 @@ var InternalPicker = function(props, ref) {
         style: style
     }, rest), {
         catchMove: true
-    }), renderTitleBar(), typeof children !== 'function' && children, /*#__PURE__*/ React.createElement("div", {
+    }), renderTitleBar(), typeof children !== 'function' && children, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-panel"),
         ref: pickerRef
     }, Taro.getEnv() === 'WEB' ? columnsList === null || columnsList === void 0 ? void 0 : columnsList.map(function(item, index) {

package/dist/es/packages/picker/pickerpanel.js

@@ -2,6 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
+import { View } from "@tarojs/components";
 import { useTouch } from "../../utils/use-touch";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
 import { passiveSupported } from "../../utils/supports-passive";
@@ -152,7 +153,7 @@ var InternalPickerPanel = function(props, ref) {
             event.stopPropagation();
         }
     };
-    var getReference = function() {
+    var getReference = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
             var refe;
             return _ts_generator(this, function(_state) {
@@ -227,16 +228,16 @@ var InternalPickerPanel = function(props, ref) {
             element.removeEventListener('touchend', touchEnd, eventOptions);
         };
     });
-    return /*#__PURE__*/ React.createElement("div", {
+    return /*#__PURE__*/ React.createElement(View, {
         className: "nut-picker-list",
         ref: pickerPanelRef
-    }, /*#__PURE__*/ React.createElement("div", {
+    }, /*#__PURE__*/ React.createElement(View, {
         className: "nut-picker-roller",
         ref: rollerRef,
         style: threeDimensional ? touchRollerStyle() : touchTileStyle(),
         onTransitionEnd: stopMomentum
     }, threeDimensional && options.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "nut-picker-roller-item ".concat(isHidden(index + 1) && 'nut-picker-roller-item-hidden'),
             style: {
                 transform: "rotate3d(1, 0, 0, ".concat(-rotation * (index + 1), "deg) translate3d(0px, 0px, 104px)"),
@@ -246,7 +247,7 @@ var InternalPickerPanel = function(props, ref) {
             key: item.value ? item.value : index
         }, /*#__PURE__*/ React.createElement(React.Fragment, null, item.text));
     }), !threeDimensional && options.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "nut-picker-roller-item-title",
             key: item.value ? item.value : index,
             style: {
@@ -254,9 +255,9 @@ var InternalPickerPanel = function(props, ref) {
                 lineHeight: "".concat(lineSpacing.current, "px")
             }
         }, /*#__PURE__*/ React.createElement(React.Fragment, null, item.text));
-    })), /*#__PURE__*/ React.createElement("div", {
+    })), /*#__PURE__*/ React.createElement(View, {
         className: "nut-picker-mask"
-    }), /*#__PURE__*/ React.createElement("div", {
+    }), /*#__PURE__*/ React.createElement(View, {
         className: "nut-picker-indicator",
         ref: listRef
     }));