@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -1,50 +1,59 @@
 .nut-popup {
   position: fixed;
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
   background-color: $overlay-content-bg-color;
-  color: $color-title;
   -webkit-overflow-scrolling: touch;
   font-size: $font-size-base;
 
   &-title {
     display: flex;
+    flex-direction: row;
     align-items: center;
     justify-content: center;
-    // height: $popup-title-height;
     border-bottom: $popup-title-border-bottom;
     padding: $popup-title-padding;
     position: relative;
 
-    &-left {
-      position: absolute;
-      left: $popup-title-padding;
+    &-wrapper {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
     }
 
     &-title {
+      color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
+      line-height: $popup-title-font-size;
     }
 
     &-description {
-      color: $color-text-help;
+      color: $color-text;
       font-size: $popup-description-font-size;
       font-weight: $font-weight;
+      &-gap {
+        margin-top: $popup-description-spacing;
+      }
+    }
+
+    &-left {
+      position: absolute;
+      top: $popup-title-padding;
+      left: $popup-title-padding;
     }
 
     &-right {
-      position: absolute !important;
+      position: absolute;
+      top: $popup-title-padding;
+      right: $popup-title-padding;
+
       z-index: 1;
-      cursor: pointer;
       width: $popup-icon-size;
       height: $popup-icon-size;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      top: $popup-title-padding;
-      right: $popup-title-padding;
-      color: $color-text-help;
+      color: $color-title;
+      cursor: pointer;
 
       &:active {
         opacity: 0.7;
@@ -71,6 +80,7 @@
     top: 50%;
     left: 50%;
     min-height: 10%;
+    max-width: 295px;
     transform: translate(-50%, -50%);
 
     &.nut-popup-round {
@@ -80,7 +90,7 @@
 
   &-bottom,
   &-top {
-    max-height: 83%;
+    max-height: 87%;
   }
 
   &-bottom {
@@ -96,6 +106,8 @@
   &-right {
     top: 0;
     right: 0;
+    width: 100px;
+    height: 100%;
 
     &.nut-popup-round {
       border-radius: $popup-border-radius 0 0 $popup-border-radius;
@@ -105,6 +117,8 @@
   &-left {
     top: 0;
     left: 0;
+    width: 100px;
+    height: 100%;
 
     &.nut-popup-round {
       border-radius: 0 $popup-border-radius $popup-border-radius 0;
@@ -312,7 +326,7 @@
   }
 
   .nut-overflow-hidden {
-    overflow: hidden !important;
+    overflow: hidden;
   }
 }
 

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

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -12,22 +16,13 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
   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;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -62,49 +57,63 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
   position: fixed;
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
   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-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  color: var(--nutui-gray-7);
+  font-weight: var(--nutui-font-weight-bold, 600);
+  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-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  color: var(--nutui-gray-6);
+  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 !important;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  position: absolute;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,13 +134,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  max-width: 295px;
   transform: translate(-50%, -50%);
 }
 .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;
@@ -139,21 +149,25 @@
   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;
+  width: 100px;
+  height: 100%;
 }
 .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;
+  width: 100px;
+  height: 100%;
 }
 .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;
@@ -161,7 +175,7 @@
   width: 100%;
 }
 .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 {
   /* 从顶部滑出 */
@@ -313,7 +327,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,

package/dist/es/packages/price/index.d.ts

@@ -1,3 +1,3 @@
 import { Price } from "./price";
-export type { PriceProps } from "./price";
+export type { PriceProps, PriceSize, PriceColor } from './types';
 export default Price;

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

@@ -1,12 +1,3 @@
 import { FunctionComponent } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export interface PriceProps extends BasicComponent {
-    price: number | string;
-    symbol: string;
-    digits: number;
-    thousands: boolean;
-    position: string;
-    size: string;
-    line: boolean;
-}
+import { PriceProps } from './types';
 export declare const Price: FunctionComponent<Partial<PriceProps>>;

package/dist/es/packages/price/price.js

@@ -2,21 +2,23 @@ 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 React from "react";
-import { Text } from "@tarojs/components";
+import { Text, View } from "@tarojs/components";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
+import { harmony } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    color: 'primary',
     price: 0,
     symbol: '¥',
     digits: 2,
     thousands: false,
     position: 'before',
-    size: 'large',
+    size: 'normal',
     line: false
 });
 export var Price = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), price = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, price = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
     var classPrefix = 'nut-price';
     var rtl = useRtl();
     var replaceSpecialChar = function(url) {
@@ -35,11 +37,9 @@ export var Price = function(props) {
         if (Number(num) === 0) {
             num = 0;
         }
+        num = num.toString();
         if (checkPoint(num)) {
-            num = Number(num).toFixed(digits);
             num = typeof num.split('.') === 'string' ? num.split('.') : num.split('.')[0];
-        } else {
-            num = num.toString();
         }
         if (thousands) {
             return (num || 0).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
@@ -70,15 +70,21 @@ export var Price = function(props) {
             ])
         }, symbol ? replaceSpecialChar(symbol) : '');
     };
-    return /*#__PURE__*/ React.createElement(Text, {
-        className: "".concat(classPrefix, " ").concat(line ? "".concat(classPrefix, "-line") : '', " ").concat(className),
+    var renderInner = function() {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, symbol && position === 'before' ? renderSymbol() : null, /*#__PURE__*/ React.createElement(Text, {
+            className: "".concat(classPrefix, "-integer ").concat(classPrefix, "-integer-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
+        }, formatThousands(price)), digits ? /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(Text, {
+            className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
+        }, "."), /*#__PURE__*/ React.createElement(Text, {
+            className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
+        }, formatDecimal(price))) : null, symbol && position === 'after' ? renderSymbol() : null);
+    };
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, harmony() ? /*#__PURE__*/ React.createElement(Text, {
+        className: "".concat(classPrefix, " ").concat(classPrefix, "-").concat(color, " ").concat(className),
+        style: style
+    }, renderInner()) : /*#__PURE__*/ React.createElement(View, {
+        className: "".concat(classPrefix, " ").concat(classPrefix, "-").concat(color, " ").concat(className),
         style: style
-    }, symbol && position === 'before' ? renderSymbol() : null, /*#__PURE__*/ React.createElement(Text, {
-        className: "".concat(classPrefix, "-integer ").concat(classPrefix, "-integer-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, formatThousands(price)), digits !== 0 ? /*#__PURE__*/ React.createElement(Text, {
-        className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, ".") : null, /*#__PURE__*/ React.createElement(Text, {
-        className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, formatDecimal(price)), symbol && position === 'after' ? renderSymbol() : null);
+    }, renderInner()));
 };
 Price.displayName = 'NutPrice';

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

@@ -1,6 +1,6 @@
 .nut-price {
   direction: ltr;
-  font-size: $font-size-large;
+  font-size: $font-size-l;
   display: flex;
   flex-direction: row;
   align-items: baseline;
@@ -8,15 +8,45 @@
   &-symbol,
   &-integer,
   &-decimal {
-    color: $color-primary;
+    color: $price-color;
+    font-family: 'JD';
+    line-height: 1;
+  }
+
+  &-darkgray {
+    .nut-price {
+      &-symbol,
+      &-integer,
+      &-decimal {
+        font-family: 'JD-Bold';
+        color: $price-darkgray-color;
+      }
+    }
+  }
+
+  &-primary {
+    .nut-price {
+      &-symbol,
+      &-integer,
+      &-decimal {
+        font-family: 'JD-Bold';
+        color: $price-primary-color;
+      }
+    }
   }
 
   &-symbol {
-    font-size: $price-symbol-medium-size;
     padding-right: $price-symbol-padding-right;
+    &-xlarge {
+      font-size: $price-symbol-xlarge-size;
+    }
 
     &-large {
-      font-size: $price-symbol-big-size;
+      font-size: $price-symbol-large-size;
+    }
+
+    &-normal {
+      font-size: $price-symbol-normal-size;
     }
 
     &-small {
@@ -30,10 +60,16 @@
   }
 
   &-integer {
-    font-size: $price-integer-medium-size;
+    &-xlarge {
+      font-size: $price-integer-xlarge-size;
+    }
 
     &-large {
-      font-size: $price-integer-big-size;
+      font-size: $price-integer-large-size;
+    }
+
+    &-normal {
+      font-size: $price-integer-normal-size;
     }
 
     &-small {
@@ -42,10 +78,16 @@
   }
 
   &-decimal {
-    font-size: $price-decimal-medium-size;
+    &-xlarge {
+      font-size: $price-decimal-xlarge-size;
+    }
 
     &-large {
-      font-size: $price-decimal-big-size;
+      font-size: $price-decimal-large-size;
+    }
+
+    &-normal {
+      font-size: $price-decimal-normal-size;
     }
 
     &-small {
@@ -55,7 +97,5 @@
 
   &-line {
     text-decoration: line-through $price-line-color;
-    font-size: $price-line-font-size;
-    color: $price-line-color;
   }
 }

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

@@ -1,47 +1,70 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-price {
   direction: ltr;
-  font-size: var(--nutui-font-size-4, 16px);
+  font-size: var(--nutui-font-size-l, 16px);
   display: flex;
   flex-direction: row;
   align-items: baseline;
 }
 .nut-price-symbol, .nut-price-integer, .nut-price-decimal {
-  color: var(--nutui-color-primary, #ff0f23);
+  color: var(--nutui-price-color, var(--nutui-color-text-help));
+  font-family: "JD";
+  line-height: 1;
+}
+.nut-price-darkgray .nut-price-symbol, .nut-price-darkgray .nut-price-integer, .nut-price-darkgray .nut-price-decimal {
+  font-family: "JD-Bold";
+  color: var(--nutui-price-darkgray-color, var(--nutui-gray-7));
+}
+.nut-price-primary .nut-price-symbol, .nut-price-primary .nut-price-integer, .nut-price-primary .nut-price-decimal {
+  font-family: "JD-Bold";
+  color: var(--nutui-price-color, var(--nutui-brand-6));
 }
 .nut-price-symbol {
-  font-size: var(--nutui-price-symbol-medium-size, 14px);
-  padding-right: var(--nutui-price-symbol-padding-right, 1px);
+  padding-right: var(--nutui-price-symbol-padding-right, 0px);
+}
+.nut-price-symbol-xlarge {
+  font-size: var(--nutui-price-symbol-xlarge-size, 12px);
 }
 .nut-price-symbol-large {
-  font-size: var(--nutui-price-symbol-big-size, 18px);
+  font-size: var(--nutui-price-symbol-large-size, 12px);
+}
+.nut-price-symbol-normal {
+  font-size: var(--nutui-price-symbol-normal-size, 12px);
 }
 .nut-price-symbol-small {
-  font-size: var(--nutui-price-symbol-small-size, 10px);
+  font-size: var(--nutui-price-symbol-small-size, 12px);
 }
 .nut-price-symbol-rtl {
   padding-right: 0;
-  padding-left: var(--nutui-price-symbol-padding-right, 1px);
+  padding-left: var(--nutui-price-symbol-padding-right, 0px);
 }
-.nut-price-integer {
-  font-size: var(--nutui-price-integer-medium-size, 16px);
+.nut-price-integer-xlarge {
+  font-size: var(--nutui-price-integer-xlarge-size, 24px);
 }
 .nut-price-integer-large {
-  font-size: var(--nutui-price-integer-big-size, 24px);
+  font-size: var(--nutui-price-integer-large-size, 18px);
+}
+.nut-price-integer-normal {
+  font-size: var(--nutui-price-integer-normal-size, 16px);
 }
 .nut-price-integer-small {
   font-size: var(--nutui-price-integer-small-size, 12px);
 }
-.nut-price-decimal {
-  font-size: var(--nutui-price-decimal-medium-size, 14px);
+.nut-price-decimal-xlarge {
+  font-size: var(--nutui-price-decimal-xlarge-size, 12px);
 }
 .nut-price-decimal-large {
-  font-size: var(--nutui-price-decimal-big-size, 18px);
+  font-size: var(--nutui-price-decimal-large-size, 12px);
+}
+.nut-price-decimal-normal {
+  font-size: var(--nutui-price-decimal-normal-size, 12px);
 }
 .nut-price-decimal-small {
-  font-size: var(--nutui-price-decimal-small-size, 10px);
+  font-size: var(--nutui-price-decimal-small-size, 12px);
 }
 .nut-price-line {
-  text-decoration: line-through var(--nutui-price-line-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  font-size: var(--nutui-price-line-font-size, 12px);
-  color: var(--nutui-price-line-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  text-decoration: line-through var(--nutui-price-line-color, var(--nutui-color-text-help));
 }

package/dist/es/packages/price/types.d.ts

@@ -0,0 +1,13 @@
+import { BasicComponent } from "../../utils/typings";
+export type PriceSize = 'xlarge' | 'large' | 'normal' | 'small';
+export type PriceColor = 'primary' | 'gray' | 'darkgray';
+export interface PriceProps extends BasicComponent {
+    color: PriceColor;
+    price: number | string;
+    symbol: string;
+    digits: number;
+    thousands: boolean;
+    position: string;
+    size: PriceSize;
+    line: boolean;
+}

package/dist/es/packages/price/types.js

@@ -0,0 +1 @@
+export { };

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

@@ -1,45 +1,13 @@
 import React, { FunctionComponent } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export interface ProgressProps extends BasicComponent {
-    /**
-    * 百分比
-    * @default 0
-    */
-    percent: number
-    /**
-    * 进度条背景颜色
-    * @default #f3f3f3
-    */
-    background: string
-    /**
-    * 进度条线条颜色
-    * @default linear-gradient(135deg, #FF0F23 0%, #fa6419 100%)
-    */
-    color: string
-    /**
-    * 进度条宽度
-    * @default -
-    */
-    strokeWidth: string
-    /**
-    * 是否显示文字内容
-    * @default false
-    */
-    showText: boolean
-    /**
-    * 是否展示动画效果
-    * @default false
-    */
-    animated: boolean
-    /**
-    * 每次进入可视区展示进度条动画
-    * @default false
-    */
-    lazy: boolean
-    /**
-    * 延迟数据加载时长，单位 ms
-    * @default 0
-    */
-    delay: number
+    percent: number;
+    background: string;
+    color: string;
+    strokeWidth: string;
+    showText: boolean;
+    animated: boolean;
+    lazy: boolean;
+    delay: number;
 }
 export declare const Progress: FunctionComponent<Partial<ProgressProps> & React.HTMLAttributes<HTMLDivElement>>;