@nutui/nutui-react-taro 2.0.0-alpha.1 → 2.0.0-alpha.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v2.0.0-alpha.2
+`2023-04-26`
+
+* 🛠 refactor: navbar (#890) @拧巴的猫
+* 🛠 refactor: animate (#940) @junjun666
+* 🛠 refactor: badge (#936) @xiaoyatong
+* 🛠 refactor: drag (#937) @拧巴的猫
+* 🛠 refactor: elevator (#927) @拧巴的猫
+* 🛠 refactor: menu (#923) @oasis-cloud
+* 🛠 refactor: progress (#943) @Eiinu
+* 🔨 chore: sync pnpm-lock @oasis-cloud
+* :bug: fix: 修改taro增加主题编译 (#950) @junjun666
+
+
 # v2.0.0-alpha.1
 `2023-04-21`
 

package/dist/esm/Address.js

@@ -1,4 +1,4 @@
-import { A as Address } from './address.taro-632ca799.js';
+import { A as Address } from './address.taro-2f915873.js';
 import 'react';
 import '@nutui/icons-react-taro';
 import './popup.taro-020bf791.js';
@@ -14,7 +14,7 @@ import './configprovider-9960f0fb.js';
 import 'lodash.kebabcase';
 import './zh-CN-b4f493ba.js';
 import '@tarojs/taro';
-import './elevator.taro-81a11ecc.js';
+import './elevator.taro-588e219b.js';
 import './configprovider.taro-c8c54556.js';
 
 

package/dist/esm/Animate.js

@@ -1,8 +1,7 @@
-import { A as Animate } from './animate.taro-fb7986d6.js';
+import { A as Animate } from './animate.taro-9e65d07a.js';
 import 'react';
 import 'classnames';
-import './bem-350c1702.js';
-import '@bem-react/classname';
+import './typings-d8491423.js';
 
 
 

package/dist/esm/Badge.js

@@ -1,8 +1,6 @@
-import { B as Badge } from './badge.taro-ae154f41.js';
+import { B as Badge } from './badge.taro-1d5df601.js';
 import 'react';
 import 'classnames';
-import './bem-350c1702.js';
-import '@bem-react/classname';
 import './typings-d8491423.js';
 
 

package/dist/esm/Divider.js

@@ -1,6 +1,7 @@
-import { D as Divider } from './divider.taro-6c1657ce.js';
+import { D as Divider } from './divider.taro-67e9f757.js';
 import 'react';
 import 'classnames';
+import './typings-d8491423.js';
 
 
 

package/dist/esm/Drag.js

@@ -1,8 +1,7 @@
-import { D as Drag } from './drag.taro-79bb8744.js';
+import { D as Drag } from './drag.taro-2d3d9d11.js';
 import 'react';
 import '@tarojs/taro';
-import './bem-350c1702.js';
-import '@bem-react/classname';
+import './typings-d8491423.js';
 
 
 

package/dist/esm/Elevator.js

@@ -1,9 +1,9 @@
-import { E as Elevator } from './elevator.taro-81a11ecc.js';
+import { E as Elevator } from './elevator.taro-588e219b.js';
 import 'react';
 import '@tarojs/taro';
 import '@tarojs/components';
-import './bem-350c1702.js';
-import '@bem-react/classname';
+import 'classnames';
+import './typings-d8491423.js';
 
 
 

package/dist/esm/Menu.js

@@ -1,4 +1,4 @@
-import { M as Menu } from './menu.taro-54951911.js';
+import { M as Menu } from './menu.taro-b61442a7.js';
 import 'react';
 import 'classnames';
 import '@nutui/icons-react-taro';

package/dist/esm/MenuItem.js

@@ -1,14 +1,13 @@
-import { M as MenuItem } from './menuitem.taro-86a6bb6c.js';
+import { M as MenuItem } from './menuitem.taro-bca78e07.js';
 import 'react';
 import 'classnames';
+import '@tarojs/taro';
 import 'react-transition-group';
 import '@nutui/icons-react-taro';
-import './configprovider.taro-c8c54556.js';
-import 'lodash.kebabcase';
-import './zh-CN-b4f493ba.js';
 import './overlay.taro-ad0d4775.js';
 import '@tarojs/components';
 import './typings-d8491423.js';
+import './use-client-rect-1f8ed1fe.js';
 
 
 

package/dist/esm/NavBar.js

@@ -1,9 +1,6 @@
-import { N as NavBar } from './navbar.taro-69f47d51.js';
+import { N as NavBar } from './navbar.taro-02c69d66.js';
 import 'react';
 import 'classnames';
-import '@nutui/icons-react-taro';
-import './bem-350c1702.js';
-import '@bem-react/classname';
 import './typings-d8491423.js';
 
 

package/dist/esm/Progress.js

@@ -1,9 +1,6 @@
-import { P as Progress } from './progress.taro-24392ef3.js';
+import { P as Progress } from './progress.taro-1c199fbe.js';
 import 'react';
 import 'classnames';
-import '@nutui/icons-react-taro';
-import './bem-350c1702.js';
-import '@bem-react/classname';
 import './typings-d8491423.js';
 
 

package/dist/esm/Uploader.js

@@ -1,4 +1,4 @@
-import { U as Uploader } from './uploader.taro-2151eec6.js';
+import { U as Uploader } from './uploader.taro-17569890.js';
 import 'react';
 import 'classnames';
 import '@tarojs/taro';
@@ -6,9 +6,7 @@ import '@nutui/icons-react-taro';
 import '@tarojs/components';
 import './button.taro-a1c9512f.js';
 import './typings-d8491423.js';
-import './progress.taro-24392ef3.js';
-import './bem-350c1702.js';
-import '@bem-react/classname';
+import './progress.taro-1c199fbe.js';
 import './configprovider.taro-c8c54556.js';
 import 'lodash.kebabcase';
 import './zh-CN-b4f493ba.js';

package/dist/esm/{address.taro-632ca799.js → address.taro-2f915873.js}

@@ -4,7 +4,7 @@ import { P as Popup } from './popup.taro-020bf791.js';
 import { c as cn } from './bem-350c1702.js';
 import { u as useConfig } from './configprovider-9960f0fb.js';
 import { createSelectorQuery } from '@tarojs/taro';
-import { E as Elevator } from './elevator.taro-81a11ecc.js';
+import { E as Elevator } from './elevator.taro-588e219b.js';
 import { u as useConfig$1 } from './configprovider.taro-c8c54556.js';
 import { C as ComponentDefaults } from './typings-d8491423.js';
 
@@ -302,7 +302,7 @@ const CustomRender = (props) => {
                         item.name)));
             })))),
         privateType === 'custom2' && (React__default.createElement("div", { className: b('elevator-group') },
-            React__default.createElement(Elevator, { height: height, indexList: regionList[tabName[tabIndex]], onClickItem: handleElevatorItem })))));
+            React__default.createElement(Elevator, { height: height, list: regionList[tabName[tabIndex]], onClickItem: handleElevatorItem })))));
 };
 
 const defaultProps = {

package/dist/esm/{animate.taro-fb7986d6.js → animate.taro-9e65d07a.js}

@@ -1,23 +1,24 @@
 import React__default, { useState } from 'react';
 import classNames from 'classnames';
-import { c as cn } from './bem-350c1702.js';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 const defaultProps = {
+    ...ComponentDefaults,
     type: 'shake',
     action: 'initial',
     loop: false,
     onClick: (event) => { },
 };
+const classPrefix = `nut-animate`;
 const Animate = (props) => {
     const { className, type, action, loop, onClick, children, ...rest } = {
         ...defaultProps,
         ...props,
     };
     const [clicked, setClicked] = useState(false);
-    const b = cn('animate');
     const classes = classNames({
         'nut-ani-container': true,
-        [`${b('')}-${type}`]: action === 'initial' || clicked ? type : false,
+        [`${classPrefix}-${type}`]: action === 'initial' || clicked ? type : false,
         loop: loop,
     });
     const cls = classNames(classes, className);

package/dist/esm/{badge.taro-ae154f41.js → badge.taro-1d5df601.js}

@@ -1,31 +1,27 @@
 import React__default from 'react';
 import classNames from 'classnames';
-import { c as cn } from './bem-350c1702.js';
 import { C as ComponentDefaults } from './typings-d8491423.js';
 
-const b = cn('badge');
 const defaultProps = {
     ...ComponentDefaults,
-    className: '',
     value: '',
     dot: false,
-    max: 10000,
+    max: 99,
     top: '0',
-    right: '0',
-    zIndex: '0',
+    right: '5',
     color: '',
-    icon: null,
 };
 const Badge = (props) => {
-    const { className, style, children, dot, top, right, zIndex, color, icon } = {
+    const { className, style, value, max, children, dot, top, right, color } = {
         ...defaultProps,
         ...props,
     };
+    const classPrefix = 'nut-badge';
+    const classes = classNames(classPrefix, className);
+    const contentClasses = classNames({ [`${classPrefix}__dot`]: dot }, `${classPrefix}__content`, `${classPrefix}__sup`);
     function content() {
-        if (dot)
-            return undefined;
-        const { value } = props;
-        const { max } = props;
+        if (dot || typeof value === 'object')
+            return null;
         if (typeof value === 'number' && typeof max === 'number') {
             return max < value ? `${max}+` : value;
         }
@@ -35,14 +31,13 @@ const Badge = (props) => {
         const style = {};
         style.top = `${Number(top) || parseFloat(top) || 0}px`;
         style.right = `${Number(right) || parseFloat(right) || 0}px`;
-        style.zIndex = zIndex;
         style.background = color;
         return style;
     };
-    return (React__default.createElement("div", { className: classNames(b(), className), style: style },
-        icon && React__default.createElement("div", { className: "slot-icon" }, icon),
+    return (React__default.createElement("div", { className: classes, style: style },
+        typeof value === 'object' && value && (React__default.createElement("div", { className: `${classPrefix}__icon` }, value)),
         React__default.createElement("div", null, children),
-        React__default.createElement("div", { className: classNames({ 'is-dot': dot }, b('content'), 'sup'), style: getStyle() }, content())));
+        React__default.createElement("div", { className: contentClasses, style: getStyle() }, content())));
 };
 Badge.defaultProps = defaultProps;
 Badge.displayName = 'NutBadge';

package/dist/esm/{divider.taro-6c1657ce.js → divider.taro-67e9f757.js}

@@ -1,7 +1,9 @@
 import React__default from 'react';
 import classNames from 'classnames';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 const defaultProps = {
+    ...ComponentDefaults,
     contentPosition: 'center',
     direction: 'horizontal',
 };

package/dist/esm/{drag.taro-79bb8744.js → drag.taro-2d3d9d11.js}

@@ -1,8 +1,9 @@
 import React__default, { useState, useRef, useEffect } from 'react';
 import { getSystemInfoSync, createSelectorQuery } from '@tarojs/taro';
-import { c as cn } from './bem-350c1702.js';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 const defaultProps = {
+    ...ComponentDefaults,
     attract: false,
     direction: undefined,
     boundary: {
@@ -18,7 +19,7 @@ const Drag = (props) => {
         ...defaultProps,
         ...props,
     };
-    const b = cn('drag');
+    const classPrefix = 'nut-drag';
     const [boundaryState, setBoundaryState] = useState(boundary);
     const myDrag = useRef(null);
     const dragRef = useRef(null);
@@ -99,7 +100,7 @@ const Drag = (props) => {
             clearTimeout(timer.current);
         };
     }, []);
-    return (React__default.createElement("div", { style: style, className: `${b()} ${className}`, ...reset, ref: myDrag },
+    return (React__default.createElement("div", { style: style, className: `${classPrefix} ${className}`, ...reset, ref: myDrag },
         React__default.createElement("div", { onTouchStart: (event) => touchStart(event), ref: dragRef, onTouchMove: touchMove, onTouchEnd: touchEnd, 
             // eslint-disable-next-line react/no-unknown-property
             style: currstyle }, children)));

package/dist/esm/{elevator.taro-81a11ecc.js → elevator.taro-588e219b.js}

@@ -1,24 +1,26 @@
 import React__default, { createContext, useRef, useState, useEffect } from 'react';
 import { nextTick, createSelectorQuery } from '@tarojs/taro';
 import { ScrollView } from '@tarojs/components';
-import { c as cn } from './bem-350c1702.js';
+import classNames from 'classnames';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 const elevatorContext = createContext({});
 const defaultProps = {
+    ...ComponentDefaults,
     height: '200px',
-    acceptKey: 'title',
-    indexList: [],
-    isSticky: false,
+    floorKey: 'title',
+    list: [],
+    sticky: false,
     spaceHeight: 23,
     titleHeight: 35,
     className: 'weapp-elevator',
 };
 const Elevator = (props) => {
-    const { height, acceptKey, indexList, isSticky, spaceHeight, titleHeight, className, onClickItem, onClickIndex, children, ...rest } = {
+    const { height, floorKey, list, sticky, spaceHeight, titleHeight, className, style, onClickItem, onClickIndex, children, ...rest } = {
         ...defaultProps,
         ...props,
     };
-    const b = cn('elevator');
+    const classPrefix = 'nut-elevator';
     const listview = useRef(null);
     const initData = {
         anchorIndex: 0,
@@ -53,7 +55,7 @@ const Elevator = (props) => {
         for (let i = 0; i < state.current.listGroup.length; i++) {
             const query = createSelectorQuery();
             query
-                .selectAll(`.${className} .elevator__item__${i}`)
+                .selectAll(`.${className} .nut-elevator__item__${i}`)
                 .boundingClientRect();
             // eslint-disable-next-line no-loop-func
             query.exec((res) => {
@@ -148,27 +150,32 @@ const Elevator = (props) => {
             });
         }
     }, [listview]);
-    return (React__default.createElement("div", { className: `${b()} ${className} `, ...rest },
-        isSticky && scrollTop > 0 ? (React__default.createElement("div", { className: b('list__fixed') },
-            React__default.createElement("span", { className: "fixed-title" }, indexList[currentIndex][acceptKey]))) : null,
-        React__default.createElement("div", { className: b('list'), style: { height: Number.isNaN(+height) ? height : `${height}px` } },
-            React__default.createElement(ScrollView, { scrollTop: scrollTop, scrollY: true, type: "list", className: b('list__inner'), ref: listview, onScroll: listViewScroll }, indexList.map((item, idx) => {
-                return (React__default.createElement("div", { className: `${b('list__item')} elevator__item__${idx}`, key: idx },
-                    React__default.createElement("div", { className: b('list__item__code') }, item[acceptKey]),
+    return (React__default.createElement("div", { className: `${classPrefix} ${className}`, style: style, ...rest },
+        sticky && scrollTop > 0 ? (React__default.createElement("div", { className: `${classPrefix}__list__fixed` },
+            React__default.createElement("span", { className: `${classPrefix}__list__fixed__title` }, list[currentIndex][floorKey]))) : null,
+        React__default.createElement("div", { className: `${classPrefix}__list`, style: { height: Number.isNaN(+height) ? height : `${height}px` } },
+            React__default.createElement(ScrollView, { scrollTop: scrollTop, scrollY: true, className: `${classPrefix}__list__inner`, type: "list", ref: listview, onScroll: listViewScroll }, list.map((item, idx) => {
+                return (React__default.createElement("div", { className: `${classPrefix}__list__item nut-elevator__item__${idx}`, key: idx },
+                    React__default.createElement("div", { className: `${classPrefix}__list__item__code` }, item[floorKey]),
                     React__default.createElement(React__default.Fragment, null, item.list.map((subitem) => {
-                        return (React__default.createElement("div", { className: b('list__item__name', {
-                                highcolor: currentData.id === subitem.id &&
-                                    currentKey === item[acceptKey],
-                            }), key: subitem.id, onClick: () => handleClickItem(item[acceptKey], subitem) }, children ? (React__default.createElement(React__default.Fragment, null,
+                        return (React__default.createElement("div", { className: classNames({
+                                [`${classPrefix}__list__item__name`]: true,
+                                [`${classPrefix}__list__item__name--highcolor`]: currentData.id === subitem.id &&
+                                    currentKey === item[floorKey],
+                            }), key: subitem.id, onClick: () => handleClickItem(item[floorKey], subitem) }, children ? (React__default.createElement(React__default.Fragment, null,
                             React__default.createElement(elevatorContext.Provider, { value: subitem }, children))) : (subitem.name)));
                     }))));
             }))),
-        indexList.length && scrollStart ? (React__default.createElement("div", { className: b('code--current', { current: true }) }, indexList[codeIndex][acceptKey])) : null,
-        React__default.createElement("div", { className: b('bars') },
-            React__default.createElement("div", { className: b('bars__inner'), onTouchStart: (event) => touchStart(event), onTouchMove: (event) => touchMove(event), onTouchEnd: touchEnd, style: { touchAction: 'pan-y' } }, indexList.map((item, index) => {
-                return (React__default.createElement("div", { className: `${b('bars__inner__item', {
-                        active: item[acceptKey] === indexList[currentIndex][acceptKey],
-                    })} `, "data-index": index, key: index, onClick: () => handleClickIndex(item[acceptKey]) }, item[acceptKey]));
+        list.length && scrollStart ? (React__default.createElement("div", { className: classNames({
+                [`${classPrefix}__code--current`]: true,
+                [`${classPrefix}__code--current--current`]: true,
+            }) }, list[codeIndex][floorKey])) : null,
+        React__default.createElement("div", { className: `${classPrefix}__bars` },
+            React__default.createElement("div", { className: `${classPrefix}__bars__inner`, onTouchStart: (event) => touchStart(event), onTouchMove: (event) => touchMove(event), onTouchEnd: touchEnd, style: { touchAction: 'pan-y' } }, list.map((item, index) => {
+                return (React__default.createElement("div", { className: classNames({
+                        [`${classPrefix}__bars__inner__item`]: true,
+                        [`${classPrefix}__bars__inner__item--active`]: item[floorKey] === list[currentIndex][floorKey],
+                    }), "data-index": index, key: index, onClick: () => handleClickIndex(item[floorKey]) }, item[floorKey]));
             })))));
 };
 Elevator.defaultProps = defaultProps;

package/dist/esm/menu.taro-b61442a7.js

@@ -0,0 +1,111 @@
+import React__default, { useRef, useState, useEffect } from 'react';
+import classNames from 'classnames';
+import { ArrowUp2, ArrowDown2 } from '@nutui/icons-react-taro';
+import { C as ComponentDefaults } from './typings-d8491423.js';
+
+const defaultProps = {
+    ...ComponentDefaults,
+    activeColor: '',
+    closeOnClickOverlay: true,
+    scrollFixed: false,
+    lockScroll: true,
+    icon: null,
+};
+const Menu = (props) => {
+    const { className, icon, scrollFixed, lockScroll, closeOnClickOverlay, children, activeColor, ...rest } = {
+        ...defaultProps,
+        ...props,
+    };
+    const menuRef = useRef(null);
+    const [isScrollFixed, setIsScrollFixed] = useState(false);
+    const getScrollTop = (el) => {
+        return Math.max(0, 'scrollTop' in el ? el.scrollTop : el.pageYOffset);
+    };
+    const onScroll = () => {
+        const { scrollFixed } = props;
+        const scrollTop = getScrollTop(window);
+        const isFixed = scrollTop > (typeof scrollFixed === 'boolean' ? 30 : Number(scrollFixed));
+        setIsScrollFixed(isFixed);
+    };
+    useEffect(() => {
+        if (scrollFixed) {
+            window.addEventListener('scroll', onScroll);
+        }
+        return () => window.removeEventListener('scroll', onScroll);
+    }, []);
+    const [showMenuItem, setShowMenuItem] = useState([]);
+    const [menuItemTitle, setMenuItemTitle] = useState([]);
+    const toggleMenuItem = (index) => {
+        showMenuItem[index] = !showMenuItem[index];
+        const temp = showMenuItem.map((i, idx) => idx === index ? i : false);
+        setShowMenuItem([...temp]);
+    };
+    const hideMenuItem = (index) => {
+        showMenuItem[index] = false;
+        setShowMenuItem([...showMenuItem]);
+    };
+    const updateTitle = (text, index) => {
+        menuItemTitle[index] = text;
+        setMenuItemTitle([...menuItemTitle]);
+    };
+    const cloneChildren = () => {
+        return React__default.Children.map(children, (child, index) => {
+            return React__default.cloneElement(child, {
+                show: showMenuItem[index],
+                index,
+                activeColor,
+                parent: {
+                    closeOnClickOverlay,
+                    lockScroll,
+                    toggleMenuItem,
+                    updateTitle,
+                    hideMenuItem,
+                    menuRef,
+                },
+            });
+        });
+    };
+    const menuTitle = () => {
+        return React__default.Children.map(children, (child, index) => {
+            if (React__default.isValidElement(child)) {
+                const { title, options, value, disabled, direction } = child.props;
+                const selected = options?.filter((option) => option.value === value);
+                const finallyTitle = () => {
+                    if (title)
+                        return title;
+                    if (menuItemTitle && menuItemTitle[index])
+                        return menuItemTitle[index];
+                    if (selected && selected.length && selected[0].text)
+                        return selected[0].text;
+                    return '';
+                };
+                return (React__default.createElement("div", { className: classNames('nut-menu__item ', className, {
+                        active: showMenuItem[index],
+                        disabled,
+                    }), style: { color: showMenuItem[index] ? activeColor : '' }, key: index, onClick: () => {
+                        !disabled && toggleMenuItem(index);
+                    } },
+                    React__default.createElement("div", { className: classNames('nut-menu__title ', {
+                            active: showMenuItem[index],
+                            disabled,
+                        }) },
+                        React__default.createElement("div", { className: "nut-menu__title-text" }, finallyTitle()),
+                        icon ||
+                            (direction === 'up' ? (React__default.createElement(ArrowUp2, { className: "nut-menu__title-icon", size: 10 })) : (React__default.createElement(ArrowDown2, { className: "nut-menu__title-icon", size: 10 }))))));
+            }
+            return null;
+        });
+    };
+    return (React__default.createElement("div", { ...rest, className: classNames(`nut-menu`, className, {
+            'scroll-fixed': isScrollFixed,
+        }), ref: menuRef },
+        React__default.createElement("div", { className: "nut-menu-relative" },
+            React__default.createElement("div", { className: classNames('nut-menu__bar', {
+                    opened: showMenuItem.includes(true),
+                }) }, menuTitle()),
+            cloneChildren())));
+};
+Menu.defaultProps = defaultProps;
+Menu.displayName = 'NutMenu';
+
+export { Menu as M };