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

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

@@ -0,0 +1,96 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-price {
+  direction: ltr;
+  font-size: 16px;
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+}
+.nut-price-symbol {
+  color: #888b94;
+  font-family: "JD";
+  line-height: 1;
+}
+.nut-price-integer {
+  color: #888b94;
+  font-family: "JD";
+  line-height: 1;
+}
+.nut-price-decimal {
+  color: #888b94;
+  font-family: "JD";
+  line-height: 1;
+}
+.nut-price-darkgray .nut-price-symbol {
+  font-family: "JD-Bold";
+  color: #1a1a1a;
+}
+.nut-price-darkgray .nut-price-integer {
+  font-family: "JD-Bold";
+  color: #1a1a1a;
+}
+.nut-price-darkgray .nut-price-decimal {
+  font-family: "JD-Bold";
+  color: #1a1a1a;
+}
+.nut-price-primary .nut-price-symbol {
+  font-family: "JD-Bold";
+  color: #ff0f23;
+}
+.nut-price-primary .nut-price-integer {
+  font-family: "JD-Bold";
+  color: #ff0f23;
+}
+.nut-price-primary .nut-price-decimal {
+  font-family: "JD-Bold";
+  color: #ff0f23;
+}
+.nut-price-symbol {
+  padding-right: 0px;
+}
+.nut-price-symbol-xlarge {
+  font-size: 12px;
+}
+.nut-price-symbol-large {
+  font-size: 12px;
+}
+.nut-price-symbol-normal {
+  font-size: 12px;
+}
+.nut-price-symbol-small {
+  font-size: 12px;
+}
+.nut-price-symbol-rtl {
+  padding-right: 0;
+  padding-left: 0px;
+}
+.nut-price-integer-xlarge {
+  font-size: 24px;
+}
+.nut-price-integer-large {
+  font-size: 18px;
+}
+.nut-price-integer-normal {
+  font-size: 16px;
+}
+.nut-price-integer-small {
+  font-size: 12px;
+}
+.nut-price-decimal-xlarge {
+  font-size: 12px;
+}
+.nut-price-decimal-large {
+  font-size: 12px;
+}
+.nut-price-decimal-normal {
+  font-size: 12px;
+}
+.nut-price-decimal-small {
+  font-size: 12px;
+}
+.nut-price-line {
+  text-decoration: line-through #888b94;
+}

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

@@ -10,8 +10,8 @@ import { View } from "@tarojs/components";
 import pxTransform from "../../utils/px-transform";
 import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
-import useUuid from "../../utils/use-uuid";
-import { harmony, harmonyAndRn, rn, web } from "../../utils/platform-taro";
+import useUuid from "../../hooks/use-uuid";
+import { harmony, web } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     percent: 0,
     showText: false,
