@nutui/nutui-react-taro 3.0.0-beta.2 → 3.0.0-beta.4

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

@@ -2,6 +2,8 @@
   width: $navbar-width;
   position: relative;
   display: flex;
+  flex-direction: row;
+  justify-content: center;
   align-items: center;
   height: $navbar-height;
   box-sizing: border-box;
@@ -16,6 +18,7 @@
     position: fixed;
     top: 0;
     left: 0;
+    right: 0;
     width: 100%;
   }
 
@@ -24,27 +27,32 @@
     width: 100%;
   }
 
+  &-safe-area-inset-top {
+    padding-top: constant(safe-area-inset-top);
+    padding-top: env(safe-area-inset-top);
+  }
+
+  &-align-left {
+    padding-left: 14px;
+  }
+
   &-title {
-    min-width: 53%;
-    margin: 0 auto;
+    width: 50%;
+    height: 100%;
     text-align: center;
     display: flex;
+    flex-direction: row;
     align-items: center;
     justify-content: center;
     font-size: $navbar-title-font-size;
     font-weight: $navbar-title-font-weight;
     color: $navbar-title-font-color;
-
-    .nut-tabs-titles {
-      background: transparent;
-
-      &-item-text {
-        color: $color-title;
-      }
-    }
-
-    .nut-tabpane {
-      display: none;
+    &-align-left {
+      min-width: 0;
+      flex: 1;
+      justify-content: flex-start;
+      padding: 0 8px;
+      text-align: left;
     }
   }
 
@@ -59,125 +67,62 @@
     bottom: 0;
     display: flex;
     align-items: center;
+    flex-direction: row;
+    height: 100%;
     cursor: pointer;
     padding: 0 14px;
-
+    /* #ifndef rn harmony jd h5 weapp*/
     .nut-icon,
     .nutui-iconfont {
       width: 20px;
       height: 20px;
       font-size: 20px;
     }
+    /* #endif */
   }
 
   &-left {
     left: 0;
+    &-rtl {
+      left: auto;
+      right: 0;
+    }
+    &-align-left {
+      position: static;
+      padding: 0;
+    }
 
     &-back {
       display: flex;
+      flex-direction: row;
       align-items: center;
       justify-content: center;
-      margin-right: 10px;
+      &-children {
+        margin-right: 10px;
+        &-rtl {
+          margin-right: 0;
+          margin-left: 10px;
+        }
+      }
     }
   }
 
   &-right {
     right: 0;
-
-    .nut-icon {
-      margin-left: 12px;
-
-      &:first-child {
-        margin-left: 0;
-      }
-    }
-  }
-
-  &-title-align-left {
-    padding-left: 14px;
-
-    .nut-navbar-left {
-      position: static;
-      padding: 0;
-
-      .nut-icon {
-        margin-left: 12px;
-
-        &:first-child {
-          margin-left: 0;
-        }
-      }
+    &-rtl {
+      right: auto;
+      left: 0;
     }
-    .nut-navbar-right {
+    &-align-left {
       position: static;
       display: inline-flex;
       white-space: nowrap;
       padding-left: 0;
     }
-    .nut-navbar-left-back {
-      margin-right: 0;
-    }
-
-    .nut-navbar-title {
-      min-width: 0;
-      margin: 0;
-      flex: 1;
-      justify-content: flex-start;
-      padding: 0 8px;
-      text-align: left;
-    }
   }
-}
-
-[dir='rtl'] .nut-navbar,
-.nut-rtl .nut-navbar {
-  &-fixed {
-    left: auto;
-    right: 0;
-  }
-
-  &-left {
-    left: auto;
-    right: 0;
+  &-rtl {
     .nut-icon-ArrowLeft {
       transform: rotateY(180deg);
     }
-    &-back {
-      margin-right: 0;
-      margin-left: 10px;
-    }
-  }
-
-  &-right {
-    right: auto;
-    left: 0;
-    .nut-icon {
-      margin-left: 0;
-      margin-right: 12px;
-
-      &:first-child {
-        margin-left: 0;
-        margin-right: 0;
-      }
-    }
-  }
-
-  &-title-align-left {
-    .nut-navbar-left {
-      .nut-icon-ArrowLeft {
-        margin-left: 0;
-        margin-right: 12px;
-
-        &:first-child {
-          margin-left: 0;
-          margin-right: 0;
-        }
-      }
-    }
-
-    .nut-navbar-left-back {
-      margin-right: 0;
-      margin-left: 0;
-    }
   }
 }

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

@@ -2,11 +2,13 @@
   width: var(--nutui-navbar-width, 100%);
   position: relative;
   display: flex;
+  flex-direction: row;
+  justify-content: center;
   align-items: center;
   height: var(--nutui-navbar-height, 44px);
   box-sizing: border-box;
   background: var(--nutui-navbar-background, var(--nutui-color-background, #f5f6fa));
-  box-shadow: var(--nutui-navbar-box-shadow, 0px);
+  box-shadow: var(--nutui-navbar-box-shadow, 0 0 transparent);
   font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
   margin-bottom: var(--nutui-navbar-margin-bottom, 20px);
@@ -16,31 +18,38 @@
   position: fixed;
   top: 0;
   left: 0;
+  right: 0;
   width: 100%;
 }
 .nut-navbar-placeholder {
   display: inline-block;
   width: 100%;
 }
+.nut-navbar-safe-area-inset-top {
+  padding-top: constant(safe-area-inset-top);
+  padding-top: env(safe-area-inset-top);
+}
+.nut-navbar-align-left {
+  padding-left: 14px;
+}
 .nut-navbar-title {
-  min-width: 53%;
-  margin: 0 auto;
+  width: 50%;
+  height: 100%;
   text-align: center;
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   font-size: var(--nutui-navbar-title-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-navbar-title-font-weight, var(--nutui-font-weight-bold, 600));
   color: var(--nutui-navbar-title-font-color, var(--nutui-color-title, #1a1a1a));
 }
-.nut-navbar-title .nut-tabs-titles {
-  background: transparent;
-}
-.nut-navbar-title .nut-tabs-titles-item-text {
-  color: var(--nutui-color-title, #1a1a1a);
-}
-.nut-navbar-title .nut-tabpane {
-  display: none;
+.nut-navbar-title-align-left {
+  min-width: 0;
+  flex: 1;
+  justify-content: flex-start;
+  padding: 0 8px;
+  text-align: left;
 }
 .nut-navbar-title ::-webkit-scrollbar {
   display: none;
@@ -51,8 +60,12 @@
   bottom: 0;
   display: flex;
   align-items: center;
+  flex-direction: row;
+  height: 100%;
   cursor: pointer;
   padding: 0 14px;
+  /* #ifndef rn harmony jd h5 weapp*/
+  /* #endif */
 }
 .nut-navbar-left .nut-icon,
 .nut-navbar-left .nutui-iconfont, .nut-navbar-right .nut-icon,
@@ -64,98 +77,40 @@
 .nut-navbar-left {
   left: 0;
 }
+.nut-navbar-left-rtl {
+  left: auto;
+  right: 0;
+}
+.nut-navbar-left-align-left {
+  position: static;
+  padding: 0;
+}
 .nut-navbar-left-back {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
+}
+.nut-navbar-left-back-children {
   margin-right: 10px;
 }
+.nut-navbar-left-back-children-rtl {
+  margin-right: 0;
+  margin-left: 10px;
+}
 .nut-navbar-right {
   right: 0;
 }
-.nut-navbar-right .nut-icon {
-  margin-left: 12px;
-}
-.nut-navbar-right .nut-icon:first-child {
-  margin-left: 0;
-}
-.nut-navbar-title-align-left {
-  padding-left: 14px;
-}
-.nut-navbar-title-align-left .nut-navbar-left {
-  position: static;
-  padding: 0;
-}
-.nut-navbar-title-align-left .nut-navbar-left .nut-icon {
-  margin-left: 12px;
-}
-.nut-navbar-title-align-left .nut-navbar-left .nut-icon:first-child {
-  margin-left: 0;
+.nut-navbar-right-rtl {
+  right: auto;
+  left: 0;
 }
-.nut-navbar-title-align-left .nut-navbar-right {
+.nut-navbar-right-align-left {
   position: static;
   display: inline-flex;
   white-space: nowrap;
   padding-left: 0;
 }
-.nut-navbar-title-align-left .nut-navbar-left-back {
-  margin-right: 0;
-}
-.nut-navbar-title-align-left .nut-navbar-title {
-  min-width: 0;
-  margin: 0;
-  flex: 1;
-  justify-content: flex-start;
-  padding: 0 8px;
-  text-align: left;
-}
-
-[dir=rtl] .nut-navbar-fixed,
-.nut-rtl .nut-navbar-fixed {
-  left: auto;
-  right: 0;
-}
-[dir=rtl] .nut-navbar-left,
-.nut-rtl .nut-navbar-left {
-  left: auto;
-  right: 0;
-}
-[dir=rtl] .nut-navbar-left .nut-icon-ArrowLeft,
-.nut-rtl .nut-navbar-left .nut-icon-ArrowLeft {
+.nut-navbar-rtl .nut-icon-ArrowLeft {
   transform: rotateY(180deg);
-}
-[dir=rtl] .nut-navbar-left-back,
-.nut-rtl .nut-navbar-left-back {
-  margin-right: 0;
-  margin-left: 10px;
-}
-[dir=rtl] .nut-navbar-right,
-.nut-rtl .nut-navbar-right {
-  right: auto;
-  left: 0;
-}
-[dir=rtl] .nut-navbar-right .nut-icon,
-.nut-rtl .nut-navbar-right .nut-icon {
-  margin-left: 0;
-  margin-right: 12px;
-}
-[dir=rtl] .nut-navbar-right .nut-icon:first-child,
-.nut-rtl .nut-navbar-right .nut-icon:first-child {
-  margin-left: 0;
-  margin-right: 0;
-}
-[dir=rtl] .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft,
-.nut-rtl .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft {
-  margin-left: 0;
-  margin-right: 12px;
-}
-[dir=rtl] .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft:first-child,
-.nut-rtl .nut-navbar-title-align-left .nut-navbar-left .nut-icon-ArrowLeft:first-child {
-  margin-left: 0;
-  margin-right: 0;
-}
-[dir=rtl] .nut-navbar-title-align-left .nut-navbar-left-back,
-.nut-rtl .nut-navbar-title-align-left .nut-navbar-left-back {
-  margin-right: 0;
-  margin-left: 0;
 }

package/dist/es/packages/pagination/pagination.js

@@ -9,6 +9,7 @@ import { View } from "@tarojs/components";
 import { useConfig } from "../configprovider/index";
 import { usePropsValue } from "../../utils/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
+import addColorForHarmony from "../../utils/add-color-for-harmony";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     defaultValue: 1,
     mode: 'multi',
@@ -106,7 +107,7 @@ export var Pagination = function(props) {
         onClick: function(e) {
             return handleSelectPage(currentPage - 1);
         }
-    }, prev || locale.pagination.prev), mode === 'multi' && /*#__PURE__*/ React.createElement(View, {
+    }, addColorForHarmony(prev || locale.pagination.prev, currentPage === 1 ? '#c2c4cc' : '#ff0f23')), mode === 'multi' && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-contain")
     }, pages.map(function(item, index) {
         return /*#__PURE__*/ React.createElement(View, {
@@ -125,11 +126,13 @@ export var Pagination = function(props) {
         onClick: function(e) {
             return handleSelectPage(currentPage + 1);
         }
-    }, next || locale.pagination.next)), mode === 'lite' && /*#__PURE__*/ React.createElement(View, {
+    }, addColorForHarmony(next || locale.pagination.next, currentPage >= pageCount ? '#c2c4cc' : '#ff0f23'))), mode === 'lite' && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-lite")
     }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-lite-active")
     }, currentPage), /*#__PURE__*/ React.createElement(View, {
+        className: "".concat(classPrefix, "-lite-spliterator")
+    }, "/"), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-lite-default")
     }, pageCount)));
 };

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

@@ -67,10 +67,11 @@
 }
 
 .nut-pagination-lite {
-  width: $pagination-lite-width;
   height: $pagination-lite-height;
+  padding: 0 $spacing-xs;
   display: flex;
   flex-direction: row;
+  align-items: center;
   color: $color-primary-text;
   background-color: $pagination-lite-background-color;
   border-radius: $pagination-lite-radius;
@@ -78,18 +79,11 @@
 
 .nut-pagination-lite-active,
 .nut-pagination-lite-default {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: $pagination-lite-height;
-  height: $pagination-lite-height;
-  font-size: $font-size-s;
+  font-size: $font-size-xs;
   color: $pagination-lite-color;
-  font-weight: 400;
 }
 
-.nut-pagination-lite-active {
-  border-radius: $pagination-lite-radius;
-  font-size: $font-size-s;
-  background-color: $pagination-lite-active-background-color;
+.nut-pagination-lite-spliterator {
+  font-size: $font-size-xs;
+  color: $pagination-lite-color;
 }

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

@@ -66,29 +66,23 @@
 }
 
 .nut-pagination-lite {
-  width: var(--nutui-pagination-lite-width, 40px);
   height: var(--nutui-pagination-lite-height, 20px);
+  padding: 0 var(--nutui-spacing-xs, 6px);
   display: flex;
   flex-direction: row;
+  align-items: center;
   color: var(--nutui-color-primary-text, #ffffff);
-  background-color: var(--nutui-pagination-lite-background-color, var(--nutui-black-7));
-  border-radius: var(--nutui-pagination-lite-radius, 6px);
+  background-color: var(--nutui-pagination-lite-background-color, rgba(0, 0, 0, 0.45));
+  border-radius: var(--nutui-pagination-lite-radius, var(--nutui-radius-xs, 4px));
 }
 
 .nut-pagination-lite-active,
 .nut-pagination-lite-default {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: var(--nutui-pagination-lite-height, 20px);
-  height: var(--nutui-pagination-lite-height, 20px);
-  font-size: var(--nutui-font-size-s, 12px);
+  font-size: var(--nutui-font-size-xs, 11px);
   color: var(--nutui-pagination-lite-color, #ffffff);
-  font-weight: 400;
 }
 
-.nut-pagination-lite-active {
-  border-radius: var(--nutui-pagination-lite-radius, 6px);
-  font-size: var(--nutui-font-size-s, 12px);
-  background-color: var(--nutui-pagination-lite-active-background-color, var(--nutui-black-5));
+.nut-pagination-lite-spliterator {
+  font-size: var(--nutui-font-size-xs, 11px);
+  color: var(--nutui-pagination-lite-color, #ffffff);
 }

package/dist/es/packages/progress/progress.js

@@ -44,7 +44,7 @@ export var Progress = function(props) {
     var _useState = _sliced_to_array(useState(percent), 2), displayPercent = _useState[0], setDispalyPercent = _useState[1];
     var stylesInner = {
         width: "".concat(displayPercent, "%"),
-        backgroundColor: color || '#FF0F23'
+        background: color || '#FF0F23'
     };
     if (strokeWidth) {
         stylesOuter.height = pxTransform(Number(strokeWidth));
@@ -137,11 +137,10 @@ export var Progress = function(props) {
         }
     }, []);
     var getTextStyle = function() {
-        var value = harmony() ? '93%' : '99%';
         return rtl ? {
-            right: value
+            right: '100%'
         } : {
-            left: value
+            left: '100%'
         };
     };
     var computeRight = function() {

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

@@ -29,7 +29,7 @@
     justify-content: center;
     transition: all 0.4s;
     border-radius: $progress-border-radius;
-    background-color: $progress-color;
+    background: $progress-color;
   }
 
   &-text {
@@ -39,7 +39,7 @@
     top: $progress-text-position-top;
     bottom: $progress-text-position-bottom;
     transition: all 0.4s;
-    // transform: translate(-50%);
+    transform: translate(-50%);
 
     &-inner {
       display: flex;

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

@@ -27,7 +27,7 @@
   justify-content: center;
   transition: all 0.4s;
   border-radius: var(--nutui-progress-border-radius, 12px);
-  background-color: var(--nutui-progress-color, #ff0f23);
+  background: var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
 }
 .nut-progress-text {
   display: flex;
@@ -36,6 +36,7 @@
   top: var(--nutui-progress-text-position-top, -4px);
   bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
+  transform: translate(-50%);
 }
 .nut-progress-text-inner {
   display: flex;
@@ -49,7 +50,7 @@
   border-radius: var(--nutui-progress-text-border-radius, 5px);
   font-size: var(--nutui-progress-text-font-size, 9px);
   line-height: 1;
-  background: var(--nutui-progress-text-background, #ff0f23);
+  background: var(--nutui-progress-text-background, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
 }
 @keyframes progressActive {
   0% {

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

@@ -1,4 +1,10 @@
-import { Radio } from "./radio";
+import React from 'react';
+import { RadioProps } from "./radio";
+import { RadioGroup } from "../radiogroup/radiogroup";
 export type { RadioProps } from "./radio";
 export type { RadioShape, RadioPosition } from './types';
-export default Radio;
+type CompoundedComponent = React.FC<Partial<RadioProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>> & {
+    Group: typeof RadioGroup;
+};
+declare const InnerRadio: CompoundedComponent;
+export default InnerRadio;

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

@@ -1,2 +1,6 @@
+import React from "react";
 import { Radio } from "./radio";
-export default Radio;
+import { RadioGroup } from "../radiogroup/radiogroup";
+var InnerRadio = Radio;
+InnerRadio.Group = RadioGroup;
+export default InnerRadio;

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

@@ -1,54 +1,15 @@
-import React, { FunctionComponent } from 'react';
-import RadioGroup from "../radiogroup/index";
+import React, { FC } from 'react';
 import { BasicComponent } from "../../utils/typings";
 import { RadioPosition, RadioShape } from "./types";
 export interface RadioProps extends BasicComponent {
-    /**
-    * 是否禁用选择
-    * @default false
-    */
-    disabled: boolean
-    /**
-    * 指定当前是否选中
-    * @default -
-    */
-    checked: boolean
-    /**
-    * 初始是否选中
-    * @default -
-    */
-    defaultChecked: boolean
-    /**
-    * 形状
-    * @default round
-    */
-    shape: RadioShape
-    /**
-    * 文本所在的位置
-    * @default right
-    */
-    labelPosition: RadioPosition
-    /**
-    * <a href="#/icon">图标名称</a>，选中前(建议和activeIcon一起修改)
-    * @default 'CheckNormal'
-    */
-    icon: React.ReactNode
-    /**
-    * <a href="#/icon">图标名称</a>，选中后(建议和icon一起修改)
-    * @default 'CheckChecked'
-    */
-    activeIcon: React.ReactNode
-    /**
-    * 携带的标识值，用于 Group 模式
-    * @default -
-    */
-    value: string | number
-    /**
-    * 选中态变化时触发
-    * @default -
-    */
-    onChange: (checked: boolean) => void
+    disabled: boolean;
+    checked: boolean;
+    defaultChecked: boolean;
+    shape: RadioShape;
+    labelPosition: RadioPosition;
+    icon: React.ReactNode;
+    activeIcon: React.ReactNode;
+    value: string | number;
+    onChange: (checked: boolean) => void;
 }
-export declare const Radio: FunctionComponent<Partial<RadioProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>> & {
-    Group: typeof RadioGroup;
-};
+export declare const Radio: FC<Partial<RadioProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>>;