@tarojs/components-react 4.2.1-beta.2 → 4.2.1

package/dist/components/image/index.js

@@ -11,18 +11,16 @@ function Image(props) {
   const [, setIsLoaded] = useState(false);
   const {
       className,
-      style,
+      style = {},
       src,
       mode,
       onError,
       lazyLoad,
       imgProps,
-      forwardedRef,
-      disableDefaultSize = false
+      forwardedRef
     } = props,
-    reset = __rest(props, ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef", "disableDefaultSize"]);
+    reset = __rest(props, ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef"]);
   const cls = classNames('taro-img', {
-    'taro-img--with-default-host-size': !disableDefaultSize,
     'taro-img__widthfix': mode === 'widthFix'
   }, className);
   const imgCls = classNames('taro-img__mode-' + (mode || 'scaleToFill').toLowerCase().replace(/\s/g, ''));

package/dist/components/image/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/components/image/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends React.HTMLAttributes<HTMLDivElement> {\n  src: string\n  mode: string\n  onError: () => void\n  onLoad: (e) => void\n  lazyLoad?: boolean\n  imgProps?: Record<string, any>\n  forwardedRef?: React.MutableRefObject<HTMLDivElement>\n  /** 为 true 时不挂载默认占位尺寸（320×240），由业务 style/class 决定容器大小 */\n  disableDefaultSize?: boolean\n}\n\nfunction Image (props: IProps) {\n  const imgRef = useRef<HTMLImageElement | null>(null)\n  const observer = useRef<Partial<IntersectionObserver>>({})\n  const [, setIsLoaded] = useState(false)\n  const {\n    className,\n    style,\n    src,\n    mode,\n    onError,\n    lazyLoad,\n    imgProps,\n    forwardedRef,\n    disableDefaultSize = false,\n    ...reset\n  } = props\n\n  const cls = classNames(\n    'taro-img',\n    {\n      'taro-img--with-default-host-size': !disableDefaultSize,\n      'taro-img__widthfix': mode === 'widthFix'\n    },\n    className\n  )\n  const imgCls = classNames(\n    'taro-img__mode-' +\n      (mode || 'scaleToFill').toLowerCase().replace(/\\s/g, '')\n  )\n\n  const imageOnLoad = useCallback((e) => {\n    const { onLoad } = props\n    Object.defineProperty(e, 'detail', {\n      enumerable: true,\n      writable: true,\n      value: {\n        width: e.target.width,\n        height: e.target.height\n      }\n    })\n\n    onLoad && onLoad(e)\n  }, [props])\n\n  useEffect(() => {\n    if (lazyLoad) {\n      observer.current = new IntersectionObserver(\n        entries => {\n          // 异步 api 关系\n          if (entries[entries.length - 1].isIntersecting) {\n            setIsLoaded(true)\n            // findDOMNode(this).children[0].src = src\n            imgRef.current!.src = src\n          }\n        },\n        {\n          rootMargin: '300px 0px'\n        }\n      )\n      observer.current.observe?.(imgRef.current!)\n    }\n\n    return () => {\n      observer.current?.disconnect?.()\n    }\n  }, [lazyLoad, src])\n\n  return (\n    <div className={cls} style={style} ref={forwardedRef} {...reset}>\n      {lazyLoad ? (\n        <img\n          ref={img => (imgRef.current = img)}\n          className={imgCls}\n          data-src={src}\n          onLoad={imageOnLoad}\n          onError={onError}\n          {...imgProps}\n        />\n      ) : (\n        <img\n          ref={img => (imgRef.current = img)}\n          className={imgCls}\n          src={src}\n          onLoad={imageOnLoad}\n          onError={onError}\n          {...imgProps}\n        />\n      )}\n    </div>\n  )\n}\n\nexport default createForwardRefComponent(Image)\n"],"names":["Image","props","imgRef","useRef","observer","setIsLoaded","useState","className","style","src","mode","onError","lazyLoad","imgProps","forwardedRef","disableDefaultSize","reset","__rest","cls","classNames","imgCls","toLowerCase","replace","imageOnLoad","useCallback","e","onLoad","Object","defineProperty","enumerable","writable","value","width","target","height","useEffect","current","IntersectionObserver","entries","length","isIntersecting","rootMargin","_b","_a","observe","call","disconnect","_jsx","ref","children","img","createForwardRefComponent"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../src/components/image/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends React.HTMLAttributes<HTMLDivElement> {\n  src: string\n  mode: string\n  onError: () => void\n  onLoad: (e) => void\n  lazyLoad?: boolean\n  imgProps?: Record<string, any>\n  forwardedRef?: React.MutableRefObject<HTMLDivElement>\n}\n\nfunction Image (props: IProps) {\n  const imgRef = useRef<HTMLImageElement | null>(null)\n  const observer = useRef<Partial<IntersectionObserver>>({})\n  const [, setIsLoaded] = useState(false)\n  const {\n    className,\n    style = {},\n    src,\n    mode,\n    onError,\n    lazyLoad,\n    imgProps,\n    forwardedRef,\n    ...reset\n  } = props\n\n  const cls = classNames(\n    'taro-img',\n    {\n      'taro-img__widthfix': mode === 'widthFix'\n    },\n    className\n  )\n  const imgCls = classNames(\n    'taro-img__mode-' +\n      (mode || 'scaleToFill').toLowerCase().replace(/\\s/g, '')\n  )\n\n  const imageOnLoad = useCallback((e) => {\n    const { onLoad } = props\n    Object.defineProperty(e, 'detail', {\n      enumerable: true,\n      writable: true,\n      value: {\n        width: e.target.width,\n        height: e.target.height\n      }\n    })\n\n    onLoad && onLoad(e)\n  }, [props])\n\n  useEffect(() => {\n    if (lazyLoad) {\n      observer.current = new IntersectionObserver(\n        entries => {\n          // 异步 api 关系\n          if (entries[entries.length - 1].isIntersecting) {\n            setIsLoaded(true)\n            // findDOMNode(this).children[0].src = src\n            imgRef.current!.src = src\n          }\n        },\n        {\n          rootMargin: '300px 0px'\n        }\n      )\n      observer.current.observe?.(imgRef.current!)\n    }\n\n    return () => {\n      observer.current?.disconnect?.()\n    }\n  }, [lazyLoad, src])\n\n  return (\n    <div className={cls} style={style} ref={forwardedRef} {...reset}>\n      {lazyLoad ? (\n        <img\n          ref={img => (imgRef.current = img)}\n          className={imgCls}\n          data-src={src}\n          onLoad={imageOnLoad}\n          onError={onError}\n          {...imgProps}\n        />\n      ) : (\n        <img\n          ref={img => (imgRef.current = img)}\n          className={imgCls}\n          src={src}\n          onLoad={imageOnLoad}\n          onError={onError}\n          {...imgProps}\n        />\n      )}\n    </div>\n  )\n}\n\nexport default createForwardRefComponent(Image)\n"],"names":["Image","props","imgRef","useRef","observer","setIsLoaded","useState","className","style","src","mode","onError","lazyLoad","imgProps","forwardedRef","reset","__rest","cls","classNames","imgCls","toLowerCase","replace","imageOnLoad","useCallback","e","onLoad","Object","defineProperty","enumerable","writable","value","width","target","height","useEffect","current","IntersectionObserver","entries","length","isIntersecting","rootMargin","_b","_a","observe","call","disconnect","_jsx","ref","children","img","createForwardRefComponent"],"mappings":"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"}

package/dist/components/picker/index.js

@@ -1,7 +1,6 @@
 import { __rest } from 'tslib';
 import './style/index.scss.js';
 import { View } from '@tarojs/components';
-import Taro from '@tarojs/taro';
 import classNames from 'classnames';
 import React__default from 'react';
 import { verifyValue, verifyTime, hoursRange, minutesRange, verifyDate, getYearRange, getMonthRange, getDayRange, compareTime, omit } from '../../utils/index.js';
@@ -128,13 +127,12 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
       children,
       formType,
       lang,
-      theme = 'light',
-      enableClickItemScroll = true
+      theme = 'light'
     } = props,
-    restProps = __rest(props, ["mode", "disabled", "range", "rangeKey", "value", "start", "end", "fields", "headerText", "level", "regionData", "textProps", "colors", "onChange", "onColumnChange", "onCancel", "children", "formType", "lang", "theme", "enableClickItemScroll"]);
+    restProps = __rest(props, ["mode", "disabled", "range", "rangeKey", "value", "start", "end", "fields", "headerText", "level", "regionData", "textProps", "colors", "onChange", "onColumnChange", "onCancel", "children", "formType", "lang", "theme"]);
   const indexRef = React__default.useRef([]);
   const pickerDateRef = React__default.useRef();
-  // region：首次用户滚动初始化完成前不入库
+  // 记录是否是用户滚动
   const isInitializationCompletedRef = React__default.useRef(false);
   const [state, setState] = React__default.useState({
     pickerValue: value || EMPTY_ARRAY,
@@ -143,45 +141,14 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
     hidden: true,
     fadeOut: false,
     isWillLoadCalled: false,
-    a11yTimeLimitColumnId: null,
-    a11yTimeLimitNonce: 0
+    timestamp: 0 // 用以部分模式下强制刷新组件的的时间戳，多用于反复限位
   });
-  // 安全区域底部距离
-  const [safeAreaBottom, setSafeAreaBottom] = React__default.useState(0);
   // 在组件内部
   const [columnsCount, setColumnsCount] = React__default.useState(() => getRegionColumnsCount(level));
   // 只在level变化时更新列数
   React__default.useEffect(() => {
     setColumnsCount(getRegionColumnsCount(level));
   }, [level]);
-  // 更新安全区域
-  const updateSafeArea = React__default.useCallback(() => {
-    try {
-      const systemInfo = Taro.getSystemInfoSync();
-      const {
-        safeArea,
-        windowHeight
-      } = systemInfo;
-      if (safeArea && windowHeight) {
-        const lengthScaleRatio = systemInfo.lengthScaleRatio || 1;
-        const bottom = (windowHeight - safeArea.bottom) / lengthScaleRatio;
-        setSafeAreaBottom(Math.max(0, bottom));
-      }
-    } catch (e) {
-      // H5 环境或其他异常情况，不设置安全区域
-      setSafeAreaBottom(0);
-    }
-  }, []);
-  // 初始化安全区域
-  React__default.useEffect(() => {
-    updateSafeArea();
-  }, [updateSafeArea]);
-  // 监听窗口变化（导航方式切换等）
-  React__default.useEffect(() => {
-    const handleResize = () => updateSafeArea();
-    window.addEventListener('resize', handleResize);
-    return () => window.removeEventListener('resize', handleResize);
-  }, [updateSafeArea]);
   // 获取当前索引数组
   const getIndices = React__default.useCallback(() => {
     return indexRef.current;
@@ -232,36 +199,25 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
       const monthRange = getMonthRange(_start, _end, currentYear);
       const dayRange = getDayRange(_start, _end, currentYear, currentMonth);
       indexRef.current = [yearRange.indexOf(currentYear), monthRange.indexOf(currentMonth), dayRange.indexOf(currentDay)];
-      // 与 props 同步时始终刷新 _updateValue，避免取消后再开时日列草稿与索引不一致
-      pickerDateRef.current = {
-        _value,
-        _start,
-        _end,
-        _updateValue: [currentYear, currentMonth, currentDay]
-      };
+      if (!pickerDateRef.current || pickerDateRef.current._value.getTime() !== _value.getTime() || pickerDateRef.current._start.getTime() !== _start.getTime() || pickerDateRef.current._end.getTime() !== _end.getTime()) {
+        pickerDateRef.current = {
+          _value,
+          _start,
+          _end,
+          _updateValue: [currentYear, currentMonth, currentDay]
+        };
+      }
     } else if (mode === 'region') {
       // region 模式处理 - 验证数据
       if (!regionData) {
         console.error('Picker: regionData is required for region mode');
-        indexRef.current = Array.from({
-          length: columnsCount
-        }, () => 0);
-        setState(prev => Object.assign(Object.assign({}, prev), {
-          selectedIndices: [...indexRef.current],
-          pickerValue: value || EMPTY_ARRAY
-        }));
+        indexRef.current = [0];
         return;
       }
       const validation = validateRegionData(regionData, 'Picker');
       if (!validation.valid) {
         console.error(validation.error);
-        indexRef.current = Array.from({
-          length: columnsCount
-        }, () => 0);
-        setState(prev => Object.assign(Object.assign({}, prev), {
-          selectedIndices: [...indexRef.current],
-          pickerValue: value || EMPTY_ARRAY
-        }));
+        indexRef.current = [0];
         return;
       }
       // 获取列数
@@ -308,16 +264,16 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
       handleProps();
     }
   }, [handleProps, state.isWillLoadCalled, JSON.stringify(value)]);
-  // 打开时按 props 重算索引，避免未确认的滑动与 indexRef 残留导致再开抖动
+  // 显示 Picker
   const showPicker = React__default.useCallback(() => {
     if (disabled) return;
     isInitializationCompletedRef.current = false;
-    handleProps();
+    const newIndices = getIndices();
     setState(prev => Object.assign(Object.assign({}, prev), {
-      hidden: false,
-      a11yTimeLimitColumnId: null
+      selectedIndices: newIndices,
+      hidden: false
     }));
-  }, [disabled, handleProps]);
+  }, [disabled, getIndices]);
   // 隐藏 Picker
   const hidePicker = React__default.useCallback(() => {
     isInitializationCompletedRef.current = false;
@@ -392,11 +348,11 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
         finalIndices = [...newIndices];
         hasLimited = true;
       }
+      // 触发限位，更新状态，其它状态不用主动触发滚动
       if (hasLimited) {
         setState(prev => Object.assign(Object.assign({}, prev), {
           selectedIndices: finalIndices,
-          a11yTimeLimitColumnId: columnId,
-          a11yTimeLimitNonce: prev.a11yTimeLimitNonce + 1
+          timestamp: Date.now()
         }));
       } else {
         setState(prev => Object.assign(Object.assign({}, prev), {
@@ -629,17 +585,11 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
       }
     });
   }, [onColumnChange]);
-  const consumeTimeA11yLimitFocus = React__default.useCallback(() => {
-    setState(prev => Object.assign(Object.assign({}, prev), {
-      a11yTimeLimitColumnId: null
-    }));
-  }, []);
-  // 取消时按 props 回同步索引，避免与 value 脱节
+  // 处理取消
   const handleCancel = React__default.useCallback(() => {
-    handleProps();
     hidePicker();
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
-  }, [handleProps, hidePicker, onCancel]);
+  }, [hidePicker, onCancel]);
   // 渲染选择器组
   const renderPickerGroup = React__default.useMemo(() => {
     switch (mode) {
@@ -653,16 +603,11 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
             columnId: String(index),
             selectedIndex: state.selectedIndices[index] // 传递对应列的selectedIndex
             ,
-            colors: colors,
-            enableClickItemScroll: enableClickItemScroll
+            colors: colors
           }, index));
         }
       case 'time':
         {
-          const timeA11yLimitFocus = state.a11yTimeLimitColumnId != null ? {
-            nonce: state.a11yTimeLimitNonce,
-            columnId: state.a11yTimeLimitColumnId
-          } : null;
           return [/*#__PURE__*/jsx(PickerGroup, {
             mode: "time",
             range: hoursRange,
@@ -670,24 +615,16 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
             columnId: "0",
             selectedIndex: state.selectedIndices[0] // 传递小时列的selectedIndex
             ,
-            colors: colors,
-            timeA11yLimitFocus: timeA11yLimitFocus,
-            onTimeA11yLimitFocusConsumed: consumeTimeA11yLimitFocus,
-            timeA11yLimitEventNonce: state.a11yTimeLimitNonce,
-            enableClickItemScroll: enableClickItemScroll
-          }, "hour"), /*#__PURE__*/jsx(PickerGroup, {
+            colors: colors
+          }, `hour-${state.timestamp}`), /*#__PURE__*/jsx(PickerGroup, {
             mode: "time",
             range: minutesRange,
             updateIndex: updateIndex,
             columnId: "1",
             selectedIndex: state.selectedIndices[1] // 传递分钟列的selectedIndex
             ,
-            colors: colors,
-            timeA11yLimitFocus: timeA11yLimitFocus,
-            onTimeA11yLimitFocusConsumed: consumeTimeA11yLimitFocus,
-            timeA11yLimitEventNonce: state.a11yTimeLimitNonce,
-            enableClickItemScroll: enableClickItemScroll
-          }, "minute")];
+            colors: colors
+          }, `minute-${state.timestamp}`)];
         }
       case 'date':
         {
@@ -712,8 +649,7 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
             columnId: "0",
             selectedIndex: state.selectedIndices[0] // 传递年份列的selectedIndex
             ,
-            colors: colors,
-            enableClickItemScroll: enableClickItemScroll
+            colors: colors
           }, `year`)];
           if (fields === 'month' || fields === 'day') {
             renderView.push(/*#__PURE__*/jsx(PickerGroup, {
@@ -724,8 +660,7 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
               columnId: "1",
               selectedIndex: state.selectedIndices[1] // 传递月份列的selectedIndex
               ,
-              colors: colors,
-              enableClickItemScroll: enableClickItemScroll
+              colors: colors
             }, `month`));
           }
           if (fields === 'day') {
@@ -737,8 +672,7 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
               columnId: "2",
               selectedIndex: state.selectedIndices[2] // 传递日期列的selectedIndex
               ,
-              colors: colors,
-              enableClickItemScroll: enableClickItemScroll
+              colors: colors
             }, `day`));
           }
           return renderView;
