@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

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

@@ -4,12 +4,7 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
@@ -20,12 +15,6 @@
   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;
 }
@@ -63,18 +52,17 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
-  color: var(--nutui-color-title, #1a1a1a);
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,35 +75,40 @@
   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-title {
+.nut-popup-title-wrapper {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+}
+.nut-popup-title-title {
+  color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  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-color-text-help, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-color-text, #505259);
+  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;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-color-text-help, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-color-title, #1a1a1a);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -136,15 +129,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
-  /* #ifndef rn */
+  max-width: 295px;
   transform: translate(-50%, -50%);
-  /* #endif */
 }
 .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;
@@ -152,40 +144,33 @@
   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;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .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;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .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;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 100px;
-  /* #endif */
 }
 .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 {
   /* 从顶部滑出 */
@@ -251,22 +236,16 @@
 }
 @keyframes popup-slide-top-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -278,22 +257,16 @@
 }
 @keyframes popup-slide-right-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -305,22 +278,16 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
-  /* #ifndef rn */
   transform: translate(0, 0);
-  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -332,16 +299,12 @@
 }
 @keyframes popup-slide-left-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -395,9 +358,7 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
   transform: translate(50%, -50%);
-  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -412,60 +373,129 @@
 
 .nut-indicator {
   display: flex;
-  flex-direction: row;
   width: auto;
+  flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: center;
 }
