Merge branch '3.x' into fix/types

NervJS · Sep 16, 2024 · 7945c38 · 7945c38
2 parents 4e6c51f + 36173b8
commit 7945c38
Show file tree

Hide file tree

Showing 98 changed files with 323 additions and 144 deletions.
diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Node binding for taro",
   "main": "binding.js",
   "typings": "binding.d.ts",

diff --git a/examples/mini-program-example/src/pages/index/index.tsx b/examples/mini-program-example/src/pages/index/index.tsx
@@ -49,21 +49,20 @@ export default function Index() {
       </Button>
       <Button
         onClick={()=>{
-          nativeApi.harmonyNavigateTo({
-            indexHtmlPath: '/spa/new/index.html',
-            taroPath: 'pages/performance/index/index'
+          Taro.navigateTo({
+            url: 'pages/harmony-hybrid/mix-router/home/index'
           })
         }}>
-        多实例（多SPA跳转）：性能列表页
+        多实例及混合路由测试页
       </Button>
       <Button
         onClick={()=>{
-          nativeApi.harmonyNavigateTo({
+          nativeApi.navigateToTaroHybrid({
             indexHtmlPath: '/spa/new/index.html',
-            taroPath: 'pages/api/index/index'
+            taroPath: '/pages/index/index'
           })
         }}>
-        单实例（单SPA）：接口列表页
+        多实例（单SPA）：首页
       </Button>
     </View>
   )

diff --git a/examples/mini-program-example/src/util/nativeApi.ts b/examples/mini-program-example/src/util/nativeApi.ts
@@ -1,13 +1,14 @@
 // @ts-ignore
-const decorator = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
+const sync = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
 
 // @proxyClassSign('')
 class NativeApi {
-  // @ts-ignore
-  @decorator
-  harmonyNavigateTo(options: any) {
-    return options
-  }
+  @sync
+  navigateToTaroHybrid(_options: any) {}
+
+
+  @sync
+  navigateToNative(_options: any){}
 }
 
 const nativeApi = new NativeApi()

diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-arm64",
   "description": "Native binding for taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "os": [
     "darwin"
   ],

diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-x64",
   "description": "Native binding for taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "os": [
     "darwin"
   ],

diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-linux-x64-gnu",
   "description": "Native binding for taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "os": [
     "linux"
   ],

diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding-linux-x64-musl",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "os": [
     "linux"
   ],

diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-win32-x64-msvc",
   "description": "Native binding for taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "开放式跨端跨框架开发解决方案",
   "homepage": "https://github.com/NervJS/taro#readme",
   "author": "O2Team",

diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",

diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro babel preset",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/create-app",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "create taro app with one command",
   "author": "VincentW <Vincent.Mr.W@gmail.com>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/create-app#readme",

diff --git a/packages/css-to-react-native/package.json b/packages/css-to-react-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [

diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro specific linting rules for ESLint",
   "main": "index.js",
   "files": [

diff --git a/packages/postcss-html-transform/package.json b/packages/postcss-html-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-html-transform",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "transform html tag name selector",
   "main": "index.js",
   "author": "drchan",

diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "parse constants defined in config",
   "main": "index.js",
   "author": "Simba",

diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "main": "index.js",
   "keywords": [

diff --git a/packages/postcss-unit-transform/package.json b/packages/postcss-unit-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-taro-unit-transform",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "小程序单位转换",
   "main": "index.js",
   "scripts": {

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro utils internal use.",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/shared#readme",

diff --git a/packages/stylelint-config-taro-rn/package.json b/packages/stylelint-config-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-taro-rn",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Shareable stylelint config for React Native CSS modules",
   "main": "index.js",
   "files": [

diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stylelint-taro-rn",
   "description": "A collection of React Native specific rules for stylelint",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "main": "dist/index.js",
   "files": [
     "dist",

diff --git a/packages/taro-alipay/package.json b/packages/taro-alipay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-alipay",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "支付宝小程序平台插件",
   "author": "Chen-jj",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-alipay#readme",

diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro common API",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/api#readme",

diff --git a/packages/taro-cli-convertor/package.json b/packages/taro-cli-convertor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli-convertor",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "cli tool for taro-convert",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "cli tool for taro",
   "main": "index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-components-advanced/package.json b/packages/taro-components-advanced/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-react",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro 组件库 React 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue2/package.json b/packages/taro-components-library-vue2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue2",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro 组件库 Vue2 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue3",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "Taro 组件库 Vue3 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-react",
-  "version": "3.6.34",
+  "version": "3.6.35",
   "description": "",
   "main:h5": "src/index.js",
   "main": "dist/index.js",

diff --git a/packages/taro-components-react/src/components/button/index.tsx b/packages/taro-components-react/src/components/button/index.tsx
@@ -3,7 +3,7 @@ import './style/index.scss'
 import classNames from 'classnames'
 import React from 'react'
 
-import { omit } from '../../utils'
+import { createForwardRefComponent, omit } from '../../utils'
 
 interface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'> {
   size?: string
@@ -15,6 +15,7 @@ interface IProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'ty
   loading?: boolean
   type?: string
   className?: string
+  forwardedRef?: React.MutableRefObject<HTMLButtonElement>
 }
 
 interface IState {
@@ -54,6 +55,7 @@ class Button extends React.Component<IProps, IState> {
       hoverStayTime = 70,
       loading = false,
       type,
+      forwardedRef,
     } = this.props
     const cls = classNames(
       className,
@@ -96,8 +98,9 @@ class Button extends React.Component<IProps, IState> {
 
     return (
       <button
-        {...omit(this.props, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading'])}
+        {...omit(this.props, ['hoverClass', 'onTouchStart', 'onTouchEnd', 'type', 'loading', 'forwardedRef'])}
         type={type}
+        ref={forwardedRef}
         className={cls}
         style={style}
         onClick={onClick}
@@ -114,4 +117,4 @@ class Button extends React.Component<IProps, IState> {
   }
 }
 
-export default Button
+export default createForwardRefComponent(Button)
diff --git a/packages/taro-components-react/src/components/icon/index.tsx b/packages/taro-components-react/src/components/icon/index.tsx
@@ -3,18 +3,19 @@ import './style/index.scss'
 import classNames from 'classnames'
 import React from 'react'
 
-import { omit } from '../../utils'
+import { createForwardRefComponent, omit } from '../../utils'
 
 
 interface IProps {
   type: string
   color: string
   size?: number | string
   className?: string
+  forwardedRef?: React.MutableRefObject<HTMLLIElement>
 }
 
 const Icon = (props: IProps) => {
-  let { type, className = '', size = '23', color } = props
+  let { type, className = '', size = '23', color, forwardedRef } = props
   if (type) type = type.replace(/_/g, '-')
   const cls = classNames(
     {
@@ -25,7 +26,7 @@ const Icon = (props: IProps) => {
   const style = { 'font-size': size + 'px', color: color }
 
   return (
-    <i {...omit(props, ['type', 'className'])} className={cls} style={style} />
+    <i {...omit(props, ['type', 'className', 'forwardedRef'])} className={cls} style={style} ref={forwardedRef} />
   )
 }
-export default Icon
+export default createForwardRefComponent(Icon)