@@ -773,8 +707,7 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
               updateIndex: updateIndex,
               columnId: String(i),
               selectedIndex: state.selectedIndices[i],
-              colors: colors,
-              enableClickItemScroll: enableClickItemScroll
+              colors: colors
             }, `region-${i}`));
           }
           return columns;
@@ -787,11 +720,10 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
           columnId: "0",
           selectedIndex: state.selectedIndices[0] // 传递selector模式的selectedIndex
           ,
-          colors: colors,
-          enableClickItemScroll: enableClickItemScroll
+          colors: colors
         });
     }
-  }, [mode, range, rangeKey, fields, updateIndex, updateDay, handleColumnChange, pickerDateRef.current, level, regionData, state.selectedIndices, state.a11yTimeLimitColumnId, state.a11yTimeLimitNonce, consumeTimeA11yLimitFocus, columnsCount, lang, colors, enableClickItemScroll]);
+  }, [mode, range, rangeKey, fields, updateIndex, updateDay, handleColumnChange, pickerDateRef.current, level, regionData, state.selectedIndices, columnsCount, lang, colors]);
   // 动画类名控制逻辑
   const clsMask = classNames('taro-picker__mask-overlay', 'taro-picker__animate-fade-in', {
     'taro-picker__animate-fade-out': state.fadeOut
@@ -805,9 +737,6 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
   const titleStyle = colors.titleColor ? {
     color: colors.titleColor
   } : null;
-  const maskOverlayStyle = colors.maskColor ? {
-    backgroundColor: colors.maskColor
-  } : undefined;
   // 暴露方法给外部
   React__default.useImperativeHandle(ref, () => ({
     showPicker,
@@ -826,16 +755,15 @@ const Picker = /*#__PURE__*/React__default.forwardRef((props, ref) => {
       onClick: showPicker,
       children: children
     }), !state.hidden && /*#__PURE__*/jsxs(View, {
-      className: classNames('taro-picker__overlay', `taro-picker__overlay--theme-${theme}`),
+      className: "taro-picker__overlay",
       children: [/*#__PURE__*/jsx(View, {
         className: clsMask,
-        style: maskOverlayStyle,
         onClick: handleCancel
       }), /*#__PURE__*/jsxs(View, {
         className: clsSlider,
-        style: Object.assign(Object.assign({}, backgroundStyle), {
-          paddingBottom: safeAreaBottom ? `${safeAreaBottom}px` : undefined
-        }),
+        ...(backgroundStyle ? {
+          style: backgroundStyle
+        } : {}),
         children: [/*#__PURE__*/jsxs(View, {
           className: "taro-picker__hd",
           ...(backgroundStyle ? {