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

package/dist/cjs/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/cjs/packages/pagination/pagination.js

@@ -21,6 +21,7 @@ var _components = require("@tarojs/components");
 var _index = require("../configprovider/index");
 var _usepropsvalue = require("../../utils/use-props-value");
 var _typings = require("../../utils/typings");
+var _addcolorforharmony = /*#__PURE__*/ _interop_require_default._(require("../../utils/add-color-for-harmony"));
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     defaultValue: 1,
     mode: 'multi',
@@ -118,7 +119,7 @@ var Pagination = function Pagination(props) {
         onClick: function onClick(e) {
             return handleSelectPage(currentPage - 1);
         }
-    }, prev || locale.pagination.prev), mode === 'multi' && /*#__PURE__*/ _react.default.createElement(_components.View, {
+    }, (0, _addcolorforharmony.default)(prev || locale.pagination.prev, currentPage === 1 ? '#c2c4cc' : '#ff0f23')), mode === 'multi' && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-contain")
     }, pages.map(function(item, index) {
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
@@ -137,11 +138,13 @@ var Pagination = function Pagination(props) {
         onClick: function onClick(e) {
             return handleSelectPage(currentPage + 1);
         }
-    }, next || locale.pagination.next)), mode === 'lite' && /*#__PURE__*/ _react.default.createElement(_components.View, {
+    }, (0, _addcolorforharmony.default)(next || locale.pagination.next, currentPage >= pageCount ? '#c2c4cc' : '#ff0f23'))), mode === 'lite' && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-lite")
     }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-lite-active")
     }, currentPage), /*#__PURE__*/ _react.default.createElement(_components.View, {
+        className: "".concat(classPrefix, "-lite-spliterator")
+    }, "/"), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-lite-default")
     }, pageCount)));
 };

package/dist/cjs/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/cjs/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/cjs/packages/progress/progress.js

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

package/dist/cjs/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/cjs/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/cjs/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/cjs/packages/radio/index.js

@@ -8,5 +8,10 @@ Object.defineProperty(exports, "default", {
         return _default;
     }
 });
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _radio = require("./radio");
-var _default = _radio.Radio;
+var _radiogroup = require("../radiogroup/radiogroup");
+var InnerRadio = _radio.Radio;
+InnerRadio.Group = _radiogroup.RadioGroup;
+var _default = InnerRadio;

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

@@ -1,5 +1,4 @@
-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 {
@@ -13,6 +12,4 @@ export interface RadioProps extends BasicComponent {
     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'>>;

package/dist/cjs/packages/radio/radio.js

@@ -20,7 +20,6 @@ var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
 var _context = /*#__PURE__*/ _interop_require_default._(require("../radiogroup/context"));
-var _index = /*#__PURE__*/ _interop_require_default._(require("../radiogroup/index"));
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../utils/use-props-value");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -98,14 +97,14 @@ var Radio = function Radio(props) {
     };
     var renderLabel = function renderLabel() {
         var labelcls = (0, _classnames.default)("".concat(classPrefix, "-label"), (0, _define_property._)({}, "".concat(classPrefix, "-label-disabled"), disabled));
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderIcon(), /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderIcon(), /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: labelcls
         }, children));
     };
     var renderButton = function renderButton() {
         var _obj;
         var buttoncls = (0, _classnames.default)("".concat(classPrefix, "-button"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-button-active"), checkedStatement), (0, _define_property._)(_obj, "".concat(classPrefix, "-button-disabled"), disabled), _obj));
-        return /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: buttoncls
         }, children);
     };
@@ -127,4 +126,3 @@ var Radio = function Radio(props) {
     }, renderRadioItem());
 };
 Radio.displayName = 'NutRadio';
-Radio.Group = _index.default;

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

@@ -77,6 +77,7 @@
     border: 1px solid $color-text-disabled;
   }
 }
