Merge pull request #2 from NervJS/next

拉取上游更新
NervJS · Aug 22, 2022 · 6f65560 · 6f65560
2 parents 041b33b + 91c2f53
commit 6f65560
Show file tree

Hide file tree

Showing 84 changed files with 1,249 additions and 1,274 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {

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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "keywords": [
     "postcss",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "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/shared/src/utils.ts b/packages/shared/src/utils.ts
@@ -172,9 +172,13 @@ export function getComponentsAlias (origin: typeof internalComponents) {
   Object.keys(origin)
     .sort((a, b) => {
       const reg = /^(Static|Pure|Catch)*(View|Image|Text)$/
-      if (reg.test(a)) {
+      const isACommonly = reg.test(a)
+      const isBCommonly = reg.test(b)
+      if (isACommonly && isBCommonly) {
+        return a > b ? 1 : -1
+      } else if (isACommonly) {
         return -1
-      } else if (reg.test(b)) {
+      } else if (isBCommonly) {
         return 1
       } else {
         return a >= b ? 1 : -1

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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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.5.3",
+  "version": "3.5.4",
   "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/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "description": "cli tool for taro",
   "main": "index.js",
   "scripts": {

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.5.3",
+  "version": "3.5.4",
   "description": "",
   "main:h5": "src/index.js",
   "main": "dist/index.js",

diff --git a/packages/taro-components-rn/package.json b/packages/taro-components-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-rn",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "description": "多端解决方案基础组件（RN）",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/packages/taro-components-rn/src/components/Video/index.tsx b/packages/taro-components-rn/src/components/Video/index.tsx
@@ -290,7 +290,7 @@ class _Video extends Component<Props, any> {
     const detail: onFullscreenChangeEventDetail = {
       fullScreen: fullscreenUpdate === PLAYER_WILL_PRESENT || fullscreenUpdate === PLAYER_DID_PRESENT,
       fullscreenUpdate,
-      direction: 1,
+      direction: 'vertical',
       ...status,
     }
     if (this.state.isFullScreen !== fullScreen) {

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

diff --git a/packages/taro-components/src/components/input/input.tsx b/packages/taro-components/src/components/input/input.tsx
@@ -144,6 +144,7 @@ export class Input implements ComponentInterface {
         value,
         cursor: value.length
       })
+      this.onInputExcuted = false
     }
   }
 

diff --git a/packages/taro-components/src/components/swiper/swiper.tsx b/packages/taro-components/src/components/swiper/swiper.tsx
@@ -272,8 +272,8 @@ export class Swiper implements ComponentInterface {
         slideTo () {
           that.current = this.realIndex
         },
-        // slideChange 事件在 swiper.slideTo 改写 current 时不触发，因此用 slideChangeTransitionEnd 事件代替
-        slideChangeTransitionEnd (_swiper: ISwiper) {
+         // slideChange 事件在 swiper.slideTo 改写 current 时不触发，因此用 slideChangeTransitionStart 事件代替
+         slideChangeTransitionStart (_swiper: ISwiper) {
           if (that.circular) {
             if (_swiper.isBeginning || _swiper.isEnd) {
               _swiper.slideToLoop(this.realIndex, 0) // 更新下标
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,6 +144,7 @@ export class Input implements ComponentInterface { @@
             value,
             cursor: value.length
           })
+          this.onInputExcuted = false
         }
       }
@@ Expand Down @@