@nutui/nutui-react-taro 3.0.0-beta.11 → 3.0.0-beta.13

package/dist/cjs/packages/pickerview/pickerview.js

@@ -0,0 +1,201 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+var _object_spread = require("@swc/helpers/_/_object_spread");
+var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
+var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
+var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
+var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _components = require("@tarojs/components");
+var _reactfastcompare = /*#__PURE__*/ _interop_require_default._(require("react-fast-compare"));
+var _typings = require("../../utils/typings");
+var _usepropsvalue = require("../../hooks/use-props-value");
+var _pickerroller = /*#__PURE__*/ _interop_require_default._(require("./pickerroller"));
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+    options: [],
+    defaultValue: [],
+    value: undefined,
+    renderLabel: function renderLabel(item) {
+        return item.label;
+    }
+});
+var InternalPickerView = function InternalPickerView(props, ref) {
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), options = _$_object_spread.options, _object_spread_defaultValue = _$_object_spread.defaultValue, defaultValue = _object_spread_defaultValue === void 0 ? [] : _object_spread_defaultValue, value = _$_object_spread.value, duration = _$_object_spread.duration, threeDimensional = _$_object_spread.threeDimensional, renderLabel = _$_object_spread.renderLabel, className = _$_object_spread.className, style = _$_object_spread.style, onChange = _$_object_spread.onChange;
+    var classPrefix = 'nut-pickerview';
+    var cls = (0, _classnames.default)(classPrefix, className);
+    var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
+        value: value,
+        defaultValue: (0, _to_consumable_array._)(defaultValue),
+        finalValue: (0, _to_consumable_array._)(defaultValue)
+    }), 1), selectedValue = _usePropsValue[0];
+    var _useState = (0, _sliced_to_array._)((0, _react.useState)(selectedValue), 2), innerValue = _useState[0], setInnerValue = _useState[1];
+    var _useState1 = (0, _sliced_to_array._)((0, _react.useState)([]), 2), innerOptions = _useState1[0], setInnerOptions = _useState1[1];
+    var changeIndex = (0, _react.useRef)(0);
+    /**
+   * 数据类型：级联、多列
+   */ var columnsType = (0, _react.useMemo)(function() {
+        var firstColumn = props.options[0] || [];
+        if (Array.isArray(firstColumn) && firstColumn.length > 0 && 'children' in firstColumn[0]) {
+            return 'cascade';
+        }
+        return 'multiple';
+    }, [
+        props.options
+    ]);
+    var formatCascadeOptions = function formatCascadeOptions(options, value) {
+        var _loop = function _loop() {
+            var currentOptions = columnOptions.children;
+            formatted.push(currentOptions);
+            var currentValue = value === null || value === void 0 ? void 0 : value[columnIndex];
+            if (currentValue === 0) {
+                // 如果 currentValue 为 0，返回第一个 children
+                columnOptions = currentOptions[0];
+            } else if (currentValue) {
+                // 如果 currentValue 存在，查找匹配的项
+                var index = currentOptions.findIndex(function(columnItem) {
+                    return columnItem.value === currentValue;
+                });
+                columnOptions = currentOptions[index === -1 ? 0 : index] // 如果未找到，默认取第一个
+                ;
+            } else {
+                return "break" // 如果 currentValue 不存在，终止循环
+                ;
+            }
+            columnIndex++;
+        };
+        if (!options.length) return [] // 如果 options 为空，直接返回空数组
+        ;
+        var formatted = [];
+        var columnOptions = {
+            label: '',
+            value: '',
+            children: options
+        };
+        var columnIndex = 0;
+        while(columnOptions && columnOptions.children){
+            var _ret = _loop();
+            if (_ret === "break") break;
+        }
+        return formatted;
+    };
+    var formatOptions = (0, _react.useMemo)(function() {
+        if (columnsType === 'cascade') {
+            var _props_options;
+            return formatCascadeOptions(props === null || props === void 0 ? void 0 : (_props_options = props.options) === null || _props_options === void 0 ? void 0 : _props_options[0], innerValue);
+        }
+        return props.options;
+    }, [
+        innerValue,
+        options,
+        columnsType
+    ]);
+    (0, _react.useEffect)(function() {
+        var options = props.options;
+        if (Array.isArray(options) && options.length && options !== innerOptions) {
+            setInnerOptions(formatOptions);
+        }
+    }, [
+        props.options,
+        innerValue
+    ]);
+    (0, _react.useEffect)(function() {
+        if (selectedValue !== innerValue) {
+            setInnerValue(selectedValue);
+        }
+    }, [
+        selectedValue
+    ]);
+    var handleSelect = (0, _react.useCallback)(function(option, index) {
+        var newValue = option === null || option === void 0 ? void 0 : option.value;
+        if (!newValue || innerValue[index] === newValue) return;
+        changeIndex.current = index;
+        if (columnsType === 'multiple') {
+            setInnerValue(function(prev) {
+                var next = (0, _to_consumable_array._)(prev);
+                next[index] = newValue;
+                return next;
+            });
+        } else {
+            var _option_children, _option_children1, _props_options;
+            var startIndex = index;
+            var values = [];
+            values[index] = option.value;
+            while(option === null || option === void 0 ? void 0 : (_option_children = option.children) === null || _option_children === void 0 ? void 0 : _option_children[0]){
+                values[index + 1] = option.children[0].value;
+                index++;
+                option = option.children[0];
+            }
+            // 当前改变列的下一列 children 值为空
+            if (option === null || option === void 0 ? void 0 : (_option_children1 = option.children) === null || _option_children1 === void 0 ? void 0 : _option_children1.length) {
+                values[index + 1] = '';
+            }
+            var combineResult = (0, _to_consumable_array._)(innerValue.slice(0, startIndex)).concat((0, _to_consumable_array._)(values.splice(startIndex)));
+            setInnerValue((0, _to_consumable_array._)(combineResult));
+            var optionFirst = props === null || props === void 0 ? void 0 : (_props_options = props.options) === null || _props_options === void 0 ? void 0 : _props_options[0];
+            if (!(0, _reactfastcompare.default)(formatCascadeOptions(optionFirst, combineResult), innerOptions)) {
+                setInnerOptions(formatCascadeOptions(optionFirst, combineResult));
+            }
+        }
+    }, [
+        innerValue,
+        props.options,
+        columnsType,
+        innerOptions
+    ]);
+    var selectedOptions = (0, _react.useMemo)(function() {
+        return innerOptions.map(function(columnOptions, index) {
+            var selectedOption = columnOptions.find(function(item) {
+                return item.value === innerValue[index];
+            });
+            return selectedOption;
+        // return selectedOption || columnOptions[0]
+        }).filter(Boolean);
+    }, [
+        innerOptions,
+        innerValue
+    ]);
+    (0, _react.useEffect)(function() {
+        onChange === null || onChange === void 0 ? void 0 : onChange({
+            value: innerValue,
+            index: changeIndex.current,
+            selectedOptions: selectedOptions
+        });
+    }, [
+        innerValue,
+        selectedOptions,
+        onChange
+    ]);
+    return /*#__PURE__*/ _react.default.createElement(_components.View, {
+        className: cls,
+        style: style
+    }, innerOptions.map(function(item, index) {
+        var _props_setRefs;
+        return /*#__PURE__*/ _react.default.createElement(_pickerroller.default, {
+            ref: props === null || props === void 0 ? void 0 : (_props_setRefs = props.setRefs) === null || _props_setRefs === void 0 ? void 0 : _props_setRefs.call(props, index),
+            key: index,
+            keyIndex: index,
+            value: innerValue[index],
+            options: item,
+            renderLabel: renderLabel,
+            onSelect: handleSelect,
+            duration: duration,
+            threeDimensional: threeDimensional
+        });
+    }), (innerOptions === null || innerOptions === void 0 ? void 0 : innerOptions.length) ? /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
+        className: "nut-pickerview-mask"
+    }), /*#__PURE__*/ _react.default.createElement(_components.View, {
+        className: "nut-pickerview-indicator"
+    })) : null);
+};
+var PickerView = /*#__PURE__*/ _react.default.forwardRef(InternalPickerView);
+var _default = PickerView;

