@nutui/nutui-react 3.0.0-beta.9 → 3.0.1

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

@@ -1,25 +1,3 @@
-import React, { FunctionComponent, MouseEvent, ReactNode } from 'react';
-import { OverlayProps } from "../overlay/overlay";
-type Teleport = HTMLElement | (() => HTMLElement) | null;
-export interface PopupProps extends OverlayProps {
-    position: string;
-    transition: string;
-    overlayStyle: React.CSSProperties;
-    overlayClassName: string;
-    closeable: boolean;
-    closeIconPosition: string;
-    closeIcon: ReactNode;
-    left: ReactNode;
-    title: ReactNode;
-    description: ReactNode;
-    destroyOnClose: boolean;
-    portal: Teleport;
-    overlay: boolean;
-    round: boolean;
-    onOpen: () => void;
-    onClose: () => void;
-    onOverlayClick: (e: MouseEvent) => boolean | void;
-    onCloseIconClick: (e: MouseEvent) => boolean | void;
-}
+import React, { FunctionComponent } from 'react';
+import { PopupProps } from './types';
 export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>>;
-export {};

package/dist/cjs/packages/popup/popup.js

@@ -21,9 +21,8 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _iconsreact = require("@nutui/icons-react");
 var _overlay = require("../overlay/overlay");
 var _overlay1 = /*#__PURE__*/ _interop_require_default._(require("../overlay"));
-var _typings = require("../../utils/typings");
-var _uselockscroll = require("../../utils/use-lock-scroll");
-var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var _uselockscroll = require("../../hooks/use-lock-scroll");
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
     position: 'center',
     transition: '',
     overlayStyle: {},
@@ -37,13 +36,13 @@ var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object
     round: false,
     onOpen: function onOpen() {},
     onClose: function onClose() {},
