@nutui/nutui-react-taro 3.0.20-cpp → 3.0.20

package/dist/es/types/spec/dialog/h5.d.ts

@@ -1,8 +1,6 @@
 import { BaseDialog, BaseContentProps } from './base';
 export interface WebContentProps extends BaseContentProps {
     onClick: (event: MouseEvent) => void;
-    ariaRole?: string;
-    ariaLabel?: string;
 }
 export interface WebDialogProps extends BaseDialog {
 }

package/dist/es/types/spec/dialog/taro.d.ts

@@ -2,8 +2,6 @@ import { ITouchEvent } from '@tarojs/components';
 import { BaseDialog, BaseContentProps } from './base';
 export interface TaroContentProps extends BaseContentProps {
     onClick: (event: ITouchEvent) => void;
-    ariaRole?: string;
-    ariaLabel?: string;
 }
 export interface TaroDialogProps extends Omit<BaseDialog, 'onOverlayClick' | 'onClick'> {
     onClick: (event: ITouchEvent) => void;

package/dist/es/types/spec/overlay/base.d.ts

@@ -32,5 +32,4 @@ export interface BaseOverlay extends BaseProps {
     * 点击时触发
     */
     onClick: (event: any) => void
-    ariaLabel?: string;
 }

package/dist/es/types/spec/popup/base.d.ts

@@ -34,7 +34,7 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     */
     title?: ReactNode
     /**
-    * 頂部佔位
+    * 顶部占位
     */
     top?: ReactNode
     /**
@@ -89,7 +89,8 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     * 结束触碰时触发
     */
     onTouchEnd: (height: number, e: any) => void
-    closeAriaLabel?: string;
-    overlayProps?: any;
-    animated?: boolean;
+    /**
+    * 关闭图标的 aria-label
+    */
+    closeAriaLabel?: string
 }

package/dist/es/types/spec/price/base.d.ts

@@ -41,8 +41,4 @@ export interface BasePrice extends BaseProps {
     * 是否划线价
     */
     line: boolean
-    /**
-    * 开启后，当 price 包含非法字符时，原样展示，不做格式化处理
-    */
-    raw: boolean
 }

package/dist/es/utils/taro/{ConfigurableCSSTransition.js → ConfigurableCSSTransition copy.js }

@@ -10,45 +10,84 @@ var ConfigurableCSSTransition = function(props) {
         if (inPhase) return "".concat(baseClassName, "-enter-done");
         return "".concat(baseClassName, "-exit-done");
     }), 2), classes = _useState1[0], setClasses = _useState1[1];
-    var timerRef = useRef(null);
+    var fallbackTimerRef = useRef(null);
     var statusRef = useRef(status);
     var prevInPhase = useRef(inPhase);
+    var latestOnAnimationEnd = useRef(children.props.onAnimationEnd);
+    useEffect(function() {
+        latestOnAnimationEnd.current = children.props.onAnimationEnd;
+    });
     var updateStatus = useCallback(function(nextStatus) {
         statusRef.current = nextStatus;
         setStatus(nextStatus);
     }, []);