package/dist/cjs/packages/pickerview/style/css.js

@@ -0,0 +1 @@
+import './style.css'

package/dist/cjs/packages/pickerview/style/index.js

@@ -0,0 +1 @@
+import './pickerview.scss';

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

@@ -0,0 +1,79 @@
+.nut-pickerview {
+  --nutui-picker-item-height: 36px;
+  position: relative;
+  display: flex;
+  width: 100%;
+  height: $picker-list-height;
+  $pickerview-top: calc(($picker-list-height - $picker-item-height) / 2);
+  overflow: hidden;
+
+  &-mask,
+  &-indicator {
+    position: absolute;
+    left: 0;
+    right: 0;
+    z-index: 3;
+    pointer-events: none;
+  }
+
+  &-mask {
+    top: 0;
+    bottom: 0;
+    background-image: $picker-mask-background;
+    background-position: top, bottom;
+    background-size: 100% $pickerview-top;
+    background-repeat: no-repeat;
+    transform: translateZ(0);
+  }
+
+  &-indicator {
+    top: $pickerview-top;
+    height: $picker-item-height;
+    border: $picker-item-active-line-border;
+    border-left: 0;
+    border-right: 0;
+    box-sizing: border-box;
+  }
+
+  &-list {
+    position: relative;
+    flex: 1;
+    height: $picker-list-height;
+    overflow: hidden;
+    touch-action: none;
+  }
+
+  &-roller {
+    position: absolute;
+    top: $pickerview-top;
+    width: 100%;
+    height: $picker-item-height;
+    z-index: 1;
+    transform-style: preserve-3d;
+  }
+
+  &-roller-item {
+    position: absolute;
+    top: 0;
+    backface-visibility: hidden;
+    -moz-backface-visibility: hidden;
+    -webkit-backface-visibility: hidden;
+    &-hidden {
+      visibility: hidden;
+      opacity: 0;
+    }
+  }
+
+  &-roller-item,
+  &-roller-item-tiled {
+    width: 100%;
+    height: $picker-item-height;
+    line-height: $picker-item-height;
+    color: $picker-item-text-color;
+    font-size: $picker-item-text-font-size;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}

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

@@ -0,0 +1,73 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-pickerview {
+  --nutui-picker-item-height: 36px;
+  position: relative;
+  display: flex;
+  width: 100%;
+  height: calc(var(--nutui-picker-item-height, 36px) * 7);
+  overflow: hidden;
+}
+.nut-pickerview-mask, .nut-pickerview-indicator {
+  position: absolute;
+  left: 0;
+  right: 0;
+  z-index: 3;
+  pointer-events: none;
+}
+.nut-pickerview-mask {
+  top: 0;
+  bottom: 0;
+  background-image: var(--picker-mask-background, linear-gradient(180deg, var(--nutui-white-12), var(--nutui-white-7)), linear-gradient(0deg, var(--nutui-white-12), var(--nutui-white-7)));
+  background-position: top, bottom;
+  background-size: 100% calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  background-repeat: no-repeat;
+  transform: translateZ(0);
+}
+.nut-pickerview-indicator {
+  top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  height: var(--nutui-picker-item-height, 36px);
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-left: 0;
+  border-right: 0;
+  box-sizing: border-box;
+}
+.nut-pickerview-list {
+  position: relative;
+  flex: 1;
+  height: calc(var(--nutui-picker-item-height, 36px) * 7);
+  overflow: hidden;
+  touch-action: none;
+}
+.nut-pickerview-roller {
+  position: absolute;
+  top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  width: 100%;
+  height: var(--nutui-picker-item-height, 36px);
+  z-index: 1;
+  transform-style: preserve-3d;
+}
+.nut-pickerview-roller-item {
+  position: absolute;
+  top: 0;
+  backface-visibility: hidden;
+  -moz-backface-visibility: hidden;
+  -webkit-backface-visibility: hidden;
+}
+.nut-pickerview-roller-item-hidden {
+  visibility: hidden;
+  opacity: 0;
+}
+.nut-pickerview-roller-item, .nut-pickerview-roller-item-tiled {
+  width: 100%;
+  height: var(--nutui-picker-item-height, 36px);
+  line-height: var(--nutui-picker-item-height, 36px);
+  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

package/dist/cjs/packages/pickerview/style/style.harmony.css

@@ -0,0 +1,83 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-pickerview {
+  position: relative;
+  display: flex;
+  width: 100%;
+  height: calc(36px * 7);
+  overflow: hidden;
+}
+.nut-pickerview-mask, .nut-pickerview-indicator {
+  position: absolute;
+  left: 0;
+  right: 0;
+  z-index: 3;
+  pointer-events: none;
+}
+.nut-pickerview-mask {
+  top: 0;
+  bottom: 0;
+  background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.4)), linear-gradient(0deg, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.4));
+  background-position: top, bottom;
+  background-size: 100% calc((36px * 7 - 36px) / 2);
+  background-repeat: no-repeat;
+  transform: translateZ(0);
+}
+.nut-pickerview-indicator {
+  top: calc((36px * 7 - 36px) / 2);
+  height: 36px;
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  border-left: 0;
+  border-right: 0;
+  box-sizing: border-box;
+}
+.nut-pickerview-list {
+  position: relative;
+  flex: 1;
+  height: calc(36px * 7);
+  overflow: hidden;
+  touch-action: none;
+}
+.nut-pickerview-roller {
+  position: absolute;
+  top: calc((36px * 7 - 36px) / 2);
+  width: 100%;
+  height: 36px;
+  z-index: 1;
+  transform-style: preserve-3d;
+}
+.nut-pickerview-roller-item {
+  position: absolute;
+  top: 0;
+  backface-visibility: hidden;
+  -moz-backface-visibility: hidden;
+  -webkit-backface-visibility: hidden;
+}
+.nut-pickerview-roller-item-hidden {
+  visibility: hidden;
+  opacity: 0;
+}
+.nut-pickerview-roller-item {
+  width: 100%;
+  height: 36px;
+  line-height: 36px;
+  color: #1a1a1a;
+  font-size: 14px;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.nut-pickerview-roller-item-tiled {
+  width: 100%;
+  height: 36px;
+  line-height: 36px;
+  color: #1a1a1a;
+  font-size: 14px;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

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

@@ -0,0 +1,32 @@
+import { BasicComponent } from "../../utils/typings";
+export type PickerValue = string | number | null;
+export interface PickerOptionItem {
+    label: string | number;
+    value: string | number;
+    children?: PickerOptionItem[];
+}
+export type PickerOptions = PickerOptionItem[];
+export interface PickerRollerProps {
+    options: PickerOptionItem[];
+    keyIndex: number;
+    value: PickerValue;
+    threeDimensional?: boolean;
+    duration?: number | string;
+    onSelect: (option: PickerOptionItem, index: number) => void;
+    renderLabel: (item: PickerOptionItem) => React.ReactNode;
+}
+export interface PickerOnChangeCallbackParameter {
+    value: PickerValue[];
+    index: number;
+    selectedOptions: PickerOptionItem[];
+}
+export interface PickerViewProps extends BasicComponent {
+    setRefs?: (ref: any) => any;
+    options: PickerOptions[];
+    value?: PickerValue[];
+    defaultValue?: PickerValue[];
+    threeDimensional?: boolean;
+    duration?: number | string;
+    renderLabel: (item: PickerOptionItem) => React.ReactNode;
+    onChange?: (arg0: PickerOnChangeCallbackParameter) => void;
+}

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/dist/cjs/packages/pickerview/utils.d.ts

@@ -0,0 +1,14 @@
+export declare const momentum: (distance: number, duration: number) => number;
+export declare const useStyles: (touchTime: number, touchDeg: string, scrollDistance: number, lineSpacing: React.MutableRefObject<number>, rotation: number) => {
+    touchRollerStyle: () => {
+        transition: string;
+        transform: string;
+    };
+    touchTiledStyle: () => {
+        transition: string;
+        transform: string;
+    };
+    rollerStyle: (index: number) => {
+        transform: string;
+    };
+};

package/dist/cjs/packages/pickerview/utils.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    momentum: function() {
+        return momentum;
+    },
+    useStyles: function() {
+        return useStyles;
+    }
+});
+var momentum = function momentum(distance, duration) {
+    var speed = Math.abs(distance / duration);
+    return speed / 0.003 * (distance < 0 ? -1 : 1);
+};
+var useStyles = function useStyles(touchTime, touchDeg, scrollDistance, lineSpacing, rotation) {
+    var getTransitionStyle = function getTransitionStyle(transformValue) {
+        return {
+            transition: "transform ".concat(touchTime, "ms cubic-bezier(0.17, 0.89, 0.45, 1)"),
+            transform: transformValue
+        };
+    };
+    var touchRollerStyle = function touchRollerStyle() {
+        return getTransitionStyle("rotate3d(1, 0, 0, ".concat(touchDeg, ")"));
+    };
+    var touchTiledStyle = function touchTiledStyle() {
+        return getTransitionStyle("translate3d(0, ".concat(scrollDistance, "px, 0)"));
+    };
+    var rollerStyle = function rollerStyle(index) {
+        return {
+            transform: "rotate3d(1, 0, 0, ".concat(-rotation * (index + 1), "deg) translate3d(0px, 0px, ").concat(Math.round(lineSpacing.current * 3.2), "px)")
+        };
+    };
+    return {
+        touchRollerStyle: touchRollerStyle,
+        touchTiledStyle: touchTiledStyle,
+        rollerStyle: rollerStyle
+    };
+};

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