+
 [dir='rtl'] .nut-radio,
 .nut-rtl .nut-radio {
   &:last-child {

package/dist/cjs/packages/radiogroup/radiogroup.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ViewProps } from '@tarojs/components/types/View';
 import { RadioGroupDirection, RadioGroupOption, RadioGroupPosition, RadioGroupShape } from './types';
 export interface RadioGroupProps {
     value?: string | number;
@@ -10,4 +11,4 @@ export interface RadioGroupProps {
     options: RadioGroupOption[];
     onChange: (value: string | number) => void;
 }
-export declare const RadioGroup: React.ForwardRefExoticComponent<Partial<RadioGroupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onChange"> & React.RefAttributes<unknown>>;
+export declare const RadioGroup: React.ForwardRefExoticComponent<Omit<Partial<RadioGroupProps> & Omit<ViewProps, "onChange">, "ref"> & React.RefAttributes<unknown>>;

package/dist/cjs/packages/radiogroup/radiogroup.js

@@ -17,6 +17,7 @@ var _object_without_properties = require("@swc/helpers/_/_object_without_propert
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _components = require("@tarojs/components");
 var _context = /*#__PURE__*/ _interop_require_default._(require("./context"));
 var _index = /*#__PURE__*/ _interop_require_default._(require("../radio/index"));
 var _usepropsvalue = require("../../utils/use-props-value");
@@ -40,7 +41,7 @@ var RadioGroup = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
         "options",
         "disabled"
     ]);
-    var cls = (0, _classnames.default)(classPrefix, (0, _define_property._)({}, "".concat(classPrefix, "-").concat(props.direction), props.direction), className);
+    var cls = (0, _classnames.default)(classPrefix, (0, _define_property._)({}, "".concat(classPrefix, "-").concat(direction), direction), className);
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
         defaultValue: props.defaultValue,
         value: props.value,
@@ -83,7 +84,7 @@ var RadioGroup = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
                 setVal2State('');
             }
         }
-    }, /*#__PURE__*/ _react.default.createElement("div", (0, _object_spread._)({
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: cls
     }, rest), (options === null || options === void 0 ? void 0 : options.length) ? renderOptionsChildren() : children));
 });

package/dist/cjs/packages/rate/style/rate.scss

@@ -18,10 +18,10 @@
     display: flex;
     flex-shrink: 0;
     position: relative;
-    margin-right: $rate-item-margin;
+    margin-left: $rate-item-margin;
 
-    &:last-child {
-      margin-right: 0;
+    &:first-child {
+      margin-left: 0;
     }
 
     &-half {
@@ -39,11 +39,16 @@
 
     &-icon {
       display: flex;
-      color: $rate-icon-color;
       cursor: pointer;
 
+      .nut-icon {
+        color: $rate-icon-color;
+      }
+
       &-disabled {
-        color: $rate-icon-inactive-color;
+        .nut-icon {
+          color: $rate-icon-inactive-color;
+        }
       }
 
       &.nut-rate-item-icon.nut-rate-item-icon-half {

package/dist/cjs/packages/rate/style/style.css

@@ -12,10 +12,10 @@
   display: flex;
   flex-shrink: 0;
   position: relative;
-  margin-right: var(--nutui-rate-item-margin, 14px);
+  margin-left: var(--nutui-rate-item-margin, 14px);
 }
-.nut-rate-item:last-child {
-  margin-right: 0;
+.nut-rate-item:first-child {
+  margin-left: 0;
 }
 .nut-rate-item-half {
   position: absolute;
@@ -30,10 +30,12 @@
 }
 .nut-rate-item-icon {
   display: flex;
-  color: var(--nutui-rate-icon-color, var(--nutui-color-primary, #ff0f23));
   cursor: pointer;
 }
-.nut-rate-item-icon-disabled {
+.nut-rate-item-icon .nut-icon {
+  color: var(--nutui-rate-icon-color, var(--nutui-color-primary, #ff0f23));
+}
+.nut-rate-item-icon-disabled .nut-icon {
   color: var(--nutui-rate-icon-inactive-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-rate-item-icon.nut-rate-item-icon.nut-rate-item-icon-half {

package/dist/cjs/packages/safearea/style/safearea.scss

@@ -1,5 +1,5 @@
 .nut-safe-area {
-  display: block;
+  display: flex;
   width: 100%;
 
   &-position-top {

package/dist/cjs/packages/safearea/style/style.css

@@ -1,5 +1,5 @@
 .nut-safe-area {
-  display: block;
+  display: flex;
   width: 100%;
 }
 .nut-safe-area-position-top {

package/dist/cjs/packages/searchbar/searchbar.d.ts

@@ -3,7 +3,7 @@ import type { ChangeEvent, FocusEvent, MouseEvent } from 'react';
 import { ITouchEvent } from '@tarojs/components';
 import { BasicComponent } from "../../utils/typings";
 export interface SearchBarProps extends BasicComponent {
-    value?: number | string;
+    value?: string;
     placeholder?: string;
     shape?: 'square' | 'round';
     disabled?: boolean;