-    onOverlayClick: function onOverlayClick(e) {
+    onOverlayClick: function onOverlayClick() {
         return true;
     },
-    onCloseIconClick: function onCloseIconClick(e) {
+    onCloseIconClick: function onCloseIconClick() {
         return true;
     }
-}), _overlay.defaultOverlayProps);
+});
 // 默认1000，参看variables
 var _zIndex = 1100;
 var Popup = function Popup(props) {
@@ -54,20 +53,14 @@ var Popup = function Popup(props) {
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
     var _useState2 = (0, _sliced_to_array._)((0, _react.useState)(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
     var _useState3 = (0, _sliced_to_array._)((0, _react.useState)(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
-    var shouldLockScroll = !innerVisible ? false : lockScroll;
-    (0, _uselockscroll.useLockScroll)(nodeRef, shouldLockScroll);
+    (0, _uselockscroll.useLockScroll)(nodeRef, innerVisible && lockScroll);
     var classPrefix = 'nut-popup';
-    var baseStyle = {
+    var overlayStyles = (0, _object_spread._)({}, overlayStyle);
+    var popStyles = (0, _object_spread_props._)((0, _object_spread._)({}, style), {
         zIndex: index
-    };
-    var overlayStyles = (0, _object_spread_props._)((0, _object_spread._)({}, overlayStyle), {
-        '--nutui-overlay-zIndex': index
     });
-    var popStyles = (0, _object_spread._)({}, style, baseStyle);
     var _obj;
-    var popClassName = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
-    var _obj1;
-    var closeClasses = (0, _classnames.default)((_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-title-right"), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-title-right-").concat(closeIconPosition), true), _obj1));
+    var popClassName = (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
     var open = function open() {
         if (!innerVisible) {
             setInnerVisible(true);
@@ -89,30 +82,20 @@ var Popup = function Popup(props) {
             onClose && onClose();
         }
     };
-    var onHandleClickOverlay = function onHandleClickOverlay(e) {
+    var handleOverlayClick = function handleOverlayClick(e) {
         e.stopPropagation();
-        if (closeOnOverlayClick) {
-            var closed = onOverlayClick && onOverlayClick(e);
-            closed && close();
+        if (closeOnOverlayClick && onOverlayClick(e)) {
+            close();
         }
     };
-    var onHandleClick = function onHandleClick(e) {
-        onClick && onClick(e);
-    };
-    var onHandleClickCloseIcon = function onHandleClickCloseIcon(e) {
-        var closed = onCloseIconClick && onCloseIconClick(e);
-        closed && close();
-    };
-    var onHandleOpened = function onHandleOpened(e) {
-        afterShow && afterShow();
-    };
-    var onHandleClosed = function onHandleClosed(e) {
-        afterClose && afterClose();
+    var handleCloseIconClick = function handleCloseIconClick(e) {
+        onCloseIconClick(e) && close();
     };
     var renderCloseIcon = function renderCloseIcon() {
+        var closeClasses = (0, _classnames.default)("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
         return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement("div", {
             className: closeClasses,
-            onClick: onHandleClickCloseIcon
+            onClick: handleCloseIconClick
         }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
     };
     var renderTitle = function renderTitle() {
@@ -141,25 +124,26 @@ var Popup = function Popup(props) {
             unmountOnExit: destroyOnClose,
             timeout: duration,
             in: innerVisible,
-            onEntered: onHandleOpened,
-            onExited: onHandleClosed
+            onEntered: afterShow,
+            onExited: afterClose
         }, /*#__PURE__*/ _react.default.createElement("div", {
             ref: nodeRef,
             style: popStyles,
             className: popClassName,
-            onClick: onHandleClick
-        }, renderTitle(), showChildren ? children : ''));
+            onClick: onClick
+        }, renderTitle(), showChildren && children));
     };
     var renderNode = function renderNode() {
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay && /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+            zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
             duration: duration,
-            onClick: onHandleClickOverlay
-        }) : null, renderPop());
+            onClick: handleOverlayClick
+        }), renderPop());
     };
     (0, _react.useEffect)(function() {
         visible ? open() : close();
@@ -173,8 +157,7 @@ var Popup = function Popup(props) {
         transition
     ]);
     var resolveContainer = function resolveContainer(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
+        return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
     };
     var renderToContainer = function renderToContainer(getContainer, node) {
         if (getContainer) {

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

@@ -141,7 +141,6 @@
         opacity: 0;
         transform: scale(0.8);
       }
-
       to {
         opacity: 1;
         transform: scale(1);
@@ -153,7 +152,6 @@
         opacity: 1;
         transform: scale(1);
       }
-
       to {
         opacity: 0;
         transform: scale(0.8);
@@ -176,7 +174,6 @@
       from {
         opacity: 0;
       }
-
       to {
         opacity: 1;
       }
@@ -186,7 +183,6 @@
       from {
         opacity: 1;
       }
-
       to {
         opacity: 0;
       }
@@ -209,6 +205,9 @@
       from {
         transform: translate3d(0, -100%, 0);
       }
+      to {
+        transform: translate3d(0, 0%, 0);
+      }
     }
 
     @keyframes popup-slide-top-exit {
@@ -236,6 +235,9 @@
       from {
         transform: translate3d(100%, 0, 0);
       }
+      to {
+        transform: translate3d(0%, 0, 0);
+      }
     }
 
     @keyframes popup-slide-right-exit {
@@ -263,6 +265,9 @@
       from {
         transform: translate3d(0, 100%, 0);
       }
+      to {
+        transform: translate3d(0, 0%, 0);
+      }
     }
 
     @keyframes slide-bottom-exit {
@@ -290,6 +295,9 @@
       from {
         transform: translate3d(-100%, 0, 0);
       }
+      to {
+        transform: translate3d(0%, 0, 0);
+      }
     }
 
     @keyframes popup-slide-left-exit {

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

@@ -4,19 +4,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  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-l, 16px));
   line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-6);
+  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);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {
@@ -243,6 +238,9 @@
   from {
     transform: translate3d(0, -100%, 0);
   }
+  to {
+    transform: translate3d(0, 0%, 0);
+  }
 }
 @keyframes popup-slide-top-exit {
   to {
@@ -264,6 +262,9 @@
   from {
     transform: translate3d(100%, 0, 0);
   }
+  to {
+    transform: translate3d(0%, 0, 0);
+  }
 }
 @keyframes popup-slide-right-exit {
   to {
@@ -285,6 +286,9 @@
   from {
     transform: translate3d(0, 100%, 0);
   }
+  to {
+    transform: translate3d(0, 0%, 0);
+  }
 }
 @keyframes slide-bottom-exit {
   to {
@@ -306,6 +310,9 @@
   from {
     transform: translate3d(-100%, 0, 0);
   }
+  to {
+    transform: translate3d(0%, 0, 0);
+  }
 }
 @keyframes popup-slide-left-exit {
   to {

package/dist/cjs/packages/popup/types.d.ts

@@ -0,0 +1,25 @@
+import React, { ReactNode } from 'react';
+import { OverlayProps } from "../overlay/types";
+export type Teleport = HTMLElement | (() => HTMLElement) | null;
+export type Position = 'top' | 'bottom' | 'left' | 'right' | 'center' | 'none';
+export type CloseIconPosition = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+export interface PopupProps extends OverlayProps {
+    position: Position;
+    transition: string;
+    overlayStyle: React.CSSProperties;
+    overlayClassName: string;
+    closeable: boolean;
+    closeIconPosition: CloseIconPosition;
+    closeIcon: ReactNode;
+    left?: ReactNode;
+    title?: ReactNode;
+    description?: ReactNode;
+    destroyOnClose: boolean;
+    portal: Teleport;
+    overlay: boolean;
+    round: boolean;
+    onOpen: () => void;
+    onClose: () => void;
+    onOverlayClick: (e: React.MouseEvent) => boolean | void;
+    onCloseIconClick: (e: React.MouseEvent) => boolean | void;
+}

package/dist/cjs/packages/popup/types.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _react = /*#__PURE__*/ _interop_require_default._(require("react"));

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

@@ -20,7 +20,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));
+  color: var(--nutui-price-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-price-symbol {
   padding-right: var(--nutui-price-symbol-padding-right, 0px);

package/dist/cjs/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-gray-3));
+  background: var(--nutui-progress-background, var(--nutui-color-background, #f2f3f5));
 }
 .nut-progress-outer .nut-progress-active:before {
   content: "";

package/dist/cjs/packages/pulltorefresh/pulltorefresh.js

@@ -36,7 +36,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     completeText: '',
     completeDelay: 500,
     disabled: false,
-    headHeight: 50,
+    headHeight: 80,
     threshold: 60,
     onRefresh: function onRefresh() {}
 });

package/dist/cjs/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/cjs/packages/pulltorefresh/style/style.css

@@ -12,7 +12,7 @@
   bottom: 0;
   left: 0;
   width: 100%;
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-text-help, #888b94);
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -24,13 +24,13 @@
   margin-bottom: 4px;
 }
 .nut-pulltorefresh-primary {
-  background: var(--nutui-pulltorefresh-color-primary, var(--nutui-brand-6));
+  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/cjs/packages/radio/radio.js

@@ -20,7 +20,7 @@ var _iconsreact = require("@nutui/icons-react");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _context = /*#__PURE__*/ _interop_require_default._(require("../radiogroup/context"));
 var _typings = require("../../utils/typings");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     disabled: false,
     shape: 'round',

package/dist/cjs/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;
 
@@ -54,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/cjs/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;
@@ -19,23 +22,26 @@
   border: 1px solid var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
 }
 .nut-radiogroup-vertical .nut-radio-button-active {
-  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-brand-6));
-  background-color: var(--nutui-brand-1);
+  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;
 }
 .nut-radiogroup-horizontal .nut-radio-button-active {
-  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-brand-6));
-  background-color: var(--nutui-brand-1);
+  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-gray-4);
+  background: var(--nutui-color-text-disabled, #c2c4cc);
   color: #ffffff;
-  border: 1px solid var(--nutui-gray-4);
+  border: 1px solid var(--nutui-color-text-disabled, #c2c4cc);
 }
 
 [dir=rtl] .nut-radiogroup .nut-radio,
@@ -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;
 }
