@nutui/nutui-react 3.0.0-beta.1 → 3.0.0-beta.3

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

@@ -73,6 +73,11 @@
 .nut-avatar {
   position: relative;
   flex: 0 0 auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: var(--nutui-avatar-normal-width, 40px);
+  height: var(--nutui-avatar-normal-height, 40px);
 }
 .nut-avatar-round {
   border-radius: 999px;
@@ -96,21 +101,12 @@
 .nut-avatar-icon {
   background-size: 100% 100%;
 }
-.nut-avatar .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-text {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 100%;
-  height: 100%;
 }
 .nut-avatar-large {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
@@ -118,30 +114,15 @@
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
-.nut-avatar-large-img-image {
-  width: var(--nutui-avatar-large-width, 60px);
-  height: var(--nutui-avatar-large-height, 60px);
-}
 .nut-avatar-large-icon {
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
-.nut-avatar-large .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-large-text {
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
 .nut-avatar-small {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: var(--nutui-avatar-small-width, 32px);
-  height: var(--nutui-avatar-small-height, 32px);
-}
-.nut-avatar-small-img-image {
   width: var(--nutui-avatar-small-width, 32px);
   height: var(--nutui-avatar-small-height, 32px);
 }
@@ -149,25 +130,6 @@
   width: var(--nutui-avatar-small-width, 32px);
   height: var(--nutui-avatar-small-height, 32px);
 }
-.nut-avatar-normal {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
-}
-.nut-avatar-normal-img-image {
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
-}
-.nut-avatar-normal .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
-.nut-avatar-normal-text {
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
-}
 
 .nut-skeleton {
   display: inline-block;

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

@@ -1,6 +1,13 @@
 .nut-badge {
   position: relative;
-  display: inline-block;
+  display: inline-flex;
+  width: auto;
+  /* #ifdef harmony */
+  min-width: 1px;
+  /* #endif */
+  /* #ifndef harmony */
+  min-width: auto;
+  /* #endif */
 }
 .nut-badge-icon {
   position: absolute;
@@ -8,8 +15,6 @@
   justify-content: center;
   align-items: center;
   background: var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
-  top: -10%;
-  right: -15%;
   padding: var(--nutui-badge-icon-padding, 3px);
   text-align: center;
   border: var(--nutui-badge-border, 0px solid var(--nutui-color-primary-text, #ffffff));
@@ -27,7 +32,12 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  /* #ifdef harmony */
+  background: var(--nutui-color-primary, #ff0f23);
+  /* #endif */
+  /* #ifndef harmony */
   background: var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  /* #endif */
   color: var(--nutui-badge-color, #fff);
   padding: var(--nutui-badge-padding, 0 4px);
   font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxs, 10px));
@@ -45,7 +55,9 @@
   padding: 0;
 }
 .nut-badge-content {
-  transform: var(--nutui-badge-content-transform, translateY(-50%) translateX(100%));
+  /* #ifndef rn */
+  transform: var(--nutui-badge-content-transform, translateX(100%));
+  /* #endif */
 }
 .nut-badge-dot {
   width: var(--nutui-badge-dot-width, 7px);
@@ -54,22 +66,12 @@
   border-radius: var(--nutui-badge-dot-width, 7px);
   padding: 0;
 }
-.nut-badge-outline .nut-badge-content {
+.nut-badge-outline {
   background: var(--nutui-color-primary-text, #ffffff);
   border: 1px solid var(--nutui-color-primary, #ff0f23);
   color: var(--nutui-color-primary, #ff0f23);
 }
 
-[dir=rtl] .nut-badge-icon,
-.nut-rtl .nut-badge-icon {
-  right: auto;
-  left: -15%;
-}
-[dir=rtl] .nut-badge-content,
-.nut-rtl .nut-badge-content {
-  transform: var(--nutui-badge-content-transform, translateY(-50%) translateX(-100%));
-}
-
 .nut-tabbar-item {
   display: flex;
   flex-direction: column;

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

@@ -1,6 +1,13 @@
 .nut-badge {
   position: relative;
-  display: inline-block;
+  display: inline-flex;
+  width: auto;
+  /* #ifdef harmony */
+  min-width: 1px;
+  /* #endif */
+  /* #ifndef harmony */
+  min-width: auto;
+  /* #endif */
 }
 .nut-badge-icon {
   position: absolute;
@@ -8,8 +15,6 @@
   justify-content: center;
   align-items: center;
   background: var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
-  top: -10%;
-  right: -15%;
   padding: var(--nutui-badge-icon-padding, 3px);
   text-align: center;
   border: var(--nutui-badge-border, 0px solid var(--nutui-color-primary-text, #ffffff));
@@ -27,7 +32,12 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  /* #ifdef harmony */
+  background: var(--nutui-color-primary, #ff0f23);
+  /* #endif */
+  /* #ifndef harmony */
   background: var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  /* #endif */
   color: var(--nutui-badge-color, #fff);
   padding: var(--nutui-badge-padding, 0 4px);
   font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxs, 10px));
@@ -45,7 +55,9 @@
   padding: 0;
 }
 .nut-badge-content {
-  transform: var(--nutui-badge-content-transform, translateY(-50%) translateX(100%));
+  /* #ifndef rn */
+  transform: var(--nutui-badge-content-transform, translateX(100%));
+  /* #endif */
 }
 .nut-badge-dot {
   width: var(--nutui-badge-dot-width, 7px);
@@ -54,22 +66,12 @@
   border-radius: var(--nutui-badge-dot-width, 7px);
   padding: 0;
 }
-.nut-badge-outline .nut-badge-content {
+.nut-badge-outline {
   background: var(--nutui-color-primary-text, #ffffff);
   border: 1px solid var(--nutui-color-primary, #ff0f23);
   color: var(--nutui-color-primary, #ff0f23);
 }
 
-[dir=rtl] .nut-badge-icon,
-.nut-rtl .nut-badge-icon {
-  right: auto;
-  left: -15%;
-}
-[dir=rtl] .nut-badge-content,
-.nut-rtl .nut-badge-content {
-  transform: var(--nutui-badge-content-transform, translateY(-50%) translateX(-100%));
-}
-
 .nut-tabbar-item {
   display: flex;
   flex-direction: column;

package/dist/cjs/packages/toast/Notification.js

@@ -92,25 +92,14 @@ var Notification = /*#__PURE__*/ function(_superClass) {
             value: function renderIcon() {
                 var icon = this.props.icon;
                 if (typeof icon === 'string') {
-                    var iconNode = null;
-                    switch(icon){
-                        case 'success':
-                            iconNode = /*#__PURE__*/ _react.createElement(_iconsreact.Check, null);
-                            break;
-                        case 'loading':
-                            iconNode = /*#__PURE__*/ _react.createElement(_iconsreact.Loading, {
-                                className: "nut-icon-loading"
-                            });
-                            break;
-                        case 'fail':
-                            iconNode = /*#__PURE__*/ _react.createElement(_iconsreact.Failure, null);
-                            break;
-                        case 'warn':
-                            iconNode = /*#__PURE__*/ _react.createElement(_iconsreact.Tips, null);
-                            break;
-                        default:
-                            break;
-                    }
+                    var iconNode = {
+                        success: /*#__PURE__*/ _react.createElement(_iconsreact.Success, null),
+                        fail: /*#__PURE__*/ _react.createElement(_iconsreact.Failure, null),
+                        warn: /*#__PURE__*/ _react.createElement(_iconsreact.Tips, null),
+                        loading: /*#__PURE__*/ _react.createElement(_iconsreact.Loading, {
+                            className: "nut-icon-loading"
+                        })
+                    }[icon];
                     return /*#__PURE__*/ _react.createElement("p", {
                         className: "".concat(classPrefix, "-icon-wrapper")
                     }, iconNode);
@@ -136,9 +125,9 @@ var Notification = /*#__PURE__*/ function(_superClass) {
                 var _this = this;
                 var _this_props = this.props, id = _this_props.id, icon = _this_props.icon, title = _this_props.title, content = _this_props.content, position = _this_props.position, size = _this_props.size, closeOnOverlayClick = _this_props.closeOnOverlayClick, lockScroll = _this_props.lockScroll, style = _this_props.style, className = _this_props.className, contentClassName = _this_props.contentClassName, contentStyle = _this_props.contentStyle, wordBreak = _this_props.wordBreak;
                 var show = this.state.show;
-                var classes = (0, _classnames.default)((0, _define_property._)({
+                var classes = (0, _classnames.default)({
                     'nut-toast-has-icon': icon
-                }, "nut-toast-".concat(size), true));
+                });
                 return /*#__PURE__*/ _react.createElement(_react.Fragment, null, /*#__PURE__*/ _react.createElement(_index.default, {
                     visible: show,
                     style: style,
@@ -152,12 +141,12 @@ var Notification = /*#__PURE__*/ function(_superClass) {
                     className: "".concat(classPrefix, " ").concat(classes),
                     id: "toast-".concat(id)
                 }, /*#__PURE__*/ _react.createElement("div", {
-                    className: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(wordBreak),
-                    style: contentStyle
+                    className: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(classPrefix, "-inner-").concat(size, " ").concat(classPrefix, "-inner-").concat(wordBreak),
+                    style: (0, _object_spread._)({}, contentStyle)
                 }, this.renderIcon(), title ? /*#__PURE__*/ _react.createElement("div", {
                     className: "".concat(classPrefix, "-title")
                 }, title) : null, /*#__PURE__*/ _react.createElement("span", {
-                    className: "".concat(classPrefix, "-text")
+                    className: "".concat(classPrefix, "-text ").concat(content ? '' : "".concat(classPrefix, "-text-empty"))
                 }, content)))));
             }
         }

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/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.js

@@ -23,11 +23,11 @@ var options = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.Com
     title: '',
     size: 'base',
     icon: null,
-    onClose: function onClose() {},
     closeOnOverlayClick: false,
     lockScroll: false,
     contentClassName: '',
-    wordBreak: 'break-all'
+    wordBreak: 'break-all',
+    onClose: function onClose() {}
 });
 function getInstance(props, callback) {
     if (messageInstance) {

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

@@ -1,5 +1,6 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
   color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-trendarrow-font-size, 14px);

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

@@ -1,5 +1,6 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
   color: $color-title;
   font-size: $trendarrow-font-size;