+    var handleAnimationEnd = useCallback(function(e) {
+        var _latestOnAnimationEnd_current;
+        (_latestOnAnimationEnd_current = latestOnAnimationEnd.current) === null || _latestOnAnimationEnd_current === void 0 ? void 0 : _latestOnAnimationEnd_current.call(latestOnAnimationEnd, e);
+        if (e && e.target !== e.currentTarget) return;
+        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        if (statusRef.current === 'entering') {
+            updateStatus('entered');
+            setClasses("".concat(baseClassName, "-enter-done"));
+            onEntered === null || onEntered === void 0 ? void 0 : onEntered();
+        } else if (statusRef.current === 'exiting') {
+            updateStatus('exited');
+            setClasses("".concat(baseClassName, "-exit-done"));
+            if (unmountOnExit) {
+                updateStatus('unmounted');
+            }
+            onExited === null || onExited === void 0 ? void 0 : onExited();
+        }
+    }, [
+        baseClassName,
+        onEntered,
+        onExited,
+        unmountOnExit,
+        updateStatus
+    ]);
     var enter = useCallback(function() {
-        if (timerRef.current) clearTimeout(timerRef.current);
+        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
         if (statusRef.current === 'unmounted') {
             updateStatus('exited');
         }
-        updateStatus('entering');
-        setClasses("".concat(baseClassName, "-enter ").concat(baseClassName, "-enter-active"));
-        timerRef.current = setTimeout(function() {
+        if (timeout === 0) {
             updateStatus('entered');
             setClasses("".concat(baseClassName, "-enter-done"));
             onEntered === null || onEntered === void 0 ? void 0 : onEntered();
-        }, timeout);
+            return;
+        }
+        updateStatus('entering');
+        setClasses("".concat(baseClassName, "-enter ").concat(baseClassName, "-enter-active"));
+        // Safety fallback: Give it extra time over the expected timeout in case onAnimationEnd misses
+        fallbackTimerRef.current = setTimeout(function() {
+            handleAnimationEnd(null);
+        }, timeout + 200);
     }, [
         baseClassName,
+        handleAnimationEnd,
         onEntered,
         timeout,
         updateStatus
     ]);
     var exit = useCallback(function() {
-        if (timerRef.current) clearTimeout(timerRef.current);
-        updateStatus('exiting');
-        setClasses("".concat(baseClassName, "-exit ").concat(baseClassName, "-exit-active"));
-        timerRef.current = setTimeout(function() {
+        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        if (timeout === 0) {
             updateStatus('exited');
             setClasses("".concat(baseClassName, "-exit-done"));
             if (unmountOnExit) {
                 updateStatus('unmounted');
             }
             onExited === null || onExited === void 0 ? void 0 : onExited();
-        }, timeout);
+            return;
+        }
+        updateStatus('exiting');
+        setClasses("".concat(baseClassName, "-exit ").concat(baseClassName, "-exit-active"));
+        fallbackTimerRef.current = setTimeout(function() {
+            handleAnimationEnd(null);
+        }, timeout + 200);
     }, [
         baseClassName,
+        handleAnimationEnd,
         onExited,
         timeout,
         unmountOnExit,
@@ -64,7 +103,7 @@ var ConfigurableCSSTransition = function(props) {
             prevInPhase.current = inPhase;
         }
         return function() {
-            if (timerRef.current) clearTimeout(timerRef.current);
+            if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
         };
     }, [
         inPhase,
@@ -73,7 +112,8 @@ var ConfigurableCSSTransition = function(props) {
     ]);
     if (status === 'unmounted') return null;
     return /*#__PURE__*/ cloneElement(children, {
-        className: "".concat(children.props.className || '', " ").concat(classes)
+        className: "".concat(children.props.className || '', " ").concat(classes),
+        onAnimationEnd: handleAnimationEnd
     });
 };
 export default ConfigurableCSSTransition;

package/dist/es/utils/taro/get-rect.js

@@ -34,8 +34,7 @@ export var getRectInMultiPlatform = function(element) {
                             resolve(lru.get(element));
                             return;
                         }
-                        createSelectorQuery()// https://taro.jd.com/docs/reference/config/page/
-                        .in((element === null || element === void 0 ? void 0 : element._scope) || element).select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
+                        createSelectorQuery().select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
                             var _param = _sliced_to_array(param, 1), rects = _param[0];
                             if (rects) {
                                 lru.set(element, rects);
@@ -67,8 +66,7 @@ export var getRectInMultiPlatformWithoutCache = function(element) {
                 return [
                     2,
                     new Promise(function(resolve, reject) {
-                        createSelectorQuery()// https://taro.jd.com/docs/reference/config/page/
-                        .in((element === null || element === void 0 ? void 0 : element._scope) || element).select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
+                        createSelectorQuery().select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
                             var _param = _sliced_to_array(param, 1), rects = _param[0];
                             resolve(rects);
                         });

package/dist/es/utils/taro/get-system-info.d.ts

@@ -14,4 +14,9 @@ export declare const getDeviceInfo: () => IDeviceInfo;
  * @returns {Taro.getWindowInfo.Result} 窗口信息
  */
 export declare const getWindowInfo: () => Taro.getWindowInfo.Result;
+/**
+ * 获取应用基础信息，兼容新旧 API
+ * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
+ */
+export declare const getAppBaseInfo: () => Taro.getAppBaseInfo.Result;
 export {};

package/dist/es/utils/taro/get-system-info.js

@@ -13,11 +13,10 @@ import Taro from "@tarojs/taro";
  * @returns {Taro.getWindowInfo.Result} 窗口信息
  */ export var getWindowInfo = function() {
     return typeof Taro.getWindowInfo === 'function' ? Taro.getWindowInfo() : Taro.getSystemInfoSync();
-} // /**
- //  * 获取应用基础信息，兼容新旧 API
- //  * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
- //  */
- // export const getAppBaseInfo = (): Taro.getAppBaseInfo.Result => {
- //   return canIUse('getAppBaseInfo') ? taroGetAppBaseInfo() : getSystemInfoSync()
- // }
-;
+};
+/**
+ * 获取应用基础信息，兼容新旧 API
+ * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
+ */ export var getAppBaseInfo = function() {
+    return typeof Taro.getAppBaseInfo === 'function' ? Taro.getAppBaseInfo() : Taro.getSystemInfoSync();
+};