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

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

@@ -121,10 +121,7 @@ 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", {
         className: (0, _classnames.default)(classPrefix, className)

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,13 +141,13 @@ 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: (0, _classnames.default)("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), (0, _define_property._)({}, "".concat(classPrefix, "-inner-descrption"), content)),
+                    style: (0, _object_spread._)({}, contentStyle)
                 }, this.renderIcon(), title ? /*#__PURE__*/ _react.createElement("div", {
                     className: "".concat(classPrefix, "-title")
-                }, title) : null, /*#__PURE__*/ _react.createElement("span", {
+                }, title) : null, content ? /*#__PURE__*/ _react.createElement("span", {
                     className: "".concat(classPrefix, "-text")
-                }, content)))));
+                }, content) : null))));
             }
         }
     ]);

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

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

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

@@ -1,3 +1,67 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-overlay {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
+  position: fixed;
+  /* #endif */
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  z-index: var(--nutui-overlay-zIndex, 1000);
+}
+
+.nut-overflow-hidden {
+  overflow: hidden !important;
+}
+
+@keyframes nut-fade-in {
+  0% {
+    opacity: 0;
+  }
+  1% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+@keyframes nut-fade-out {
+  0% {
+    opacity: 1;
+  }
+  1% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+.nut-overlay-slide-enter-active, .nut-overlay-slide-appear-active {
+  animation-fill-mode: both;
+  animation-name: nut-fade-in;
+  animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
+}
+.nut-overlay-slide-exit-active {
+  animation-fill-mode: both;
+  animation-name: nut-fade-out;
+  animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
+}
+
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 @keyframes rotation {
   0% {
     -webkit-transform: rotate(0deg);
@@ -7,12 +71,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,39 +92,59 @@
   --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%);
-  min-width: 30%;
-  max-width: 95.7%;
+  transform: translate(0, -50%);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  min-width: 96px;
+  max-width: 60%;
+  box-sizing: border-box;
   font-size: var(--nutui-toast-text-font-size, 14px);
   text-align: var(--nutui-toast-inner-text-align, center);
-  padding: var(--nutui-toast-inner-padding, 16px 24px);
+  padding: var(--nutui-toast-inner-padding, 13px 16px);
   word-break: break-all;
-  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);
+  background: var(--nutui-toast-inner-bg-color, var(--nutui-black-10));
+  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, 12px));
   color: var(--nutui-toast-font-color, #ffffff);
-  transform: translate(-50%, -50%);
 }
-.nut-toast-inner.normal {
+.nut-toast-inner-descrption {
+  max-width: 68.2%;
+}
+.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 +152,42 @@
 .nut-toast-top {
   top: var(--nutui-toast-inner-top, 20%);
 }
-.nut-toast-text:empty {
-  margin-bottom: -8px;
+.nut-toast-text {
+  color: #ffffff;
+  text-align: var(--nutui-toast-inner-text-align, center);
+  line-height: 20px;
 }
 .nut-toast-title {
   color: #ffffff;
   font-size: var(--nutui-toast-title-font-size, 16px);
-  font-weight: 500;
+  font-weight: 600;
+  text-align: var(--nutui-toast-inner-text-align, center);
+  line-height: 22px;
 }
-.nut-toast-title:empty {
-  margin-bottom: -8px;
+.nut-toast .nut-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;
+  margin: 3px 0 5px;
+  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 +199,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,26 +31,29 @@
     --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;
-    min-width: 30%;
-    max-width: 95.7%;
+    transform: translate(-0, -50%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    min-width: 96px;
+    max-width: 60%;
+    // max-width: 224px;
+    box-sizing: border-box;
     font-size: $toast-text-font-size;
     text-align: $toast-inner-text-align;
     padding: $toast-inner-padding;
@@ -50,21 +61,38 @@
     background: $toast-inner-bg-color;
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
-    transform: translate(-50%, -50%);
 
-    &.normal {
+    &-descrption {
+      max-width: 68.2%;
+      // max-width: 256px;
+    }
+
+    &-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,51 +104,46 @@
   }
 
   &-text {
-    &:empty {
-      margin-bottom: -8px;
-    }
+    color: #ffffff;
+    text-align: $toast-inner-text-align;
+    line-height: 20px;
   }
 
   &-title {
     color: #ffffff;
     font-size: $toast-title-font-size;
-    font-weight: 500;
-
-    &:empty {
-      margin-bottom: -8px;
-    }
+    font-weight: 600;
+    text-align: $toast-inner-text-align;
+    line-height: 22px;
   }
 
-  &-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;
-      }
-    }
+  .nut-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: 3px 0 5px;
+    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 +156,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) {