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

package/dist/es/packages/picker/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 {
@@ -363,24 +410,24 @@
 }
 
 .nut-picker {
-  background-color: var(--nutui-gray-1, #ffffff);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
   width: 100%;
 }
 .nut-picker-control {
   display: flex;
   height: var(--nutui-popup-title-height, 50px);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
   align-items: center;
   justify-content: space-between;
   padding: var(--nutui-popup-title-padding, 16px);
 }
 .nut-picker-cancel-btn {
-  color: var(--nutui-picker-title-cancel-color, var(--nutui-gray-6, #505259));
-  font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-3, 14px));
+  color: var(--nutui-picker-title-cancel-color, var(--nutui-color-text, #505259));
+  font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-confirm-btn {
   color: var(--nutui-picker-title-ok-color, var(--nutui-color-primary, #ff0f23));
-  font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-title {
   flex: 1;
@@ -388,9 +435,9 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
-  font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 500));
+  color: var(--nutui-color-title, #1a1a1a);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-picker-panel {
   display: flex;
@@ -401,11 +448,11 @@
   top: 108px;
   height: var(--nutui-picker-item-height, 36px);
   width: 100%;
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-left: 0;
   border-right: 0;
-  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-3, 14px));
+  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   z-index: 3;
 }
 .nut-picker-indicator-taro {
@@ -413,7 +460,7 @@
   border: 0;
 }
 .nut-picker-indicator-taro::before, .nut-picker-indicator-taro::after {
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-left: 0;
   border-right: 0;
 }
@@ -461,8 +508,8 @@
   text-overflow: ellipsis;
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
-  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-3, 14px));
+  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   text-align: center;
 }
 .nut-picker-item {
@@ -487,8 +534,8 @@
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
   text-align: center;
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-font-size-3, 14px);
+  color: var(--nutui-color-title, #1a1a1a);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-picker-roller-item-hidden {
   visibility: hidden;

package/dist/es/packages/popover/popover.js

@@ -8,6 +8,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useEffect, useRef, useState } from "react";
 import classNames from "classnames";
 import Taro, { createSelectorQuery } from "@tarojs/taro";
+import { View } from "@tarojs/components";
 import Popup from "../popup/index";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
 import { ComponentDefaults } from "../../utils/typings";
@@ -72,11 +73,11 @@ export var Popover = function(props) {
     }, [
         visible
     ]);
-    var getContentWidth = function() {
+    var getContentWidth = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
             var rect;
             return _ts_generator(this, function(_state) {
-                createSelectorQuery().selectViewport().scrollOffset(function() {
+                createSelectorQuery().selectViewport().scrollOffset(/*#__PURE__*/ function() {
                     var _ref = _async_to_generator(function(res) {
                         var distance;
                         return _ts_generator(this, function(_state) {
@@ -147,7 +148,7 @@ export var Popover = function(props) {
             return _ref.apply(this, arguments);
         };
     }();
-    var getRectTaro = function() {
+    var getRectTaro = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(targetId) {
             return _ts_generator(this, function(_state) {
                 return [
@@ -166,7 +167,7 @@ export var Popover = function(props) {
             return _ref.apply(this, arguments);
         };
     }();
-    var getPopoverContentW = function() {
+    var getPopoverContentW = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
             var rectContent;
             return _ts_generator(this, function(_state) {
@@ -312,7 +313,7 @@ export var Popover = function(props) {
             onClose === null || onClose === void 0 ? void 0 : onClose();
         }
     };
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, !targetId && /*#__PURE__*/ React.createElement("div", {
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, !targetId && /*#__PURE__*/ React.createElement(View, {
         className: "nut-popover-wrapper",
         ref: popoverRef,
         onClick: function() {
@@ -325,7 +326,7 @@ export var Popover = function(props) {
             }
         },
         style: style
-    }, Array.isArray(children) ? children[0] : children), /*#__PURE__*/ React.createElement("div", {
+    }, Array.isArray(children) ? children[0] : children), /*#__PURE__*/ React.createElement(View, {
         className: classes,
         style: getRootPosition()
     }, /*#__PURE__*/ React.createElement(Popup, _object_spread({
@@ -333,14 +334,14 @@ export var Popover = function(props) {
         position: "default",
         overlay: overlay,
         visible: showPopup
-    }, rest), /*#__PURE__*/ React.createElement("div", {
+    }, rest), /*#__PURE__*/ React.createElement(View, {
         className: "nut-popover-content-group",
         ref: popoverContentRef
-    }, showArrow && /*#__PURE__*/ React.createElement("div", {
+    }, showArrow && /*#__PURE__*/ React.createElement(View, {
         className: popoverArrow(),
         style: popoverArrowStyle()
     }), Array.isArray(children) ? children[1] : '', list.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: classNames({
                 'nut-popover-menu-item': true,
                 'nut-popover-menu-disabled': item.disabled
@@ -349,18 +350,18 @@ export var Popover = function(props) {
             onClick: function() {
                 return handleSelect(item, index);
             }
-        }, item.icon ? /*#__PURE__*/ React.createElement("div", {
+        }, item.icon ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-popover-menu-item-icon"
-        }, item.icon) : null, /*#__PURE__*/ React.createElement("div", {
+        }, item.icon) : null, /*#__PURE__*/ React.createElement(View, {
             className: "nut-popover-menu-item-name"
-        }, item.name), item.action && item.action.icon ? /*#__PURE__*/ React.createElement("div", {
+        }, item.name), item.action && item.action.icon ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-popover-menu-item-action-icon",
             onClick: function(e) {
                 var _item_action_onClick, _item_action;
                 return (_item_action = item.action) === null || _item_action === void 0 ? void 0 : (_item_action_onClick = _item_action.onClick) === null || _item_action_onClick === void 0 ? void 0 : _item_action_onClick.call(_item_action, e);
             }
         }, item.action.icon) : null);
-    }))), showPopup && closeOnOutsideClick && /*#__PURE__*/ React.createElement("div", {
+    }))), showPopup && closeOnOutsideClick && /*#__PURE__*/ React.createElement(View, {
         className: "nut-popover-content-bg",
         onClick: clickAway,
         onTouchMove: clickAway

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

@@ -161,11 +161,11 @@
     }
 
     &-top-end {
+      right: 0;
       .nut-popover-arrow-top-end {
         right: 16px;
         transform: translateX(0%);
       }
-      right: 0;
     }
 
     &-top-start {
@@ -185,12 +185,12 @@
     }
 
     &-bottom-end {
+      right: 0;
+
       .nut-popover-arrow-bottom-end {
         right: 16px;
         transform: translateX(0%);
       }
-
-      right: 0;
     }
 
     &-bottom-start {