Merge branch 'main' into hybrid

StarJacky · Jan 29, 2024 · cc468e2 · cc468e2
2 parents e789db0 + c094615
commit cc468e2
Show file tree

Hide file tree

Showing 7 changed files with 344 additions and 4 deletions.
diff --git a/packages/taro-components-react/src/components/icon/index.tsx b/packages/taro-components-react/src/components/icon/index.tsx
@@ -0,0 +1,31 @@
+import './style/index.scss'
+
+import classNames from 'classnames'
+import React from 'react'
+
+import { omit } from '../../utils'
+
+
+interface IProps {
+  type: string
+  color: string
+  size?: number | string
+  className?: string
+}
+
+const Icon = (props: IProps) => {
+  let { type, className = '', size = '23', color } = props
+  if (type) type = type.replace(/_/g, '-')
+  const cls = classNames(
+    {
+      [`weui-icon-${type}`]: true
+    },
+    className
+  )
+  const style = { 'font-size': size + 'px', color: color }
+
+  return (
+    <i {...omit(props, ['type', 'className'])} className={cls} style={style} />
+  )
+}
+export default Icon
diff --git a/packages/taro-components-react/src/components/icon/style/index.scss b/packages/taro-components-react/src/components/icon/style/index.scss
diff --git a/packages/taro-components-react/src/index.ts b/packages/taro-components-react/src/index.ts
@@ -22,7 +22,7 @@ export { Editor } from '@tarojs/components/lib/react'
 export { FollowSwan } from '@tarojs/components/lib/react'
 export { Form } from '@tarojs/components/lib/react'
 export { FunctionalPageNavigator } from '@tarojs/components/lib/react'
-export { Icon } from '@tarojs/components/lib/react'
+export { default as Icon } from './components/icon'
 export { default as Image } from './components/image'
 export { InlinePaymentPanel } from '@tarojs/components/lib/react'
 export { Input } from '@tarojs/components/lib/react'

diff --git a/packages/taro-components/types/Picker.d.ts b/packages/taro-components/types/Picker.d.ts
@@ -3,6 +3,11 @@ import { StyleProp, TextStyle, ViewStyle } from 'react-native'
 import { StandardProps, CommonEventFunction, FormItemProps } from './common'
 /** 选择器通用参数 */
 interface PickerStandardProps extends StandardProps, FormItemProps {
+  /**
+   * 选择器的标题，微信小程序中仅安卓可用
+   * @supported weapp
+   */
+  headerText?: string
   /**
    * 选择器类型，默认是普通选择器
    * @default "selector"

diff --git a/packages/taro-h5/rollup.config.ts b/packages/taro-h5/rollup.config.ts
@@ -31,7 +31,7 @@ const baseConfig: RollupOptions = {
     }),
     commonjs() as InputPluginOption,
     postcss({
-      extract: true,
+      // extract: true, Note: 开启需要在 @tarojs/plugin-platform-h5 中的 API 引入样式
       inject: { insertAt: 'top' },
       minimize: true,
     }) as InputPluginOption,

diff --git a/packages/taro-platform-h5/src/program.ts b/packages/taro-platform-h5/src/program.ts
@@ -119,7 +119,7 @@ export default class H5 extends TaroPlatformWeb {
               break
             default:
               if (this.useHtmlComponents) {
-                args[0].loaderMeta.extraImportForWeb += `import { PullDownRefresh } from '@tarojs/components'\n`
+                args[0].loaderMeta.extraImportForWeb += `import '@tarojs/components-react/dist/index.css'\nimport { PullDownRefresh } from '@tarojs/components'\n`
                 args[0].loaderMeta.execBeforeCreateWebApp += `config.PullDownRefresh = PullDownRefresh\n`
               }
           }

diff --git a/packages/taro-platform-harmony-hybrid/src/program.ts b/packages/taro-platform-harmony-hybrid/src/program.ts
@@ -122,7 +122,7 @@ export default class H5 extends TaroPlatformWeb {
             break
           default:
             if (this.useHtmlComponents) {
-              args[0].loaderMeta.extraImportForWeb += `import { PullDownRefresh } from '@tarojs/components'\n`
+              args[0].loaderMeta.extraImportForWeb += `import '@tarojs/components-react/dist/index.css'\nimport { PullDownRefresh } from '@tarojs/components'\n`
               args[0].loaderMeta.execBeforeCreateWebApp += `config.PullDownRefresh = PullDownRefresh\n`
             }
         }