@nutui/nutui-react-taro 3.0.13 → 3.0.15

package/dist/es/packages/dialog/dialog.js

@@ -65,8 +65,6 @@ export var BaseDialog = function(props) {
         var handleCancel = function(e) {
             e.stopPropagation();
             if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
-            if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-            onClose();
             onCancel();
         };
         var handleOk = /*#__PURE__*/ function() {
@@ -152,24 +150,21 @@ export var BaseDialog = function(props) {
     };
     var renderCloseIcon = function() {
         if (!closeIcon) return null;
-        var handleCancel = function() {
-            if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
+        var handleClose = function() {
             if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
             onClose();
-            onCancel();
         };
         var _obj;
         var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-close"), true), _define_property(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
         var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
         return /*#__PURE__*/ React.createElement(View, {
             className: closeClasses,
-            onClick: handleCancel
+            onClick: handleClose
         }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
-            closed && onClose();
             closed && onCancel();
         }
     };

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

@@ -1,23 +1,6 @@
 import React, { FunctionComponent } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export declare const elevatorContext: React.Context<ElevatorData>;
-export interface ElevatorProps extends BasicComponent {
-    height: number | string;
-    floorKey: string;
-    list: any[];
-    sticky: boolean;
-    spaceHeight: number;
-    titleHeight: number;
-    showKeys: boolean;
-    onItemClick: (key: string, item: ElevatorData) => void;
-    onIndexClick: (key: string) => void;
-}
-interface ElevatorData {
-    name: string;
-    id: number | string;
-    [key: string]: string | number;
-}
-export declare const Elevator: FunctionComponent<Partial<ElevatorProps> & React.HTMLAttributes<HTMLDivElement>> & {
+import { ElevatorItem, TaroElevatorProps } from "../../types";
+export declare const elevatorContext: React.Context<ElevatorItem>;
+export declare const Elevator: FunctionComponent<Partial<TaroElevatorProps> & React.HTMLAttributes<HTMLDivElement>> & {
     Context: typeof elevatorContext;
 };
-export {};

package/dist/es/packages/elevator/elevator.js

@@ -1,9 +1,10 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useEffect, useRef, useState, createContext, useMemo } from "react";
 import Taro, { nextTick, createSelectorQuery } from "@tarojs/taro";
 import { ScrollView, View, Text } from "@tarojs/components";
@@ -11,25 +12,30 @@ import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
 import { harmony } from "../../utils/taro/platform";
 import { useUuid } from "../../hooks/use-uuid";
+import raf from "../../utils/raf";
+import { usePropsValue } from "../../hooks";
 export var elevatorContext = /*#__PURE__*/ createContext({});
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    mode: 'horizontal',
     height: '200px',
     floorKey: 'title',
     list: [],
     sticky: false,
-    spaceHeight: 23,
-    titleHeight: 35,
+    spaceHeight: 18,
     showKeys: true,
-    className: 'weapp-elevator'
+    defaultValue: undefined,
+    value: undefined
 });
 export var Elevator = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), height = _ref.height, floorKey = _ref.floorKey, list = _ref.list, sticky = _ref.sticky, spaceHeight = _ref.spaceHeight, titleHeight = _ref.titleHeight, showKeys = _ref.showKeys, className = _ref.className, style = _ref.style, onItemClick = _ref.onItemClick, onIndexClick = _ref.onIndexClick, children = _ref.children, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), value = _ref.value, defaultValue = _ref.defaultValue, mode = _ref.mode, height = _ref.height, floorKey = _ref.floorKey, list = _ref.list, sticky = _ref.sticky, spaceHeight = _ref.spaceHeight, showKeys = _ref.showKeys, className = _ref.className, style = _ref.style, onItemClick = _ref.onItemClick, onIndexClick = _ref.onIndexClick, children = _ref.children, rest = _object_without_properties(_ref, [
+        "value",
+        "defaultValue",
+        "mode",
         "height",
         "floorKey",
         "list",
         "sticky",
         "spaceHeight",
-        "titleHeight",
         "showKeys",
         "className",
         "style",
@@ -39,25 +45,25 @@ export var Elevator = function(props) {
     ]);
     var uuid = useUuid();
     var classPrefix = 'nut-elevator';
-    var listview = useRef(null);
     var initData = {
         anchorIndex: 0,
         listHeight: [],
-        listGroup: [],
         scrollY: 0
     };
     var touchState = useRef({
         y1: 0,
         y2: 0
     });
-    var _useState = _sliced_to_array(useState({}), 2), currentData = _useState[0], setCurrentData = _useState[1];
-    var _useState1 = _sliced_to_array(useState(''), 2), currentKey = _useState1[0], setCurrentKey = _useState1[1];
-    var _useState2 = _sliced_to_array(useState(0), 2), codeIndex = _useState2[0], setCodeIndex = _useState2[1];
-    var _useState3 = _sliced_to_array(useState(false), 2), scrollStart = _useState3[0], setScrollStart = _useState3[1];
+    var _usePropsValue = _sliced_to_array(usePropsValue({
+        value: value,
+        defaultValue: defaultValue || {}
+    }), 2), currentData = _usePropsValue[0], setCurrentData = _usePropsValue[1];
+    var _useState = _sliced_to_array(useState(0), 2), codeIndex = _useState[0], setCodeIndex = _useState[1];
+    var _useState1 = _sliced_to_array(useState(false), 2), scrollStart = _useState1[0], setScrollStart = _useState1[1];
     var state = useRef(initData);
     var scrolling = useRef(false);
-    var _useState4 = _sliced_to_array(useState(0), 2), scrollTop = _useState4[0], setScrollTop = _useState4[1];
-    var _useState5 = _sliced_to_array(useState(0), 2), scrollY = _useState5[0], setScrollY = _useState5[1];
+    var _useState2 = _sliced_to_array(useState(0), 2), scrollTop = _useState2[0], setScrollTop = _useState2[1];
+    var _useState3 = _sliced_to_array(useState(0), 2), scrollY = _useState3[0], setScrollY = _useState3[1];
     var resetScrollState = function() {
         setScrollStart(false);
     };
@@ -68,39 +74,71 @@ export var Elevator = function(props) {
         return el.dataset.index;
     };
     var calculateHeight = function() {
-        var height = 0;
-        state.current.listHeight.push(height);
-        for(var i = 0; i < state.current.listGroup.length; i++){
-            var query = createSelectorQuery();
-            query.selectAll(".".concat(classPrefix, "-").concat(uuid, " .nut-elevator-item-").concat(i)).boundingClientRect();
-            // eslint-disable-next-line no-loop-func
-            query.exec(function(res) {
-                if (res[0][0]) height += res[0][0].height;
-                state.current.listHeight.push(height);
-            });
-        }
-    };
-    var scrollTo = function(index) {
-        if (!index && index !== 0) {
-            return;
-        }
-        if (!state.current.listHeight.length) {
-            calculateHeight();
-        }
-        var cacheIndex = index;
-        if (index < 0) {
-            cacheIndex = 0;
-        }
-        if (index > state.current.listHeight.length - 2) {
-            cacheIndex = Math.max(0, state.current.listHeight.length - 2);
-        }
-        setCodeIndex(cacheIndex);
-        var scrollTop = state.current.listHeight[cacheIndex];
-        setScrollTop(scrollTop);
-        if (sticky && scrollY !== scrollTop) {
-            setScrollY(Math.floor(scrollTop) > 0 ? 1 : 0);
-        }
+        state.current.listHeight = [
+            0
+        ];
+        var query = createSelectorQuery();
+        query.selectAll("#".concat(classPrefix, "-").concat(uuid, " .").concat(classPrefix, "-list-item")).boundingClientRect().exec(function() {
+            var rect = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+            if (rect[0] && rect[0].length) {
+                // rect[0] = rect[0].reverse()
+                state.current.listHeight = rect[0].reduce(function(acc, item, index) {
+                    // 当前项的高度等于前面所有项的高度之和
+                    var height = acc[index] + item.height;
+                    acc.push(height);
+                    return acc;
+                }, [
+                    0
+                ]);
+            }
+        });
     };
+    var scrollTo = /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function(index) {
+            var cacheIndex, scrollTop;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        if (!index && index !== 0) {
+                            return [
+                                2
+                            ];
+                        }
+                        if (!!state.current.listHeight.length) return [
+                            3,
+                            2
+                        ];
+                        return [
+                            4,
+                            calculateHeight()
+                        ];
+                    case 1:
+                        _state.sent();
+                        _state.label = 2;
+                    case 2:
+                        cacheIndex = index;
+                        if (index < 0) {
+                            cacheIndex = 0;
+                        }
+                        if (index > state.current.listHeight.length - 2) {
+                            cacheIndex = Math.max(0, state.current.listHeight.length - 2);
+                        }
+                        setCodeIndex(cacheIndex);
+                        scrollTop = state.current.listHeight[cacheIndex];
+                        setScrollTop(scrollTop);
+                        if (mode === 'vertical' && sticky) {
+                            setScrollY(Math.floor(scrollTop) > 0 ? 1 : 0);
+                        }
+                        return [
+                            2
+                        ];
+                }
+            });
+        });
+        return function scrollTo(index) {
+            return _ref.apply(this, arguments);
+        };
+    }();
     var touchMove = function(e) {
         var firstTouch = e.touches[0];
         touchState.current.y2 = firstTouch.pageY;
@@ -125,39 +163,31 @@ export var Elevator = function(props) {
     var handleClickItem = function(key, item) {
         onItemClick && onItemClick(key, item);
         setCurrentData(item);
-        setCurrentKey(key);
     };
     var handleClickIndex = function(key) {
         onIndexClick && onIndexClick(key);
     };
-    var setListGroup = function() {
-        if (listview.current) {
-            createSelectorQuery().selectAll(".".concat(classPrefix, "-").concat(uuid, " .nut-elevator-list-item")).node(function(el) {
-                state.current.listGroup = _to_consumable_array(Object.keys(el));
-                calculateHeight();
-            }).exec();
-        }
-    };
     var listViewScroll = function(e) {
-        var listHeight = state.current.listHeight;
-        if (!listHeight.length) {
-            calculateHeight();
-        }
-        var target = e.target;
-        var scrollTop = target.scrollTop;
-        state.current.scrollY = Math.floor(scrollTop);
-        Taro.getEnv() === 'WEB' && setScrollTop(scrollTop);
-        if (sticky && scrollTop !== scrollY) {
-            setScrollY(Math.floor(scrollTop) > 0 ? 1 : 0);
-        }
-        if (scrolling.current) return;
-        for(var i = 0; i < listHeight.length - 1; i++){
-            var height1 = listHeight[i];
-            var height2 = listHeight[i + 1];
-            if (state.current.scrollY >= height1 && state.current.scrollY < height2) {
-                return setCodeIndex(i);
+        raf(function() {
+            var listHeight = state.current.listHeight;
+            if (!listHeight.length) {
+                calculateHeight();
             }
-        }
+            var target = e.target;
+            var scrollTop = target.scrollTop;
+            state.current.scrollY = Math.floor(scrollTop);
+            Taro.getEnv() === 'WEB' && setScrollTop(scrollTop);
+            if (mode === 'vertical' && sticky) {
+                setScrollY(Math.floor(scrollTop) > 0 ? 1 : 0);
+            }
+            if (scrolling.current) return;
+            var index = listHeight.findIndex(function(height, i) {
+                return state.current.scrollY >= height && state.current.scrollY < (listHeight[i + 1] || Infinity);
+            });
+            if (index !== -1 && index !== codeIndex) {
+                setCodeIndex(index);
+            }
+        });
     };
     var getWrapStyle = useMemo(function() {
         var calcHeight = Number.isNaN(+height) ? height : "".concat(height, "px");
@@ -168,17 +198,14 @@ export var Elevator = function(props) {
         height
     ]);
     useEffect(function() {
-        if (listview.current) {
-            nextTick(function() {
-                setListGroup();
-            });
-        }
-    }, [
-        listview
-    ]);
+        nextTick(function() {
+            calculateHeight();
+        });
+    }, []);
     var _obj;
     return /*#__PURE__*/ React.createElement("div", _object_spread({
-        className: "".concat(classPrefix, " ").concat(className, " ").concat(classPrefix, "-").concat(uuid),
+        className: "".concat(classPrefix, " ").concat(className, " ").concat(classPrefix, "-").concat(mode, " "),
+        id: "".concat(classPrefix, "-").concat(uuid),
         style: style
     }, rest), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list"),
@@ -186,11 +213,10 @@ export var Elevator = function(props) {
     }, /*#__PURE__*/ React.createElement(ScrollView, {
         scrollTop: scrollTop,
         scrollY: true,
-        scrollWithAnimation: true,
+        enhanced: true,
+        scrollWithAnimation: false,
         scrollAnchoring: true,
         className: "".concat(classPrefix, "-list-inner"),
-        type: "list",
-        ref: listview,
         onScroll: listViewScroll,
         onTouchStart: function(e) {
             scrolling.current = false;
@@ -201,10 +227,12 @@ export var Elevator = function(props) {
             key: idx
         }, /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-list-item-code")
-        }, item[floorKey]), /*#__PURE__*/ React.createElement(React.Fragment, null, item.list.map(function(subitem) {
+        }, item[floorKey]), /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-list-item-sublist")
+        }, item.list.map(function(subitem) {
             var _obj;
             return /*#__PURE__*/ React.createElement(View, {
-                className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-list-item-name"), true), _define_property(_obj, "".concat(classPrefix, "-list-item-name-highcolor"), currentData.id === subitem.id && currentKey === item[floorKey]), _obj)),
+                className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-list-item-name"), true), _define_property(_obj, "".concat(classPrefix, "-list-item-name-highcolor"), currentData.id === subitem.id), _obj)),
                 key: subitem.id,
                 onClick: function() {
                     return handleClickItem(item[floorKey], subitem);
@@ -215,7 +243,7 @@ export var Elevator = function(props) {
         })));
     }))), showKeys ? /*#__PURE__*/ React.createElement(React.Fragment, null, list.length && scrollStart ? /*#__PURE__*/ React.createElement(View, {
         className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-code-current"), true), _define_property(_obj, "".concat(classPrefix, "-code-current-current"), true), _obj))
-    }, list[codeIndex][floorKey]) : null, /*#__PURE__*/ React.createElement(View, {
+    }, list[codeIndex] && String(list[codeIndex][floorKey])) : null, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-bars")
     }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-bars-inner")
@@ -238,12 +266,12 @@ export var Elevator = function(props) {
             style: {
                 touchAction: 'pan-y'
             }
-        }, item[floorKey]);
-    })))) : null, sticky && scrollY > 0 ? /*#__PURE__*/ React.createElement(View, {
+        }, String(item[floorKey]));
+    })))) : null, mode === 'vertical' && sticky && scrollY > 0 ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list-fixed")
     }, /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-list-fixed-title")