@@ -1,10 +1,10 @@
 import React, { FunctionComponent } from 'react';
-import { PopupProps } from "../popup/popup";
+import { PopupProps } from "../popup/index";
 import { PopoverTheme, PopoverLocation, PopoverList } from './types';
 export interface PopoverProps extends PopupProps {
     list: PopoverList[];
-    theme: PopoverTheme | string;
-    location: PopoverLocation | string;
+    theme: PopoverTheme;
+    location: PopoverLocation;
     visible: boolean;
     offset: string[] | number[];
     arrowOffset: number;

package/dist/cjs/packages/popover/popover.js

@@ -25,7 +25,7 @@ var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
 var _getrectbytaro = require("../../utils/get-rect-by-taro");
 var _typings = require("../../utils/typings");
-var _useclientrect = require("../../utils/use-client-rect");
+var _useclientrect = require("../../hooks/use-client-rect");
 var _index1 = require("../configprovider/index");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     list: [],
@@ -334,7 +334,7 @@ var Popover = function Popover(props) {
         style: getRootPosition()
     }, /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread._)({
         className: "nut-popover-content nut-popover-content-".concat(location),
-        position: "default",
+        position: "none",
         overlay: overlay,
         visible: showPopup
     }, rest), /*#__PURE__*/ _react.default.createElement(_components.View, {

package/dist/cjs/packages/popover/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 {
@@ -437,7 +432,7 @@
   background: var(--nutui-popover-content-background-color, #ffffff);
   border-radius: var(--nutui-popover-border-radius, var(--nutui-radius-xs, 4px));
   font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   line-height: 28px;
   max-height: initial;
   overflow-y: initial;
@@ -447,7 +442,7 @@
   align-items: center;
   justify-content: center;
   padding: 0 var(--nutui-popover-menu-item-padding, 8px);
-  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3));
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   max-width: var(--nutui-popover-menu-item-width, 160px);
   word-wrap: break-word;
 }
@@ -481,7 +476,7 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
   width: 12px;
@@ -489,7 +484,7 @@
   font-size: 12px;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
-  color: var(--nutui-popover-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
   cursor: not-allowed;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -548,14 +543,14 @@
 }
 
 .nut-popover-dark {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10));
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   color: var(--nutui-popover-content-background-color, #ffffff);
 }
 .nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
 }
 .nut-popover-dark .nut-popover-content {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10)) !important;
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7))) !important;
   color: var(--nutui-popover-content-background-color, #ffffff) !important;
 }
 .nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {