@nutui/nutui-react 3.0.5 → 3.0.6

package/dist/es/packages/notify/style/notify.scss

@@ -6,7 +6,7 @@
 /*入场动画过程*/
 .fade-enter-active {
   opacity: 1;
-  transition: opacity 1s;
+  transition: opacity 300ms ease-in;
 }
 
 /*入场动画结束*/
@@ -22,7 +22,7 @@
 /*离场动画过程*/
 .fade-exit-active {
   opacity: 0;
-  transition: opacity 1s;
+  transition: opacity 300ms ease-out;
 }
 
 /*离场动画结束*/
@@ -38,56 +38,59 @@
 /*页面第一次加载时的动画过程*/
 .fade-appear-active {
   opacity: 1;
-  transition: opacity 1s;
+  transition: opacity 300ms;
 }
 
 .nut-notify {
+  position: fixed;
+  left: 8px;
+  right: 8px;
+  z-index: $notify-z-index;
   display: flex;
-  justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  padding: $notify-padding;
-  color: $notify-text-color;
-  font-size: $notify-font-size;
-  white-space: pre-wrap;
-  word-wrap: break-word;
   height: $notify-height;
-
-  &-popup-top,
-  &-popup-bottom {
-    position: fixed;
-    left: 0;
-    right: 0;
-    overflow-y: auto;
-    transition: transform 0.3s;
-    z-index: 9999;
-  }
-
-  &-popup-top {
-    top: 0;
-  }
-
-  &-popup-bottom {
-    bottom: 0;
+  padding: $notify-padding;
+  border-radius: $notify-border-radius;
+  box-shadow: $notify-box-shadow;
+  background-color: $notify-background-color;
+
+  &-content {
+    flex: 1;
+    text-align: center;
+    min-width: 0;
+    font-size: $notify-font-size;
+    color: $notify-text-color;
+    white-space: nowrap;
+    overflow: hidden;
   }
 
-  &-base {
-    background: $notify-base-background-color;
+  &-ellipsis {
+    text-overflow: ellipsis;
   }
 
-  &-primary {
-    background: $notify-primary-background-color;
+  &-layout-left {
+    text-align: left;
   }
 
-  &-success {
-    background: $notify-success-background-color;
+  &-left-icon,
+  &-right-icon {
+    display: inline-flex;
   }
 
-  &-danger {
-    background: $notify-danger-background-color;
+  &-left-icon {
+    margin-right: 6px;
+    .nut-icon {
+      height: 16px;
+      width: 16px;
+    }
   }
 
-  &-warning {
-    background: $notify-warning-background-color;
+  &-right-icon {
+    margin-left: 6px;
+    .nut-icon {
+      height: 12px;
+      width: 12px;
+    }
   }
 }

package/dist/es/packages/notify/style/style.css

@@ -11,7 +11,7 @@
 /*入场动画过程*/
 .fade-enter-active {
   opacity: 1;
-  transition: opacity 1s;
+  transition: opacity 300ms ease-in;
 }
 
 /*入场动画结束*/
@@ -27,7 +27,7 @@
 /*离场动画过程*/
 .fade-exit-active {
   opacity: 0;
-  transition: opacity 1s;
+  transition: opacity 300ms ease-out;
 }
 
 /*离场动画结束*/
@@ -43,47 +43,52 @@
 /*页面第一次加载时的动画过程*/
 .fade-appear-active {
   opacity: 1;
-  transition: opacity 1s;
+  transition: opacity 300ms;
 }
 
 .nut-notify {
+  position: fixed;
+  left: 8px;
+  right: 8px;
+  z-index: var(--nutui-notify-z-index, 1000);
   display: flex;
-  justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  padding: var(--nutui-notify-padding, 0px 10px);
-  color: var(--nutui-notify-text-color, #ffffff);
-  font-size: var(--nutui-notify-font-size, var(--nutui-font-size-base, 14px));
-  white-space: pre-wrap;
-  word-wrap: break-word;
   height: var(--nutui-notify-height, 40px);
+  padding: var(--nutui-notify-padding, 0px 12px);
+  border-radius: var(--nutui-notify-border-radius, 8px);
+  box-shadow: var(--nutui-notify-box-shadow, 0px 4px 12px 0px rgba(0, 0, 0, 0.06));
+  background-color: var(--nutui-notify-background-color, #ffffff);
+}
+.nut-notify-content {
+  flex: 1;
+  text-align: center;
+  min-width: 0;
+  font-size: var(--nutui-notify-font-size, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-notify-text-color, var(--nutui-color-title, #1a1a1a));
+  white-space: nowrap;
+  overflow: hidden;
 }
-.nut-notify-popup-top, .nut-notify-popup-bottom {
-  position: fixed;
-  left: 0;
-  right: 0;
-  overflow-y: auto;
-  transition: transform 0.3s;
-  z-index: 9999;
-}
-.nut-notify-popup-top {
-  top: 0;
+.nut-notify-ellipsis {
+  text-overflow: ellipsis;
 }
-.nut-notify-popup-bottom {
-  bottom: 0;
+.nut-notify-layout-left {
+  text-align: left;
 }
-.nut-notify-base {
-  background: var(--nutui-notify-base-background-color, var(--nutui-color-primary, #ff0f23));
+.nut-notify-left-icon, .nut-notify-right-icon {
+  display: inline-flex;
 }
-.nut-notify-primary {
-  background: var(--nutui-notify-primary-background-color, var(--nutui-color-info, #0073ff));
+.nut-notify-left-icon {
+  margin-right: 6px;
 }
-.nut-notify-success {
-  background: var(--nutui-notify-success-background-color, var(--nutui-color-success, #00d900));
+.nut-notify-left-icon .nut-icon {
+  height: 16px;
+  width: 16px;
 }
-.nut-notify-danger {
-  background: var(--nutui-notify-danger-background-color, var(--nutui-color-primary, #ff0f23));
+.nut-notify-right-icon {
+  margin-left: 6px;
 }
-.nut-notify-warning {
-  background: var(--nutui-notify-warning-background-color, var(--nutui-color-warning, #ffbf00));
+.nut-notify-right-icon .nut-icon {
+  height: 12px;
+  width: 12px;
 }

package/dist/es/packages/picker/style/style.css

@@ -429,6 +429,9 @@
   z-index: 1;
   transform-style: preserve-3d;
 }
+.nut-pickerview-roller-placeholder {
+  height: var(--nutui-picker-item-height, 36px);
+}
 .nut-pickerview-roller-item {
   position: absolute;
   top: 0;

package/dist/es/packages/pickerview/style/pickerview.scss

@@ -49,6 +49,9 @@
     height: $picker-item-height;
     z-index: 1;
     transform-style: preserve-3d;
+    &-placeholder {
+      height: $picker-item-height;
+    }
   }
 
   &-roller-item {

package/dist/es/packages/pickerview/style/style.css

@@ -48,6 +48,9 @@
   z-index: 1;
   transform-style: preserve-3d;
 }
+.nut-pickerview-roller-placeholder {
+  height: var(--nutui-picker-item-height, 36px);
+}
 .nut-pickerview-roller-item {
   position: absolute;
   top: 0;

package/dist/es/packages/skeleton/skeleton.js

@@ -1,77 +1,91 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import React from "react";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import React, { useEffect, useState } from "react";
 import classNames from "classnames";
-import Avatar from "../avatar";
 import { ComponentDefaults } from "../../utils/typings";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     rows: 1,
-    animated: false,
-    title: false,
-    avatar: false,
-    avatarSize: '50px',
+    animated: true,
     visible: false,
-    avatarShape: 'round'
+    size: 'normal',
+    shape: 'round',
+    duration: 0.6,
+    inline: false
 });
 export var Skeleton = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, animated = _ref.animated, rows = _ref.rows, title = _ref.title, avatar = _ref.avatar, avatarSize = _ref.avatarSize, visible = _ref.visible, children = _ref.children, avatarShape = _ref.avatarShape, rest = _object_without_properties(_ref, [
+    var shapeStyle = function shapeStyle() {
+        if (shape === 'circle') return {
+            borderRadius: '50%'
+        };
+        if (shape === 'square') return {
+            borderRadius: '0'
+        };
+        return {};
+    };
+    var durationStyle = function durationStyle() {
+        if (typeof duration !== 'undefined') return {
+            animationDuration: "".concat(duration, "s")
+        };
+        return {};
+    };
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, width = _ref.width, height = _ref.height, shape = _ref.shape, animated = _ref.animated, rows = _ref.rows, visible = _ref.visible, size = _ref.size, duration = _ref.duration, children = _ref.children, rest = _object_without_properties(_ref, [
         "className",
+        "width",
+        "height",
+        "shape",
         "animated",
         "rows",
-        "title",
-        "avatar",
-        "avatarSize",
         "visible",
-        "children",
-        "avatarShape"
+        "size",
+        "duration",
+        "children"
     ]);
     var classPrefix = 'nut-skeleton';
     var classes = classNames(classPrefix, className);
-    var _obj;
-    var avatarClass = classNames((_obj = {}, _define_property(_obj, "nut-avatar", true), _define_property(_obj, "nut-skeleton-content-avatar", true), _define_property(_obj, "avatar-".concat(avatarShape), avatarShape), _obj));
-    var repeatLines = function(num) {
+    var repeatCount = function(num) {
         return Array.from({
             length: num
         }, function(v, i) {
             return i;
         });
     };
-    var getStyle = function() {
-        if (avatarSize) {
-            return {
-                width: avatarSize,
-                height: avatarSize
-            };
-        }
-        return {
-            width: '50px',
-            height: '50px'
-        };
+    var _useState = _sliced_to_array(useState(false), 2), animate = _useState[0], setAnimate = _useState[1];
+    var playAnimation = function() {
+        setAnimate(false) // 首先将 animate 设置为 false
+        ;
+        setTimeout(function() {
+            setAnimate(true) // 1 毫秒后再设置为 true，触发动画
+            ;
+        }, 10);
     };
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, visible ? /*#__PURE__*/ React.createElement(React.Fragment, null, children) : /*#__PURE__*/ React.createElement("div", _object_spread({
+    useEffect(function() {
+        if (!animated) return;
+        playAnimation();
+        // 每隔 3 秒播放一次动画
+        var intervalId = setInterval(playAnimation, 1000 + duration * 1000) // xs 动画 + 1s 间隔
+        ;
+        // 清理定时器
+        return function() {
+            return clearInterval(intervalId);
+        };
+    }, []);
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, visible ? children : /*#__PURE__*/ React.createElement("div", _object_spread({
         className: classes
-    }, rest), animated && /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-animation")
-    }), /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-content")
-    }, avatar && /*#__PURE__*/ React.createElement(Avatar, {
-        className: avatarClass,
-        shape: avatarShape,
-        style: getStyle(),
-        icon: "null"
-    }), rows === 1 ? /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-content-block")
-    }) : /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-content-line")
-    }, title && /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-content-title")
-    }), repeatLines(rows).map(function(item, index) {
+    }, rest), repeatCount(rows).map(function(item, index) {
+        var contentClass = "".concat(classPrefix, "-content ").concat(classPrefix, "-content-").concat(size, " ").concat(classPrefix, "-content-").concat(size, "-").concat(index);
         return /*#__PURE__*/ React.createElement("div", {
-            className: "".concat(classPrefix, "-content-block"),
-            key: index
-        });
-    })))));
+            className: "".concat(contentClass),
+            key: index,
+            style: _object_spread({
+                width: width,
+                height: height
+            }, shapeStyle())
+        }, animated && /*#__PURE__*/ React.createElement("div", {
+            className: "".concat(classPrefix, "-animated ").concat(animate ? "".concat(classPrefix, "-animation") : ''),
+            style: durationStyle()
+        }));
+    })));
 };
 Skeleton.displayName = 'NutSkeleton';

package/dist/es/packages/skeleton/style/index.js

@@ -1,2 +1 @@
-import '../../avatar/style';
 import './skeleton.scss';

package/dist/es/packages/skeleton/style/skeleton.scss

@@ -1,44 +1,29 @@
 .nut-skeleton {
-  display: inline-block;
-  position: relative;
-  overflow: hidden;
-  vertical-align: middle;
-  width: 100%;
+  line-height: 0px;
+  font-size: 0px;
 
   &-content {
-    display: flex;
-    flex-direction: row;
+    position: relative;
+    display: inline-flex;
+    width: $skeleton-line-width;
+    background: $skeleton-background;
+    border-radius: $skeleton-line-border-radius;
+    overflow: hidden;
 
-    &-avatar {
-      margin-right: 20px;
-      background: $skeleton-background !important;
+    &-normal {
+      height: $skeleton-line-normal-height;
     }
 
-    &-block {
-      width: $skeleton-line-width;
-      height: $skeleton-line-height;
-      background: $skeleton-background;
-      margin-top: 10px;
-      border-radius: $skeleton-line-border-radius;
+    &-large {
+      height: $skeleton-line-large-height;
     }
 
-    &-line {
-      width: 100%;
-      display: flex;
-      flex-direction: column;
-      .nut-skeleton-content-block:last-child {
-        width: 70%;
-      }
+    &-small {
+      height: $skeleton-line-small-height;
+      margin-top: 8px;
     }
-
-    &-title {
-      width: 30%;
-      height: $skeleton-line-height;
-      background: $skeleton-background;
-    }
-
-    &-block-last-child {
-      width: 55%;
+    &-small-0 {
+      margin-top: 0;
     }
   }
 
@@ -49,41 +34,50 @@
     width: 100%;
     height: 100%;
     z-index: 1;
-    animation: nut-skeleton 2s ease-in-out 0s infinite;
+    background: linear-gradient(
+      90deg,
+      rgba(0, 0, 0, 0) 0%,
+      rgba(0, 0, 0, 0.02) 50%,
+      rgba(0, 0, 0, 0) 100%
+    );
+    animation-name: nut-skeleton;
+    animation-delay: 0s;
+    animation-duration: 0.6s;
+    animation-direction: normal;
+    animation-fill-mode: both;
+    animation-play-state: running;
+    animation-iteration-count: 1;
+    animation-timing-function: linear;
   }
 
   @keyframes nut-skeleton {
-    0% {
-      background-position-x: -500px;
+    from {
+      transform: translateX(-100%);
     }
 
     to {
-      background-position-x: calc(500px + 100%);
+      transform: translateX(100%);
     }
   }
 }
 
 [dir='rtl'] .nut-skeleton,
 .nut-rtl .nut-skeleton {
-  &-content {
-    .nut-avatar {
-      margin-right: 0;
-      margin-left: 20px;
-    }
-  }
   &-animation {
     left: auto;
     right: 0;
-    animation: nut-skeleton-rtl 2s ease-in-out 0s infinite;
+    animation: nut-skeleton-rtl 2s linear 0s infinite;
   }
 
   @keyframes nut-skeleton-rtl {
-    0% {
-      background-position-x: calc(500px + 100%);
+    from {
+      //background-position: -200% 0;
+      transform: translateX(100%);
     }
 
     to {
-      background-position-x: -500px;
+      //background-position: 200% 0;
+      transform: translateX(-100%);
     }
   }
 }