-    }, list[codeIndex][floorKey])) : null);
+    }, list[codeIndex] && String(list[codeIndex][floorKey]))) : null);
 };
 Elevator.displayName = 'NutElevator';
 Elevator.Context = elevatorContext;

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

@@ -1,3 +1,3 @@
 import { Elevator } from "./elevator";
-export type { ElevatorProps } from "./elevator";
+export type { TaroElevatorProps as ElevatorProps } from "../../types";
 export default Elevator;

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

@@ -1,68 +1,66 @@
 .nut-elevator {
-  width: 100%;
-  display: block;
   position: relative;
-  overflow: hidden;
+  display: flex;
+  width: 100%;
 
   &-list {
-    display: block;
     position: relative;
     top: 0;
+    display: flex;
+    width: 100%;
     overflow: hidden;
-    font-size: $elevator-list-font-size;
-    color: $elevator-list-color;
 
     &-inner {
-      height: 100%;
+      display: flex;
+      flex-direction: column;
+      min-height: 100%;
       width: 100%;
-      display: block;
       background-color: $elevator-list-bg-color;
       overflow: auto;
     }
 
     &-item {
-      display: block;
-
+      display: flex;
+      &-sublist {
+        display: flex;
+        flex-direction: column;
+      }
       &-code {
         display: flex;
-        position: relative;
+        align-items: center;
         height: $elevator-list-item-code-height;
-        line-height: $elevator-list-item-code-line-height;
         font-size: $elevator-list-item-code-font-size;
         color: $elevator-list-item-code-color;
-        padding: $elevator-list-item-padding;
         font-weight: $elevator-list-item-code-font-weight;
-        box-sizing: border-box;
-        border-bottom: $elevator-list-item-code-border-bottom;
-        background-color: $elevator-list-item-code-background-color;
       }
 
       &-name {
         display: flex;
         align-items: center;
-        padding: $elevator-list-item-padding;
         height: $elevator-list-item-name-height;
-        line-height: $elevator-list-item-name-line-height;
+        font-size: $elevator-list-font-size;
+        color: $elevator-list-color;
 
         &-highcolor {
           color: $color-primary;
+          font-weight: 600;
         }
       }
     }
 
     &-fixed {
-      display: flex;
-      align-items: center;
-      width: 100%;
       position: absolute;
       top: 0;
       left: 0;
       z-index: 1;
+      display: flex;
+      align-items: center;
+      width: 100%;
       padding: $elevator-list-item-padding;
       height: $elevator-list-item-code-height;
-      background-color: $elevator-list-fixed-bg-color;
       box-sizing: border-box;
       box-shadow: $elevator-list-fixed-box-shadow;
+      background-color: $elevator-list-fixed-bg-color;
       &-title {
         font-size: $elevator-list-item-code-font-size;
         color: $elevator-list-fixed-color;
@@ -76,41 +74,71 @@
     right: $elevator-list-item-code-current-right;
     top: $elevator-list-item-code-current-top;
     transform: $elevator-bars-transform;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: $elevator-list-item-code-current-width;
     height: $elevator-list-item-code-current-height;
-    line-height: $elevator-list-item-code-current-line-height;
     border-radius: $elevator-list-item-code-current-border-radius;
     background: $elevator-list-item-code-current-bg-color;
     box-shadow: $elevator-list-item-code-current-box-shadow;
-    text-align: $elevator-list-item-code-current-text-align;
+    color: $elevator-list-item-code-current-color;
   }
 
   &-bars {
     position: absolute;
     right: $elevator-bars-right;
     top: $elevator-bars-top;
-    color: $color-text-help;
-    font-size: $elevator-bars-font-size;
     transform: $elevator-bars-transform;
-    padding: $elevator-bars-padding;
-    background-color: $elevator-bars-background-color;
-    border-radius: $elevator-bars-border-radius;
-    text-align: center;
     z-index: $elevator-bars-z-index;
 
     &-inner {
+      display: flex;
+      flex-direction: column;
       &-item {
-        display: block;
-        padding: $elevator-bars-inner-item-padding;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        height: 16px;
+        width: 16px;
+        border-radius: 50%;
+        margin: 1px 0;
+        color: $elevator-bars-color;
+        font-size: $elevator-bars-font-size;
         cursor: pointer;
-
         &-active {
           font-weight: $font-weight-bold;
           color: $elevator-bars-active-color;
+          /* #ifndef weapp jd*/
+          background: linear-gradient(to right, #ff475d, #ff0f23);
+          /* #endif */
+          /* #ifdef weapp jd*/
+          background: #ff0f23;
+          /* #endif */
         }
       }
     }
   }
+  &-horizontal {
+    .nut-elevator-list-item {
+      &-code {
+        width: $elevator-list-item-code-width;
+        justify-content: center;
+      }
+    }
+  }
+  &-vertical {
+    .nut-elevator-list-item {
+      flex-direction: column;
+      &-code {
+        border-bottom: $elevator-list-item-code-border-bottom;
+      }
+      &-name,
+      &-code {
+        padding: $elevator-list-item-padding;
+      }
+    }
+  }
 }
 
 [dir='rtl'] .nut-elevator,