-.nut-indicator-dot {
+.nut-indicator-fixed-width {
+  width: 21px;
+}
+.nut-indicator-dot, .nut-indicator-line {
   display: inline-block;
   vertical-align: middle;
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-size, 4px);
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-size, 3px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
-  margin: 0 var(--nutui-indicator-dot-margin, 2px);
+  background-color: var(--nutui-color-border-disabled, #c2c4cc);
+  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
+  opacity: 0.4;
 }
-.nut-indicator-dot:first-child {
+.nut-indicator-dot-0, .nut-indicator-line-0 {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child {
-  margin-right: 0px;
+.nut-indicator-dot-active, .nut-indicator-line-active {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
+  opacity: 1;
+}
+.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-fixed-width .nut-indicator-dot-active {
+  width: 6px;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width {
+  justify-content: flex-start;
+  height: 21px;
+  width: auto;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 3px;
+  height: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
+  height: 6px;
 }
-.nut-indicator-active {
-  width: var(--nutui-indicator-dot-active-size, 8px);
-  border-radius: var(--nutui-indicator-border-radius, 2px);
+.nut-indicator-vertical.nut-indicator-fixed-width.nut-indicator-fixed-width.nut-indicator-white .nut-indicator-dot-active {
+  height: 6px;
+}
+.nut-indicator-line {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  margin: 0;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: transparent;
+}
+.nut-indicator-line-active {
+  transition: transform 0.3s ease-in-out;
   background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
 }
+
+.nut-indicator-track {
+  position: relative;
+}
+.nut-indicator-track:after {
+  display: block;
+  content: " ";
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: var(--nutui-color-border-disabled, #c2c4cc);
+  opacity: 0.4;
+}
+
+.nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
+  position: relative;
+  box-sizing: content-box;
+  background: rgba(255, 255, 255, 0.4);
+  opacity: 1;
+}
+.nut-indicator-white .nut-indicator-line {
+  opacity: 0;
+}
+.nut-indicator-white .nut-indicator-line-active {
+  opacity: 1;
+  background: rgb(255, 255, 255);
+}
+.nut-indicator-white .nut-indicator-dot-active {
+  background: rgb(255, 255, 255);
+}
+
+.nut-indicator-track.nut-indicator-white:after {
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  background: rgba(255, 255, 255, 0.4);
+}
+
 .nut-indicator-vertical {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
 }
-.nut-indicator-vertical-dot {
-  margin: var(--nutui-indicator-dot-margin, 2px) 0;
+.nut-indicator-vertical .nut-indicator-dot {
+  margin: 0px;
+  margin-top: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
 }
-.nut-indicator-vertical-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot-0 {
   margin-top: 0px;
 }
-.nut-indicator-vertical-dot:last-child {
-  margin-bottom: 0px;
+.nut-indicator-vertical .nut-indicator-dot-active {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
 }
-.nut-indicator-vertical-active {
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-active-size, 8px);
+.nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
 }
 
-[dir=rtl] .nut-indicator-dot:first-child,
-.nut-rtl .nut-indicator-dot:first-child {
-  margin-left: var(--nutui-indicator-dot-margin, 2px);
-  margin-right: 0px;
-}
-[dir=rtl] .nut-indicator-dot:last-child,
-.nut-rtl .nut-indicator-dot:last-child {
-  margin-right: var(--nutui-indicator-dot-margin, 2px);
+[dir=rtl] .nut-indicator-dot-0,
+.nut-rtl .nut-indicator-dot-0 {
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
   margin-left: 0px;
 }
 
@@ -473,9 +503,14 @@
   width: 100%;
   height: 100%;
   overflow: hidden;
-  touch-action: none;
   position: relative;
 }
+.nut-swiper-canmove-horizontal {
+  touch-action: pan-y;
+}
+.nut-swiper-canmove-vertical {
+  touch-action: pan-x;
+}
 .nut-swiper-indicator {
   display: flex;
   flex-direction: row;
@@ -502,15 +537,7 @@
   display: flex;
   position: relative;
 }
-.nut-swiper-inner-horizontal {
-  /* #ifndef rn */
-  transform: translateX(var(--swiper-offset));
-  /* #ifndef rn */
-}
 .nut-swiper-inner-vertical {
-  /* #ifndef rn */
-  transform: translateY(var(--swiper-offset));
-  /* #ifndef rn */
   flex-direction: column;
 }
 
@@ -530,9 +557,6 @@
 .nut-rtl .nut-swiper-indicator {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
-  transform: translateX(50%);
-  /* #endif */
 }
 [dir=rtl] .nut-swiper-indicator-vertical,
 .nut-rtl .nut-swiper-indicator-vertical {
@@ -582,7 +606,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background, #f5f6fa);
+  background: var(--nutui-color-background, #f2f3f5);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -595,7 +619,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background, #f5f6fa);
+  background: var(--nutui-color-background, #f2f3f5);
   background-size: 100% 100%;
 }
 

package/dist/es/packages/indicator/indicator.d.ts

@@ -1,7 +1,11 @@
 import React, { FunctionComponent } from 'react';
+export type IndicatorType = 'anchor' | 'slide';
+export type IndicatorColor = 'primary' | 'white';
 export interface IndicatorProps {
     total: number;
     current: number;
     direction: string;
+    color: IndicatorColor;
+    type: IndicatorType;
 }
 export declare const Indicator: FunctionComponent<Partial<IndicatorProps> & React.HTMLAttributes<HTMLDivElement>>;

package/dist/es/packages/indicator/indicator.js

@@ -4,36 +4,65 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import React from "react";
 import classNames from "classnames";
 var defaultProps = {
-    total: 3,
+    total: 2,
     current: 0,
-    direction: 'horizontal'
+    direction: 'horizontal',
+    color: 'primary',
+    type: 'anchor'
 };
 var classPrefix = "nut-indicator";
 export var Indicator = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), total = _ref.total, current = _ref.current, children = _ref.children, className = _ref.className, direction = _ref.direction, rest = _object_without_properties(_ref, [
+    var maybeFixedWidth = function maybeFixedWidth() {
+        if (total === 2 || type === 'slide') {
+            return "".concat(classPrefix, "-fixed-width");
+        }
+        return '';
+    };
+    var _ref = _object_spread({}, defaultProps, props), color = _ref.color, type = _ref.type, total = _ref.total, current = _ref.current, children = _ref.children, className = _ref.className, direction = _ref.direction, rest = _object_without_properties(_ref, [
+        "color",
+        "type",
         "total",
         "current",
         "children",
         "className",
         "direction"
     ]);
-    var classes = classNames(_define_property({}, "".concat(classPrefix, "-vertical"), direction === 'vertical'));
-    var classPrefixV = direction === 'vertical' ? "".concat(classPrefix, "-vertical") : classPrefix;
-    var renderElement = function() {
+    var _obj;
+    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-vertical"), direction === 'vertical'), _define_property(_obj, "".concat(classPrefix, "-white"), color === 'white'), _define_property(_obj, "".concat(classPrefix, "-track"), type === 'slide'), _obj));
+    var renderDotElement = function() {
         var childs = [];
         for(var item = 0; item < total; item++){
             childs.push(item === current ? children || /*#__PURE__*/ React.createElement("div", {
                 key: item,
-                className: "".concat(classPrefix, "-dot ").concat(classPrefix, "-active ").concat(classPrefixV, "-dot ").concat(classPrefixV, "-active")
+                className: "".concat(classPrefix, "-dot ").concat(classPrefix, "-dot-active")
             }) : /*#__PURE__*/ React.createElement("div", {
                 key: item,
-                className: "".concat(classPrefix, "-dot ").concat(classPrefixV, "-dot")
+                className: "".concat(classPrefix, "-dot")
             }));
         }
         return childs;
     };
+    var renderLineElement = function() {
+        var trackWidth = 21;
+        var sliderWidth = 6;
+        var stride = (trackWidth - sliderWidth) / (total - 1);
+        return /*#__PURE__*/ React.createElement("div", {
+            style: {
+                transform: "".concat(direction === 'vertical' ? 'translateY' : 'translateX', "(").concat(current * stride, "px)")
+            },
+            className: "".concat(classPrefix, "-line ").concat(classPrefix, "-line-active")
+        });
+    };
+    var renderByType = function(type) {
+        switch(type){
+            case 'slide':
+                return renderLineElement();
+            default:
+                return renderDotElement();
+        }
+    };
     return /*#__PURE__*/ React.createElement("div", _object_spread({
-        className: classNames(classPrefix, classes, className)
-    }, rest), renderElement());
+        className: classNames(classPrefix, classes, maybeFixedWidth(), className)
+    }, rest), renderByType(type));
 };
 Indicator.displayName = 'NutIndicator';