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

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

@@ -4,16 +4,16 @@
   box-sizing: border-box;
   display: flex;
   flex-direction: row;
-  background-color: var(--nutui-gray-1, #ffffff);
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-3, 14px));
+  background-color: var(--nutui-color-background-overlay, #ffffff);
+  font-size: var(--nutui-textarea-font, var(--nutui-font-size-base, 14px));
   padding: var(--nutui-textarea-padding, 10px 25px);
 }
 .nut-textarea-limit {
   position: absolute;
   right: 15px;
   bottom: 12px;
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-textarea-limit-color, var(--nutui-gray-6, #505259));
+  font-size: var(--nutui-textarea-font, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-textarea-limit-color, var(--nutui-color-text, #505259));
 }
 .nut-textarea-limit-disabled {
   cursor: not-allowed;
@@ -24,19 +24,19 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 40px;
   min-width: 0;
   margin: 0;
   padding: 0;
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-textarea-text-color, var(--nutui-gray-7, #1a1a1a));
-  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-gray-7, #1a1a1a));
+  font-size: var(--nutui-textarea-font, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-textarea-text-color, var(--nutui-color-title, #1a1a1a));
+  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-color-title, #1a1a1a));
   text-align: left;
   background-color: transparent;
   border: 0;
   resize: none;
 }
 .nut-textarea-textarea .taro-textarea {
+  color: var(--nutui-textarea-text-color, var(--nutui-color-title, #1a1a1a));
   background-color: transparent;
   resize: none;
 }
@@ -44,19 +44,19 @@
   cursor: not-allowed;
   color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
-.nut-textarea .cpoyText {
-  position: absolute;
-  top: -999999px;
-  left: -999999px;
+.nut-textarea-textarea-disabled::placeholder {
+  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+}
+.nut-textarea-textarea-disabled .taro-textarea {
+  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+}
+.nut-textarea-textarea-disabled .taro-textarea::placeholder {
+  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
   left: 15px;
 }
-.nut-textarea.nut-textarea-rtl .cpoyText {
-  left: auto;
-  right: -999999px;
-}
 
 .taro-textarea {
   background-color: transparent;

package/dist/cjs/packages/textarea/style/style.harmony.css

@@ -24,7 +24,6 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 40px;
   min-width: 0;
   margin: 0;
   padding: 0;
@@ -37,6 +36,7 @@
   resize: none;
 }
 .nut-textarea-textarea .taro-textarea {
+  color: #1a1a1a;
   background-color: transparent;
   resize: none;
 }
@@ -44,19 +44,19 @@
   cursor: not-allowed;
   color: #c2c4cc;
 }
-.nut-textarea .cpoyText {
-  position: absolute;
-  top: -999999px;
-  left: -999999px;
+.nut-textarea-textarea-disabled::placeholder {
+  color: #c2c4cc;
+}
+.nut-textarea-textarea-disabled .taro-textarea {
+  color: #c2c4cc;
+}
+.nut-textarea-textarea-disabled .taro-textarea::placeholder {
+  color: #c2c4cc;
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
   left: 15px;
 }
-.nut-textarea.nut-textarea-rtl .cpoyText {
-  left: auto;
-  right: -999999px;
-}
 
 .taro-textarea {
   background-color: transparent;

package/dist/cjs/packages/textarea/style/textarea.scss

@@ -25,7 +25,6 @@
     display: block;
     box-sizing: border-box;
     width: 100%;
-    height: 40px;
     min-width: 0;
     margin: 0;
     padding: 0;
@@ -38,6 +37,7 @@
     resize: none;
 
     .taro-textarea {
+      color: $textarea-text-color;
       background-color: transparent;
       resize: none;
     }
@@ -45,24 +45,23 @@
     &-disabled {
       cursor: not-allowed;
       color: $textarea-disabled-color;
+      &::placeholder {
+        color: $textarea-disabled-color;
+      }
+      .taro-textarea {
+        color: $textarea-disabled-color;
+        &::placeholder {
+          color: $textarea-disabled-color;
+        }
+      }
     }
   }
-  .cpoyText {
-    position: absolute;
-    top: -999999px;
-    left: -999999px;
-  }
 
   &.nut-textarea-rtl {
     &-limit {
       right: auto;
       left: 15px;
     }
-
-    .cpoyText {
-      left: auto;
-      right: -999999px;
-    }
   }
 }
 

package/dist/cjs/packages/textarea/textarea.js

@@ -102,8 +102,8 @@ var TextArea = function TextArea(props) {
         className: "".concat(classPrefix, "-textarea ").concat(disabled ? "".concat(classPrefix, "-textarea-disabled") : ''),
         style: _taro.default.getEnv() === 'WEB' ? undefined : style,
         disabled: _taro.default.getEnv() === 'WEB' ? disabled : disabled || readOnly,
-        value: inputValue,
         // @ts-ignore
+        value: inputValue,
         onInput: function onInput(e) {
             return handleChange(e);
         },

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

@@ -10,16 +10,16 @@
   line-height: var(--nutui-timeselect-time-height, 50px);
   text-align: center;
   margin: var(--nutui-timeselect-time-margin, 0 10px 10px 0);
-  background: var(--nutui-timeselect-time-background, var(--nutui-gray-3, #f5f6fa));
+  background: var(--nutui-timeselect-time-background, var(--nutui-color-background, #f5f6fa));
   border-radius: 5px;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
   border: 1px solid transparent;
 }
 .nut-timedetail-item.active {
-  background-color: var(--nutui-color-primary-light, #ffebf1);
+  background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
   border: 1px solid var(--nutui-color-primary, #ff0f23);
   color: var(--nutui-color-primary, #ff0f23);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 [dir=rtl] .nut-timedetail,

package/dist/cjs/packages/timedetail/style/timedetail.scss

@@ -16,7 +16,7 @@
     border: 1px solid transparent;
 
     &.active {
-      background-color: $color-primary-light;
+      background-color: $color-primary-light-pressed;
       border: 1px solid $color-primary;
       color: $color-primary;
       font-weight: $font-weight-bold;

package/dist/cjs/packages/timedetail/timedetail.js

@@ -15,6 +15,7 @@ var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _components = require("@tarojs/components");
 var _typings = require("../../utils/typings");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     activeDate: '',
@@ -55,10 +56,10 @@ var TimeDetail = function TimeDetail(props) {
         optionKey,
         activeDate
     ]);
-    return /*#__PURE__*/ _react.default.createElement("div", {
+    return /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)(classPrefix, className)
     }, timeList[optionKey.childrenKey].map(function(item) {
-        return /*#__PURE__*/ _react.default.createElement("span", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: (0, _classnames.default)("".concat(classPrefix, "-item"), {
                 active: isActive(item[optionKey.valueKey])
             }),

package/dist/cjs/packages/timeselect/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 {
@@ -374,16 +421,16 @@
   line-height: var(--nutui-timeselect-time-height, 50px);
   text-align: center;
   margin: var(--nutui-timeselect-time-margin, 0 10px 10px 0);
-  background: var(--nutui-timeselect-time-background, var(--nutui-gray-3, #f5f6fa));
+  background: var(--nutui-timeselect-time-background, var(--nutui-color-background, #f5f6fa));
   border-radius: 5px;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
   border: 1px solid transparent;
 }
 .nut-timedetail-item.active {
-  background-color: var(--nutui-color-primary-light, #ffebf1);
+  background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
   border: 1px solid var(--nutui-color-primary, #ff0f23);
   color: var(--nutui-color-primary, #ff0f23);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 [dir=rtl] .nut-timedetail,
@@ -392,7 +439,7 @@
 }
 
 .nut-timeselect {
-  background-color: var(--nutui-gray-1, #ffffff);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
   display: flex;
   flex-direction: column;
   height: calc(100% - 50px);
@@ -406,7 +453,7 @@
   min-width: var(--nutui-timeselect-date-width, 140px);
   height: 100%;
   overflow: auto;
-  background: var(--nutui-gray-2, #f7f8fc);
+  background: var(--nutui-color-background-sunken, #f7f8fc);
 }
 
 .nut-timepannel {
@@ -414,11 +461,11 @@
   height: var(--nutui-timeselect-date-height, 40px);
   line-height: var(--nutui-timeselect-date-height, 40px);
   text-align: start;
-  color: var(--nutui-gray-6, #505259);
-  font-size: var(--nutui-font-size-3, 14px);
+  color: var(--nutui-color-text, #505259);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-timepannel.active {
-  background: var(--nutui-gray-1, #ffffff);
-  color: var(--nutui-timeselect-date-active-color, var(--nutui-gray-7, #1a1a1a));
-  font-weight: var(--nutui-font-weight-bold, 500);
+  background: var(--nutui-color-background-overlay, #ffffff);
+  color: var(--nutui-timeselect-date-active-color, var(--nutui-color-title, #1a1a1a));
+  font-weight: var(--nutui-font-weight-bold, 600);
 }

package/dist/cjs/packages/timeselect/timeselect.js

@@ -18,6 +18,7 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _components = require("@tarojs/components");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
 var _index1 = /*#__PURE__*/ _interop_require_default._(require("../timedetail/index"));
 var _typings = require("../../utils/typings");
@@ -66,7 +67,6 @@ var TimeSelect = function TimeSelect(props) {
     var closeFun = function closeFun() {
         onSelect && onSelect(activeTime);
     };
-    // 选择配送时间回调
     var handleSelectTime = function handleSelectTime(selectTime) {
         var newActiveTime = (0, _to_consumable_array._)(activeTime);
         var date = newActiveTime.find(function(item) {
@@ -127,14 +127,14 @@ var TimeSelect = function TimeSelect(props) {
             height: '20%'
         }, style),
         onClose: closeFun
-    }, rest), /*#__PURE__*/ _react.default.createElement("div", {
+    }, rest), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)(classPrefix, className)
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-content")
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-content-left")
     }, options.map(function(item) {
-        return /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             key: item[optionKey.valueKey],
             className: (0, _classnames.default)('nut-timepannel', {
                 active: item[optionKey.valueKey] === activeDate