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

package/dist/cjs/packages/button/button.js

@@ -113,7 +113,7 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
         }
     }), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-button-wrap"
-    }, loading && !(0, _platformtaro.harmonyAndRn)() && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
+    }, loading && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
         className: "nut-icon-loading"
     }), !loading && icon ? icon : null, children && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-button-children nut-button-".concat(size, "-children nut-button-").concat(type, "-children ").concat(!(props.fill || disabled || loading) ? '' : "nut-button-".concat(type).concat(props.fill ? "-".concat(fill) : '').concat(disabled || loading ? '-disabled' : '')).concat(icon || loading ? " nut-button-text" : '').concat(rightIcon ? " nut-button-text-right" : ''),

package/dist/cjs/packages/input/input.js

@@ -21,7 +21,6 @@ var _utils = require("./utils");
 var _index = require("../configprovider/index");
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../utils/use-props-value");
-var _platformtaro = require("../../utils/platform-taro");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'text',
     name: '',
@@ -180,8 +179,7 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         onBlur: handleBlur,
         onFocus: handleFocus,
         onInput: function onInput(e) {
-            console.log('eeeeee', e.detail.value);
-            handleInput((e.currentTarget || e.detail).value);
+            handleInput((e.detail || e.currentTarget).value);
         }
     })), /*#__PURE__*/ _react.default.createElement(_components.View, {
         style: {
@@ -196,8 +194,8 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
                 onClear === null || onClear === void 0 ? void 0 : onClear('');
             }
         }
-    }, clearIcon || (!(0, _platformtaro.harmonyAndRn)() ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.MaskClose, {
+    }, clearIcon || /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.MaskClose, {
         className: "nut-input-clear"
-    }) : null)));
+    })));
 });
 Input.displayName = 'NutInput';

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

@@ -47,3 +47,7 @@
     -webkit-text-fill-color: $input-disabled-color;
   }
 }
+
+.nut-input-clear {
+  flex: 0;
+}

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

@@ -43,4 +43,8 @@
   background: none;
   opacity: 1;
   -webkit-text-fill-color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+}
+
+.nut-input-clear {
+  flex: 0;
 }

package/dist/cjs/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/cjs/packages/pulltorefresh/pulltorefresh.js

@@ -62,7 +62,7 @@ var PullToRefresh = function PullToRefresh(p) {
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(0), 2), height = _useState1[0], setHeight = _useState1[1];
     var timer = (0, _react.useRef)();
     var renderIcons = function renderIcons(status) {
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, (status === 'pulling' || status === 'complete') && (!(0, _platformtaro.harmonyAndRn)() ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, null) : null), (status === 'canRelease' || status === 'refreshing') && (!(0, _platformtaro.harmonyAndRn)() ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.More, null) : null));
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, (status === 'pulling' || status === 'complete') && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, null), (status === 'canRelease' || status === 'refreshing') && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.More, null));
     };
     var renderStatusIcon = function renderStatusIcon() {
         if (props.renderIcon) {

package/dist/cjs/packages/tag/tag.d.ts

@@ -1,5 +1,5 @@
-import React, { FunctionComponent, ReactNode } from 'react';
 import type { MouseEvent } from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import { ITouchEvent } from '@tarojs/components';
 import { BasicComponent } from "../../utils/typings";
 export type TagType = 'default' | 'primary' | 'info' | 'success' | 'warning' | 'danger';

package/dist/cjs/packages/tag/tag.js

@@ -16,6 +16,7 @@ var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _components = require("@tarojs/components");
+var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _typings = require("../../utils/typings");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -76,20 +77,13 @@ var Tag = function Tag(props) {
             setVisible(false);
             onClose && onClose(e);
         }
-    }, closeIcon) : // <Close
-    //   size={8}
-    //   onClick={(e) => {
-    //     setVisible(false)
-    //     onClose && onClose(e)
-    //   }}
-    // />
-    /*#__PURE__*/ _react.default.createElement(_components.Text, {
+    }, closeIcon) : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, {
+        size: 8,
         onClick: function onClick(e) {
             setVisible(false);
             onClose && onClose(e);
-        },
-        className: "".concat(classPrefix, "-custom-icon")
-    }, "X")) : /*#__PURE__*/ _react.default.createElement(_components.View, {
+        }
+    })) : /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: classes,
         style: (0, _object_spread._)({}, style, getStyle()),
         onClick: function onClick(e) {

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

@@ -7,12 +7,20 @@
   }
 }
 .nut-toast {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   left: 0;
   top: 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
   width: 100%;
   height: 100%;
-  text-align: center;
   pointer-events: none;
   z-index: 1300;
 }