@@ -63,53 +65,54 @@
 .nut-radio-label {
   margin-left: var(--nutui-radio-label-margin-left, 4px);
   font-size: var(--nutui-radio-label-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-radio-label-color, var(--nutui-gray-7));
+  color: var(--nutui-radio-label-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-radio-label-disabled {
-  color: var(--nutui-radio-label-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-radio-label-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-radio-icon {
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
   transition-duration: 0.3s;
   transition-property: color, border-color, background-color;
   font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-radio-icon-checked {
-  color: var(--nutui-brand-6);
+  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-brand-3);
+  color: var(--nutui-color-primary-disabled-special, #ffadbe);
   box-shadow: none;
 }
 .nut-radio-icon-disabled {
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .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));
   border-radius: var(--nutui-radio-button-border-radius, 15px);
-  color: var(--nutui-radio-label-color, var(--nutui-gray-7));
+  color: var(--nutui-radio-label-color, var(--nutui-color-title, #1a1a1a));
   box-sizing: border-box;
   border: 1px solid var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
 }
 .nut-radio-button-active {
-  background: var(--nutui-brand-1);
-  color: var(--nutui-brand-6);
-  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-brand-6));
+  background: var(--nutui-color-primary-light-pressed, #ffebf1);
+  color: var(--nutui-color-primary, #ff0f23);
+  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
 }
 .nut-radio-button-disabled {
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
   border: 1px solid var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
 }
 .nut-radio .nut-radio-button-active.nut-radio-button-disabled {
-  background: var(--nutui-gray-4);
+  background: var(--nutui-color-text-disabled, #c2c4cc);
   color: #ffffff;
-  border: 1px solid var(--nutui-gray-4);
+  border: 1px solid var(--nutui-color-text-disabled, #c2c4cc);
 }
 
 [dir=rtl] .nut-radio:last-child,

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

@@ -19,7 +19,7 @@ var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _context = /*#__PURE__*/ _interop_require_default._(require("./context"));
 var _index = /*#__PURE__*/ _interop_require_default._(require("../radio/index"));
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var defaultProps = {
     labelPosition: 'right',
     onChange: function onChange(value) {},

package/dist/cjs/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/cjs/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;
@@ -19,23 +22,26 @@
   border: 1px solid var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
 }
 .nut-radiogroup-vertical .nut-radio-button-active {
-  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-brand-6));
-  background-color: var(--nutui-brand-1);
+  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;
 }
 .nut-radiogroup-horizontal .nut-radio-button-active {
-  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-brand-6));
-  background-color: var(--nutui-brand-1);
+  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-gray-4);
+  background: var(--nutui-color-text-disabled, #c2c4cc);
   color: #ffffff;
-  border: 1px solid var(--nutui-gray-4);
+  border: 1px solid var(--nutui-color-text-disabled, #c2c4cc);
 }
 
 [dir=rtl] .nut-radiogroup .nut-radio,