@tarojs/taro-h5 3.5.0-beta.1 → 3.5.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.5.0-beta.1",
+  "version": "3.5.0-beta.4",
   "description": "Taro h5 framework",
   "browser": "dist/index.esm.js",
   "main:h5": "dist/index.js",
@@ -33,14 +33,14 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.5.0-beta.1",
-    "@tarojs/router": "3.5.0-beta.1",
-    "@tarojs/runtime": "3.5.0-beta.1",
+    "@tarojs/api": "3.5.0-beta.4",
+    "@tarojs/router": "3.5.0-beta.4",
+    "@tarojs/runtime": "3.5.0-beta.4",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
     "query-string": "^7.1.1",
     "whatwg-fetch": "^3.4.0"
   },
-  "gitHead": "ba9d945ccebb86f06edb7f845110526d92dc7b00"
+  "gitHead": "7aca7841ed7e2af1b182ff5d24e91f44730ce783"
 }

package/src/api/base/weapp/app-event.ts

@@ -1,4 +1,39 @@
+import Taro from '@tarojs/api'
+import { parse } from 'query-string'
+
 import { temporarilyNotSupport } from '../../../utils'
+import { CallbackManager } from '../../../utils/handler'
+
+const appShowCallbackManager = new CallbackManager()
+const appHideCallbackManager = new CallbackManager()
+
+const getApp = () => {
+  const path = Taro.Current.page?.path
+  return {
+    /** 小程序切前台的路径 */
+    path: path?.substring(0, path.indexOf('?')),
+    /** 小程序切前台的 query 参数 */
+    query: parse(location.search),
+    /** 来源信息。 */
+    referrerInfo: {},
+    /** 小程序切前台的[场景值](https://developers.weixin.qq.com/miniprogram/dev/framework/app-service/scene.html) */
+    scene: 0,
+    /** shareTicket，详见[获取更多转发信息](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share.html) */
+    shareTicket: ''
+  }
+}
+
+const appShowListener = () => {
+  if (document.visibilityState !== 'hidden') {
+    appShowCallbackManager.trigger(getApp())
+  }
+}
+
+const appHideListener = () => {
+  if (document.visibilityState === 'hidden') {
+    appHideCallbackManager.trigger(getApp())
+  }
+}
 
 // 应用级事件
 export const onUnhandledRejection = temporarilyNotSupport('onUnhandledRejection')
@@ -7,13 +42,38 @@ export const onPageNotFound = temporarilyNotSupport('onPageNotFound')
 export const onError = temporarilyNotSupport('onError')
 export const onAudioInterruptionEnd = temporarilyNotSupport('onAudioInterruptionEnd')
 export const onAudioInterruptionBegin = temporarilyNotSupport('onAudioInterruptionBegin')
-export const onAppShow = temporarilyNotSupport('onAppShow')
-export const onAppHide = temporarilyNotSupport('onAppHide')
+
+export const onAppShow: typeof Taro.onAppShow = callback => {
+  appShowCallbackManager.add(callback)
+  if (appShowCallbackManager.count() === 1) {
+    window.addEventListener('visibilitychange', appShowListener)
+  }
+}
+
+export const onAppHide: typeof Taro.onAppHide = callback => {
+  appHideCallbackManager.add(callback)
+  if (appHideCallbackManager.count() === 1) {
+    window.addEventListener('visibilitychange', appHideListener)
+  }
+}
+
 export const offUnhandledRejection = temporarilyNotSupport('offUnhandledRejection')
 export const offThemeChange = temporarilyNotSupport('offThemeChange')
 export const offPageNotFound = temporarilyNotSupport('offPageNotFound')
 export const offError = temporarilyNotSupport('offError')
 export const offAudioInterruptionEnd = temporarilyNotSupport('offAudioInterruptionEnd')
 export const offAudioInterruptionBegin = temporarilyNotSupport('offAudioInterruptionBegin')
-export const offAppShow = temporarilyNotSupport('offAppShow')
-export const offAppHide = temporarilyNotSupport('offAppHide')
+
+export const offAppShow: typeof Taro.offWindowResize = callback => {
+  appShowCallbackManager.remove(callback)
+  if (appShowCallbackManager.count() === 0) {
+    window.removeEventListener('visibilitychange', appShowListener)
+  }
+}
+
+export const offAppHide: typeof Taro.offWindowResize = callback => {
+  appHideCallbackManager.remove(callback)
+  if (appHideCallbackManager.count() === 0) {
+    window.removeEventListener('visibilitychange', appHideListener)
+  }
+}

package/src/api/media/audio/InnerAudioContext.ts

@@ -29,7 +29,7 @@ export class InnerAudioContext implements Taro.InnerAudioContext {
   get duration () { return this.Instance?.duration || 0 }
   set loop (e) { this.setProperty('loop', e) }
   get loop () { return this.Instance?.loop || false }
-  get paused () { return this.Instance?.paused || true }
+  get paused () { return this.Instance?.paused ?? true }
   set src (e) { this.setProperty('src', e) }
   get src () { return this.Instance?.src || '' }
   set volume (e) { this.setProperty('volume', e) }

package/src/api/network/upload.ts

@@ -32,7 +32,7 @@ const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout,
     callbackManager.progressUpdate.trigger({
       progress: Math.round(loaded / total * 100),
       totalBytesSent: loaded,
-      totalBytesExpectedToSent: total
+      totalBytesExpectedToSend: total
     })
   }
 

package/src/api/network/websocket/socketTask.ts

@@ -6,7 +6,7 @@ export class SocketTask {
   OPEN: number
   CLOSING: number
   CLOSED: number
-  closeDetail: { code: any; reason: any }
+  closeDetail: { code: any, reason: any }
   _destroyWhenClose?: () => void
 
   constructor (url, protocols) {