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

package/dist/components/button/index.js

@@ -1,5 +1,6 @@
 import { __rest } from 'tslib';
 import './style/index.scss.js';
+import { View } from '@tarojs/components';
 import classNames from 'classnames';
 import { omit, createForwardRefComponent } from '../../utils/index.js';
 import { useRef, useState, useEffect, useCallback } from '../../utils/hooks.react.js';
@@ -46,6 +47,12 @@ function Button(props) {
         }
       }, props.hoverStayTime || 70);
     }
+    if (!props.disabled && props.formType) {
+      const eventName = props.formType === 'submit' ? 'tarobuttonsubmit' : 'tarobuttonreset';
+      e.currentTarget.dispatchEvent(new CustomEvent(eventName, {
+        bubbles: true
+      }));
+    }
     props.onTouchEnd && props.onTouchEnd(e);
   };
   const {
@@ -59,12 +66,18 @@ function Button(props) {
       hoverClass = 'button-hover',
       loading = false,
       type = 'default',
-      size
+      size,
+      formType
     } = props,
-    restProps = __rest(props, ["forwardedRef", "plain", "children", "disabled", "className", "style", "onClick", "hoverClass", "loading", "type", "size"]);
+    restProps = __rest(props, ["forwardedRef", "plain", "children", "disabled", "className", "style", "onClick", "hoverClass", "loading", "type", "size", "formType"]);
   const handleClick = useCallback(e => {
-    if (disabled) return; // 如果按钮不可用，直接返回
-    onClick === null || onClick === void 0 ? void 0 : onClick(e); // 否则执行点击回调
+    if (disabled) {
+      // 按钮禁用时阻止事件冒泡并不触发点击回调
+      e.stopPropagation();
+      return;
+    }
+    // 按钮可用时触发点击回调
+    onClick === null || onClick === void 0 ? void 0 : onClick(e);
   }, [disabled, onClick]);
   const cls = classNames(className, 'taro-button-core', {
     [`${hoverClass}`]: state.hover && !disabled,
@@ -76,8 +89,8 @@ function Button(props) {
     'taro-btn-primary': type === 'primary',
     'taro-btn-warn': type === 'warn'
   });
-  return /*#__PURE__*/jsxs("button", {
-    ...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick']),
+  return /*#__PURE__*/jsxs(View, {
+    ...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick', 'formType']),
     type: type,
     size: size,
     disabled: disabled,
@@ -87,9 +100,9 @@ function Button(props) {
     onClick: handleClick,
     onTouchStart: _onTouchStart,
     onTouchEnd: _onTouchEnd,
-    loading: loading.toString(),
     plain: plain.toString(),
-    children: [!!loading && /*#__PURE__*/jsx("i", {
+    "form-type": formType,
+    children: [!!loading && /*#__PURE__*/jsx(View, {
       className: "weui-loading"
     }), children]
   });

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/components/button/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent, omit } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {\n  size?: string\n  plain?: boolean\n  hoverClass?: string\n  hoverStartTime?: number\n  hoverStayTime?: number\n  disabled?: boolean\n  loading?: boolean\n  type?: string\n  className?: string\n  forwardedRef?: React.MutableRefObject<HTMLButtonElement>\n  onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void\n}\n\ninterface IState {\n  hover: boolean\n  touch: boolean\n}\n\nfunction Button (props: IProps) {\n  const startTimer = useRef<ReturnType<typeof setTimeout>>()\n  const endTimer = useRef<ReturnType<typeof setTimeout>>()\n  const [state, setState] = useState<IState>({\n    hover: false,\n    touch: false\n  })\n\n  useEffect(() => {\n    return () => {\n      startTimer.current && clearTimeout(startTimer.current)\n      endTimer.current && clearTimeout(endTimer.current)\n    }\n  }, [])\n\n  const _onTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: true\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      startTimer.current = setTimeout(() => {\n        if ((state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: true\n          }))\n        }\n      }, props.hoverStartTime || 20)\n    }\n    props.onTouchStart && props.onTouchStart(e)\n  }\n\n  const _onTouchEnd = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: false\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      endTimer.current = setTimeout(() => {\n        if (!(state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: false\n          }))\n        }\n      }, props.hoverStayTime || 70)\n    }\n    props.onTouchEnd && props.onTouchEnd(e)\n  }\n\n  const { forwardedRef, plain = false, children, disabled = false, className, style, onClick, hoverClass = 'button-hover', loading = false, type = 'default', size, ...restProps } = props\n\n  const handleClick = useCallback(\n    (e: React.MouseEvent<HTMLButtonElement>) => {\n      if (disabled) return // 如果按钮不可用，直接返回\n      onClick?.(e) // 否则执行点击回调\n    },\n    [disabled, onClick]\n  )\n\n  const cls = classNames(\n    className,\n    'taro-button-core',\n    {\n      [`${hoverClass}`]: (state as IState).hover && !disabled,\n      'taro-btn-disabled': disabled,\n      'taro-btn-loading': loading,\n      'taro-btn-plain': plain,\n      'taro-btn-mini': size === 'mini',\n      'taro-btn-default': type === 'default',\n      'taro-btn-primary': type === 'primary',\n      'taro-btn-warn': type === 'warn'\n    }\n  )\n\n  return (\n    <button\n      {...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick'])}\n      type={type}\n      size={size}\n      disabled={disabled}\n      ref={forwardedRef}\n      className={cls}\n      style={style}\n      onClick={handleClick}\n      onTouchStart={_onTouchStart}\n      onTouchEnd={_onTouchEnd}\n      loading={loading.toString()}\n      plain={plain.toString()}\n    >\n      {!!loading && <i className='weui-loading' />}\n      {children}\n    </button>\n  )\n}\n\nexport default createForwardRefComponent(Button)\n"],"names":["Button","props","startTimer","useRef","endTimer","state","setState","useState","hover","touch","useEffect","current","clearTimeout","_onTouchStart","e","Object","assign","hoverClass","disabled","setTimeout","hoverStartTime","onTouchStart","_onTouchEnd","hoverStayTime","onTouchEnd","forwardedRef","plain","children","className","style","onClick","loading","type","size","restProps","__rest","handleClick","useCallback","cls","classNames","_jsxs","omit","ref","toString","_jsx","createForwardRefComponent"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../src/components/button/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport { View } from '@tarojs/components'\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent, omit } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {\n  size?: string\n  plain?: boolean\n  hoverClass?: string\n  hoverStartTime?: number\n  hoverStayTime?: number\n  disabled?: boolean\n  loading?: boolean\n  type?: string\n  className?: string\n  forwardedRef?: React.MutableRefObject<HTMLButtonElement>\n  onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void\n  formType?: 'submit' | 'reset'\n}\n\ninterface IState {\n  hover: boolean\n  touch: boolean\n}\n\nfunction Button (props: IProps) {\n  const startTimer = useRef<ReturnType<typeof setTimeout>>()\n  const endTimer = useRef<ReturnType<typeof setTimeout>>()\n  const [state, setState] = useState<IState>({\n    hover: false,\n    touch: false\n  })\n\n  useEffect(() => {\n    return () => {\n      startTimer.current && clearTimeout(startTimer.current)\n      endTimer.current && clearTimeout(endTimer.current)\n    }\n  }, [])\n\n  const _onTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: true\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      startTimer.current = setTimeout(() => {\n        if ((state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: true\n          }))\n        }\n      }, props.hoverStartTime || 20)\n    }\n    props.onTouchStart && props.onTouchStart(e)\n  }\n\n  const _onTouchEnd = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: false\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      endTimer.current = setTimeout(() => {\n        if (!(state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: false\n          }))\n        }\n      }, props.hoverStayTime || 70)\n    }\n\n    if (!props.disabled && props.formType) {\n      const eventName = props.formType === 'submit' ? 'tarobuttonsubmit' : 'tarobuttonreset'\n      e.currentTarget.dispatchEvent(new CustomEvent(eventName, { bubbles: true }))\n    }\n\n    props.onTouchEnd && props.onTouchEnd(e)\n  }\n\n  const { forwardedRef, plain = false, children, disabled = false, className, style, onClick, hoverClass = 'button-hover', loading = false, type = 'default', size, formType, ...restProps } = props\n\n  const handleClick = useCallback(\n    (e: React.MouseEvent<HTMLButtonElement>) => {\n      if (disabled) {\n        // 按钮禁用时阻止事件冒泡并不触发点击回调\n        e.stopPropagation()\n        return\n      }\n      // 按钮可用时触发点击回调\n      onClick?.(e)\n    },\n    [disabled, onClick]\n  )\n\n  const cls = classNames(\n    className,\n    'taro-button-core',\n    {\n      [`${hoverClass}`]: (state as IState).hover && !disabled,\n      'taro-btn-disabled': disabled,\n      'taro-btn-loading': loading,\n      'taro-btn-plain': plain,\n      'taro-btn-mini': size === 'mini',\n      'taro-btn-default': type === 'default',\n      'taro-btn-primary': type === 'primary',\n      'taro-btn-warn': type === 'warn'\n    }\n  )\n\n  return (\n    <View\n      {...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick', 'formType'])}\n      type={type}\n      size={size}\n      disabled={disabled}\n      ref={forwardedRef}\n      className={cls}\n      style={style}\n      onClick={handleClick}\n      onTouchStart={_onTouchStart}\n      onTouchEnd={_onTouchEnd}\n      plain={plain.toString()}\n      form-type={formType as any}\n    >\n      {!!loading && <View className='weui-loading' />}\n      {children}\n    </View>\n  )\n}\n\nexport default createForwardRefComponent(Button)\n"],"names":["Button","props","startTimer","useRef","endTimer","state","setState","useState","hover","touch","useEffect","current","clearTimeout","_onTouchStart","e","Object","assign","hoverClass","disabled","setTimeout","hoverStartTime","onTouchStart","_onTouchEnd","hoverStayTime","formType","eventName","currentTarget","dispatchEvent","CustomEvent","bubbles","onTouchEnd","forwardedRef","plain","children","className","style","onClick","loading","type","size","restProps","__rest","handleClick","useCallback","stopPropagation","cls","classNames","_jsxs","View","omit","ref","toString","_jsx","createForwardRefComponent"],"mappings":"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"}

package/dist/components/image/index.js

@@ -2,41 +2,9 @@ import { __rest } from 'tslib';
 import './style/index.scss.js';
 import classNames from 'classnames';
 import { createForwardRefComponent } from '../../utils/index.js';
-import { useRef, useState, useEffect, useCallback } from '../../utils/hooks.react.js';
+import { useRef, useState, useCallback, useEffect } from '../../utils/hooks.react.js';
 import { jsx } from 'react/jsx-runtime';
 
-const LEGO_CDN_URL = 'http://ossin.jd.com/swm-plus/h5Tag/tag.js';
-// 检查CDN脚本是否已加载
-const isLegoScriptLoaded = () => {
-  return document.querySelector(`script[src="${LEGO_CDN_URL}"]`) !== null;
-};
-// 插入CDN脚本
-const insertLegoScript = () => {
-  if (isLegoScriptLoaded()) return;
-  const script = document.createElement('script');
-  script.type = 'module';
-  script.src = LEGO_CDN_URL;
-  document.head.appendChild(script);
-};
-// 解析lego协议URL
-const parseLegoUrl = src => {
-  if (!src.startsWith('lego://')) return null;
-  try {
-    // 移除 'lego://' 前缀
-    const urlWithoutProtocol = src.substring(7);
-    // 分割tagId和参数
-    const [tagId, params] = urlWithoutProtocol.split('?');
-    // 解析参数
-    const text = params ? new URLSearchParams(params).get('text') || '' : '';
-    return {
-      tagId,
-      text
-    };
-  } catch (error) {
-    console.warn('Failed to parse lego URL:', src, error);
-    return null;
-  }
-};
 function Image(props) {
   const imgRef = useRef(null);
   const observer = useRef({});
@@ -49,21 +17,9 @@ function Image(props) {
       onError,
       lazyLoad,
       imgProps,
-      forwardedRef,
-      lang
+      forwardedRef
     } = props,
-    reset = __rest(props
-    // 检查是否为lego模式
-    , ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef", "lang"]);
-  // 检查是否为lego模式
-  const legoData = parseLegoUrl(src);
-  const isLegoMode = legoData !== null;
-  // 如果是lego模式，确保CDN脚本已加载
-  useEffect(() => {
-    if (isLegoMode) {
-      insertLegoScript();
-    }
-  }, [isLegoMode]);
+    reset = __rest(props, ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef"]);
   const cls = classNames('taro-img', {
     'taro-img__widthfix': mode === 'widthFix'
   }, className);
@@ -102,22 +58,6 @@ function Image(props) {
       (_b = (_a = observer.current) === null || _a === void 0 ? void 0 : _a.disconnect) === null || _b === void 0 ? void 0 : _b.call(_a);
     };
   }, [lazyLoad, src]);
-  // 如果是lego模式，渲染canvas-tag
-  if (isLegoMode && legoData) {
-    return /*#__PURE__*/jsx("div", {
-      className: cls,
-      style: style,
-      ref: forwardedRef,
-      ...reset,
-      children: /*#__PURE__*/jsx("canvas-tag", {
-        tagId: legoData.tagId,
-        text: legoData.text,
-        lang: lang,
-        ...imgProps
-      })
-    });
-  }
-  // 普通图片模式
   return /*#__PURE__*/jsx("div", {
     className: cls,
     style: style,

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  lang?: string\n}\n\n// CDN脚本URL\nconst LEGO_CDN_URL = 'http://ossin.jd.com/swm-plus/h5Tag/tag.js'\n\n// 检查CDN脚本是否已加载\nconst isLegoScriptLoaded = (): boolean => {\n  return document.querySelector(`script[src=\"${LEGO_CDN_URL}\"]`) !== null\n}\n\n// 插入CDN脚本\nconst insertLegoScript = (): void => {\n  if (isLegoScriptLoaded()) return\n\n  const script = document.createElement('script')\n  script.type = 'module'\n  script.src = LEGO_CDN_URL\n  document.head.appendChild(script)\n}\n\n// 解析lego协议URL\nconst parseLegoUrl = (src: string): { tagId: string, text: string } | null => {\n  if (!src.startsWith('lego://')) return null\n\n  try {\n    // 移除 'lego://' 前缀\n    const urlWithoutProtocol = src.substring(7)\n\n    // 分割tagId和参数\n    const [tagId, params] = urlWithoutProtocol.split('?')\n\n    // 解析参数\n    const text = params ? new URLSearchParams(params).get('text') || '' : ''\n\n    return { tagId, text }\n  } catch (error) {\n    console.warn('Failed to parse lego URL:', src, error)\n    return null\n  }\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    lang,\n    ...reset\n  } = props\n\n  // 检查是否为lego模式\n  const legoData = parseLegoUrl(src)\n  const isLegoMode = legoData !== null\n\n  // 如果是lego模式，确保CDN脚本已加载\n  useEffect(() => {\n    if (isLegoMode) {\n      insertLegoScript()\n    }\n  }, [isLegoMode])\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  // 如果是lego模式，渲染canvas-tag\n  if (isLegoMode && legoData) {\n    return (\n      <div className={cls} style={style} ref={forwardedRef} {...reset}>\n        <canvas-tag\n          tagId={legoData.tagId}\n          text={legoData.text}\n          lang={lang}\n          {...imgProps}\n        />\n      </div>\n    )\n  }\n\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":["LEGO_CDN_URL","isLegoScriptLoaded","document","querySelector","insertLegoScript","script","createElement","type","src","head","appendChild","parseLegoUrl","startsWith","urlWithoutProtocol","substring","tagId","params","split","text","URLSearchParams","get","error","console","warn","Image","props","imgRef","useRef","observer","setIsLoaded","useState","className","style","mode","onError","lazyLoad","imgProps","forwardedRef","lang","reset","__rest","legoData","isLegoMode","useEffect","cls","classNames","imgCls","toLowerCase","replace","imageOnLoad","useCallback","e","onLoad","Object","defineProperty","enumerable","writable","value","width","target","height","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/index.css

@@ -1 +1 @@
-@-webkit-keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.taro-button-core[loading]>.weui-loading{animation:weuiLoading 1s steps(12) infinite;background:transparent url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E") no-repeat;background-size:100%;display:inline-block;height:20px;vertical-align:middle;width:20px}.taro-button-core[loading]>.weui-loading.weui-btn_primary,.taro-button-core[loading]>.weui-loading.weui-btn_warn{color:hsla(0,0%,100%,.6)}.taro-button-core[loading]>.weui-loading.weui-btn_primary{background-color:#179b16}.taro-button-core[loading]>.weui-loading.weui-btn_warn{background-color:#ce3c39}.taro-button-core{-webkit-tap-highlight-color:rgba(0,0,0,0);appearance:none;background-color:#f8f8f8;border:1px solid rgba(0,0,0,.2);border-radius:10px;box-sizing:border-box;color:#000;display:block;font-size:18px;line-height:2.55555556;margin-left:auto;margin-right:auto;outline:0;overflow:hidden;padding-left:14px;padding-right:14px;position:relative;text-align:center;text-decoration:none;width:100%}.taro-button-core:focus{outline:0}.taro-button-core:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core+.taro-button-core{margin-top:15px}.taro-button-core.taro-btn-default{background-color:#f8f8f8;color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):visited{color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core.taro-btn-mini{display:inline-block;font-size:13px;line-height:2.3;padding:0 1.32em;width:auto}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-warn{background-color:transparent;border-width:1px}.taro-button-core.taro-btn-disabled{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-disabled.taro-btn-default{background-color:#f7f7f7;color:rgba(0,0,0,.3)}.taro-button-core.taro-btn-disabled.taro-btn-primary{background-color:#9ed99d}.taro-button-core.taro-btn-disabled.taro-btn-warn{background-color:#ec8b89}.taro-button-core.taro-btn-loading .weui-loading{margin:-.2em .34em 0 0}.taro-button-core.taro-btn-loading.taro-btn-primary,.taro-button-core.taro-btn-loading.taro-btn-warn{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-loading.taro-btn-primary{background-color:#179b16}.taro-button-core.taro-btn-loading.taro-btn-warn{background-color:#ce3c39}.taro-button-core.taro-btn-plain.taro-btn-primary{border:1px solid #1aad19;color:#1aad19}.taro-button-core.taro-btn-plain.taro-btn-primary:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(26,173,25,.6);color:rgba(26,173,25,.6)}.taro-button-core.taro-btn-plain.taro-btn-primary:after{border-width:0}.taro-button-core.taro-btn-plain.taro-btn-warn{border:1px solid #e64340;color:#e64340}.taro-button-core.taro-btn-plain.taro-btn-warn:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(230,67,64,.6);color:rgba(230,67,64,.6)}.taro-button-core.taro-btn-plain.taro-btn-warn:after{border-width:0}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default{border:1px solid #353535;color:#353535}.taro-button-core.taro-btn-plain.taro-btn-default:not(.taro-btn-disabled):active,.taro-button-core.taro-btn-plain:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(53,53,53,.6);color:rgba(53,53,53,.6)}.taro-button-core.taro-btn-plain.taro-btn-default:after,.taro-button-core.taro-btn-plain:after{border-width:0}.taro-button-core.taro-btn-primary{background-color:#1aad19;color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):active{background-color:#179b16;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-warn{background-color:#e64340;color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):active{background-color:#ce3c39;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-warn{background-color:#f7f7f7;border:1px solid rgba(0,0,0,.2);color:rgba(0,0,0,.3)}.weui-icon-circle:before{content:"\ea01"}.weui-icon-download:before{content:"\ea02"}.weui-icon-info:before{content:"\ea03"}.weui-icon-safe-success:before{content:"\ea04"}.weui-icon-safe-warn:before{content:"\ea05"}.weui-icon-success:before{content:"\ea06"}.weui-icon-success-circle:before{content:"\ea07"}.weui-icon-success-no-circle:before{content:"\ea08"}.weui-icon-waiting:before{content:"\ea09"}.weui-icon-waiting-circle:before{content:"\ea0a"}.weui-icon-warn:before{content:"\ea0b"}.weui-icon-info-circle:before{content:"\ea0c"}.weui-icon-cancel:before{content:"\ea0d"}.weui-icon-search:before{content:"\ea0e"}.weui-icon-clear:before{content:"\ea0f"}.weui-icon-back:before{content:"\ea10"}.weui-icon-delete:before{content:"\ea11"}.weui-icon-success{color:#09bb07;font-size:23px}.weui-icon-waiting{color:#10aeff;font-size:23px}.weui-icon-warn{color:#f43530;font-size:23px}.weui-icon-info{color:#10aeff;font-size:23px}.weui-icon-success-circle,.weui-icon-success-no-circle{color:#09bb07;font-size:23px}.weui-icon-waiting-circle{color:#10aeff;font-size:23px}.weui-icon-circle{color:#c9c9c9;font-size:23px}.weui-icon-download,.weui-icon-info-circle{color:#09bb07;font-size:23px}.weui-icon-safe-success{color:#09bb07}.weui-icon-safe-warn{color:#ffbe00}.weui-icon-cancel{color:#f43530;font-size:22px}.weui-icon-clear,.weui-icon-search{color:#b2b2b2;font-size:14px}.weui-icon-delete.weui-icon_gallery-delete{color:#fff;font-size:22px}.weui-icon_msg{font-size:93px}.weui-icon_msg.weui-icon-warn{color:#f76260}.weui-icon_msg-primary{font-size:93px}.weui-icon_msg-primary.weui-icon-warn{color:#ffbe00}img[src=""]{opacity:0}.taro-img{display:inline-block;font-size:0;height:240px;overflow:hidden;position:relative;width:320px}.taro-img.taro-img__widthfix,.taro-img__mode-heightfix{height:100%}.taro-img__mode-scaletofill{height:100%;width:100%}.taro-img__mode-aspectfit{height:100%;object-fit:contain;width:100%}.taro-img__mode-aspectfill{height:100%;object-fit:cover;width:100%}.taro-img__mode-widthfix{width:100%}.taro-img__mode-bottom,.taro-img__mode-top{left:50%;position:absolute;transform:translate(-50%)}.taro-img__mode-bottom{bottom:0}.taro-img__mode-center{left:50%;position:absolute;top:50%;transform:translate(-50%,-50%)}.taro-img__mode-left,.taro-img__mode-right{position:absolute;top:50%;transform:translateY(-50%)}.taro-img__mode-right{right:0}.taro-img__mode-topright{position:absolute;right:0}.taro-img__mode-bottomleft{bottom:0;position:absolute}.taro-img__mode-bottomright{bottom:0;position:absolute;right:0}.taro-input-core{display:block}.weui-input{-webkit-appearance:none;background-color:transparent;border:0;color:inherit;font-size:inherit;height:1.4705882353em;line-height:1.4705882353;outline:0;width:100%}.weui-input::-webkit-inner-spin-button,.weui-input::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.taro-picker__overlay{position:fixed;z-index:1000}.taro-picker__mask-overlay,.taro-picker__overlay{bottom:0;height:100%;left:0;right:0;top:0;width:100%}.taro-picker__mask-overlay{background-color:rgba(0,0,0,.6);position:absolute;z-index:1001}.taro-picker{background-color:#e5e5e5;bottom:0;font-size:14px;left:0;position:absolute;width:100%;z-index:1002}.taro-picker__hd{align-items:center;background-color:#fff;display:flex;font-size:17px;height:44px;justify-content:space-between;padding:0;position:relative}.taro-picker__hd:after{background-color:#e5e5e5;bottom:0;content:"";height:1px;left:0;position:absolute;transform:scaleY(.5);width:100%}.taro-picker__action{color:#ff0f23;flex:0 0 auto;font-size:14px;height:44px;line-height:44px;padding:0 10px}.taro-picker__action:first-child{color:#888}.taro-picker__title{color:#000;font-size:16px;font-weight:500;left:50%;max-width:40%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:50%;transform:translate(-50%,-50%);white-space:nowrap}.taro-picker__bd{background-color:#fff;height:238px;overflow:hidden;width:100%}.taro-picker__bd,.taro-picker__group{box-sizing:border-box;display:flex;flex:1}.taro-picker__group{align-items:center;height:100%;justify-content:center;min-width:0;position:relative}.taro-picker__group--date .taro-picker__columns{display:flex;height:100%;width:100%}.taro-picker__mask{background:linear-gradient(180deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6) 40%,hsla(0,0%,100%,0) 45%,hsla(0,0%,100%,0) 55%,hsla(0,0%,100%,.6) 60%,hsla(0,0%,100%,.95));height:100%;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:1}.taro-picker__indicator{box-sizing:border-box;height:34px;left:0;position:absolute;top:50%;transform:translateY(-50%);width:100%;z-index:1002}.taro-picker__indicator:after,.taro-picker__indicator:before{background-color:#e5e5e5;content:"";height:1px;left:0;position:absolute;right:0;transform:scaleY(.5)}.taro-picker__indicator:before{top:0}.taro-picker__indicator:after{bottom:0}.taro-picker__content{box-sizing:border-box;height:100%;width:100%}.taro-picker__item{align-items:center;box-sizing:border-box;color:#000;display:flex;font-size:16px;height:34px;justify-content:center;line-height:34px;overflow:hidden;padding:0 8px;text-align:center;text-overflow:ellipsis;white-space:nowrap;width:100%}.taro-picker__item--selected{color:#ff0f23;font-weight:500}.taro-picker__item--disabled{color:#999}.taro-picker__column{flex:1;margin:0 8px}.taro-picker__column:first-child{margin-left:0}.taro-picker__column:last-child{margin-right:0}.taro-picker__item--custom{align-items:center;color:#888;display:flex;font-weight:400;justify-content:center;text-align:center}@keyframes taro-picker__slide-up{0%{transform:translate3d(0,100%,0)}to{transform:translateZ(0)}}@keyframes taro-picker__slide-down{0%{transform:translateZ(0)}to{transform:translate3d(0,100%,0)}}@keyframes taro-picker__fade-in{0%{opacity:0}to{opacity:1}}@keyframes taro-picker__fade-out{0%{opacity:1}to{opacity:0}}.rmc-pull-to-refresh-content{transform-origin:left top 0}.rmc-pull-to-refresh-content-wrapper{min-height:100%}.rmc-pull-to-refresh-transition{transition:transform .3s}@keyframes rmc-pull-to-refresh-indicator{50%{opacity:.2}to{opacity:1}}.rmc-pull-to-refresh-indicator{height:30px;line-height:10px;text-align:center}.rmc-pull-to-refresh-indicator>div{animation-fill-mode:both;animation:rmc-pull-to-refresh-indicator .5s linear 0s infinite;background-color:grey;border-radius:100%;display:inline-block;height:6px;margin:3px;width:6px}.rmc-pull-to-refresh-indicator>div:nth-child(0){animation-delay:-.1s!important}.rmc-pull-to-refresh-indicator>div:first-child{animation-delay:-.2s!important}.rmc-pull-to-refresh-indicator>div:nth-child(2){animation-delay:-.3s!important}.rmc-pull-to-refresh-down .rmc-pull-to-refresh-indicator{margin-top:-25px}.taro-scroll{-webkit-overflow-scrolling:auto}.taro-scroll--hidebar::-webkit-scrollbar{display:none}.taro-scroll-view{overflow:hidden}.taro-scroll-view__scroll-x{overflow-x:scroll;overflow-y:hidden}.taro-scroll-view__scroll-y{overflow-x:hidden;overflow-y:scroll}.swiper-container-wrapper{height:150px}.swiper-container{height:100%;overflow:visible;position:relative}.taro-text{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.taro-text__selectable{-moz-user-select:text;-webkit-user-select:text;-ms-user-select:text;user-select:text}
+@-webkit-keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.taro-button-core.taro-btn-loading .weui-loading{animation:weuiLoading 1s steps(12) infinite;background:transparent url(https://img13.360buyimg.com/imagetools/jfs/t1/353674/27/5761/14397/690ac1cfFf6bf0e2c/77727d0791bacf8e.png) no-repeat;background-size:cover;display:inline-block;height:22px;width:22px}.taro-button-core.taro-btn-loading .weui-loading.weui-btn_primary,.taro-button-core.taro-btn-loading .weui-loading.weui-btn_warn{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-loading .weui-loading.weui-btn_primary{background-color:#179b16}.taro-button-core.taro-btn-loading .weui-loading.weui-btn_warn{background-color:#ce3c39}.taro-button-core.taro-btn-loading.taro-btn-mini .weui-loading{display:inline-block;height:16px;vertical-align:middle;width:16px}.taro-button-core{-webkit-tap-highlight-color:rgba(0,0,0,0);align-items:center;appearance:none;background-color:#f8f8f8;border:1px solid rgba(0,0,0,.2);border-radius:10px;box-sizing:border-box;color:#000;display:flex;font-size:18px;justify-content:center;outline:0;overflow:hidden;padding:0 14px;position:relative;text-decoration:none;width:100%}.taro-button-core:focus{outline:0}.taro-button-core:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core+.taro-button-core{margin-top:15px}.taro-button-core.taro-btn-default{background-color:#f8f8f8;color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):visited{color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core.taro-btn-mini{display:inline-block;font-size:13px;padding:0 26px;vertical-align:middle;width:auto}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-warn{background-color:transparent;border-width:1px}.taro-button-core.taro-btn-disabled{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-disabled.taro-btn-default{background-color:#f7f7f7;color:rgba(0,0,0,.3)}.taro-button-core.taro-btn-disabled.taro-btn-primary{background-color:#9ed99d}.taro-button-core.taro-btn-disabled.taro-btn-warn{background-color:#ec8b89}.taro-button-core.taro-btn-loading.taro-btn-primary,.taro-button-core.taro-btn-loading.taro-btn-warn{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-loading.taro-btn-primary{background-color:#179b16}.taro-button-core.taro-btn-loading.taro-btn-warn{background-color:#ce3c39}.taro-button-core.taro-btn-plain.taro-btn-primary{border:1px solid #1aad19;color:#1aad19}.taro-button-core.taro-btn-plain.taro-btn-primary:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(26,173,25,.6);color:rgba(26,173,25,.6)}.taro-button-core.taro-btn-plain.taro-btn-primary:after{border-width:0}.taro-button-core.taro-btn-plain.taro-btn-warn{border:1px solid #e64340;color:#e64340}.taro-button-core.taro-btn-plain.taro-btn-warn:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(230,67,64,.6);color:rgba(230,67,64,.6)}.taro-button-core.taro-btn-plain.taro-btn-warn:after{border-width:0}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default{border:1px solid #353535;color:#353535}.taro-button-core.taro-btn-plain.taro-btn-default:not(.taro-btn-disabled):active,.taro-button-core.taro-btn-plain:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(53,53,53,.6);color:rgba(53,53,53,.6)}.taro-button-core.taro-btn-plain.taro-btn-default:after,.taro-button-core.taro-btn-plain:after{border-width:0}.taro-button-core.taro-btn-primary{background-color:#1aad19;color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):active{background-color:#179b16;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-warn{background-color:#e64340;color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):active{background-color:#ce3c39;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-warn{background-color:#f7f7f7;border:1px solid rgba(0,0,0,.2);color:rgba(0,0,0,.3)}.weui-icon-circle:before{content:"\ea01"}.weui-icon-download:before{content:"\ea02"}.weui-icon-info:before{content:"\ea03"}.weui-icon-safe-success:before{content:"\ea04"}.weui-icon-safe-warn:before{content:"\ea05"}.weui-icon-success:before{content:"\ea06"}.weui-icon-success-circle:before{content:"\ea07"}.weui-icon-success-no-circle:before{content:"\ea08"}.weui-icon-waiting:before{content:"\ea09"}.weui-icon-waiting-circle:before{content:"\ea0a"}.weui-icon-warn:before{content:"\ea0b"}.weui-icon-info-circle:before{content:"\ea0c"}.weui-icon-cancel:before{content:"\ea0d"}.weui-icon-search:before{content:"\ea0e"}.weui-icon-clear:before{content:"\ea0f"}.weui-icon-back:before{content:"\ea10"}.weui-icon-delete:before{content:"\ea11"}.weui-icon-success{color:#09bb07;font-size:23px}.weui-icon-waiting{color:#10aeff;font-size:23px}.weui-icon-warn{color:#f43530;font-size:23px}.weui-icon-info{color:#10aeff;font-size:23px}.weui-icon-success-circle,.weui-icon-success-no-circle{color:#09bb07;font-size:23px}.weui-icon-waiting-circle{color:#10aeff;font-size:23px}.weui-icon-circle{color:#c9c9c9;font-size:23px}.weui-icon-download,.weui-icon-info-circle{color:#09bb07;font-size:23px}.weui-icon-safe-success{color:#09bb07}.weui-icon-safe-warn{color:#ffbe00}.weui-icon-cancel{color:#f43530;font-size:22px}.weui-icon-clear,.weui-icon-search{color:#b2b2b2;font-size:14px}.weui-icon-delete.weui-icon_gallery-delete{color:#fff;font-size:22px}.weui-icon_msg{font-size:93px}.weui-icon_msg.weui-icon-warn{color:#f76260}.weui-icon_msg-primary{font-size:93px}.weui-icon_msg-primary.weui-icon-warn{color:#ffbe00}img[src=""]{opacity:0}.taro-img{display:inline-block;font-size:0;height:240px;overflow:hidden;position:relative;width:320px}.taro-img.taro-img__widthfix,.taro-img__mode-heightfix{height:100%}.taro-img__mode-scaletofill{height:100%;width:100%}.taro-img__mode-aspectfit{height:100%;object-fit:contain;width:100%}.taro-img__mode-aspectfill{height:100%;object-fit:cover;width:100%}.taro-img__mode-widthfix{width:100%}.taro-img__mode-bottom,.taro-img__mode-top{left:50%;position:absolute;transform:translate(-50%)}.taro-img__mode-bottom{bottom:0}.taro-img__mode-center{left:50%;position:absolute;top:50%;transform:translate(-50%,-50%)}.taro-img__mode-left,.taro-img__mode-right{position:absolute;top:50%;transform:translateY(-50%)}.taro-img__mode-right{right:0}.taro-img__mode-topright{position:absolute;right:0}.taro-img__mode-bottomleft{bottom:0;position:absolute}.taro-img__mode-bottomright{bottom:0;position:absolute;right:0}.taro-input-core{display:block}.weui-input{-webkit-appearance:none;background-color:transparent;border:0;color:inherit;font-size:inherit;height:1.4705882353em;line-height:1.4705882353;outline:0;width:100%}.weui-input::-webkit-inner-spin-button,.weui-input::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.taro-picker__overlay{position:fixed;z-index:1000}.taro-picker__mask-overlay,.taro-picker__overlay{bottom:0;height:100%;left:0;right:0;top:0;width:100%}.taro-picker__mask-overlay{background-color:rgba(0,0,0,.6);position:absolute;z-index:1001}.taro-picker{background-color:#e5e5e5;bottom:0;font-size:14px;left:0;position:absolute;width:100%;z-index:1002}.taro-picker__hd{align-items:center;background-color:#fff;display:flex;font-size:17px;height:44px;justify-content:space-between;padding:0;position:relative}.taro-picker__hd:after{background-color:#e5e5e5;bottom:0;content:"";height:1px;left:0;position:absolute;transform:scaleY(.5);width:100%}.taro-picker__action{color:#ff0f23;flex:0 0 auto;font-size:14px;height:44px;line-height:44px;padding:0 10px}.taro-picker__action:first-child{color:#888}.taro-picker__title{color:#000;font-size:16px;font-weight:500;left:50%;max-width:40%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:50%;transform:translate(-50%,-50%);white-space:nowrap}.taro-picker__bd{background-color:#fff;height:238px;overflow:hidden;width:100%}.taro-picker__bd,.taro-picker__group{box-sizing:border-box;display:flex;flex:1}.taro-picker__group{align-items:center;height:100%;justify-content:center;min-width:0;position:relative}.taro-picker__group--date .taro-picker__columns{display:flex;height:100%;width:100%}.taro-picker__mask{background:linear-gradient(180deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6) 40%,hsla(0,0%,100%,0) 45%,hsla(0,0%,100%,0) 55%,hsla(0,0%,100%,.6) 60%,hsla(0,0%,100%,.95));height:100%;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:1}.taro-picker__indicator{box-sizing:border-box;height:34px;left:0;position:absolute;top:50%;transform:translateY(-50%);width:100%;z-index:1002}.taro-picker__indicator:after,.taro-picker__indicator:before{background-color:#e5e5e5;content:"";height:1px;left:0;position:absolute;right:0;transform:scaleY(.5)}.taro-picker__indicator:before{top:0}.taro-picker__indicator:after{bottom:0}.taro-picker__content{box-sizing:border-box;height:100%;width:100%}.taro-picker__item{align-items:center;box-sizing:border-box;color:#000;display:flex;font-size:16px;height:34px;justify-content:center;line-height:34px;overflow:hidden;padding:0 8px;text-align:center;text-overflow:ellipsis;white-space:nowrap;width:100%}.taro-picker__item--selected{color:#ff0f23;font-weight:500}.taro-picker__item--disabled{color:#999}.taro-picker__column{flex:1;margin:0 8px}.taro-picker__column:first-child{margin-left:0}.taro-picker__column:last-child{margin-right:0}.taro-picker__item--custom{align-items:center;color:#888;display:flex;font-weight:400;justify-content:center;text-align:center}@keyframes taro-picker__slide-up{0%{transform:translate3d(0,100%,0)}to{transform:translateZ(0)}}@keyframes taro-picker__slide-down{0%{transform:translateZ(0)}to{transform:translate3d(0,100%,0)}}@keyframes taro-picker__fade-in{0%{opacity:0}to{opacity:1}}@keyframes taro-picker__fade-out{0%{opacity:1}to{opacity:0}}.rmc-pull-to-refresh-content{transform-origin:left top 0}.rmc-pull-to-refresh-content-wrapper{min-height:100%}.rmc-pull-to-refresh-transition{transition:transform .3s}@keyframes rmc-pull-to-refresh-indicator{50%{opacity:.2}to{opacity:1}}.rmc-pull-to-refresh-indicator{height:30px;line-height:10px;text-align:center}.rmc-pull-to-refresh-indicator>div{animation-fill-mode:both;animation:rmc-pull-to-refresh-indicator .5s linear 0s infinite;background-color:grey;border-radius:100%;display:inline-block;height:6px;margin:3px;width:6px}.rmc-pull-to-refresh-indicator>div:nth-child(0){animation-delay:-.1s!important}.rmc-pull-to-refresh-indicator>div:first-child{animation-delay:-.2s!important}.rmc-pull-to-refresh-indicator>div:nth-child(2){animation-delay:-.3s!important}.rmc-pull-to-refresh-down .rmc-pull-to-refresh-indicator{margin-top:-25px}.taro-scroll{-webkit-overflow-scrolling:auto}.taro-scroll--hidebar::-webkit-scrollbar{display:none}.taro-scroll-view{overflow:hidden}.taro-scroll-view__scroll-x{overflow-x:scroll;overflow-y:hidden}.taro-scroll-view__scroll-y{overflow-x:hidden;overflow-y:scroll}.swiper-container-wrapper{height:150px}.swiper-container{height:100%;overflow:visible;position:relative}.taro-text{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.taro-text__selectable{-moz-user-select:text;-webkit-user-select:text;-ms-user-select:text;user-select:text}

package/dist/original/components/button/index.js

@@ -1,5 +1,6 @@
 import { __rest } from 'tslib';
 import './style/index.scss';
+import { View } from '@tarojs/components';
 import classNames from 'classnames';
 import { omit, createForwardRefComponent } from '../../utils/index.js';
 import { useRef, useState, useEffect, useCallback } from '../../utils/hooks.react.js';
@@ -46,6 +47,12 @@ function Button(props) {
         }
       }, props.hoverStayTime || 70);
     }
+    if (!props.disabled && props.formType) {
+      const eventName = props.formType === 'submit' ? 'tarobuttonsubmit' : 'tarobuttonreset';
+      e.currentTarget.dispatchEvent(new CustomEvent(eventName, {
+        bubbles: true
+      }));
+    }
     props.onTouchEnd && props.onTouchEnd(e);
   };
   const {
@@ -59,12 +66,18 @@ function Button(props) {
       hoverClass = 'button-hover',
       loading = false,
       type = 'default',
-      size
+      size,
+      formType
     } = props,
-    restProps = __rest(props, ["forwardedRef", "plain", "children", "disabled", "className", "style", "onClick", "hoverClass", "loading", "type", "size"]);
+    restProps = __rest(props, ["forwardedRef", "plain", "children", "disabled", "className", "style", "onClick", "hoverClass", "loading", "type", "size", "formType"]);
   const handleClick = useCallback(e => {
-    if (disabled) return; // 如果按钮不可用，直接返回
-    onClick === null || onClick === void 0 ? void 0 : onClick(e); // 否则执行点击回调
+    if (disabled) {
+      // 按钮禁用时阻止事件冒泡并不触发点击回调
+      e.stopPropagation();
+      return;
+    }
+    // 按钮可用时触发点击回调
+    onClick === null || onClick === void 0 ? void 0 : onClick(e);
   }, [disabled, onClick]);
   const cls = classNames(className, 'taro-button-core', {
     [`${hoverClass}`]: state.hover && !disabled,
@@ -76,8 +89,8 @@ function Button(props) {
     'taro-btn-primary': type === 'primary',
     'taro-btn-warn': type === 'warn'
   });
-  return /*#__PURE__*/jsxs("button", {
-    ...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick']),
+  return /*#__PURE__*/jsxs(View, {
+    ...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick', 'formType']),
     type: type,
     size: size,
     disabled: disabled,
@@ -87,9 +100,9 @@ function Button(props) {
     onClick: handleClick,
     onTouchStart: _onTouchStart,
     onTouchEnd: _onTouchEnd,
-    loading: loading.toString(),
     plain: plain.toString(),
-    children: [!!loading && /*#__PURE__*/jsx("i", {
+    "form-type": formType,
+    children: [!!loading && /*#__PURE__*/jsx(View, {
       className: "weui-loading"
     }), children]
   });

package/dist/original/components/button/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/button/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent, omit } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {\n  size?: string\n  plain?: boolean\n  hoverClass?: string\n  hoverStartTime?: number\n  hoverStayTime?: number\n  disabled?: boolean\n  loading?: boolean\n  type?: string\n  className?: string\n  forwardedRef?: React.MutableRefObject<HTMLButtonElement>\n  onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void\n}\n\ninterface IState {\n  hover: boolean\n  touch: boolean\n}\n\nfunction Button (props: IProps) {\n  const startTimer = useRef<ReturnType<typeof setTimeout>>()\n  const endTimer = useRef<ReturnType<typeof setTimeout>>()\n  const [state, setState] = useState<IState>({\n    hover: false,\n    touch: false\n  })\n\n  useEffect(() => {\n    return () => {\n      startTimer.current && clearTimeout(startTimer.current)\n      endTimer.current && clearTimeout(endTimer.current)\n    }\n  }, [])\n\n  const _onTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: true\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      startTimer.current = setTimeout(() => {\n        if ((state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: true\n          }))\n        }\n      }, props.hoverStartTime || 20)\n    }\n    props.onTouchStart && props.onTouchStart(e)\n  }\n\n  const _onTouchEnd = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: false\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      endTimer.current = setTimeout(() => {\n        if (!(state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: false\n          }))\n        }\n      }, props.hoverStayTime || 70)\n    }\n    props.onTouchEnd && props.onTouchEnd(e)\n  }\n\n  const { forwardedRef, plain = false, children, disabled = false, className, style, onClick, hoverClass = 'button-hover', loading = false, type = 'default', size, ...restProps } = props\n\n  const handleClick = useCallback(\n    (e: React.MouseEvent<HTMLButtonElement>) => {\n      if (disabled) return // 如果按钮不可用，直接返回\n      onClick?.(e) // 否则执行点击回调\n    },\n    [disabled, onClick]\n  )\n\n  const cls = classNames(\n    className,\n    'taro-button-core',\n    {\n      [`${hoverClass}`]: (state as IState).hover && !disabled,\n      'taro-btn-disabled': disabled,\n      'taro-btn-loading': loading,\n      'taro-btn-plain': plain,\n      'taro-btn-mini': size === 'mini',\n      'taro-btn-default': type === 'default',\n      'taro-btn-primary': type === 'primary',\n      'taro-btn-warn': type === 'warn'\n    }\n  )\n\n  return (\n    <button\n      {...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick'])}\n      type={type}\n      size={size}\n      disabled={disabled}\n      ref={forwardedRef}\n      className={cls}\n      style={style}\n      onClick={handleClick}\n      onTouchStart={_onTouchStart}\n      onTouchEnd={_onTouchEnd}\n      loading={loading.toString()}\n      plain={plain.toString()}\n    >\n      {!!loading && <i className='weui-loading' />}\n      {children}\n    </button>\n  )\n}\n\nexport default createForwardRefComponent(Button)\n"],"names":["Button","props","startTimer","useRef","endTimer","state","setState","useState","hover","touch","useEffect","current","clearTimeout","_onTouchStart","e","Object","assign","hoverClass","disabled","setTimeout","hoverStartTime","onTouchStart","_onTouchEnd","hoverStayTime","onTouchEnd","forwardedRef","plain","children","className","style","onClick","loading","type","size","restProps","__rest","handleClick","useCallback","cls","classNames","_jsxs","omit","ref","toString","_jsx","createForwardRefComponent"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/button/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport { View } from '@tarojs/components'\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent, omit } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {\n  size?: string\n  plain?: boolean\n  hoverClass?: string\n  hoverStartTime?: number\n  hoverStayTime?: number\n  disabled?: boolean\n  loading?: boolean\n  type?: string\n  className?: string\n  forwardedRef?: React.MutableRefObject<HTMLButtonElement>\n  onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void\n  formType?: 'submit' | 'reset'\n}\n\ninterface IState {\n  hover: boolean\n  touch: boolean\n}\n\nfunction Button (props: IProps) {\n  const startTimer = useRef<ReturnType<typeof setTimeout>>()\n  const endTimer = useRef<ReturnType<typeof setTimeout>>()\n  const [state, setState] = useState<IState>({\n    hover: false,\n    touch: false\n  })\n\n  useEffect(() => {\n    return () => {\n      startTimer.current && clearTimeout(startTimer.current)\n      endTimer.current && clearTimeout(endTimer.current)\n    }\n  }, [])\n\n  const _onTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: true\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      startTimer.current = setTimeout(() => {\n        if ((state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: true\n          }))\n        }\n      }, props.hoverStartTime || 20)\n    }\n    props.onTouchStart && props.onTouchStart(e)\n  }\n\n  const _onTouchEnd = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: false\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      endTimer.current = setTimeout(() => {\n        if (!(state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: false\n          }))\n        }\n      }, props.hoverStayTime || 70)\n    }\n\n    if (!props.disabled && props.formType) {\n      const eventName = props.formType === 'submit' ? 'tarobuttonsubmit' : 'tarobuttonreset'\n      e.currentTarget.dispatchEvent(new CustomEvent(eventName, { bubbles: true }))\n    }\n\n    props.onTouchEnd && props.onTouchEnd(e)\n  }\n\n  const { forwardedRef, plain = false, children, disabled = false, className, style, onClick, hoverClass = 'button-hover', loading = false, type = 'default', size, formType, ...restProps } = props\n\n  const handleClick = useCallback(\n    (e: React.MouseEvent<HTMLButtonElement>) => {\n      if (disabled) {\n        // 按钮禁用时阻止事件冒泡并不触发点击回调\n        e.stopPropagation()\n        return\n      }\n      // 按钮可用时触发点击回调\n      onClick?.(e)\n    },\n    [disabled, onClick]\n  )\n\n  const cls = classNames(\n    className,\n    'taro-button-core',\n    {\n      [`${hoverClass}`]: (state as IState).hover && !disabled,\n      'taro-btn-disabled': disabled,\n      'taro-btn-loading': loading,\n      'taro-btn-plain': plain,\n      'taro-btn-mini': size === 'mini',\n      'taro-btn-default': type === 'default',\n      'taro-btn-primary': type === 'primary',\n      'taro-btn-warn': type === 'warn'\n    }\n  )\n\n  return (\n    <View\n      {...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick', 'formType'])}\n      type={type}\n      size={size}\n      disabled={disabled}\n      ref={forwardedRef}\n      className={cls}\n      style={style}\n      onClick={handleClick}\n      onTouchStart={_onTouchStart}\n      onTouchEnd={_onTouchEnd}\n      plain={plain.toString()}\n      form-type={formType as any}\n    >\n      {!!loading && <View className='weui-loading' />}\n      {children}\n    </View>\n  )\n}\n\nexport default createForwardRefComponent(Button)\n"],"names":["Button","props","startTimer","useRef","endTimer","state","setState","useState","hover","touch","useEffect","current","clearTimeout","_onTouchStart","e","Object","assign","hoverClass","disabled","setTimeout","hoverStartTime","onTouchStart","_onTouchEnd","hoverStayTime","formType","eventName","currentTarget","dispatchEvent","CustomEvent","bubbles","onTouchEnd","forwardedRef","plain","children","className","style","onClick","loading","type","size","restProps","__rest","handleClick","useCallback","stopPropagation","cls","classNames","_jsxs","View","omit","ref","toString","_jsx","createForwardRefComponent"],"mappings":";;;;;;;;AA8BA,SAASA,MAAMA,CAAEC,KAAa,EAAA;AAC5B,EAAA,MAAMC,UAAU,GAAGC,MAAM,EAAiC;AAC1D,EAAA,MAAMC,QAAQ,GAAGD,MAAM,EAAiC;AACxD,EAAA,MAAM,CAACE,KAAK,EAAEC,QAAQ,CAAC,GAAGC,QAAQ,CAAS;AACzCC,IAAAA,KAAK,EAAE,KAAK;AACZC,IAAAA,KAAK,EAAE;AACR,GAAA,CAAC;AAEFC,EAAAA,SAAS,CAAC,MAAK;AACb,IAAA,OAAO,MAAK;MACVR,UAAU,CAACS,OAAO,IAAIC,YAAY,CAACV,UAAU,CAACS,OAAO,CAAC;MACtDP,QAAQ,CAACO,OAAO,IAAIC,YAAY,CAACR,QAAQ,CAACO,OAAO,CAAC;KACnD;GACF,EAAE,EAAE,CAAC;EAEN,MAAME,aAAa,GAAIC,CAAsC,IAAI;AAC/DR,IAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJL,MAAAA,KAAK,EAAE;AAAI,KAAA,CACX,CAAC;AACH,IAAA,IAAIR,KAAK,CAACgB,UAAU,IAAIhB,KAAK,CAACgB,UAAU,KAAK,MAAM,IAAI,CAAChB,KAAK,CAACiB,QAAQ,EAAE;AACtEhB,MAAAA,UAAU,CAACS,OAAO,GAAGQ,UAAU,CAAC,MAAK;QACnC,IAAKd,KAAgB,CAACI,KAAK,EAAE;AAC3BH,UAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJN,YAAAA,KAAK,EAAE;AAAI,WAAA,CACX,CAAC;AACL;AACF,OAAC,EAAEP,KAAK,CAACmB,cAAc,IAAI,EAAE,CAAC;AAChC;IACAnB,KAAK,CAACoB,YAAY,IAAIpB,KAAK,CAACoB,YAAY,CAACP,CAAC,CAAC;GAC5C;EAED,MAAMQ,WAAW,GAAIR,CAAsC,IAAI;AAC7DR,IAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJL,MAAAA,KAAK,EAAE;AAAK,KAAA,CACZ,CAAC;AACH,IAAA,IAAIR,KAAK,CAACgB,UAAU,IAAIhB,KAAK,CAACgB,UAAU,KAAK,MAAM,IAAI,CAAChB,KAAK,CAACiB,QAAQ,EAAE;AACtEd,MAAAA,QAAQ,CAACO,OAAO,GAAGQ,UAAU,CAAC,MAAK;AACjC,QAAA,IAAI,CAAEd,KAAgB,CAACI,KAAK,EAAE;AAC5BH,UAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJN,YAAAA,KAAK,EAAE;AAAK,WAAA,CACZ,CAAC;AACL;AACF,OAAC,EAAEP,KAAK,CAACsB,aAAa,IAAI,EAAE,CAAC;AAC/B;IAEA,IAAI,CAACtB,KAAK,CAACiB,QAAQ,IAAIjB,KAAK,CAACuB,QAAQ,EAAE;MACrC,MAAMC,SAAS,GAAGxB,KAAK,CAACuB,QAAQ,KAAK,QAAQ,GAAG,kBAAkB,GAAG,iBAAiB;MACtFV,CAAC,CAACY,aAAa,CAACC,aAAa,CAAC,IAAIC,WAAW,CAACH,SAAS,EAAE;AAAEI,QAAAA,OAAO,EAAE;AAAM,OAAA,CAAC,CAAC;AAC9E;IAEA5B,KAAK,CAAC6B,UAAU,IAAI7B,KAAK,CAAC6B,UAAU,CAAChB,CAAC,CAAC;GACxC;EAED,MAAM;MAAEiB,YAAY;AAAEC,MAAAA,KAAK,GAAG,KAAK;MAAEC,QAAQ;AAAEf,MAAAA,QAAQ,GAAG,KAAK;MAAEgB,SAAS;MAAEC,KAAK;MAAEC,OAAO;AAAEnB,MAAAA,UAAU,GAAG,cAAc;AAAEoB,MAAAA,OAAO,GAAG,KAAK;AAAEC,MAAAA,IAAI,GAAG,SAAS;MAAEC,IAAI;AAAEf,MAAAA;AAA2B,KAAA,GAAAvB,KAAK;AAAnBuC,IAAAA,SAAS,GAAAC,MAAA,CAAKxC,KAAK,EAA5L,CAAA,cAAA,EAAA,OAAA,EAAA,UAAA,EAAA,UAAA,EAAA,WAAA,EAAA,OAAA,EAAA,SAAA,EAAA,YAAA,EAAA,SAAA,EAAA,MAAA,EAAA,MAAA,EAAA,UAAA,CAAoL,CAAQ;AAElM,EAAA,MAAMyC,WAAW,GAAGC,WAAW,CAC5B7B,CAAsC,IAAI;AACzC,IAAA,IAAII,QAAQ,EAAE;AACZ;MACAJ,CAAC,CAAC8B,eAAe,EAAE;AACnB,MAAA;AACF;AACA;AACAR,IAAAA,OAAO,aAAPA,OAAO,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAPA,OAAO,CAAGtB,CAAC,CAAC;AACd,GAAC,EACD,CAACI,QAAQ,EAAEkB,OAAO,CAAC,CACpB;AAED,EAAA,MAAMS,GAAG,GAAGC,UAAU,CACpBZ,SAAS,EACT,kBAAkB,EAClB;IACE,CAAC,CAAA,EAAGjB,UAAU,CAAE,CAAA,GAAIZ,KAAgB,CAACG,KAAK,IAAI,CAACU,QAAQ;AACvD,IAAA,mBAAmB,EAAEA,QAAQ;AAC7B,IAAA,kBAAkB,EAAEmB,OAAO;AAC3B,IAAA,gBAAgB,EAAEL,KAAK;IACvB,eAAe,EAAEO,IAAI,KAAK,MAAM;IAChC,kBAAkB,EAAED,IAAI,KAAK,SAAS;IACtC,kBAAkB,EAAEA,IAAI,KAAK,SAAS;IACtC,eAAe,EAAEA,IAAI,KAAK;AAC3B,GAAA,CACF;EAED,oBACES,IAAA,CAACC,IAAI,EAAA;IAAA,GACCC,IAAI,CAACT,SAAS,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACxJF,IAAAA,IAAI,EAAEA,IAAK;AACXC,IAAAA,IAAI,EAAEA,IAAK;AACXrB,IAAAA,QAAQ,EAAEA,QAAS;AACnBgC,IAAAA,GAAG,EAAEnB,YAAa;AAClBG,IAAAA,SAAS,EAAEW,GAAI;AACfV,IAAAA,KAAK,EAAEA,KAAM;AACbC,IAAAA,OAAO,EAAEM,WAAY;AACrBrB,IAAAA,YAAY,EAAER,aAAc;AAC5BiB,IAAAA,UAAU,EAAER,WAAY;AACxBU,IAAAA,KAAK,EAAEA,KAAK,CAACmB,QAAQ,EAAG;AACxB,IAAA,WAAA,EAAW3B,QAAgB;AAAAS,IAAAA,QAAA,GAE1B,CAAC,CAACI,OAAO,iBAAIe,GAAA,CAACJ,IAAI,EAAA;AAACd,MAAAA,SAAS,EAAC;KAAc,CAAG,EAC9CD,QAAQ;AAAA,GACL,CAAC;AAEX;AAEA,YAAeoB,yBAAyB,CAACrD,MAAM,CAAC;;;;"}

package/dist/original/components/button/style/index.scss

@@ -63,52 +63,60 @@ $weuiBtnPlainDefaultActiveColor: rgba(53, 53, 53, .6);
 $weuiBtnPlainDefaultActiveBorderColor: rgba(53, 53, 53, .6);
 
 /* Imported from weui-btn_loading.scss */
-@-webkit-keyframes weuiLoading {
-  0% {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-
-  100% {
-    transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-
-@keyframes weuiLoading {
-  0% {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-
-  100% {
-    transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-
-.taro-button-core[loading] {
-  >.weui-loading {
-    // font-size: 16px;
-    width: 20px; // 1em;
-    height: 20px; // 1em;
-    display: inline-block;
-    vertical-align: middle;
-    animation: weuiLoading 1s steps(12, end) infinite;
-    background: transparent url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E") no-repeat;
-    background-size: 100%;
-
-    &.weui-btn_primary,
-    &.weui-btn_warn {
-      color: $weuiBtnActiveFontColor;
-    }
-    &.weui-btn_primary {
-      // color: var(--weui-WHITE);
-      background-color: $weuiBtnPrimaryActiveBg;
-    }
-  
-    &.weui-btn_warn {
-      background-color: $weuiBtnWarnActiveBg;
-    }
-  }
-  
+@-webkit-keyframes weuiLoading {
+  0% {
+    transform: rotate3d(0, 0, 1, 0deg);
+  }
+
+  100% {
+    transform: rotate3d(0, 0, 1, 360deg);
+  }
+}
+
+@keyframes weuiLoading {
+  0% {
+    transform: rotate3d(0, 0, 1, 0deg);
+  }
+
+  100% {
+    transform: rotate3d(0, 0, 1, 360deg);
+  }
 }
+
+.taro-button-core.taro-btn-loading {
+  .weui-loading {
+    display: inline-block;
+    width: 22px;
+    height: 22px;
+    animation: weuiLoading 1s steps(12, end) infinite;
+    background: transparent url("https://img13.360buyimg.com/imagetools/jfs/t1/353674/27/5761/14397/690ac1cfFf6bf0e2c/77727d0791bacf8e.png") no-repeat;
+    background-size: cover;
+
+    &.weui-btn_primary,
+    &.weui-btn_warn {
+      color: $weuiBtnActiveFontColor;
+    }
+    &.weui-btn_primary {
+      // color: var(--weui-WHITE);
+      background-color: $weuiBtnPrimaryActiveBg;
+    }
+
+    &.weui-btn_warn {
+      background-color: $weuiBtnWarnActiveBg;
+    }
+  }
+
+}
+
+.taro-button-core.taro-btn-loading.taro-btn-mini {
+  .weui-loading {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    vertical-align: middle;
+  }
+}
+
 $weuiBtnHeight: 46px;
 $weuiBtnFontSize: 18px;
 $weuiBtnFontColor: #fff;
@@ -119,7 +127,7 @@ $weuiBtnDefaultGap: 15px;
 
 // Button Mini
 $weuiBtnMiniFontSize: 13px;
-$weuiBtnMiniHeight: 2.3;
+$weuiBtnMiniHeight: 2;
 
 // Button Default
 $weuiBtnDefaultFontColor: #000;
@@ -158,24 +166,20 @@ $weuiBtnPlainWarnActiveColor: rgba(230 67 64 / 60%);
 $weuiBtnPlainWarnActiveBorderColor: rgba(230 67 64 / 60%);
 
 .taro-button-core {
-  display: block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   overflow: hidden;
   position: relative;
   box-sizing: border-box;
-  margin-left: auto;
-  margin-right: auto;
-  padding-left: 14px;
-  padding-right: 14px;
-  border-width: 0;
+  padding: 0 14px;
   border: 1px solid rgb(0 0 0 / 20%);
   border-radius: $weuiBtnBorderRadius * 2;
   width: 100%;
   appearance: none;
   outline: 0;
   background-color: $weuiBtnDefaultBg;
-  line-height: 2.55555556;
   text-decoration: none;
-  text-align: center;
   font-size: $weuiBtnFontSize;
   color: $weuiBtnDefaultFontColor;
   -webkit-tap-highlight-color: rgb(0 0 0 / 0%);
@@ -209,9 +213,9 @@ $weuiBtnPlainWarnActiveBorderColor: rgba(230 67 64 / 60%);
 
   &.taro-btn-mini {
     display: inline-block;
-    padding: 0 1.32em;
+    padding: 0 26px;
     width: auto;
-    line-height: $weuiBtnMiniHeight;
+    vertical-align: middle;
     font-size: $weuiBtnMiniFontSize;
   }
 
@@ -241,9 +245,6 @@ $weuiBtnPlainWarnActiveBorderColor: rgba(230 67 64 / 60%);
   }
 
   &.taro-btn-loading {
-    .weui-loading {
-      margin: -0.2em 0.34em 0 0;
-    }
 
     &.taro-btn-primary,
     &.taro-btn-warn {
@@ -350,4 +351,4 @@ $weuiBtnPlainWarnActiveBorderColor: rgba(230 67 64 / 60%);
     background-color: #f7f7f7;
     color: rgb(0 0 0 / 30%);
   }
-}
+}

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

@@ -2,41 +2,9 @@ import { __rest } from 'tslib';
 import './style/index.scss';
 import classNames from 'classnames';
 import { createForwardRefComponent } from '../../utils/index.js';
-import { useRef, useState, useEffect, useCallback } from '../../utils/hooks.react.js';
+import { useRef, useState, useCallback, useEffect } from '../../utils/hooks.react.js';
 import { jsx } from 'react/jsx-runtime';
 
-const LEGO_CDN_URL = 'http://ossin.jd.com/swm-plus/h5Tag/tag.js';
-// 检查CDN脚本是否已加载
-const isLegoScriptLoaded = () => {
-  return document.querySelector(`script[src="${LEGO_CDN_URL}"]`) !== null;
-};
-// 插入CDN脚本
-const insertLegoScript = () => {
-  if (isLegoScriptLoaded()) return;
-  const script = document.createElement('script');
-  script.type = 'module';
-  script.src = LEGO_CDN_URL;
-  document.head.appendChild(script);
-};
-// 解析lego协议URL
-const parseLegoUrl = src => {
-  if (!src.startsWith('lego://')) return null;
-  try {
-    // 移除 'lego://' 前缀
-    const urlWithoutProtocol = src.substring(7);
-    // 分割tagId和参数
-    const [tagId, params] = urlWithoutProtocol.split('?');
-    // 解析参数
-    const text = params ? new URLSearchParams(params).get('text') || '' : '';
-    return {
-      tagId,
-      text
-    };
-  } catch (error) {
-    console.warn('Failed to parse lego URL:', src, error);
-    return null;
-  }
-};
 function Image(props) {
   const imgRef = useRef(null);
   const observer = useRef({});
@@ -49,21 +17,9 @@ function Image(props) {
       onError,
       lazyLoad,
       imgProps,
-      forwardedRef,
-      lang
+      forwardedRef
     } = props,
-    reset = __rest(props
-    // 检查是否为lego模式
-    , ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef", "lang"]);
-  // 检查是否为lego模式
-  const legoData = parseLegoUrl(src);
-  const isLegoMode = legoData !== null;
-  // 如果是lego模式，确保CDN脚本已加载
-  useEffect(() => {
-    if (isLegoMode) {
-      insertLegoScript();
-    }
-  }, [isLegoMode]);
+    reset = __rest(props, ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef"]);
   const cls = classNames('taro-img', {
     'taro-img__widthfix': mode === 'widthFix'
   }, className);
@@ -102,22 +58,6 @@ function Image(props) {
       (_b = (_a = observer.current) === null || _a === void 0 ? void 0 : _a.disconnect) === null || _b === void 0 ? void 0 : _b.call(_a);
     };
   }, [lazyLoad, src]);
-  // 如果是lego模式，渲染canvas-tag
-  if (isLegoMode && legoData) {
-    return /*#__PURE__*/jsx("div", {
-      className: cls,
-      style: style,
-      ref: forwardedRef,
-      ...reset,
-      children: /*#__PURE__*/jsx("canvas-tag", {
-        tagId: legoData.tagId,
-        text: legoData.text,
-        lang: lang,
-        ...imgProps
-      })
-    });
-  }
-  // 普通图片模式
   return /*#__PURE__*/jsx("div", {
     className: cls,
     style: style,

package/dist/original/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  lang?: string\n}\n\n// CDN脚本URL\nconst LEGO_CDN_URL = 'http://ossin.jd.com/swm-plus/h5Tag/tag.js'\n\n// 检查CDN脚本是否已加载\nconst isLegoScriptLoaded = (): boolean => {\n  return document.querySelector(`script[src=\"${LEGO_CDN_URL}\"]`) !== null\n}\n\n// 插入CDN脚本\nconst insertLegoScript = (): void => {\n  if (isLegoScriptLoaded()) return\n\n  const script = document.createElement('script')\n  script.type = 'module'\n  script.src = LEGO_CDN_URL\n  document.head.appendChild(script)\n}\n\n// 解析lego协议URL\nconst parseLegoUrl = (src: string): { tagId: string, text: string } | null => {\n  if (!src.startsWith('lego://')) return null\n\n  try {\n    // 移除 'lego://' 前缀\n    const urlWithoutProtocol = src.substring(7)\n\n    // 分割tagId和参数\n    const [tagId, params] = urlWithoutProtocol.split('?')\n\n    // 解析参数\n    const text = params ? new URLSearchParams(params).get('text') || '' : ''\n\n    return { tagId, text }\n  } catch (error) {\n    console.warn('Failed to parse lego URL:', src, error)\n    return null\n  }\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    lang,\n    ...reset\n  } = props\n\n  // 检查是否为lego模式\n  const legoData = parseLegoUrl(src)\n  const isLegoMode = legoData !== null\n\n  // 如果是lego模式，确保CDN脚本已加载\n  useEffect(() => {\n    if (isLegoMode) {\n      insertLegoScript()\n    }\n  }, [isLegoMode])\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  // 如果是lego模式，渲染canvas-tag\n  if (isLegoMode && legoData) {\n    return (\n      <div className={cls} style={style} ref={forwardedRef} {...reset}>\n        <canvas-tag\n          tagId={legoData.tagId}\n          text={legoData.text}\n          lang={lang}\n          {...imgProps}\n        />\n      </div>\n    )\n  }\n\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":["LEGO_CDN_URL","isLegoScriptLoaded","document","querySelector","insertLegoScript","script","createElement","type","src","head","appendChild","parseLegoUrl","startsWith","urlWithoutProtocol","substring","tagId","params","split","text","URLSearchParams","get","error","console","warn","Image","props","imgRef","useRef","observer","setIsLoaded","useState","className","style","mode","onError","lazyLoad","imgProps","forwardedRef","lang","reset","__rest","legoData","isLegoMode","useEffect","cls","classNames","imgCls","toLowerCase","replace","imageOnLoad","useCallback","e","onLoad","Object","defineProperty","enumerable","writable","value","width","target","height","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":";;;;;;;AAmBA,SAASA,KAAKA,CAAEC,KAAa,EAAA;AAC3B,EAAA,MAAMC,MAAM,GAAGC,MAAM,CAA0B,IAAI,CAAC;AACpD,EAAA,MAAMC,QAAQ,GAAGD,MAAM,CAAgC,EAAE,CAAC;AAC1D,EAAA,MAAM,GAAGE,WAAW,CAAC,GAAGC,QAAQ,CAAC,KAAK,CAAC;EACvC,MAAM;MACJC,SAAS;MACTC,KAAK,GAAG,EAAE;MACVC,GAAG;MACHC,IAAI;MACJC,OAAO;MACPC,QAAQ;MACRC,QAAQ;AACRC,MAAAA;AAAY,KAAA,GAEVb,KAAK;IADJc,KAAK,GAAAC,MAAA,CACNf,KAAK,EAVH,CAUL,WAAA,EAAA,OAAA,EAAA,KAAA,EAAA,MAAA,EAAA,SAAA,EAAA,UAAA,EAAA,UAAA,EAAA,cAAA,CAAA,CAAQ;AAET,EAAA,MAAMgB,GAAG,GAAGC,UAAU,CACpB,UAAU,EACV;IACE,oBAAoB,EAAER,IAAI,KAAK;GAChC,EACDH,SAAS,CACV;EACD,MAAMY,MAAM,GAAGD,UAAU,CACvB,iBAAiB,GACf,CAACR,IAAI,IAAI,aAAa,EAAEU,WAAW,EAAE,CAACC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3D;AAED,EAAA,MAAMC,WAAW,GAAGC,WAAW,CAAEC,CAAC,IAAI;IACpC,MAAM;AAAEC,MAAAA;AAAQ,KAAA,GAAGxB,KAAK;AACxByB,IAAAA,MAAM,CAACC,cAAc,CAACH,CAAC,EAAE,QAAQ,EAAE;AACjCI,MAAAA,UAAU,EAAE,IAAI;AAChBC,MAAAA,QAAQ,EAAE,IAAI;AACdC,MAAAA,KAAK,EAAE;AACLC,QAAAA,KAAK,EAAEP,CAAC,CAACQ,MAAM,CAACD,KAAK;AACrBE,QAAAA,MAAM,EAAET,CAAC,CAACQ,MAAM,CAACC;AAClB;AACF,KAAA,CAAC;AAEFR,IAAAA,MAAM,IAAIA,MAAM,CAACD,CAAC,CAAC;AACrB,GAAC,EAAE,CAACvB,KAAK,CAAC,CAAC;AAEXiC,EAAAA,SAAS,CAAC,MAAK;;AACb,IAAA,IAAItB,QAAQ,EAAE;AACZR,MAAAA,QAAQ,CAAC+B,OAAO,GAAG,IAAIC,oBAAoB,CACzCC,OAAO,IAAG;AACR;QACA,IAAIA,OAAO,CAACA,OAAO,CAACC,MAAM,GAAG,CAAC,CAAC,CAACC,cAAc,EAAE;UAC9ClC,WAAW,CAAC,IAAI,CAAC;AACjB;AACAH,UAAAA,MAAM,CAACiC,OAAQ,CAAC1B,GAAG,GAAGA,GAAG;AAC3B;AACF,OAAC,EACD;AACE+B,QAAAA,UAAU,EAAE;AACb,OAAA,CACF;AACD,MAAA,CAAAC,EAAA,GAAA,CAAAC,EAAA,GAAAtC,QAAQ,CAAC+B,OAAO,EAACQ,OAAO,MAAA,IAAA,IAAAF,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAAA,EAAA,CAAAG,IAAA,CAAAF,EAAA,EAAGxC,MAAM,CAACiC,OAAQ,CAAC;AAC7C;AAEA,IAAA,OAAO,MAAK;;AACV,MAAA,CAAAM,EAAA,GAAA,MAAArC,QAAQ,CAAC+B,OAAO,MAAE,IAAA,IAAAO,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAAA,EAAA,CAAAG,UAAU,kDAAI;KACjC;AACH,GAAC,EAAE,CAACjC,QAAQ,EAAEH,GAAG,CAAC,CAAC;AAEnB,EAAA,oBACEqC,GAAA,CAAA,KAAA,EAAA;AAAKvC,IAAAA,SAAS,EAAEU,GAAI;AAACT,IAAAA,KAAK,EAAEA,KAAM;AAACuC,IAAAA,GAAG,EAAEjC,YAAa;AAAA,IAAA,GAAKC,KAAK;IAAAiC,QAAA,EAC5DpC,QAAQ,gBACPkC,GAAA,CAAA,KAAA,EAAA;AACEC,MAAAA,GAAG,EAAEE,GAAG,IAAK/C,MAAM,CAACiC,OAAO,GAAGc,GAAK;AACnC1C,MAAAA,SAAS,EAAEY,MAAO;AAClB,MAAA,UAAA,EAAUV,GAAI;AACdgB,MAAAA,MAAM,EAAEH,WAAY;AACpBX,MAAAA,OAAO,EAAEA,OAAQ;MAAA,GACbE;KAAS,CACb,gBAEFiC,GAAA,CAAA,KAAA,EAAA;AACEC,MAAAA,GAAG,EAAEE,GAAG,IAAK/C,MAAM,CAACiC,OAAO,GAAGc,GAAK;AACnC1C,MAAAA,SAAS,EAAEY,MAAO;AAClBV,MAAAA,GAAG,EAAEA,GAAI;AACTgB,MAAAA,MAAM,EAAEH,WAAY;AACpBX,MAAAA,OAAO,EAAEA,OAAQ;MAAA,GACbE;KACJ;AACH,GACE,CAAC;AAEV;AAEA,YAAeqC,yBAAyB,CAAClD,KAAK,CAAC;;;;"}

package/dist/solid/components/button/index.js

@@ -1,12 +1,11 @@
-import { template, use, spread, mergeProps, insert } from 'solid-js/web';
+import { createComponent, mergeProps, memo } from 'solid-js/web';
 import { __rest } from 'tslib';
 import './style/index.scss.js';
+import { View } from '@tarojs/components';
 import classNames from 'classnames';
 import { omit, createForwardRefComponent } from '../../utils/index.js';
 import { useRef, useState, useEffect, useCallback } from '../../utils/hooks.solid.js';
 
-var _tmpl$ = /*#__PURE__*/template(`<button>`),
-  _tmpl$2 = /*#__PURE__*/template(`<i class=weui-loading>`);
 function Button(props) {
   const startTimer = useRef();
   const endTimer = useRef();
@@ -48,6 +47,12 @@ function Button(props) {
         }
       }, props.hoverStayTime || 70);
     }
+    if (!props.disabled && props.formType) {
+      const eventName = props.formType === 'submit' ? 'tarobuttonsubmit' : 'tarobuttonreset';
+      e.currentTarget.dispatchEvent(new CustomEvent(eventName, {
+        bubbles: true
+      }));
+    }
     props.onTouchEnd && props.onTouchEnd(e);
   };
   const {
@@ -61,12 +66,18 @@ function Button(props) {
       hoverClass = 'button-hover',
       loading = false,
       type = 'default',
-      size
+      size,
+      formType
     } = props,
-    restProps = __rest(props, ["forwardedRef", "plain", "children", "disabled", "className", "style", "onClick", "hoverClass", "loading", "type", "size"]);
+    restProps = __rest(props, ["forwardedRef", "plain", "children", "disabled", "className", "style", "onClick", "hoverClass", "loading", "type", "size", "formType"]);
   const handleClick = useCallback(e => {
-    if (disabled) return; // 如果按钮不可用，直接返回
-    onClick === null || onClick === void 0 ? void 0 : onClick(e); // 否则执行点击回调
+    if (disabled) {
+      // 按钮禁用时阻止事件冒泡并不触发点击回调
+      e.stopPropagation();
+      return;
+    }
+    // 按钮可用时触发点击回调
+    onClick === null || onClick === void 0 ? void 0 : onClick(e);
   }, [disabled, onClick]);
   const cls = classNames(className, 'taro-button-core', {
     [`${hoverClass}`]: state.hover && !disabled,
@@ -78,29 +89,26 @@ function Button(props) {
     'taro-btn-primary': type === 'primary',
     'taro-btn-warn': type === 'warn'
   });
-  return (() => {
-    var _el$ = _tmpl$();
-    use(forwardedRef, _el$);
-    spread(_el$, mergeProps(() => omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick']), {
-      "type": type,
-      "size": size,
-      "disabled": disabled,
-      "className": cls,
-      "style": style,
-      "onClick": handleClick,
-      "onTouchStart": _onTouchStart,
-      "onTouchEnd": _onTouchEnd,
-      get loading() {
-        return loading.toString();
-      },
-      get plain() {
-        return plain.toString();
-      }
-    }), false, true);
-    insert(_el$, !!loading && _tmpl$2(), null);
-    insert(_el$, children, null);
-    return _el$;
-  })();
+  return createComponent(View, mergeProps(() => omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick', 'formType']), {
+    type: type,
+    size: size,
+    disabled: disabled,
+    ref: forwardedRef,
+    className: cls,
+    style: style,
+    onClick: handleClick,
+    onTouchStart: _onTouchStart,
+    onTouchEnd: _onTouchEnd,
+    get plain() {
+      return plain.toString();
+    },
+    "form-type": formType,
+    get children() {
+      return [memo(() => !!loading && createComponent(View, {
+        className: "weui-loading"
+      })), children];
+    }
+  }));
 }
 var index = createForwardRefComponent(Button);
 

package/dist/solid/components/button/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/button/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent, omit } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {\n  size?: string\n  plain?: boolean\n  hoverClass?: string\n  hoverStartTime?: number\n  hoverStayTime?: number\n  disabled?: boolean\n  loading?: boolean\n  type?: string\n  className?: string\n  forwardedRef?: React.MutableRefObject<HTMLButtonElement>\n  onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void\n}\n\ninterface IState {\n  hover: boolean\n  touch: boolean\n}\n\nfunction Button (props: IProps) {\n  const startTimer = useRef<ReturnType<typeof setTimeout>>()\n  const endTimer = useRef<ReturnType<typeof setTimeout>>()\n  const [state, setState] = useState<IState>({\n    hover: false,\n    touch: false\n  })\n\n  useEffect(() => {\n    return () => {\n      startTimer.current && clearTimeout(startTimer.current)\n      endTimer.current && clearTimeout(endTimer.current)\n    }\n  }, [])\n\n  const _onTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: true\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      startTimer.current = setTimeout(() => {\n        if ((state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: true\n          }))\n        }\n      }, props.hoverStartTime || 20)\n    }\n    props.onTouchStart && props.onTouchStart(e)\n  }\n\n  const _onTouchEnd = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: false\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      endTimer.current = setTimeout(() => {\n        if (!(state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: false\n          }))\n        }\n      }, props.hoverStayTime || 70)\n    }\n    props.onTouchEnd && props.onTouchEnd(e)\n  }\n\n  const { forwardedRef, plain = false, children, disabled = false, className, style, onClick, hoverClass = 'button-hover', loading = false, type = 'default', size, ...restProps } = props\n\n  const handleClick = useCallback(\n    (e: React.MouseEvent<HTMLButtonElement>) => {\n      if (disabled) return // 如果按钮不可用，直接返回\n      onClick?.(e) // 否则执行点击回调\n    },\n    [disabled, onClick]\n  )\n\n  const cls = classNames(\n    className,\n    'taro-button-core',\n    {\n      [`${hoverClass}`]: (state as IState).hover && !disabled,\n      'taro-btn-disabled': disabled,\n      'taro-btn-loading': loading,\n      'taro-btn-plain': plain,\n      'taro-btn-mini': size === 'mini',\n      'taro-btn-default': type === 'default',\n      'taro-btn-primary': type === 'primary',\n      'taro-btn-warn': type === 'warn'\n    }\n  )\n\n  return (\n    <button\n      {...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick'])}\n      type={type}\n      size={size}\n      disabled={disabled}\n      ref={forwardedRef}\n      className={cls}\n      style={style}\n      onClick={handleClick}\n      onTouchStart={_onTouchStart}\n      onTouchEnd={_onTouchEnd}\n      loading={loading.toString()}\n      plain={plain.toString()}\n    >\n      {!!loading && <i className='weui-loading' />}\n      {children}\n    </button>\n  )\n}\n\nexport default createForwardRefComponent(Button)\n"],"names":["Button","props","startTimer","useRef","endTimer","state","setState","useState","hover","touch","useEffect","current","clearTimeout","_onTouchStart","e","Object","assign","hoverClass","disabled","setTimeout","hoverStartTime","onTouchStart","_onTouchEnd","hoverStayTime","onTouchEnd","forwardedRef","plain","children","className","style","onClick","loading","type","size","restProps","__rest","handleClick","useCallback","cls","classNames","_el$","_tmpl$","_$use","_$spread","_$mergeProps","omit","toString","_$insert","_tmpl$2","createForwardRefComponent"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/button/index.tsx"],"sourcesContent":["import './style/index.scss'\n\nimport { View } from '@tarojs/components'\nimport classNames from 'classnames'\n\nimport { createForwardRefComponent, omit } from '../../utils'\nimport { useCallback, useEffect, useRef, useState } from '../../utils/hooks'\n\nimport type React from 'react'\n\ninterface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {\n  size?: string\n  plain?: boolean\n  hoverClass?: string\n  hoverStartTime?: number\n  hoverStayTime?: number\n  disabled?: boolean\n  loading?: boolean\n  type?: string\n  className?: string\n  forwardedRef?: React.MutableRefObject<HTMLButtonElement>\n  onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void\n  formType?: 'submit' | 'reset'\n}\n\ninterface IState {\n  hover: boolean\n  touch: boolean\n}\n\nfunction Button (props: IProps) {\n  const startTimer = useRef<ReturnType<typeof setTimeout>>()\n  const endTimer = useRef<ReturnType<typeof setTimeout>>()\n  const [state, setState] = useState<IState>({\n    hover: false,\n    touch: false\n  })\n\n  useEffect(() => {\n    return () => {\n      startTimer.current && clearTimeout(startTimer.current)\n      endTimer.current && clearTimeout(endTimer.current)\n    }\n  }, [])\n\n  const _onTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: true\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      startTimer.current = setTimeout(() => {\n        if ((state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: true\n          }))\n        }\n      }, props.hoverStartTime || 20)\n    }\n    props.onTouchStart && props.onTouchStart(e)\n  }\n\n  const _onTouchEnd = (e: React.TouchEvent<HTMLButtonElement>) => {\n    setState((e) => ({\n      ...e,\n      touch: false\n    }))\n    if (props.hoverClass && props.hoverClass !== 'none' && !props.disabled) {\n      endTimer.current = setTimeout(() => {\n        if (!(state as IState).touch) {\n          setState((e) => ({\n            ...e,\n            hover: false\n          }))\n        }\n      }, props.hoverStayTime || 70)\n    }\n\n    if (!props.disabled && props.formType) {\n      const eventName = props.formType === 'submit' ? 'tarobuttonsubmit' : 'tarobuttonreset'\n      e.currentTarget.dispatchEvent(new CustomEvent(eventName, { bubbles: true }))\n    }\n\n    props.onTouchEnd && props.onTouchEnd(e)\n  }\n\n  const { forwardedRef, plain = false, children, disabled = false, className, style, onClick, hoverClass = 'button-hover', loading = false, type = 'default', size, formType, ...restProps } = props\n\n  const handleClick = useCallback(\n    (e: React.MouseEvent<HTMLButtonElement>) => {\n      if (disabled) {\n        // 按钮禁用时阻止事件冒泡并不触发点击回调\n        e.stopPropagation()\n        return\n      }\n      // 按钮可用时触发点击回调\n      onClick?.(e)\n    },\n    [disabled, onClick]\n  )\n\n  const cls = classNames(\n    className,\n    'taro-button-core',\n    {\n      [`${hoverClass}`]: (state as IState).hover && !disabled,\n      'taro-btn-disabled': disabled,\n      'taro-btn-loading': loading,\n      'taro-btn-plain': plain,\n      'taro-btn-mini': size === 'mini',\n      'taro-btn-default': type === 'default',\n      'taro-btn-primary': type === 'primary',\n      'taro-btn-warn': type === 'warn'\n    }\n  )\n\n  return (\n    <View\n      {...omit(restProps, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef', 'size', 'plain', 'disabled', 'onClick', 'formType'])}\n      type={type}\n      size={size}\n      disabled={disabled}\n      ref={forwardedRef}\n      className={cls}\n      style={style}\n      onClick={handleClick}\n      onTouchStart={_onTouchStart}\n      onTouchEnd={_onTouchEnd}\n      plain={plain.toString()}\n      form-type={formType as any}\n    >\n      {!!loading && <View className='weui-loading' />}\n      {children}\n    </View>\n  )\n}\n\nexport default createForwardRefComponent(Button)\n"],"names":["Button","props","startTimer","useRef","endTimer","state","setState","useState","hover","touch","useEffect","current","clearTimeout","_onTouchStart","e","Object","assign","hoverClass","disabled","setTimeout","hoverStartTime","onTouchStart","_onTouchEnd","hoverStayTime","formType","eventName","currentTarget","dispatchEvent","CustomEvent","bubbles","onTouchEnd","forwardedRef","plain","children","className","style","onClick","loading","type","size","restProps","__rest","handleClick","useCallback","stopPropagation","cls","classNames","_$createComponent","View","_$mergeProps","omit","ref","toString","_$memo","createForwardRefComponent"],"mappings":";;;;;;;;AA8BA,SAASA,MAAMA,CAAEC,KAAa,EAAA;AAC5B,EAAA,MAAMC,UAAU,GAAGC,MAAM,EAAiC;AAC1D,EAAA,MAAMC,QAAQ,GAAGD,MAAM,EAAiC;AACxD,EAAA,MAAM,CAACE,KAAK,EAAEC,QAAQ,CAAC,GAAGC,QAAQ,CAAS;AACzCC,IAAAA,KAAK,EAAE,KAAK;AACZC,IAAAA,KAAK,EAAE;AACR,GAAA,CAAC;AAEFC,EAAAA,SAAS,CAAC,MAAK;AACb,IAAA,OAAO,MAAK;MACVR,UAAU,CAACS,OAAO,IAAIC,YAAY,CAACV,UAAU,CAACS,OAAO,CAAC;MACtDP,QAAQ,CAACO,OAAO,IAAIC,YAAY,CAACR,QAAQ,CAACO,OAAO,CAAC;KACnD;GACF,EAAE,EAAE,CAAC;EAEN,MAAME,aAAa,GAAIC,CAAsC,IAAI;AAC/DR,IAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJL,MAAAA,KAAK,EAAE;AAAI,KAAA,CACX,CAAC;AACH,IAAA,IAAIR,KAAK,CAACgB,UAAU,IAAIhB,KAAK,CAACgB,UAAU,KAAK,MAAM,IAAI,CAAChB,KAAK,CAACiB,QAAQ,EAAE;AACtEhB,MAAAA,UAAU,CAACS,OAAO,GAAGQ,UAAU,CAAC,MAAK;QACnC,IAAKd,KAAgB,CAACI,KAAK,EAAE;AAC3BH,UAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJN,YAAAA,KAAK,EAAE;AAAI,WAAA,CACX,CAAC;AACL;AACF,OAAC,EAAEP,KAAK,CAACmB,cAAc,IAAI,EAAE,CAAC;AAChC;IACAnB,KAAK,CAACoB,YAAY,IAAIpB,KAAK,CAACoB,YAAY,CAACP,CAAC,CAAC;GAC5C;EAED,MAAMQ,WAAW,GAAIR,CAAsC,IAAI;AAC7DR,IAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJL,MAAAA,KAAK,EAAE;AAAK,KAAA,CACZ,CAAC;AACH,IAAA,IAAIR,KAAK,CAACgB,UAAU,IAAIhB,KAAK,CAACgB,UAAU,KAAK,MAAM,IAAI,CAAChB,KAAK,CAACiB,QAAQ,EAAE;AACtEd,MAAAA,QAAQ,CAACO,OAAO,GAAGQ,UAAU,CAAC,MAAK;AACjC,QAAA,IAAI,CAAEd,KAAgB,CAACI,KAAK,EAAE;AAC5BH,UAAAA,QAAQ,CAAEQ,CAAC,IAAKC,MAAA,CAAAC,MAAA,CAAAD,MAAA,CAAAC,MAAA,CAAA,EAAA,EACXF,CAAC,CAAA,EAAA;AACJN,YAAAA,KAAK,EAAE;AAAK,WAAA,CACZ,CAAC;AACL;AACF,OAAC,EAAEP,KAAK,CAACsB,aAAa,IAAI,EAAE,CAAC;AAC/B;IAEA,IAAI,CAACtB,KAAK,CAACiB,QAAQ,IAAIjB,KAAK,CAACuB,QAAQ,EAAE;MACrC,MAAMC,SAAS,GAAGxB,KAAK,CAACuB,QAAQ,KAAK,QAAQ,GAAG,kBAAkB,GAAG,iBAAiB;MACtFV,CAAC,CAACY,aAAa,CAACC,aAAa,CAAC,IAAIC,WAAW,CAACH,SAAS,EAAE;AAAEI,QAAAA,OAAO,EAAE;AAAM,OAAA,CAAC,CAAC;AAC9E;IAEA5B,KAAK,CAAC6B,UAAU,IAAI7B,KAAK,CAAC6B,UAAU,CAAChB,CAAC,CAAC;GACxC;EAED,MAAM;MAAEiB,YAAY;AAAEC,MAAAA,KAAK,GAAG,KAAK;MAAEC,QAAQ;AAAEf,MAAAA,QAAQ,GAAG,KAAK;MAAEgB,SAAS;MAAEC,KAAK;MAAEC,OAAO;AAAEnB,MAAAA,UAAU,GAAG,cAAc;AAAEoB,MAAAA,OAAO,GAAG,KAAK;AAAEC,MAAAA,IAAI,GAAG,SAAS;MAAEC,IAAI;AAAEf,MAAAA;AAA2B,KAAA,GAAAvB,KAAK;AAAnBuC,IAAAA,SAAS,GAAAC,MAAA,CAAKxC,KAAK,EAA5L,CAAA,cAAA,EAAA,OAAA,EAAA,UAAA,EAAA,UAAA,EAAA,WAAA,EAAA,OAAA,EAAA,SAAA,EAAA,YAAA,EAAA,SAAA,EAAA,MAAA,EAAA,MAAA,EAAA,UAAA,CAAoL,CAAQ;AAElM,EAAA,MAAMyC,WAAW,GAAGC,WAAW,CAC5B7B,CAAsC,IAAI;AACzC,IAAA,IAAII,QAAQ,EAAE;AACZ;MACAJ,CAAC,CAAC8B,eAAe,EAAE;AACnB,MAAA;AACF;AACA;AACAR,IAAAA,OAAO,aAAPA,OAAO,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAPA,OAAO,CAAGtB,CAAC,CAAC;AACd,GAAC,EACD,CAACI,QAAQ,EAAEkB,OAAO,CAAC,CACpB;AAED,EAAA,MAAMS,GAAG,GAAGC,UAAU,CACpBZ,SAAS,EACT,kBAAkB,EAClB;IACE,CAAC,CAAA,EAAGjB,UAAU,CAAE,CAAA,GAAIZ,KAAgB,CAACG,KAAK,IAAI,CAACU,QAAQ;AACvD,IAAA,mBAAmB,EAAEA,QAAQ;AAC7B,IAAA,kBAAkB,EAAEmB,OAAO;AAC3B,IAAA,gBAAgB,EAAEL,KAAK;IACvB,eAAe,EAAEO,IAAI,KAAK,MAAM;IAChC,kBAAkB,EAAED,IAAI,KAAK,SAAS;IACtC,kBAAkB,EAAEA,IAAI,KAAK,SAAS;IACtC,eAAe,EAAEA,IAAI,KAAK;AAC3B,GAAA,CACF;AAED,EAAA,OAAAS,eAAA,CACGC,IAAI,EAAAC,UAAA,CACCC,MAAAA,IAAI,CAACV,SAAS,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,EAAA;AACxJF,IAAAA,IAAI,EAAEA,IAAI;AACVC,IAAAA,IAAI,EAAEA,IAAI;AACVrB,IAAAA,QAAQ,EAAEA,QAAQ;AAAAiC,IAAAA,GAAA,EACbpB,YAAY;AACjBG,IAAAA,SAAS,EAAEW,GAAG;AACdV,IAAAA,KAAK,EAAEA,KAAK;AACZC,IAAAA,OAAO,EAAEM,WAAW;AACpBrB,IAAAA,YAAY,EAAER,aAAa;AAC3BiB,IAAAA,UAAU,EAAER,WAAW;AAAA,IAAA,IACvBU,KAAKA,GAAA;AAAA,MAAA,OAAEA,KAAK,CAACoB,QAAQ,EAAE;AAAA,KAAA;AAAA,IAAA,WAAA,EACZ5B,QAAe;AAAA,IAAA,IAAAS,QAAA,GAAA;MAAA,OAAAoB,CAAAA,IAAA,OAEzB,CAAC,CAAChB,OAAO,IAAAU,eAAA,CAAKC,IAAI,EAAA;QAACd,SAAS,EAAA;AAAA,OAAA,CAAkB,GAC9CD,QAAQ,CAAA;AAAA;AAAA,GAAA,CAAA,CAAA;AAGf;AAEA,YAAeqB,yBAAyB,CAACtD,MAAM,CAAC;;;;"}

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

@@ -1,46 +1,12 @@
-import { template, use, spread, mergeProps, getOwner, effect, style, insert, addEventListener, setAttribute } from 'solid-js/web';
+import { template, use, spread, insert, addEventListener, setAttribute, effect, style } from 'solid-js/web';
 import { __rest } from 'tslib';
 import './style/index.scss.js';
 import classNames from 'classnames';
 import { createForwardRefComponent } from '../../utils/index.js';
-import { useRef, useState, useEffect, useCallback } from '../../utils/hooks.solid.js';
+import { useRef, useState, useCallback, useEffect } from '../../utils/hooks.solid.js';
 
-var _tmpl$ = /*#__PURE__*/template(`<div><canvas-tag>`, true, false, false),
-  _tmpl$2 = /*#__PURE__*/template(`<div>`),
-  _tmpl$3 = /*#__PURE__*/template(`<img>`);
-// CDN脚本URL
-const LEGO_CDN_URL = 'http://ossin.jd.com/swm-plus/h5Tag/tag.js';
-// 检查CDN脚本是否已加载
-const isLegoScriptLoaded = () => {
-  return document.querySelector(`script[src="${LEGO_CDN_URL}"]`) !== null;
-};
-// 插入CDN脚本
-const insertLegoScript = () => {
-  if (isLegoScriptLoaded()) return;
-  const script = document.createElement('script');
-  script.type = 'module';
-  script.src = LEGO_CDN_URL;
-  document.head.appendChild(script);
-};
-// 解析lego协议URL
-const parseLegoUrl = src => {
-  if (!src.startsWith('lego://')) return null;
-  try {
-    // 移除 'lego://' 前缀
-    const urlWithoutProtocol = src.substring(7);
-    // 分割tagId和参数
-    const [tagId, params] = urlWithoutProtocol.split('?');
-    // 解析参数
-    const text = params ? new URLSearchParams(params).get('text') || '' : '';
-    return {
-      tagId,
-      text
-    };
-  } catch (error) {
-    console.warn('Failed to parse lego URL:', src, error);
-    return null;
-  }
-};
+var _tmpl$ = /*#__PURE__*/template(`<div>`),
+  _tmpl$2 = /*#__PURE__*/template(`<img>`);
 function Image(props) {
   const imgRef = useRef(null);
   const observer = useRef({});
@@ -53,21 +19,9 @@ function Image(props) {
       onError,
       lazyLoad,
       imgProps,
-      forwardedRef,
-      lang
+      forwardedRef
     } = props,
-    reset = __rest(props
-    // 检查是否为lego模式
-    , ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef", "lang"]);
-  // 检查是否为lego模式
-  const legoData = parseLegoUrl(src);
-  const isLegoMode = legoData !== null;
-  // 如果是lego模式，确保CDN脚本已加载
-  useEffect(() => {
-    if (isLegoMode) {
-      insertLegoScript();
-    }
-  }, [isLegoMode]);
+    reset = __rest(props, ["className", "style", "src", "mode", "onError", "lazyLoad", "imgProps", "forwardedRef"]);
   const cls = classNames('taro-img', {
     'taro-img__widthfix': mode === 'widthFix'
   }, className);
@@ -106,55 +60,32 @@ function Image(props) {
       (_b = (_a = observer.current) === null || _a === void 0 ? void 0 : _a.disconnect) === null || _b === void 0 ? void 0 : _b.call(_a);
     };
   }, [lazyLoad, src]);
-  // 如果是lego模式，渲染canvas-tag
-  if (isLegoMode && legoData) {
-    return (() => {
-      var _el$ = _tmpl$(),
-        _el$2 = _el$.firstChild;
-      use(forwardedRef, _el$);
-      _el$.className = cls;
-      spread(_el$, reset, false, true);
-      _el$2.lang = lang;
-      spread(_el$2, mergeProps({
-        get tagId() {
-          return legoData.tagId;
-        },
-        get text() {
-          return legoData.text;
-        }
-      }, imgProps), false, false);
-      _el$2._$owner = getOwner();
-      effect(_$p => style(_el$, style$1, _$p));
-      return _el$;
-    })();
-  }
-  // 普通图片模式
   return (() => {
-    var _el$3 = _tmpl$2();
-    use(forwardedRef, _el$3);
-    _el$3.className = cls;
-    spread(_el$3, reset, false, true);
-    insert(_el$3, lazyLoad ? (() => {
-      var _el$4 = _tmpl$3();
-      addEventListener(_el$4, "error", onError);
-      addEventListener(_el$4, "load", imageOnLoad);
-      use(img => imgRef.current = img, _el$4);
-      _el$4.className = imgCls;
-      setAttribute(_el$4, "data-src", src);
-      spread(_el$4, imgProps, false, false);
-      return _el$4;
+    var _el$ = _tmpl$();
+    use(forwardedRef, _el$);
+    _el$.className = cls;
+    spread(_el$, reset, false, true);
+    insert(_el$, lazyLoad ? (() => {
+      var _el$2 = _tmpl$2();
+      addEventListener(_el$2, "error", onError);
+      addEventListener(_el$2, "load", imageOnLoad);
+      use(img => imgRef.current = img, _el$2);
+      _el$2.className = imgCls;
+      setAttribute(_el$2, "data-src", src);
+      spread(_el$2, imgProps, false, false);
+      return _el$2;
     })() : (() => {
-      var _el$5 = _tmpl$3();
-      addEventListener(_el$5, "error", onError);
-      addEventListener(_el$5, "load", imageOnLoad);
-      use(img => imgRef.current = img, _el$5);
-      _el$5.className = imgCls;
-      setAttribute(_el$5, "src", src);
-      spread(_el$5, imgProps, false, false);
-      return _el$5;
+      var _el$3 = _tmpl$2();
+      addEventListener(_el$3, "error", onError);
+      addEventListener(_el$3, "load", imageOnLoad);
+      use(img => imgRef.current = img, _el$3);
+      _el$3.className = imgCls;
+      setAttribute(_el$3, "src", src);
+      spread(_el$3, imgProps, false, false);
+      return _el$3;
     })());
-    effect(_$p => style(_el$3, style$1, _$p));
-    return _el$3;
+    effect(_$p => style(_el$, style$1, _$p));
+    return _el$;
   })();
 }
 var index = createForwardRefComponent(Image);

package/dist/solid/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  lang?: string\n}\n\n// CDN脚本URL\nconst LEGO_CDN_URL = 'http://ossin.jd.com/swm-plus/h5Tag/tag.js'\n\n// 检查CDN脚本是否已加载\nconst isLegoScriptLoaded = (): boolean => {\n  return document.querySelector(`script[src=\"${LEGO_CDN_URL}\"]`) !== null\n}\n\n// 插入CDN脚本\nconst insertLegoScript = (): void => {\n  if (isLegoScriptLoaded()) return\n\n  const script = document.createElement('script')\n  script.type = 'module'\n  script.src = LEGO_CDN_URL\n  document.head.appendChild(script)\n}\n\n// 解析lego协议URL\nconst parseLegoUrl = (src: string): { tagId: string, text: string } | null => {\n  if (!src.startsWith('lego://')) return null\n\n  try {\n    // 移除 'lego://' 前缀\n    const urlWithoutProtocol = src.substring(7)\n\n    // 分割tagId和参数\n    const [tagId, params] = urlWithoutProtocol.split('?')\n\n    // 解析参数\n    const text = params ? new URLSearchParams(params).get('text') || '' : ''\n\n    return { tagId, text }\n  } catch (error) {\n    console.warn('Failed to parse lego URL:', src, error)\n    return null\n  }\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    lang,\n    ...reset\n  } = props\n\n  // 检查是否为lego模式\n  const legoData = parseLegoUrl(src)\n  const isLegoMode = legoData !== null\n\n  // 如果是lego模式，确保CDN脚本已加载\n  useEffect(() => {\n    if (isLegoMode) {\n      insertLegoScript()\n    }\n  }, [isLegoMode])\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  // 如果是lego模式，渲染canvas-tag\n  if (isLegoMode && legoData) {\n    return (\n      <div className={cls} style={style} ref={forwardedRef} {...reset}>\n        <canvas-tag\n          tagId={legoData.tagId}\n          text={legoData.text}\n          lang={lang}\n          {...imgProps}\n        />\n      </div>\n    )\n  }\n\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":["LEGO_CDN_URL","isLegoScriptLoaded","document","querySelector","insertLegoScript","script","createElement","type","src","head","appendChild","parseLegoUrl","startsWith","urlWithoutProtocol","substring","tagId","params","split","text","URLSearchParams","get","error","console","warn","Image","props","imgRef","useRef","observer","setIsLoaded","useState","className","style","mode","onError","lazyLoad","imgProps","forwardedRef","lang","reset","__rest","legoData","isLegoMode","useEffect","cls","classNames","imgCls","toLowerCase","replace","imageOnLoad","useCallback","e","onLoad","Object","defineProperty","enumerable","writable","value","width","target","height","current","IntersectionObserver","entries","length","isIntersecting","rootMargin","_b","_a","observe","call","disconnect","_el$","_tmpl$","_el$2","firstChild","_$use","_$spread","_$mergeProps","_$owner","_$getOwner","_$effect","_$p","_$style","_el$3","_tmpl$2","_$insert","_el$4","_tmpl$3","_$addEventListener","img","_$setAttribute","_el$5","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","_el$","_tmpl$","_$use","_$spread","_$insert","_el$2","_tmpl$2","_$addEventListener","img","_$setAttribute","_el$3","_$effect","_$p","_$style","createForwardRefComponent"],"mappings":";;;;;;;;;AAmBA,SAASA,KAAKA,CAAEC,KAAa,EAAA;AAC3B,EAAA,MAAMC,MAAM,GAAGC,MAAM,CAA0B,IAAI,CAAC;AACpD,EAAA,MAAMC,QAAQ,GAAGD,MAAM,CAAgC,EAAE,CAAC;AAC1D,EAAA,MAAM,GAAGE,WAAW,CAAC,GAAGC,QAAQ,CAAC,KAAK,CAAC;EACvC,MAAM;MACJC,SAAS;aACTC,OAAK,GAAG,EAAE;MACVC,GAAG;MACHC,IAAI;MACJC,OAAO;MACPC,QAAQ;MACRC,QAAQ;AACRC,MAAAA;AAAY,KAAA,GAEVb,KAAK;IADJc,KAAK,GAAAC,MAAA,CACNf,KAAK,EAVH,CAUL,WAAA,EAAA,OAAA,EAAA,KAAA,EAAA,MAAA,EAAA,SAAA,EAAA,UAAA,EAAA,UAAA,EAAA,cAAA,CAAA,CAAQ;AAET,EAAA,MAAMgB,GAAG,GAAGC,UAAU,CACpB,UAAU,EACV;IACE,oBAAoB,EAAER,IAAI,KAAK;GAChC,EACDH,SAAS,CACV;EACD,MAAMY,MAAM,GAAGD,UAAU,CACvB,iBAAiB,GACf,CAACR,IAAI,IAAI,aAAa,EAAEU,WAAW,EAAE,CAACC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3D;AAED,EAAA,MAAMC,WAAW,GAAGC,WAAW,CAAEC,CAAC,IAAI;IACpC,MAAM;AAAEC,MAAAA;AAAQ,KAAA,GAAGxB,KAAK;AACxByB,IAAAA,MAAM,CAACC,cAAc,CAACH,CAAC,EAAE,QAAQ,EAAE;AACjCI,MAAAA,UAAU,EAAE,IAAI;AAChBC,MAAAA,QAAQ,EAAE,IAAI;AACdC,MAAAA,KAAK,EAAE;AACLC,QAAAA,KAAK,EAAEP,CAAC,CAACQ,MAAM,CAACD,KAAK;AACrBE,QAAAA,MAAM,EAAET,CAAC,CAACQ,MAAM,CAACC;AAClB;AACF,KAAA,CAAC;AAEFR,IAAAA,MAAM,IAAIA,MAAM,CAACD,CAAC,CAAC;AACrB,GAAC,EAAE,CAACvB,KAAK,CAAC,CAAC;AAEXiC,EAAAA,SAAS,CAAC,MAAK;;AACb,IAAA,IAAItB,QAAQ,EAAE;AACZR,MAAAA,QAAQ,CAAC+B,OAAO,GAAG,IAAIC,oBAAoB,CACzCC,OAAO,IAAG;AACR;QACA,IAAIA,OAAO,CAACA,OAAO,CAACC,MAAM,GAAG,CAAC,CAAC,CAACC,cAAc,EAAE;UAC9ClC,WAAW,CAAC,IAAI,CAAC;AACjB;AACAH,UAAAA,MAAM,CAACiC,OAAQ,CAAC1B,GAAG,GAAGA,GAAG;AAC3B;AACF,OAAC,EACD;AACE+B,QAAAA,UAAU,EAAE;AACb,OAAA,CACF;AACD,MAAA,CAAAC,EAAA,GAAA,CAAAC,EAAA,GAAAtC,QAAQ,CAAC+B,OAAO,EAACQ,OAAO,MAAA,IAAA,IAAAF,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAAA,EAAA,CAAAG,IAAA,CAAAF,EAAA,EAAGxC,MAAM,CAACiC,OAAQ,CAAC;AAC7C;AAEA,IAAA,OAAO,MAAK;;AACV,MAAA,CAAAM,EAAA,GAAA,MAAArC,QAAQ,CAAC+B,OAAO,MAAE,IAAA,IAAAO,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAAA,EAAA,CAAAG,UAAU,kDAAI;KACjC;AACH,GAAC,EAAE,CAACjC,QAAQ,EAAEH,GAAG,CAAC,CAAC;AAEnB,EAAA,OAAA,CAAA,MAAA;IAAA,IAAAqC,IAAA,GAAAC,MAAA,EAAA;IAAAC,GAAA,CAC0ClC,YAAY,EAAAgC,IAAA,CAAA;IAAAA,IAAA,CAAAvC,SAAA,GAApCU,GAAG;IAAAgC,MAAA,CAAAH,IAAA,EAAuC/B,KAAK,EAAA,KAAA,EAAA,IAAA,CAAA;IAAAmC,MAAA,CAAAJ,IAAA,EAC5DlC,QAAQ,GAAA,CAAA,MAAA;MAAA,IAAAuC,KAAA,GAAAC,OAAA,EAAA;MAAAC,gBAAA,CAAAF,KAAA,EAAA,OAAA,EAMIxC,OAAO,CAAA;MAAA0C,gBAAA,CAAAF,KAAA,EAAA,MAAA,EADR7B,WAAW,CAAA;MAAA0B,GAAA,CAHdM,GAAG,IAAKpD,MAAM,CAACiC,OAAO,GAAGmB,GAAI,EAAAH,KAAA,CAAA;MAAAA,KAAA,CAAA5C,SAAA,GACvBY,MAAM;MAAAoC,YAAA,CAAAJ,KAAA,EAAA,UAAA,EACP1C,GAAG,CAAA;MAAAwC,MAAA,CAAAE,KAAA,EAGTtC,QAAQ,EAAA,KAAA,EAAA,KAAA,CAAA;AAAA,MAAA,OAAAsC,KAAA;AAAA,KAAA,GAAA,GAAA,CAAA,MAAA;MAAA,IAAAK,KAAA,GAAAJ,OAAA,EAAA;MAAAC,gBAAA,CAAAG,KAAA,EAAA,OAAA,EAQH7C,OAAO,CAAA;MAAA0C,gBAAA,CAAAG,KAAA,EAAA,MAAA,EADRlC,WAAW,CAAA;MAAA0B,GAAA,CAHdM,GAAG,IAAKpD,MAAM,CAACiC,OAAO,GAAGmB,GAAI,EAAAE,KAAA,CAAA;MAAAA,KAAA,CAAAjD,SAAA,GACvBY,MAAM;MAAAoC,YAAA,CAAAC,KAAA,EAAA,KAAA,EACZ/C,GAAG,CAAA;MAAAwC,MAAA,CAAAO,KAAA,EAGJ3C,QAAQ,EAAA,KAAA,EAAA,KAAA,CAAA;AAAA,MAAA,OAAA2C,KAAA;KAEf,GAAA,CAAA;IAAAC,MAAA,CAAAC,GAAA,IAAAC,KAAA,CAAAb,IAAA,EAnByBtC,OAAK,EAAAkD,GAAA,CAAA,CAAA;AAAA,IAAA,OAAAZ,IAAA;AAAA,GAAA,GAAA;AAsBrC;AAEA,YAAec,yBAAyB,CAAC5D,KAAK,CAAC;;;;"}

package/dist/solid/index.css

@@ -1 +1 @@
-@-webkit-keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.taro-button-core[loading]>.weui-loading{animation:weuiLoading 1s steps(12) infinite;background:transparent url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E") no-repeat;background-size:100%;display:inline-block;height:20px;vertical-align:middle;width:20px}.taro-button-core[loading]>.weui-loading.weui-btn_primary,.taro-button-core[loading]>.weui-loading.weui-btn_warn{color:hsla(0,0%,100%,.6)}.taro-button-core[loading]>.weui-loading.weui-btn_primary{background-color:#179b16}.taro-button-core[loading]>.weui-loading.weui-btn_warn{background-color:#ce3c39}.taro-button-core{-webkit-tap-highlight-color:rgba(0,0,0,0);appearance:none;background-color:#f8f8f8;border:1px solid rgba(0,0,0,.2);border-radius:10px;box-sizing:border-box;color:#000;display:block;font-size:18px;line-height:2.55555556;margin-left:auto;margin-right:auto;outline:0;overflow:hidden;padding-left:14px;padding-right:14px;position:relative;text-align:center;text-decoration:none;width:100%}.taro-button-core:focus{outline:0}.taro-button-core:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core+.taro-button-core{margin-top:15px}.taro-button-core.taro-btn-default{background-color:#f8f8f8;color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):visited{color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core.taro-btn-mini{display:inline-block;font-size:13px;line-height:2.3;padding:0 1.32em;width:auto}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-warn{background-color:transparent;border-width:1px}.taro-button-core.taro-btn-disabled{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-disabled.taro-btn-default{background-color:#f7f7f7;color:rgba(0,0,0,.3)}.taro-button-core.taro-btn-disabled.taro-btn-primary{background-color:#9ed99d}.taro-button-core.taro-btn-disabled.taro-btn-warn{background-color:#ec8b89}.taro-button-core.taro-btn-loading .weui-loading{margin:-.2em .34em 0 0}.taro-button-core.taro-btn-loading.taro-btn-primary,.taro-button-core.taro-btn-loading.taro-btn-warn{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-loading.taro-btn-primary{background-color:#179b16}.taro-button-core.taro-btn-loading.taro-btn-warn{background-color:#ce3c39}.taro-button-core.taro-btn-plain.taro-btn-primary{border:1px solid #1aad19;color:#1aad19}.taro-button-core.taro-btn-plain.taro-btn-primary:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(26,173,25,.6);color:rgba(26,173,25,.6)}.taro-button-core.taro-btn-plain.taro-btn-primary:after{border-width:0}.taro-button-core.taro-btn-plain.taro-btn-warn{border:1px solid #e64340;color:#e64340}.taro-button-core.taro-btn-plain.taro-btn-warn:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(230,67,64,.6);color:rgba(230,67,64,.6)}.taro-button-core.taro-btn-plain.taro-btn-warn:after{border-width:0}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default{border:1px solid #353535;color:#353535}.taro-button-core.taro-btn-plain.taro-btn-default:not(.taro-btn-disabled):active,.taro-button-core.taro-btn-plain:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(53,53,53,.6);color:rgba(53,53,53,.6)}.taro-button-core.taro-btn-plain.taro-btn-default:after,.taro-button-core.taro-btn-plain:after{border-width:0}.taro-button-core.taro-btn-primary{background-color:#1aad19;color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):active{background-color:#179b16;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-warn{background-color:#e64340;color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):active{background-color:#ce3c39;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-warn{background-color:#f7f7f7;border:1px solid rgba(0,0,0,.2);color:rgba(0,0,0,.3)}.weui-icon-circle:before{content:"\ea01"}.weui-icon-download:before{content:"\ea02"}.weui-icon-info:before{content:"\ea03"}.weui-icon-safe-success:before{content:"\ea04"}.weui-icon-safe-warn:before{content:"\ea05"}.weui-icon-success:before{content:"\ea06"}.weui-icon-success-circle:before{content:"\ea07"}.weui-icon-success-no-circle:before{content:"\ea08"}.weui-icon-waiting:before{content:"\ea09"}.weui-icon-waiting-circle:before{content:"\ea0a"}.weui-icon-warn:before{content:"\ea0b"}.weui-icon-info-circle:before{content:"\ea0c"}.weui-icon-cancel:before{content:"\ea0d"}.weui-icon-search:before{content:"\ea0e"}.weui-icon-clear:before{content:"\ea0f"}.weui-icon-back:before{content:"\ea10"}.weui-icon-delete:before{content:"\ea11"}.weui-icon-success{color:#09bb07;font-size:23px}.weui-icon-waiting{color:#10aeff;font-size:23px}.weui-icon-warn{color:#f43530;font-size:23px}.weui-icon-info{color:#10aeff;font-size:23px}.weui-icon-success-circle,.weui-icon-success-no-circle{color:#09bb07;font-size:23px}.weui-icon-waiting-circle{color:#10aeff;font-size:23px}.weui-icon-circle{color:#c9c9c9;font-size:23px}.weui-icon-download,.weui-icon-info-circle{color:#09bb07;font-size:23px}.weui-icon-safe-success{color:#09bb07}.weui-icon-safe-warn{color:#ffbe00}.weui-icon-cancel{color:#f43530;font-size:22px}.weui-icon-clear,.weui-icon-search{color:#b2b2b2;font-size:14px}.weui-icon-delete.weui-icon_gallery-delete{color:#fff;font-size:22px}.weui-icon_msg{font-size:93px}.weui-icon_msg.weui-icon-warn{color:#f76260}.weui-icon_msg-primary{font-size:93px}.weui-icon_msg-primary.weui-icon-warn{color:#ffbe00}img[src=""]{opacity:0}.taro-img{display:inline-block;font-size:0;height:240px;overflow:hidden;position:relative;width:320px}.taro-img.taro-img__widthfix,.taro-img__mode-heightfix{height:100%}.taro-img__mode-scaletofill{height:100%;width:100%}.taro-img__mode-aspectfit{height:100%;object-fit:contain;width:100%}.taro-img__mode-aspectfill{height:100%;object-fit:cover;width:100%}.taro-img__mode-widthfix{width:100%}.taro-img__mode-bottom,.taro-img__mode-top{left:50%;position:absolute;transform:translate(-50%)}.taro-img__mode-bottom{bottom:0}.taro-img__mode-center{left:50%;position:absolute;top:50%;transform:translate(-50%,-50%)}.taro-img__mode-left,.taro-img__mode-right{position:absolute;top:50%;transform:translateY(-50%)}.taro-img__mode-right{right:0}.taro-img__mode-topright{position:absolute;right:0}.taro-img__mode-bottomleft{bottom:0;position:absolute}.taro-img__mode-bottomright{bottom:0;position:absolute;right:0}.taro-picker__overlay{position:fixed;z-index:1000}.taro-picker__mask-overlay,.taro-picker__overlay{bottom:0;height:100%;left:0;right:0;top:0;width:100%}.taro-picker__mask-overlay{background-color:rgba(0,0,0,.6);position:absolute;z-index:1001}.taro-picker{background-color:#e5e5e5;bottom:0;font-size:14px;left:0;position:absolute;width:100%;z-index:1002}.taro-picker__hd{align-items:center;background-color:#fff;display:flex;font-size:17px;height:44px;justify-content:space-between;padding:0;position:relative}.taro-picker__hd:after{background-color:#e5e5e5;bottom:0;content:"";height:1px;left:0;position:absolute;transform:scaleY(.5);width:100%}.taro-picker__action{color:#ff0f23;flex:0 0 auto;font-size:14px;height:44px;line-height:44px;padding:0 10px}.taro-picker__action:first-child{color:#888}.taro-picker__title{color:#000;font-size:16px;font-weight:500;left:50%;max-width:40%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:50%;transform:translate(-50%,-50%);white-space:nowrap}.taro-picker__bd{background-color:#fff;height:238px;overflow:hidden;width:100%}.taro-picker__bd,.taro-picker__group{box-sizing:border-box;display:flex;flex:1}.taro-picker__group{align-items:center;height:100%;justify-content:center;min-width:0;position:relative}.taro-picker__group--date .taro-picker__columns{display:flex;height:100%;width:100%}.taro-picker__mask{background:linear-gradient(180deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6) 40%,hsla(0,0%,100%,0) 45%,hsla(0,0%,100%,0) 55%,hsla(0,0%,100%,.6) 60%,hsla(0,0%,100%,.95));height:100%;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:1}.taro-picker__indicator{box-sizing:border-box;height:34px;left:0;position:absolute;top:50%;transform:translateY(-50%);width:100%;z-index:1002}.taro-picker__indicator:after,.taro-picker__indicator:before{background-color:#e5e5e5;content:"";height:1px;left:0;position:absolute;right:0;transform:scaleY(.5)}.taro-picker__indicator:before{top:0}.taro-picker__indicator:after{bottom:0}.taro-picker__content{box-sizing:border-box;height:100%;width:100%}.taro-picker__item{align-items:center;box-sizing:border-box;color:#000;display:flex;font-size:16px;height:34px;justify-content:center;line-height:34px;overflow:hidden;padding:0 8px;text-align:center;text-overflow:ellipsis;white-space:nowrap;width:100%}.taro-picker__item--selected{color:#ff0f23;font-weight:500}.taro-picker__item--disabled{color:#999}.taro-picker__column{flex:1;margin:0 8px}.taro-picker__column:first-child{margin-left:0}.taro-picker__column:last-child{margin-right:0}.taro-picker__item--custom{align-items:center;color:#888;display:flex;font-weight:400;justify-content:center;text-align:center}@keyframes taro-picker__slide-up{0%{transform:translate3d(0,100%,0)}to{transform:translateZ(0)}}@keyframes taro-picker__slide-down{0%{transform:translateZ(0)}to{transform:translate3d(0,100%,0)}}@keyframes taro-picker__fade-in{0%{opacity:0}to{opacity:1}}@keyframes taro-picker__fade-out{0%{opacity:1}to{opacity:0}}.taro-scroll{-webkit-overflow-scrolling:auto}.taro-scroll--hidebar::-webkit-scrollbar{display:none}.taro-scroll-view{overflow:hidden}.taro-scroll-view__scroll-x{overflow-x:scroll;overflow-y:hidden}.taro-scroll-view__scroll-y{overflow-x:hidden;overflow-y:scroll}.taro-text{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.taro-text__selectable{-moz-user-select:text;-webkit-user-select:text;-ms-user-select:text;user-select:text}
+@-webkit-keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes weuiLoading{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.taro-button-core.taro-btn-loading .weui-loading{animation:weuiLoading 1s steps(12) infinite;background:transparent url(https://img13.360buyimg.com/imagetools/jfs/t1/353674/27/5761/14397/690ac1cfFf6bf0e2c/77727d0791bacf8e.png) no-repeat;background-size:cover;display:inline-block;height:22px;width:22px}.taro-button-core.taro-btn-loading .weui-loading.weui-btn_primary,.taro-button-core.taro-btn-loading .weui-loading.weui-btn_warn{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-loading .weui-loading.weui-btn_primary{background-color:#179b16}.taro-button-core.taro-btn-loading .weui-loading.weui-btn_warn{background-color:#ce3c39}.taro-button-core.taro-btn-loading.taro-btn-mini .weui-loading{display:inline-block;height:16px;vertical-align:middle;width:16px}.taro-button-core{-webkit-tap-highlight-color:rgba(0,0,0,0);align-items:center;appearance:none;background-color:#f8f8f8;border:1px solid rgba(0,0,0,.2);border-radius:10px;box-sizing:border-box;color:#000;display:flex;font-size:18px;justify-content:center;outline:0;overflow:hidden;padding:0 14px;position:relative;text-decoration:none;width:100%}.taro-button-core:focus{outline:0}.taro-button-core:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core+.taro-button-core{margin-top:15px}.taro-button-core.taro-btn-default{background-color:#f8f8f8;color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):visited{color:#000}.taro-button-core.taro-btn-default:not(.taro-btn-disabled):active{background-color:#dedede;color:rgba(0,0,0,.6)}.taro-button-core.taro-btn-mini{display:inline-block;font-size:13px;padding:0 26px;vertical-align:middle;width:auto}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-warn{background-color:transparent;border-width:1px}.taro-button-core.taro-btn-disabled{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-disabled.taro-btn-default{background-color:#f7f7f7;color:rgba(0,0,0,.3)}.taro-button-core.taro-btn-disabled.taro-btn-primary{background-color:#9ed99d}.taro-button-core.taro-btn-disabled.taro-btn-warn{background-color:#ec8b89}.taro-button-core.taro-btn-loading.taro-btn-primary,.taro-button-core.taro-btn-loading.taro-btn-warn{color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-loading.taro-btn-primary{background-color:#179b16}.taro-button-core.taro-btn-loading.taro-btn-warn{background-color:#ce3c39}.taro-button-core.taro-btn-plain.taro-btn-primary{border:1px solid #1aad19;color:#1aad19}.taro-button-core.taro-btn-plain.taro-btn-primary:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(26,173,25,.6);color:rgba(26,173,25,.6)}.taro-button-core.taro-btn-plain.taro-btn-primary:after{border-width:0}.taro-button-core.taro-btn-plain.taro-btn-warn{border:1px solid #e64340;color:#e64340}.taro-button-core.taro-btn-plain.taro-btn-warn:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(230,67,64,.6);color:rgba(230,67,64,.6)}.taro-button-core.taro-btn-plain.taro-btn-warn:after{border-width:0}.taro-button-core.taro-btn-plain,.taro-button-core.taro-btn-plain.taro-btn-default{border:1px solid #353535;color:#353535}.taro-button-core.taro-btn-plain.taro-btn-default:not(.taro-btn-disabled):active,.taro-button-core.taro-btn-plain:not(.taro-btn-disabled):active{background-color:transparent;border-color:rgba(53,53,53,.6);color:rgba(53,53,53,.6)}.taro-button-core.taro-btn-plain.taro-btn-default:after,.taro-button-core.taro-btn-plain:after{border-width:0}.taro-button-core.taro-btn-primary{background-color:#1aad19;color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-primary:not(.taro-btn-disabled):active{background-color:#179b16;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-warn{background-color:#e64340;color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):visited{color:#fff}.taro-button-core.taro-btn-warn:not(.taro-btn-disabled):active{background-color:#ce3c39;color:hsla(0,0%,100%,.6)}.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-default,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-primary,.taro-button-core.taro-btn-plain.taro-btn-disabled.taro-btn-warn{background-color:#f7f7f7;border:1px solid rgba(0,0,0,.2);color:rgba(0,0,0,.3)}.weui-icon-circle:before{content:"\ea01"}.weui-icon-download:before{content:"\ea02"}.weui-icon-info:before{content:"\ea03"}.weui-icon-safe-success:before{content:"\ea04"}.weui-icon-safe-warn:before{content:"\ea05"}.weui-icon-success:before{content:"\ea06"}.weui-icon-success-circle:before{content:"\ea07"}.weui-icon-success-no-circle:before{content:"\ea08"}.weui-icon-waiting:before{content:"\ea09"}.weui-icon-waiting-circle:before{content:"\ea0a"}.weui-icon-warn:before{content:"\ea0b"}.weui-icon-info-circle:before{content:"\ea0c"}.weui-icon-cancel:before{content:"\ea0d"}.weui-icon-search:before{content:"\ea0e"}.weui-icon-clear:before{content:"\ea0f"}.weui-icon-back:before{content:"\ea10"}.weui-icon-delete:before{content:"\ea11"}.weui-icon-success{color:#09bb07;font-size:23px}.weui-icon-waiting{color:#10aeff;font-size:23px}.weui-icon-warn{color:#f43530;font-size:23px}.weui-icon-info{color:#10aeff;font-size:23px}.weui-icon-success-circle,.weui-icon-success-no-circle{color:#09bb07;font-size:23px}.weui-icon-waiting-circle{color:#10aeff;font-size:23px}.weui-icon-circle{color:#c9c9c9;font-size:23px}.weui-icon-download,.weui-icon-info-circle{color:#09bb07;font-size:23px}.weui-icon-safe-success{color:#09bb07}.weui-icon-safe-warn{color:#ffbe00}.weui-icon-cancel{color:#f43530;font-size:22px}.weui-icon-clear,.weui-icon-search{color:#b2b2b2;font-size:14px}.weui-icon-delete.weui-icon_gallery-delete{color:#fff;font-size:22px}.weui-icon_msg{font-size:93px}.weui-icon_msg.weui-icon-warn{color:#f76260}.weui-icon_msg-primary{font-size:93px}.weui-icon_msg-primary.weui-icon-warn{color:#ffbe00}img[src=""]{opacity:0}.taro-img{display:inline-block;font-size:0;height:240px;overflow:hidden;position:relative;width:320px}.taro-img.taro-img__widthfix,.taro-img__mode-heightfix{height:100%}.taro-img__mode-scaletofill{height:100%;width:100%}.taro-img__mode-aspectfit{height:100%;object-fit:contain;width:100%}.taro-img__mode-aspectfill{height:100%;object-fit:cover;width:100%}.taro-img__mode-widthfix{width:100%}.taro-img__mode-bottom,.taro-img__mode-top{left:50%;position:absolute;transform:translate(-50%)}.taro-img__mode-bottom{bottom:0}.taro-img__mode-center{left:50%;position:absolute;top:50%;transform:translate(-50%,-50%)}.taro-img__mode-left,.taro-img__mode-right{position:absolute;top:50%;transform:translateY(-50%)}.taro-img__mode-right{right:0}.taro-img__mode-topright{position:absolute;right:0}.taro-img__mode-bottomleft{bottom:0;position:absolute}.taro-img__mode-bottomright{bottom:0;position:absolute;right:0}.taro-picker__overlay{position:fixed;z-index:1000}.taro-picker__mask-overlay,.taro-picker__overlay{bottom:0;height:100%;left:0;right:0;top:0;width:100%}.taro-picker__mask-overlay{background-color:rgba(0,0,0,.6);position:absolute;z-index:1001}.taro-picker{background-color:#e5e5e5;bottom:0;font-size:14px;left:0;position:absolute;width:100%;z-index:1002}.taro-picker__hd{align-items:center;background-color:#fff;display:flex;font-size:17px;height:44px;justify-content:space-between;padding:0;position:relative}.taro-picker__hd:after{background-color:#e5e5e5;bottom:0;content:"";height:1px;left:0;position:absolute;transform:scaleY(.5);width:100%}.taro-picker__action{color:#ff0f23;flex:0 0 auto;font-size:14px;height:44px;line-height:44px;padding:0 10px}.taro-picker__action:first-child{color:#888}.taro-picker__title{color:#000;font-size:16px;font-weight:500;left:50%;max-width:40%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:50%;transform:translate(-50%,-50%);white-space:nowrap}.taro-picker__bd{background-color:#fff;height:238px;overflow:hidden;width:100%}.taro-picker__bd,.taro-picker__group{box-sizing:border-box;display:flex;flex:1}.taro-picker__group{align-items:center;height:100%;justify-content:center;min-width:0;position:relative}.taro-picker__group--date .taro-picker__columns{display:flex;height:100%;width:100%}.taro-picker__mask{background:linear-gradient(180deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6) 40%,hsla(0,0%,100%,0) 45%,hsla(0,0%,100%,0) 55%,hsla(0,0%,100%,.6) 60%,hsla(0,0%,100%,.95));height:100%;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:1}.taro-picker__indicator{box-sizing:border-box;height:34px;left:0;position:absolute;top:50%;transform:translateY(-50%);width:100%;z-index:1002}.taro-picker__indicator:after,.taro-picker__indicator:before{background-color:#e5e5e5;content:"";height:1px;left:0;position:absolute;right:0;transform:scaleY(.5)}.taro-picker__indicator:before{top:0}.taro-picker__indicator:after{bottom:0}.taro-picker__content{box-sizing:border-box;height:100%;width:100%}.taro-picker__item{align-items:center;box-sizing:border-box;color:#000;display:flex;font-size:16px;height:34px;justify-content:center;line-height:34px;overflow:hidden;padding:0 8px;text-align:center;text-overflow:ellipsis;white-space:nowrap;width:100%}.taro-picker__item--selected{color:#ff0f23;font-weight:500}.taro-picker__item--disabled{color:#999}.taro-picker__column{flex:1;margin:0 8px}.taro-picker__column:first-child{margin-left:0}.taro-picker__column:last-child{margin-right:0}.taro-picker__item--custom{align-items:center;color:#888;display:flex;font-weight:400;justify-content:center;text-align:center}@keyframes taro-picker__slide-up{0%{transform:translate3d(0,100%,0)}to{transform:translateZ(0)}}@keyframes taro-picker__slide-down{0%{transform:translateZ(0)}to{transform:translate3d(0,100%,0)}}@keyframes taro-picker__fade-in{0%{opacity:0}to{opacity:1}}@keyframes taro-picker__fade-out{0%{opacity:1}to{opacity:0}}.taro-scroll{-webkit-overflow-scrolling:auto}.taro-scroll--hidebar::-webkit-scrollbar{display:none}.taro-scroll-view{overflow:hidden}.taro-scroll-view__scroll-x{overflow-x:scroll;overflow-y:hidden}.taro-scroll-view__scroll-y{overflow-x:hidden;overflow-y:scroll}.taro-text{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.taro-text__selectable{-moz-user-select:text;-webkit-user-select:text;-ms-user-select:text;user-select:text}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-react",
-  "version": "4.1.8-beta.2",
+  "version": "4.1.8",
   "description": "",
   "main:h5": "dist/index.js",
   "main": "dist/index.js",
@@ -29,9 +29,9 @@
     "identity-obj-proxy": "^3.0.0",
     "swiper": "11.1.15",
     "tslib": "^2.6.2",
-    "@tarojs/shared": "4.1.8-beta.2",
-    "@tarojs/taro": "4.1.8-beta.2",
-    "@tarojs/components": "4.1.8-beta.2"
+    "@tarojs/components": "4.1.8",
+    "@tarojs/shared": "4.1.8",
+    "@tarojs/taro": "4.1.8"
   },
   "devDependencies": {
     "@babel/plugin-transform-runtime": "^7.24.1",
@@ -47,8 +47,8 @@
     "jest-environment-jsdom": "^29.7.0",
     "solid-js": "^1.8.16",
     "ts-jest": "^29.1.1",
-    "@tarojs/runtime": "4.1.8-beta.2",
-    "@tarojs/helper": "4.1.8-beta.2"
+    "@tarojs/helper": "4.1.8",
+    "@tarojs/runtime": "4.1.8"
   },
   "peerDependencies": {
     "react": "*",