@@ -20,18 +28,24 @@
   --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
   --nutui-overlay-zIndex: 1300;
 }
-.nut-toast-small .nut-toast-inner {
-  font-size: var(--nutui-font-size-s, 12px);
-}
-.nut-toast-large .nut-toast-inner {
-  font-size: var(--nutui-font-size-l, 16px);
+.nut-toast-overlay-default-taro {
+  /* #ifdef harmony */
+  background-color: rgba(0, 0, 0, 0);
+  z-index: 1300;
+  /* #endif */
+  /* #ifndef harmony */
+  --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
+  --nutui-overlay-zIndex: 1300;
+  /* #endif */
 }
 .nut-toast-inner {
-  display: flex;
-  flex-direction: column;
   position: absolute;
-  left: 50%;
   top: var(--nutui-toast-inner-top, 50%);
+  transform: translate(0, -50%);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
   min-width: 30%;
   max-width: 95.7%;
   font-size: var(--nutui-toast-text-font-size, 14px);
@@ -41,18 +55,28 @@
   background: var(--nutui-toast-inner-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   border-radius: var(--nutui-toast-inner-border-radius, 16px);
   color: var(--nutui-toast-font-color, #ffffff);
-  transform: translate(-50%, -50%);
 }
-.nut-toast-inner.normal {
+.nut-toast-inner-normal {
   word-break: normal;
   word-wrap: normal;
 }
-.nut-toast-inner.break-word {
+.nut-toast-inner-break-word {
   word-break: normal;
   word-wrap: break-word;
 }
+.nut-toast-inner-small {
+  font-size: var(--nutui-font-size-s, 12px);
+}
+.nut-toast-inner-large {
+  font-size: var(--nutui-font-size-l, 16px);
+}
 .nut-toast-center {
-  top: var(--nutui-toast-inner-top, 50%);
+  /* #ifdef rn */
+  top: var(--nutui-toast-inner-top, 38%);
+  /* #endif */
+  /* #ifndef rn */
+  top: var(--nutui-toast-inner-top, 48%);
+  /* #endif */
 }
 .nut-toast-bottom {
   top: var(--nutui-toast-inner-top, 80%);
@@ -60,40 +84,43 @@
 .nut-toast-top {
   top: var(--nutui-toast-inner-top, 20%);
 }
-.nut-toast-text:empty {
+.nut-toast-text {
+  color: #ffffff;
+  text-align: var(--nutui-toast-inner-text-align, center);
+}
+.nut-toast-text-empty {
   margin-bottom: -8px;
 }
 .nut-toast-title {
   color: #ffffff;
   font-size: var(--nutui-toast-title-font-size, 16px);
   font-weight: 500;
+  text-align: var(--nutui-toast-inner-text-align, center);
 }
-.nut-toast-title:empty {
-  margin-bottom: -8px;
+.nut-toast-icon {
+  width: 24px;
+  height: 24px;
+  color: #ffffff;
 }
-.nut-toast-has-icon .nut-toast-icon-wrapper {
+.nut-toast-icon-wrapper {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
   margin-bottom: 8px;
+  color: #ffffff;
 }
-.nut-toast-has-icon .nut-toast-icon-wrapper .nut-icon {
+.nut-toast-icon-wrapper-icon {
   width: 24px;
   height: 24px;
 }
-.nut-toast-loading .nut-toast-inner {
-  display: inline-flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-.nut-toast-loading .nut-toast-icon-wrapper {
-  animation: rotation 2s linear infinite;
+.nut-toast-rtl {
+  left: auto;
+  right: 0;
 }
-.nut-toast-loading .nut-toast-icon-wrapper .nut-icon {
-  width: 24px;
-  height: 24px;
+.nut-toast-rtl-inner {
+  left: auto;
+  right: 50%;
 }
 
 [dir=rtl] .nut-toast,
@@ -105,7 +132,6 @@
 .nut-rtl .nut-toast-inner {
   left: auto;
   right: 50%;
-  transform: translate(50%, -50%);
 }
 
 .toast-fade-enter-active {

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

@@ -6,42 +6,40 @@
     -webkit-transform: rotate(360deg);
   }
 }
-
-.nut-toast-overlay-default {
-  background: rgba(0, 0, 0, 0);
-  z-index: 1300;
-}
-
 .nut-toast {
-  display: flex;
-  flex-direction: column;
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
-  top: 0;
+  /* #endif */
   left: 0;
-  height: 100%;
-  width: 100%;
-  align-items: center;
+  top: 0;
+  display: flex;
+  flex-direction: row;
   justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
   z-index: 1300;
 }
-
-
-.nut-toast-small .nut-toast-inner {
-  font-size: 12px;
-}
-
-.nut-toast-large .nut-toast-inner {
-  font-size: 16px;
+.nut-toast-overlay-default-taro {
+  /* #ifdef harmony */
+  background-color: rgba(0, 0, 0, 0);
+  z-index: 1300;
+  /* #endif */
+  /* #ifndef harmony */
+  /* #endif */
 }
-
 .nut-toast-inner {
+  position: absolute;
+  top: 50%;
+  transform: translate(0, -50%);
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  position: absolute;
-  left: 50%;
-  top: 50%;
   min-width: 30%;
   max-width: 95.7%;
   font-size: 14px;
@@ -51,79 +49,72 @@
   background: rgba(0, 0, 0, 0.7);
   border-radius: 16px;
   color: #ffffff;
-  transform: translate(-50%, -50%);
 }
-
-.nut-toast-inner.normal {
+.nut-toast-inner-normal {
   word-break: normal;
   word-wrap: normal;
 }
-
-.nut-toast-inner.break-word {
+.nut-toast-inner-break-word {
   word-break: normal;
   word-wrap: break-word;
 }
-
+.nut-toast-inner-small {
+  font-size: 12px;
+}
+.nut-toast-inner-large {
+  font-size: 16px;
+}
 .nut-toast-center {
-  top: 50%;
+  /* #ifdef rn */
+  top: 38%;
+  /* #endif */
+  /* #ifndef rn */
+  top: 48%;
+  /* #endif */
 }
-
 .nut-toast-bottom {
   top: 80%;
 }
-
 .nut-toast-top {
   top: 20%;
 }
-
 .nut-toast-text {
-  display: flex;
   color: #ffffff;
   text-align: center;
 }
-
-.nut-toast-text:empty {
+.nut-toast-text-empty {
   margin-bottom: -8px;
 }
-
 .nut-toast-title {
-  display: flex;
   color: #ffffff;
   font-size: 16px;
   font-weight: 500;
+  text-align: center;
 }
-
-.nut-toast-title:empty {
-  margin-bottom: -8px;
+.nut-toast-icon {
+  width: 24px;
+  height: 24px;
+  color: #ffffff;
 }
-
-.nut-toast-has-icon .nut-toast-icon-wrapper {
+.nut-toast-icon-wrapper {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
   margin-bottom: 8px;
+  color: #ffffff;
 }
-
-.nut-toast-has-icon .nut-toast-icon-wrapper .nut-icon {
+.nut-toast-icon-wrapper-icon {
   width: 24px;
   height: 24px;
 }
-
-.nut-toast-loading .nut-toast-inner {
-  display: inline-flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.nut-toast-loading .nut-toast-icon-wrapper {
-  animation: rotation 2s linear infinite;
+.nut-toast-rtl {
+  left: auto;
+  right: 0;
 }
-
-.nut-toast-loading .nut-toast-icon-wrapper .nut-icon {
-  width: 24px;
-  height: 24px;
+.nut-toast-rtl-inner {
+  left: auto;
+  right: 50%;
 }
 
 [dir=rtl] .nut-toast,
@@ -131,12 +122,10 @@
   left: auto;
   right: 0;
 }
-
 [dir=rtl] .nut-toast-inner,
 .nut-rtl .nut-toast-inner {
   left: auto;
   right: 50%;
-  transform: translate(50%, -50%);
 }
 
 .toast-fade-enter-active {

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

@@ -9,12 +9,20 @@
 }
 
 .nut-toast {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   left: 0;
   top: 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
   width: 100%;
   height: 100%;
-  text-align: center;
   pointer-events: none;
   z-index: 1300;
 
@@ -23,24 +31,25 @@
     --nutui-overlay-zIndex: 1300;
   }
 
-  &-small {
-    .nut-toast-inner {
-      font-size: $font-size-s;
-    }
-  }
-
-  &-large {
-    .nut-toast-inner {
-      font-size: $font-size-l;
-    }
+  &-overlay-default-taro {
+    /* #ifdef harmony */
+    background-color: rgba(0, 0, 0, 0);
+    z-index: 1300;
+    /* #endif */
+    /* #ifndef harmony */
+    --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
+    --nutui-overlay-zIndex: 1300;
+    /* #endif */
   }
 
   &-inner {
-    display: flex;
-    flex-direction: column;
     position: absolute;
-    left: 50%;
     top: $toast-inner-top;
+    transform: translate(-0, -50%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
     min-width: 30%;
     max-width: 95.7%;
     font-size: $toast-text-font-size;
@@ -50,21 +59,33 @@
     background: $toast-inner-bg-color;
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
-    transform: translate(-50%, -50%);
 
-    &.normal {
+    &-normal {
       word-break: normal;
       word-wrap: normal;
     }
 
-    &.break-word {
+    &-break-word {
       word-break: normal;
       word-wrap: break-word;
     }
+
+    &-small {
+      font-size: $font-size-s;
+    }
+
+    &-large {
+      font-size: $font-size-l;
+    }
   }
 
   &-center {
-    top: var(--nutui-toast-inner-top, 50%);
+    /* #ifdef rn */
+    top: var(--nutui-toast-inner-top, 38%);
+    /* #endif */
+    /* #ifndef rn */
+    top: var(--nutui-toast-inner-top, 48%);
+    /* #endif */
   }
 
   &-bottom {
@@ -76,7 +97,9 @@
   }
 
   &-text {
-    &:empty {
+    color: #ffffff;
+    text-align: $toast-inner-text-align;
+    &-empty {
       margin-bottom: -8px;
     }
   }
@@ -85,42 +108,36 @@
     color: #ffffff;
     font-size: $toast-title-font-size;
     font-weight: 500;
-
-    &:empty {
-      margin-bottom: -8px;
-    }
+    text-align: $toast-inner-text-align;
   }
 
-  &-has-icon {
-    .nut-toast-icon-wrapper {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-bottom: 8px;
-
-      .nut-icon {
-        width: 24px;
-        height: 24px;
-      }
-    }
+  &-icon {
+    width: 24px;
+    height: 24px;
+    color: #ffffff;
   }
 
-  &-loading {
-    .nut-toast-inner {
-      display: inline-flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
+  &-icon-wrapper {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 8px;
+    color: #ffffff;
+
+    &-icon {
+      width: 24px;
+      height: 24px;
     }
+  }
 
-    .nut-toast-icon-wrapper {
-      animation: rotation 2s linear infinite;
+  &-rtl {
+    left: auto;
+    right: 0;
 
-      .nut-icon {
-        width: 24px;
-        height: 24px;
-      }
+    &-inner {
+      left: auto;
+      right: 50%;
     }
   }
 }
@@ -133,7 +150,6 @@
   &-inner {
     left: auto;
     right: 50%;
-    transform: translate(50%, -50%);
   }
 }
 

package/dist/cjs/packages/toast/toast.d.ts

@@ -5,19 +5,19 @@ export type ToastSize = 'small' | 'base' | 'large';
 export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
 export interface ToastProps extends BasicComponent {
     id?: string;
-    maskClassName?: string;
-    contentClassName?: string;
-    contentStyle?: React.CSSProperties;
-    icon: React.ReactNode;
-    iconSize: string;
-    content: React.ReactNode;
     duration: number;
     position?: ToastPosition;
-    type: string;
     title: string;
     closeOnOverlayClick: boolean;
     lockScroll: boolean;
     size: ToastSize;
+    icon: React.ReactNode;
+    iconSize: string;
+    maskClassName?: string;
+    content: React.ReactNode;
+    contentClassName?: string;
+    contentStyle?: React.CSSProperties;
+    type: string;
     visible: boolean;
     wordBreak?: ToastWordBreak;
     onClose: () => void;