@@ -132,7 +132,7 @@ export var Progress = function(props) {
     useEffect(function() {
         if (web()) {
             handleWebObserver();
-        } else if (!harmonyAndRn()) {
+        } else if (!harmony()) {
             handleOtherObserver();
         }
     }, []);
@@ -147,19 +147,16 @@ export var Progress = function(props) {
         if (children) {
             return 0;
         }
-        if (!harmonyAndRn()) {
+        if (!harmony()) {
             return Math.floor("".concat(percent, "%").length * 9 / 2);
         }
-        if (rn()) {
-            return "".concat(percent, "%").length * 9 + 4;
-        }
         return Math.floor(("".concat(percent, "%").length * 9 + 4) / 2);
     };
     var computeInnerStyle = function() {
         var style = {
             backgroundColor: color || '#ff0f23'
         };
-        if (harmonyAndRn()) {
+        if (harmony()) {
             style.width = harmony() ? pxTransform("".concat(percent, "%").length * 9 + 4) : "".concat(percent, "%").length * 9 + 4;
         }
         return style;

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

@@ -12,7 +12,7 @@
   flex: auto;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
-  background: var(--nutui-progress-background, var(--nutui-color-background, #f5f6fa));
+  background: var(--nutui-progress-background, var(--nutui-color-background, #f2f3f5));
 }
 .nut-progress-outer .nut-progress-active:before {
   content: "";
@@ -49,7 +49,7 @@
   align-items: center;
   height: 100%;
   width: 100%;
-  color: var(--nutui-progress-text-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-progress-text-color, #ffffff);
   padding: var(--nutui-progress-text-padding, 0 5px);
   border-radius: var(--nutui-progress-text-border-radius, 5px);
   font-size: var(--nutui-progress-text-font-size, 9px);

package/dist/es/packages/progress/style/style.harmony.css

@@ -0,0 +1,77 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-progress {
+  display: flex;
+  align-items: center;
+  position: relative;
+  width: 100%;
+}
+.nut-progress-outer {
+  flex: auto;
+  border-radius: 12px;
+  height: 10px;
+  background: #f2f3f5;
+}
+.nut-progress-outer .nut-progress-active:before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 12px;
+  animation: progressActive 2s ease-in-out infinite;
+}
+.nut-progress-inner {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  transition: all 0.4s;
+  border-radius: 12px;
+  background: linear-gradient(135deg, #ff475d 0%, #ff0f23 100%);
+}
+.nut-progress-text {
+  display: flex;
+  align-items: center;
+  position: absolute;
+  top: -4px;
+  bottom: -4px;
+  transition: all 0.4s;
+  transform: translate(-50%);
+}
+.nut-progress-text-inner {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  width: 100%;
+  color: #ffffff;
+  padding: 0 5px;
+  border-radius: 5px;
+  font-size: 9px;
+  line-height: 1;
+  background: linear-gradient(135deg, #ff475d 0%, #ff0f23 100%);
+}
+@keyframes progressActive {
+  0% {
+    background: rgba(255, 255, 255, 0.1);
+    width: 0;
+  }
+  20% {
+    background: rgba(255, 255, 255, 0.5);
+    width: 0;
+  }
+  to {
+    background: rgba(255, 255, 255, 0);
+    width: 100%;
+  }
+}
+
+[dir=rtl] .nut-progress-text,
+.nut-rtl .nut-progress-text {
+  transform: translate(50%);
+}

package/dist/es/packages/pulltorefresh/pulltorefresh.js

@@ -10,12 +10,12 @@ import { View } from "@tarojs/components";
 import { Loading, More } from "@nutui/icons-react-taro";
 import Taro from "@tarojs/taro";
 import { useConfig } from "../configprovider/index";
-import { useTouch } from "../../utils/use-touch";
+import { useTouch } from "../../hooks/use-touch";
 import { rubberbandIfOutOfBounds } from "../../utils/rubberband";
 import { sleep } from "../../utils/sleep";
 import { ComponentDefaults } from "../../utils/typings";
 import pxTransform from "../../utils/px-transform";
-import { rn } from "../../utils/platform-taro";
+import { getDeviceInfo } from "../../utils/get-system-info";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: 'default',
     pullingText: '',
@@ -24,7 +24,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     completeText: '',
     completeDelay: 500,
     disabled: false,
-    headHeight: 50,
+    headHeight: 80,
     threshold: 60,
     scrollTop: 0,
     onRefresh: function() {}
@@ -87,11 +87,6 @@ export var PullToRefresh = function(p) {
             setStatus(height > threshold ? 'canRelease' : 'pulling');
         }
         clearTimeout(timer.current);
-        if (rn()) {
-            timer.current = setTimeout(function() {
-                handleTouchEnd();
-            }, 300);
-        }
     };
     function _doRefresh() {
         _doRefresh = _async_to_generator(function() {
@@ -161,7 +156,7 @@ export var PullToRefresh = function(p) {
         }
     };
     // 安卓微信小程序onTouchMove回调次数少导致下拉卡顿，增加动效会更顺畅
-    var isAndroidWeApp = Taro.getSystemInfoSync().platform === 'android' && Taro.getEnv() === 'WEAPP';
+    var isAndroidWeApp = getDeviceInfo().platform === 'android' && Taro.getEnv() === 'WEAPP';
     var springStyles = _object_spread({
         height: pxTransform(height)
     }, !pullingRef.current || isAndroidWeApp ? {
@@ -171,6 +166,7 @@ export var PullToRefresh = function(p) {
     return /*#__PURE__*/ React.createElement(View, {
         className: classes,
         style: props.style,
+        catchMove: true,
         onTouchStart: handleTouchStart,
         onTouchMove: handleTouchMove,
         onTouchEnd: handleTouchEnd

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

@@ -9,7 +9,7 @@
       bottom: 0;
       left: 0;
       width: 100%;
-      color: $color-title;
+      color: $color-text-help;
       display: flex;
       flex-direction: column;
       justify-content: center;

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

@@ -12,7 +12,7 @@
   bottom: 0;
   left: 0;
   width: 100%;
-  color: var(--nutui-color-title, #1a1a1a);
+  color: var(--nutui-color-text-help, #888b94);
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -27,10 +27,10 @@
   background: var(--nutui-pulltorefresh-color-primary, var(--nutui-color-primary, #ff0f23));
 }
 .nut-pulltorefresh-primary-content {
-  color: var(--nutui-white-12);
+  color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
 }
 .nut-pulltorefresh-primary-head-content {
-  color: var(--nutui-white-12);
+  color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
 }
 .nut-pulltorefresh-primary-status-text {
   color: #ffffff;

package/dist/es/packages/pulltorefresh/style/style.harmony.css

@@ -0,0 +1,43 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-pulltorefresh-head {
+  overflow: hidden;
+  position: relative;
+  font-size: 12px;
+}
+.nut-pulltorefresh-head-content {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  color: #888b94;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.nut-pulltorefresh-head-content-icons {
+  width: 36px;
+  height: 26px;
+  margin-bottom: 4px;
+}
+.nut-pulltorefresh-primary {
+  background: #ff0f23;
+}
+.nut-pulltorefresh-primary-content {
+  color: rgba(255, 255, 255, 0.9);
+}
+.nut-pulltorefresh-primary-head-content {
+  color: rgba(255, 255, 255, 0.9);
+}
+.nut-pulltorefresh-primary-status-text {
+  color: #ffffff;
+}
+
+[dir=rtl] .nut-pulltorefresh-head-content,
+.nut-rtl .nut-pulltorefresh-head-content {
+  left: auto;
+  right: 0;
+}

package/dist/es/packages/radio/radio.js

@@ -9,7 +9,7 @@ import classNames from "classnames";
 import { View } from "@tarojs/components";
 import RadioContext from "../radiogroup/context";
 import { ComponentDefaults } from "../../utils/typings";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     disabled: false,
     shape: 'round',

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

@@ -3,11 +3,6 @@
   align-items: center;
   flex-shrink: 0;
 
-  &:last-child {
-    margin-bottom: 0 !important;
-    margin-right: 0 !important;
-  }
-
   &.nut-radio-reverse {
     flex-direction: row-reverse;
 
@@ -37,9 +32,12 @@
   &-icon {
     &-checked {
       color: $color-primary;
+      box-shadow: 0px 2px 4px 0px #ff0f2333;
+      border-radius: 50%;
 
       &.nut-radio-icon-disabled {
         color: $color-primary-disabled-special;
+        box-shadow: none;
       }
     }
 
@@ -51,6 +49,7 @@
   &-button {
     display: inline-flex;
     align-items: center;
+    min-height: 30px;
     padding: $radio-button-padding;
     font-size: $radio-button-font-size;
     background: $radio-button-background;

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

@@ -11,6 +11,9 @@
 .nut-radiogroup .nut-radio-button {
   background-color: var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
 }
+.nut-radiogroup .nut-radio:last-child {
+  margin: 0;
+}
 .nut-radiogroup-vertical .nut-radio.nut-radio-reverse {
   width: 100%;
   justify-content: space-between;
@@ -22,8 +25,8 @@
   border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
 }
-.nut-radiogroup-horizontal .nut-radio {
-  display: inline-flex;
+.nut-radiogroup-horizontal {
+  display: flex;
 }
 .nut-radiogroup-horizontal .nut-radio-button {
   border: 1px solid #ffffff;
@@ -32,6 +35,9 @@
   border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
 }
+.nut-radiogroup-horizontal .nut-radio:last-child {
+  margin: 0 var(--nutui-radiogroup-radio-margin, 20px) var(--nutui-radiogroup-radio-margin-bottom, 5px) 0;
+}
 .nut-radiogroup .nut-radio-button-active.nut-radio-button-disabled {
   background: var(--nutui-color-text-disabled, #c2c4cc);
   color: #ffffff;
@@ -49,10 +55,6 @@
   align-items: center;
   flex-shrink: 0;
 }
-.nut-radio:last-child {
-  margin-bottom: 0 !important;
-  margin-right: 0 !important;
-}
 .nut-radio.nut-radio-reverse {
   flex-direction: row-reverse;
 }
@@ -76,9 +78,12 @@
 }
 .nut-radio-icon-checked {
   color: var(--nutui-color-primary, #ff0f23);
+  box-shadow: 0px 2px 4px 0px rgba(255, 15, 35, 0.2);
+  border-radius: 50%;
 }
 .nut-radio-icon-checked.nut-radio-icon-disabled {
   color: var(--nutui-color-primary-disabled-special, #ffadbe);
+  box-shadow: none;
 }
 .nut-radio-icon-disabled {
   color: var(--nutui-color-text-disabled, #c2c4cc);
@@ -86,6 +91,7 @@
 .nut-radio-button {
   display: inline-flex;
   align-items: center;
+  min-height: 30px;
   padding: var(--nutui-radio-button-padding, 5px 18px);
   font-size: var(--nutui-radio-button-font-size, var(--nutui-font-size-s, 12px));
   background: var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));

package/dist/es/packages/radio/style/style.harmony.css

@@ -0,0 +1,90 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-radio {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+}
+.nut-radio.nut-radio-reverse {
+  flex-direction: row-reverse;
+}
+.nut-radio.nut-radio-reverse .nut-radio-label {
+  margin-right: 4px;
+  margin-left: 0;
+}
+.nut-radio-label {
+  margin-left: 4px;
+  font-size: 12px;
+  color: #1a1a1a;
+}
+.nut-radio-label-disabled {
+  color: #c2c4cc;
+}
+.nut-radio-icon {
+  color: #c2c4cc;
+  transition-duration: 0.3s;
+  transition-property: color, border-color, background-color;
+  font-size: 16px;
+}
+.nut-radio-icon-checked {
+  color: #ff0f23;
+  box-shadow: 0px 2px 4px 0px rgba(255, 15, 35, 0.2);
+  border-radius: 50%;
+}
+.nut-radio-icon-checked.nut-radio-icon-disabled {
+  color: #ffadbe;
+  box-shadow: none;
+}
+.nut-radio-icon-disabled {
+  color: #c2c4cc;
+}
+.nut-radio-button {
+  display: inline-flex;
+  align-items: center;
+  min-height: 30px;
+  padding: 5px 18px;
+  font-size: 12px;
+  background: rgba(250, 44, 25, 0.05);
+  border-radius: 15px;
+  color: #1a1a1a;
+  box-sizing: border-box;
+  border: 1px solid rgba(250, 44, 25, 0.05);
+}
+.nut-radio-button-active {
+  background: #ffebf1;
+  color: #ff0f23;
+  border: 1px solid #ff0f23;
+}
+.nut-radio-button-disabled {
+  color: #c2c4cc;
+  border: 1px solid rgba(250, 44, 25, 0.05);
+}
+.nut-radio .nut-radio-button-active.nut-radio-button-disabled {
+  background: #c2c4cc;
+  color: #ffffff;
+  border: 1px solid #c2c4cc;
+}
+
+[dir=rtl] .nut-radio:last-child,
+.nut-rtl .nut-radio:last-child {
+  margin-right: 0 !important;
+  margin-left: 0 !important;
+}
+[dir=rtl] .nut-radio.nut-radio-reverse .nut-radio-label {
+  margin-left: 4px;
+  margin-right: 0;
+}
+.nut-rtl .nut-radio.nut-radio-reverse .nut-radio-label {
+  margin-left: 4px;
+  margin-right: 0;
+}
+[dir=rtl] .nut-radio-label {
+  margin-left: 0;
+  margin-right: 4px;
+}
+.nut-rtl .nut-radio-label {
+  margin-left: 0;
+  margin-right: 4px;
+}

package/dist/es/packages/radiogroup/radiogroup.js

@@ -8,7 +8,7 @@ import classNames from "classnames";
 import { View } from "@tarojs/components";
 import RadioContext from "./context";
 import Radio from "../radio/index";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = {
     labelPosition: 'right',
     onChange: function(value) {},

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

@@ -9,6 +9,10 @@
     &-button {
       background-color: $radio-button-background;
     }
+
+    &:last-child {
+      margin: 0;
+    }
   }
 
   &-vertical {
@@ -30,9 +34,9 @@
   }
 
   &-horizontal {
-    .nut-radio {
-      display: inline-flex;
+    display: flex;
 
+    .nut-radio {
       &-button {
         border: 1px solid $white;
       }
@@ -41,6 +45,10 @@
         border: $radio-button-active-border;
         background-color: $color-primary-light-pressed;
       }
+
+      &:last-child {
+        margin: 0 $radiogroup-radio-margin $radiogroup-radio-margin-bottom 0;
+      }
     }
   }
 

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

@@ -11,6 +11,9 @@
 .nut-radiogroup .nut-radio-button {
   background-color: var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
 }
+.nut-radiogroup .nut-radio:last-child {
+  margin: 0;
+}
 .nut-radiogroup-vertical .nut-radio.nut-radio-reverse {
   width: 100%;
   justify-content: space-between;
@@ -22,8 +25,8 @@
   border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
 }
-.nut-radiogroup-horizontal .nut-radio {
-  display: inline-flex;
+.nut-radiogroup-horizontal {
+  display: flex;
 }
 .nut-radiogroup-horizontal .nut-radio-button {
   border: 1px solid #ffffff;
@@ -32,6 +35,9 @@
   border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
 }
+.nut-radiogroup-horizontal .nut-radio:last-child {
+  margin: 0 var(--nutui-radiogroup-radio-margin, 20px) var(--nutui-radiogroup-radio-margin-bottom, 5px) 0;
+}
 .nut-radiogroup .nut-radio-button-active.nut-radio-button-disabled {
   background: var(--nutui-color-text-disabled, #c2c4cc);
   color: #ffffff;