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

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

@@ -1,22 +1,31 @@
 .nut-textarea {
+  display: flex;
+  flex-direction: column;
   position: relative;
   width: 100%;
   box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
-  background-color: $color-background-overlay;
-  font-size: $textarea-font;
-  padding: $textarea-padding;
+  font-size: $font-size-base;
+  border-radius: $radius-s;
+
+  &-container {
+    padding: $textarea-padding;
+    background-color: $color-background-overlay;
+  }
+
+  &-error {
+    border: 0.5px solid $color-danger;
+    background-color: $color-danger-light;
+  }
 
   &-limit {
-    position: absolute;
-    right: 15px;
-    bottom: 12px;
-    font-size: $textarea-font;
-    color: $textarea-limit-color;
+    text-align: right;
+    font-size: $font-size-base;
+    line-height: $font-size-base;
+    margin-top: $spacing-base;
+    color: $color-text-help;
     &-disabled {
       cursor: not-allowed;
-      color: $textarea-disabled-color;
+      color: $color-text-disabled;
     }
   }
 
@@ -29,7 +38,7 @@
     min-width: 0;
     margin: 0;
     padding: 0;
-    font-size: $textarea-font;
+    font-size: $font-size-base;
     color: $textarea-text-color;
     caret-color: $textarea-text-curror-color;
     text-align: left;
@@ -37,32 +46,49 @@
     border: 0;
     resize: none;
 
+    // &::after{
+    //   content: '';
+    //   position: absolute;
+    //   width: 2px;
+    //   height: 14px;
+    //   background-color: red;
+    //   // left: 10px;
+    //   // top: 50%;
+    //   transform: translateY(-50%);
+    //   z-index: 1;
+    //   pointer-events: none;
+    // }
+
     .taro-textarea {
+      color: $textarea-text-color;
       background-color: transparent;
       resize: none;
     }
 
+    &::placeholder {
+      color: $color-text-help;
+    }
+
     &-disabled {
       cursor: not-allowed;
-      color: $textarea-disabled-color;
+      color: $color-text-disabled;
+      &::placeholder {
+        color: $color-text-disabled;
+      }
+      .taro-textarea {
+        color: $color-text-disabled;
+        &::placeholder {
+          color: $color-text-disabled;
+        }
+      }
     }
   }
-  .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.d.ts

@@ -11,6 +11,8 @@ export interface TextAreaProps extends Omit<TextareaProps, 'showCount' | 'onFocu
     readOnly: boolean;
     disabled: boolean;
     autoSize: boolean;
+    plain: boolean;
+    status: 'error' | 'default';
     onChange: (value: string) => void;
     onBlur: (event: Event) => void;
     onFocus: (event: Event) => void;

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

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "TextArea", {
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
@@ -29,11 +28,13 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     placeholder: '',
     readOnly: false,
     disabled: false,
-    autoSize: false
+    autoSize: false,
+    plain: false,
+    status: 'default'
 });
 var TextArea = function TextArea(props) {
     var locale = (0, _configprovider.useConfig)().locale;
-    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, value = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, value = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, plain = _ref.plain, status = _ref.status, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = (0, _object_without_properties._)(_ref, [
         "className",
         "value",
         "defaultValue",
@@ -45,6 +46,8 @@ var TextArea = function TextArea(props) {
         "disabled",
         "autoSize",
         "style",
+        "plain",
+        "status",
         "onChange",
         "onBlur",
         "onFocus"
@@ -84,9 +87,8 @@ var TextArea = function TextArea(props) {
         if (readOnly) return;
         onBlur && onBlur(event);
     };
-    var _obj;
-    return /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-disabled"), disabled), (0, _define_property._)(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj), className)
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
+        className: (0, _classnames.default)(classPrefix, disabled ? "".concat(classPrefix, "-disabled") : '', readOnly ? "".concat(classPrefix, "-readonly") : '', rtl ? "".concat(classPrefix, "-rtl") : '', plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container"), status ? "".concat(classPrefix, "-").concat(status) : '', className)
     }, /*#__PURE__*/ _react.default.createElement(_components.Textarea, (0, _object_spread._)({
         nativeProps: {
             style: style,
@@ -102,8 +104,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);
         },
@@ -118,6 +120,6 @@ var TextArea = function TextArea(props) {
         placeholder: placeholder || locale.placeholder
     }, rest)), showCount && /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-limit ").concat(disabled ? "".concat(classPrefix, "-limit-disabled") : '')
-    }, inputValue.length, "/", maxLength < 0 ? 0 : maxLength));
+    }, inputValue.length, "/", maxLength < 0 ? 0 : maxLength)));
 };
 TextArea.displayName = 'NutTextArea';

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

@@ -1,6 +1,12 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-timedetail {
   display: flex;
   align-content: flex-start;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
   padding: 0 0 50px 12px;
 }
@@ -10,16 +16,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-gray-3));
   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);
-  border: 1px solid var(--nutui-color-primary, #ff0f23);
-  color: var(--nutui-color-primary, #ff0f23);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  background-color: var(--nutui-brand-1);
+  border: 1px solid var(--nutui-brand-6);
+  color: var(--nutui-brand-6);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 [dir=rtl] .nut-timedetail,

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

@@ -1,6 +1,8 @@
 .nut-timedetail {
   display: flex;
   align-content: flex-start;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
   padding: 0 0 50px 12px;
 
@@ -16,7 +18,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

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -12,22 +16,13 @@
   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-black-10));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -62,49 +57,63 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
   position: fixed;
-  min-height: 26%;
+  min-height: 46%;
   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-gray-1));
   -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);
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
+.nut-popup-title-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 .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));
+  color: var(--nutui-gray-7);
+  font-weight: var(--nutui-font-weight-bold, 600);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .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-gray-6);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
-  position: absolute !important;
-  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));
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  position: absolute;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,13 +134,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  max-width: 295px;
   transform: translate(-50%, -50%);
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -139,21 +149,25 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
 .nut-popup-right {
   top: 0;
   right: 0;
+  width: 100px;
+  height: 100%;
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
+  width: 100px;
+  height: 100%;
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
@@ -161,7 +175,7 @@
   width: 100%;
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -313,7 +327,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -365,6 +379,8 @@
 .nut-timedetail {
   display: flex;
   align-content: flex-start;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
   padding: 0 0 50px 12px;
 }
@@ -374,16 +390,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-gray-3));
   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);
-  border: 1px solid var(--nutui-color-primary, #ff0f23);
-  color: var(--nutui-color-primary, #ff0f23);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  background-color: var(--nutui-brand-1);
+  border: 1px solid var(--nutui-brand-6);
+  color: var(--nutui-brand-6);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 [dir=rtl] .nut-timedetail,
@@ -392,7 +408,7 @@
 }
 
 .nut-timeselect {
-  background-color: var(--nutui-gray-1, #ffffff);
+  background-color: var(--nutui-gray-1);
   display: flex;
   flex-direction: column;
   height: calc(100% - 50px);
@@ -406,7 +422,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, var(--nutui-gray-2));
 }
 
 .nut-timepannel {
@@ -414,11 +430,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-gray-6);
+  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-gray-1);
+  color: var(--nutui-timeselect-date-active-color, var(--nutui-gray-7));
+  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) {
@@ -122,19 +122,16 @@ var TimeSelect = function TimeSelect(props) {
         visible: visible,
         position: "bottom",
         title: title || locale.timeselect.pickupTime,
-        style: (0, _object_spread._)({
-            width: '100%',
-            height: '20%'
-        }, style),
+        style: (0, _object_spread._)({}, 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

package/dist/cjs/packages/toast/style/index.js

@@ -1 +1,2 @@
+import '../../overlay/style';
 import './toast.scss';