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

package/dist/es/packages/picker/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 {
@@ -377,23 +384,24 @@
 }
 
 .nut-picker {
-  background-color: var(--nutui-gray-1);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
   width: 100%;
 }
 .nut-picker-control {
   display: flex;
-  height: var(--nutui-popup-title-height, 50px);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   align-items: center;
   justify-content: space-between;
+  height: var(--nutui-popup-title-height, 50px);
   padding: var(--nutui-popup-title-padding, 16px);
+  box-sizing: border-box;
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-picker-cancel-btn {
-  color: var(--nutui-picker-title-cancel-color, var(--nutui-gray-6));
+  color: var(--nutui-picker-title-cancel-color, var(--nutui-color-text, #505259));
   font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-confirm-btn {
-  color: var(--nutui-picker-title-ok-color, var(--nutui-brand-6));
+  color: var(--nutui-picker-title-ok-color, var(--nutui-color-primary, #ff0f23));
   font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-title {
@@ -402,117 +410,10 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-picker-panel {
   display: flex;
-  position: relative;
-}
-.nut-picker-indicator {
-  position: absolute;
-  top: 108px;
-  height: var(--nutui-picker-item-height, 36px);
-  width: 100%;
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
-  border-left: 0;
-  border-right: 0;
-  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
-  z-index: 3;
-}
-.nut-picker-indicator-taro {
-  height: var(--nutui-picker-item-height, 36px);
-  border: 0;
-}
-.nut-picker-indicator-taro::before, .nut-picker-indicator-taro::after {
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
-  border-left: 0;
-  border-right: 0;
-}
-.nut-picker-list {
-  flex: 1;
-  position: relative;
-  height: var(--nutui-picker-list-height, 252px);
-  overflow: hidden;
-  text-align: center;
-}
-.nut-picker-list-panel {
-  transform-style: preserve-3d;
-}
-.nut-picker-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 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% 108px;
-  background-repeat: no-repeat;
-  transform: translateZ(0);
-  z-index: 3;
-}
-.nut-picker-view-panel {
-  height: var(--nutui-picker-list-height, 252px);
-  flex-grow: 1;
-}
-.nut-picker-content, .nut-picker-roller {
-  position: absolute;
-  top: 108px;
-  width: 100%;
-  height: var(--nutui-picker-item-height, 36px);
-}
-.nut-picker-content {
-  background: #fff;
-  z-index: 2;
-  overflow: hidden;
-}
-.nut-picker-item, .nut-picker-roller-item {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  height: var(--nutui-picker-item-height, 36px);
-  line-height: var(--nutui-picker-item-height, 36px);
-  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
-  text-align: center;
-}
-.nut-picker-item {
-  font-size: 16px;
-  background: #fff;
-}
-.nut-picker-roller {
-  z-index: 1;
-  transform-style: preserve-3d;
-}
-.nut-picker-roller-item {
-  backface-visibility: hidden;
-  -moz-backface-visibility: hidden;
-  -webkit-backface-visibility: hidden;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.nut-picker-roller-item-title {
-  display: block;
-  width: 100%;
-  height: var(--nutui-picker-item-height, 36px);
-  line-height: var(--nutui-picker-item-height, 36px);
-  text-align: center;
-  color: var(--nutui-gray-7);
-  font-size: var(--nutui-font-size-base, 14px);
-}
-.nut-picker-roller-item-hidden {
-  visibility: hidden;
-  opacity: 0;
-}
-.nut-picker-placeholder {
-  height: 1px;
-}
-
-[dir=rtl] .nut-picker-mask,
-.nut-rtl .nut-picker-mask {
-  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)));
 }

package/dist/es/packages/picker/style/style.harmony.css

@@ -0,0 +1,38 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-picker {
+  background-color: #ffffff;
+  width: 100%;
+}
+.nut-picker-control {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 50px;
+  padding: 16px;
+  box-sizing: border-box;
+  font-size: 16px;
+}
+.nut-picker-cancel-btn {
+  color: #505259;
+  font-size: 14px;
+}
+.nut-picker-confirm-btn {
+  color: #ff0f23;
+  font-size: 14px;
+}
+.nut-picker-title {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: center;
+  color: #1a1a1a;
+  font-size: 16px;
+  font-weight: 600;
+}
+.nut-picker-panel {
+  display: flex;
+}

package/dist/es/packages/picker/types.d.ts

@@ -1,7 +1,26 @@
-export interface PickerOption {
-    text: string | number;
-    value: string | number;
-    disabled?: boolean;
-    children?: PickerOption[];
-    className?: string | number;
+import { PopupProps } from "../popup/types";
+import { BasicComponent } from "../../utils/typings";
+import { PickerOnChangeCallbackParameter, PickerOption, PickerOptions, PickerValue } from "../pickerview/types";
+export type PickerRef = PickerActions;
+export type PickerActions = {
+    open: () => void;
+    close: () => void;
+};
+export type ColumnsType = 'single' | 'multiple' | 'cascade';
+export interface PickerProps extends Omit<BasicComponent, 'children'> {
+    visible?: boolean | undefined;
+    title?: string;
+    options: PickerOptions[];
+    value?: PickerValue[];
+    defaultValue?: PickerValue[];
+    threeDimensional?: boolean;
+    duration: number | string;
+    closeOnOverlayClick: boolean;
+    renderLabel?: (item: PickerOption) => React.ReactNode;
+    popupProps: Partial<Omit<PopupProps, 'title' | 'onClose' | 'closeOnOverlayClick'>>;
+    onConfirm?: (selectedOptions: PickerOptions, selectedValue: PickerValue[]) => void;
+    onCancel?: () => void;
+    onClose?: (selectedOptions: PickerOptions, selectedValue: PickerValue[]) => void;
+    onChange?: (args0: PickerOnChangeCallbackParameter) => void;
+    children?: any;
 }

package/dist/es/packages/picker/types.taro.d.ts

@@ -0,0 +1,5 @@
+import { PopupProps } from "../popup/types";
+import { PickerProps as PickerWebProps } from './types';
+export type PickerProps = Omit<PickerWebProps, 'popupProps'> & {
+    popupProps: Partial<Omit<PopupProps, 'title' | 'onClose' | 'closeOnOverlayClick'>>;
+};

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

@@ -0,0 +1,3 @@
+import PickerView from "./pickerview";
+export type { PickerViewProps, PickerOption, PickerRollerProps, PickerValue, PickerOptions, PickerOnChangeCallbackParameter, } from './types';
+export default PickerView;

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

@@ -0,0 +1,2 @@
+import PickerView from "./pickerview";
+export default PickerView;

package/dist/es/packages/pickerview/pickerroller.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { PickerRollerProps } from './types';
+declare const PickerRoller: React.ForwardRefExoticComponent<Partial<PickerRollerProps> & React.RefAttributes<{
+    stopMomentum: () => void;
+    moving: boolean;
+}>>;
+export default PickerRoller;

package/dist/es/packages/pickerview/pickerroller.js

@@ -0,0 +1,175 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
+import { View } from "@tarojs/components";
+import { useTouch } from "../../hooks/use-touch";
+import { passiveSupported } from "../../utils/supports-passive";
+import { web } from "../../utils/platform-taro";
+import { preventDefault } from "../../utils";
+import { momentum, useStyles } from "./utils";
+var InternalPickerRoller = function(props, ref) {
+    var _props_keyIndex = props.keyIndex, keyIndex = _props_keyIndex === void 0 ? 0 : _props_keyIndex, _props_options = props.options, options = _props_options === void 0 ? [] : _props_options, _props_threeDimensional = props.threeDimensional, threeDimensional = _props_threeDimensional === void 0 ? true : _props_threeDimensional, _props_duration = props.duration, duration = _props_duration === void 0 ? 1000 : _props_duration, onSelect = props.onSelect, _props_renderLabel = props.renderLabel, renderLabel = _props_renderLabel === void 0 ? function(item) {
+        return item.label;
+    } : _props_renderLabel;
+    var DEFAULT_DURATION = 200;
+    var INERTIA_TIME = 300;
+    var INERTIA_DISTANCE = 15;
+    var ROTATION = 20;
+    var touch = useTouch();
+    var _useState = _sliced_to_array(useState(1), 2), currentIndex = _useState[0], setCurrentIndex = _useState[1];
+    var lineSpacing = useRef(36);
+    var _useState1 = _sliced_to_array(useState(0), 2), touchTime = _useState1[0], setTouchTime = _useState1[1];
+    var _useState2 = _sliced_to_array(useState('0deg'), 2), touchDeg = _useState2[0], setTouchDeg = _useState2[1];
+    var isMoving = useRef(false);
+    var rollerRef = useRef(null);
+    var pickerRollerRef = useRef(null);
+    var _useState3 = _sliced_to_array(useState(0), 2), startTime = _useState3[0], setStartTime = _useState3[1];
+    var _useState4 = _sliced_to_array(useState(0), 2), startY = _useState4[0], setStartY = _useState4[1];
+    var transformY = useRef(0);
+    var _useState5 = _sliced_to_array(useState(0), 2), scrollDistance = _useState5[0], setScrollDistance = _useState5[1];
+    var _useStyles = useStyles(touchTime, touchDeg, scrollDistance, lineSpacing, ROTATION), touchRollerStyle = _useStyles.touchRollerStyle, touchTiledStyle = _useStyles.touchTiledStyle, rollerStyle = _useStyles.rollerStyle;
+    var isItemHidden = function(index) {
+        return index >= currentIndex + 8 || index <= currentIndex - 8;
+    };
+    var applyTransform = function(type, deg) {
+        var time = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : DEFAULT_DURATION, translateY = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 0;
+        setTouchTime(type !== 'end' ? 0 : time);
+        setTouchDeg(deg);
+        setScrollDistance(translateY);
+    };
+    var handleMove = function(move, type, time) {
+        var updatedMove = move + transformY.current;
+        if (type === 'end') {
+            updatedMove = Math.max(Math.min(updatedMove, 0), -(options.length - 1) * lineSpacing.current);
+            // 滚动距离为lineSpacing.current的倍数值
+            var endMove = Math.round(updatedMove / lineSpacing.current) * lineSpacing.current;
+            var deg = "".concat((Math.abs(Math.round(endMove / lineSpacing.current)) + 1) * ROTATION, "deg");
+            applyTransform(type, deg, time, endMove);
+            setCurrentIndex(Math.abs(Math.round(endMove / lineSpacing.current)) + 1);
+        } else {
+            var currentDeg = (-updatedMove / lineSpacing.current + 1) * ROTATION;
+            var deg1 = Math.min(Math.max(currentDeg, 0), (options.length + 1) * ROTATION);
+            if (deg1 >= 0 && deg1 < (options.length + 1) * ROTATION) {
+                applyTransform('', "".concat(deg1, "deg"), undefined, updatedMove);
+                setCurrentIndex(Math.abs(Math.round(updatedMove / lineSpacing.current)) + 1);
+            }
+        }
+    };
+    var selectValue = function(move) {
+        onSelect === null || onSelect === void 0 ? void 0 : onSelect(options === null || options === void 0 ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
+    };
+    var handleTouchStart = function(event) {
+        touch.start(event);
+        setStartY(touch.deltaY.current);
+        setStartTime(Date.now());
+        transformY.current = scrollDistance;
+    };
+    var handleTouchMove = function(event) {
+        touch.move(event);
+        if (touch.isVertical) {
+            isMoving.current = true;
+            preventDefault(event, true);
+        }
+        var move = touch.deltaY.current - startY;
+        handleMove(move);
+    };
+    var handleTouchEnd = function() {
+        if (!isMoving.current) return;
+        var move = touch.deltaY.current - startY;
+        var moveTime = Date.now() - startTime;
+        if (moveTime <= INERTIA_TIME && Math.abs(move) > INERTIA_DISTANCE) {
+            var distance = momentum(move, moveTime);
+            handleMove(distance, 'end', +duration);
+        } else {
+            handleMove(move, 'end');
+        }
+        setTimeout(function() {
+            touch.reset();
+        }, 0);
+    };
+    var updateStatus = function(shouldSelect, value) {
+        var selectedValue = value || props.value;
+        var index = options.findIndex(function(item) {
+            return item.value === selectedValue;
+        });
+        setCurrentIndex(index === -1 ? 1 : index + 1);
+        var move = index * lineSpacing.current;
+        shouldSelect && selectValue(-move);
+        handleMove(-move);
+    };
+    var stopMomentumScroll = function() {
+        isMoving.current = false;
+        setTouchTime(0);
+        selectValue(scrollDistance);
+    };
+    // lineSpacing.current CSS variable
+    useEffect(function() {
+        var element = pickerRollerRef.current;
+        if (element && web()) {
+            var computedStyle = getComputedStyle(element);
+            var currentLineSpacing = computedStyle.getPropertyValue('--nutui-picker-item-height');
+            !!currentLineSpacing && (lineSpacing.current = parseFloat(currentLineSpacing));
+        }
+    }, [
+        pickerRollerRef.current
+    ]);
+    useEffect(function() {
+        isMoving.current = false;
+        setScrollDistance(0);
+        transformY.current = 0;
+        updateStatus(false);
+    }, [
+        options,
+        props.value
+    ]);
+    useImperativeHandle(ref, function() {
+        return {
+            stopMomentum: stopMomentumScroll,
+            moving: isMoving.current
+        };
+    });
+    useEffect(function() {
+        var _pickerRollerRef_current, _pickerRollerRef_current1, _pickerRollerRef_current2;
+        var eventOptions = passiveSupported ? {
+            passive: false,
+            once: true
+        } : false;
+        (_pickerRollerRef_current = pickerRollerRef.current) === null || _pickerRollerRef_current === void 0 ? void 0 : _pickerRollerRef_current.addEventListener('touchstart', handleTouchStart, eventOptions);
+        (_pickerRollerRef_current1 = pickerRollerRef.current) === null || _pickerRollerRef_current1 === void 0 ? void 0 : _pickerRollerRef_current1.addEventListener('touchmove', handleTouchMove, eventOptions);
+        (_pickerRollerRef_current2 = pickerRollerRef.current) === null || _pickerRollerRef_current2 === void 0 ? void 0 : _pickerRollerRef_current2.addEventListener('touchend', handleTouchEnd, eventOptions);
+        return function() {
+            var _pickerRollerRef_current, _pickerRollerRef_current1, _pickerRollerRef_current2;
+            (_pickerRollerRef_current = pickerRollerRef.current) === null || _pickerRollerRef_current === void 0 ? void 0 : _pickerRollerRef_current.removeEventListener('touchstart', handleTouchStart, eventOptions);
+            (_pickerRollerRef_current1 = pickerRollerRef.current) === null || _pickerRollerRef_current1 === void 0 ? void 0 : _pickerRollerRef_current1.removeEventListener('touchmove', handleTouchMove, eventOptions);
+            (_pickerRollerRef_current2 = pickerRollerRef.current) === null || _pickerRollerRef_current2 === void 0 ? void 0 : _pickerRollerRef_current2.removeEventListener('touchend', handleTouchEnd, eventOptions);
+        };
+    }, [
+        pickerRollerRef.current,
+        handleTouchStart,
+        handleTouchMove,
+        handleTouchEnd
+    ]);
+    return /*#__PURE__*/ React.createElement(View, {
+        className: "nut-pickerview-list",
+        ref: pickerRollerRef
+    }, /*#__PURE__*/ React.createElement(View, {
+        className: "nut-pickerview-roller",
+        ref: rollerRef,
+        style: threeDimensional ? touchRollerStyle() : touchTiledStyle(),
+        onTransitionEnd: stopMomentumScroll
+    }, threeDimensional && options.map(function(item, index) {
+        var _item_value;
+        return /*#__PURE__*/ React.createElement(View, {
+            className: "nut-pickerview-roller-item ".concat(isItemHidden(index + 1) && 'nut-pickerview-roller-item-hidden'),
+            style: rollerStyle(index),
+            key: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : index
+        }, renderLabel(item));
+    }), !threeDimensional && options.map(function(item, index) {
+        var _item_value;
+        return /*#__PURE__*/ React.createElement(View, {
+            className: "nut-pickerview-roller-item-tiled",
+            key: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : index
+        }, renderLabel(item));
+    })));
+};
+var PickerRoller = /*#__PURE__*/ React.forwardRef(InternalPickerRoller);
+export default PickerRoller;

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import { PickerViewProps } from './types';
+declare const PickerView: React.ForwardRefExoticComponent<Partial<PickerViewProps> & React.RefAttributes<unknown>>;
+export default PickerView;