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

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

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

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-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/es/packages/radio/radio.js

@@ -8,7 +8,7 @@ import { CheckChecked, CheckNormal, CheckDisabled } from "@nutui/icons-react";
 import classNames from "classnames";
 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;
 
@@ -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/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;
@@ -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/es/packages/radiogroup/radiogroup.js

@@ -7,7 +7,7 @@ import React, { useCallback } from "react";
 import classNames from "classnames";
 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;
@@ -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,

package/dist/es/packages/range/range.js

@@ -4,10 +4,10 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useState, useCallback, useMemo, useRef } from "react";
 import classNames from "classnames";
-import { useTouch } from "../../utils/use-touch";
-import { getRect } from "../../utils/use-client-rect";
+import { useTouch } from "../../hooks/use-touch";
+import { getRect } from "../../hooks/use-client-rect";
 import { ComponentDefaults } from "../../utils/typings";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { useRtl } from "../configprovider";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     range: false,

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

@@ -20,7 +20,7 @@
   position: relative;
   height: var(--nutui-range-height, 4px);
   margin: 0 var(--nutui-range-margin, 15px);
-  background-color: var(--nutui-range-inactive-color, var(--nutui-brand-1));
+  background-color: var(--nutui-range-inactive-color, var(--nutui-color-primary-light-pressed, #ffebf1));
   border-radius: 2px;
   flex: 1;
   cursor: pointer;
@@ -33,7 +33,7 @@
 }
 .nut-range-min, .nut-range-max {
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-range-color, var(--nutui-gray-7));
+  color: var(--nutui-range-color, var(--nutui-color-title, #1a1a1a));
   user-select: none;
 }
 .nut-range-bar {
@@ -43,7 +43,7 @@
   height: 100%;
   max-width: 100%;
   max-height: 100%;
-  background: var(--nutui-range-active-color, var(--nutui-brand-6));
+  background: var(--nutui-range-active-color, var(--nutui-color-primary, #ff0f23));
   border-radius: 2px;
   transition: all 0.2s;
 }
@@ -55,7 +55,7 @@
   background: var(--nutui-range-button-background, #ffffff);
   border-radius: 50%;
   box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.15);
-  border: var(--nutui-range-button-border, 1px solid var(--nutui-brand-6));
+  border: var(--nutui-range-button-border, 1px solid var(--nutui-color-primary, #ff0f23));
   outline: none;
   align-items: center;
   top: 50%;
@@ -93,7 +93,7 @@
   justify-content: center;
   user-select: none;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-range-color, var(--nutui-gray-7));
+  color: var(--nutui-range-color, var(--nutui-color-title, #1a1a1a));
   text-align: center;
   vertical-align: center;
   box-sizing: border-box;
@@ -137,10 +137,10 @@
   height: 11px;
   left: 0px;
   border-radius: 6px;
-  background: var(--nutui-range-inactive-color, var(--nutui-brand-1));
+  background: var(--nutui-range-inactive-color, var(--nutui-color-primary-light-pressed, #ffebf1));
 }
 .nut-range-tick-active {
-  background: var(--nutui-range-active-color, var(--nutui-brand-6));
+  background: var(--nutui-range-active-color, var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-range-vertical-container {
@@ -203,10 +203,10 @@
   width: 10px;
   height: 10px;
   border-radius: 5px;
-  background: var(--nutui-range-inactive-color, var(--nutui-brand-1));
+  background: var(--nutui-range-inactive-color, var(--nutui-color-primary-light-pressed, #ffebf1));
 }
 .nut-range-vertical-tick-active {
-  background: var(--nutui-range-active-color, var(--nutui-brand-6));
+  background: var(--nutui-range-active-color, var(--nutui-color-primary, #ff0f23));
 }
 
 [dir=rtl] .nut-range-button-wrapper, [dir=rtl] .nut-range-button-wrapper-right,

package/dist/es/packages/rate/rate.js

@@ -6,9 +6,9 @@ import React, { useEffect, useRef, useState } from "react";
 import classNames from "classnames";
 import { StarFill } from "@nutui/icons-react";
 import { ComponentDefaults } from "../../utils/typings";
-import { usePropsValue } from "../../utils/use-props-value";
-import { getRect } from "../../utils/use-client-rect";
-import useRefs from "../../utils/use-refs";
+import { usePropsValue } from "../../hooks/use-props-value";
+import { getRect } from "../../hooks/use-client-rect";
+import useRefs from "../../hooks/use-refs";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     size: 'normal',
     showScore: false,

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

@@ -59,10 +59,10 @@
   cursor: pointer;
 }
 .nut-rate-item-icon .nut-icon {
-  color: var(--nutui-rate-icon-color, var(--nutui-red-6));
+  color: var(--nutui-rate-icon-color, var(--nutui-color-primary-icon, #ff3333));
 }
 .nut-rate-item-icon-disabled .nut-icon {
-  color: var(--nutui-rate-icon-inactive-color, var(--nutui-gray-8));
+  color: var(--nutui-rate-icon-inactive-color, var(--nutui-color-primary-icon-disabled, #dadce0));
 }
 .nut-rate-item-icon.nut-rate-item-icon.nut-rate-item-icon-half {
   position: absolute;
@@ -79,7 +79,7 @@
 .nut-rate-score {
   display: inline-flex;
   align-items: center;
-  color: var(--nutui-rate-font-color, var(--nutui-red-6));
+  color: var(--nutui-rate-font-color, var(--nutui-color-primary-icon, #ff3333));
   font-family: "JD";
   line-height: 1;
 }
@@ -96,7 +96,7 @@
   padding-left: calc(var(--nutui-rate-item-margin, 4px) / 2);
 }
 .nut-rate-score-disabled {
-  color: var(--nutui-rate-icon-inactive-color, var(--nutui-gray-8));
+  color: var(--nutui-rate-icon-inactive-color, var(--nutui-color-primary-icon-disabled, #dadce0));
 }
 
 [dir=rtl] .nut-rate-item,

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

@@ -35,6 +35,9 @@
     display: flex;
     flex-direction: row;
     margin-top: $resultpage-actions-margin-top;
+    .nut-button-children {
+      white-space: nowrap;
+    }
   }
   &-action {
     margin-left: 6px;

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

@@ -21,7 +21,7 @@
   width: var(--nutui-resultpage-width, 240px);
   margin-bottom: var(--nutui-resultpage-title-margin-bottom, 12px);
   font-size: var(--nutui-resultpage-title-font-size, var(--nutui-font-size-xl, 18px));
-  color: var(--nutui-resultpage-title-color, var(--nutui-gray-7));
+  color: var(--nutui-resultpage-title-color, var(--nutui-color-title, #1a1a1a));
   font-weight: var(--nutui-font-weight-bold, 600);
   text-align: center;
 }
@@ -29,7 +29,7 @@
   width: var(--nutui-resultpage-width, 240px);
   line-height: var(--nutui-resultpage-description-line-height, 20px);
   font-size: var(--nutui-resultpage-description-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-resultpage-description-color, var(--nutui-gray-6));
+  color: var(--nutui-resultpage-description-color, var(--nutui-color-text, #505259));
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
@@ -41,6 +41,9 @@
   flex-direction: row;
   margin-top: var(--nutui-resultpage-actions-margin-top, 16px);
 }
+.nut-resultpage-actions .nut-button-children {
+  white-space: nowrap;
+}
 .nut-resultpage-action {
   margin-left: 6px;
   margin-right: 6px;

package/dist/es/packages/searchbar/searchbar.js

@@ -63,7 +63,6 @@ export var SearchBar = function(props) {
         return /*#__PURE__*/ React.createElement("input", {
             className: "".concat(classPrefix, "-input ").concat(clearable ? "".concat(classPrefix, "-input-clear") : ''),
             ref: searchRef,
-            style: style,
             value: value || '',
             placeholder: placeholder || locale.placeholder,
             disabled: disabled,

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

@@ -7,8 +7,8 @@
   align-items: center;
   width: var(--nutui-searchbar-width, 100%);
   padding: var(--nutui-searchbar-padding, 6px 16px);
-  background: var(--nutui-searchbar-background, var(--nutui-gray-3));
-  color: var(--nutui-searchbar-color, var(--nutui-gray-7));
+  background: var(--nutui-searchbar-background, var(--nutui-color-background, #f2f3f5));
+  color: var(--nutui-searchbar-color, var(--nutui-color-title, #1a1a1a));
   font-size: var(--nutui-searchbar-font-size, var(--nutui-font-size-base, 14px));
   box-sizing: border-box;
   justify-content: center;
@@ -20,7 +20,7 @@
   justify-content: center;
   padding: var(--nutui-searchbar-content-padding, 0 12px);
   height: var(--nutui-searchbar-input-height, 32px);
-  background: var(--nutui-searchbar-content-background, var(--nutui-gray-1));
+  background: var(--nutui-searchbar-content-background, var(--nutui-color-background-overlay, #ffffff));
   border-radius: var(--nutui-searchbar-content-border-radius, 4px);
 }
 .nut-searchbar-icon {
@@ -87,8 +87,8 @@
   width: 100%;
   padding: var(--nutui-searchbar-input-padding, 0 4px);
   font-size: var(--nutui-searchbar-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-searchbar-input-text-color, var(--nutui-gray-7));
-  caret-color: var(--nutui-searchbar-input-curror-color, var(--nutui-gray-7));
+  color: var(--nutui-searchbar-input-text-color, var(--nutui-color-title, #1a1a1a));
+  caret-color: var(--nutui-searchbar-input-curror-color, var(--nutui-color-title, #1a1a1a));
   background: transparent;
   text-align: var(--nutui-searchbar-input-text-align, left);
 }

package/dist/es/packages/segmented/segmented.js

@@ -3,7 +3,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import React, { useCallback } from "react";
 import classNames from "classnames";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { mergeProps } from "../../utils/merge-props";
 var defaultProps = {
     options: [],

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

@@ -9,7 +9,7 @@
   padding: var(--nutui-segmented-padding, var(--nutui-spacing-xxxs, 2px));
   align-items: center;
   border-radius: var(--nutui-segmented-radius, var(--nutui-radius-xs, 4px));
-  background: var(--nutui-black-7);
+  background: var(--nutui-color-mask-part, rgba(0, 0, 0, 0.4));
   box-sizing: border-box;
 }
 
@@ -27,7 +27,7 @@
 }
 
 .nut-segmented-item-active {
-  background: var(--nutui-segmented-active-background, var(--nutui-black-7));
+  background: var(--nutui-segmented-active-background, var(--nutui-color-mask-part, rgba(0, 0, 0, 0.4)));
 }
 
 .nut-segmented-icon {

package/dist/es/packages/shortpassword/shortpassword.js

@@ -6,10 +6,10 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import React, { useEffect, useImperativeHandle, useMemo } from "react";
 import { Tips } from "@nutui/icons-react";
 import classNames from "classnames";
-import Popup from "../popup";
+import Popup from "../popup/index";
 import { useConfig } from "../configprovider";
 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), {
     value: '',
     visible: false,

package/dist/es/packages/shortpassword/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 {
@@ -379,14 +374,14 @@
 .nut-shortpassword-title {
   line-height: 1;
   font-size: var(--nutui-font-size-l, 16px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-shortpassword-description {
   margin-top: 12px;
   margin-bottom: 24px;
   line-height: 1;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-shortpassword-input {
   padding: 0 0 10px;
@@ -415,9 +410,9 @@
   height: 41px;
   margin: 0 auto;
   box-sizing: border-box;
-  background: var(--nutui-shortpassword-background-color, var(--nutui-gray-3));
+  background: var(--nutui-shortpassword-background-color, var(--nutui-color-background, #f2f3f5));
   border-radius: 4px;
-  border: 1px solid var(--nutui-shortpassword-border-color, var(--nutui-gray-3));
+  border: 1px solid var(--nutui-shortpassword-border-color, var(--nutui-color-background, #f2f3f5));
   display: flex;
   position: absolute;
   left: 0;
@@ -444,12 +439,12 @@
 .nut-shortpassword-message-error {
   line-height: 1;
   font-size: var(--nutui-font-size-xs, 11px);
-  color: var(--nutui-shortpassword-error, var(--nutui-brand-6));
+  color: var(--nutui-shortpassword-error, var(--nutui-color-primary, #ff0f23));
 }
 .nut-shortpassword-message-forget {
   line-height: 1;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-shortpassword-forget, var(--nutui-gray-5));
+  color: var(--nutui-shortpassword-forget, var(--nutui-color-text-help, #888b94));
   display: flex;
   align-items: center;
 }
@@ -463,15 +458,15 @@
 }
 .nut-shortpassword-footer-cancel {
   background: #ffffff;
-  border: 1px solid var(--nutui-brand-6);
+  border: 1px solid var(--nutui-color-primary, #ff0f23);
   border-radius: 15px;
   padding: 8px 38px;
   line-height: 1;
   font-size: var(--nutui-font-size-base, 14px);
-  color: var(--nutui-brand-6);
+  color: var(--nutui-color-primary, #ff0f23);
 }
 .nut-shortpassword-footer-sure {
-  background: linear-gradient(135deg, var(--nutui-brand-6) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
+  background: linear-gradient(135deg, var(--nutui-color-primary, #ff0f23) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
   border-radius: 15px;
   padding: 8px 38px;
   line-height: 1;
@@ -491,5 +486,5 @@
 }
 [dir=rtl] .nut-shortpassword-footer-sure,
 .nut-rtl .nut-shortpassword-footer-sure {
-  background: linear-gradient(-135deg, var(--nutui-brand-6) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
+  background: linear-gradient(-135deg, var(--nutui-color-primary, #ff0f23) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
 }