@tarojs/taro-h5 3.5.0-beta.2 → 3.5.0-beta.5

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/device/vibrate.ts

@@ -2,11 +2,11 @@ import Taro from '@tarojs/api'
 
 import { MethodHandler } from '../../utils/handler'
 
-const vibrator = function vibrator (mm) {
+const vibrator = function vibrator (mm: number | number[]) {
   try {
     return window.navigator.vibrate(mm)
   } catch (e) {
-    console.warn('当前浏览器不支持vibrate')
+    console.warn('当前浏览器不支持 vibrate。')
   }
 }
 
@@ -15,11 +15,10 @@ const vibrator = function vibrator (mm) {
  */
 export const vibrateShort: typeof Taro.vibrateShort = ({ success, fail, complete } = {}) => {
   const handle = new MethodHandler({ name: 'vibrateShort', success, fail, complete })
-  if (vibrator) {
-    vibrator(15)
+  if (vibrator(15)) {
     return handle.success()
   } else {
-    return handle.fail()
+    return handle.fail({ errMsg: 'style is not support' })
   }
 }
 
@@ -28,10 +27,9 @@ export const vibrateShort: typeof Taro.vibrateShort = ({ success, fail, complete
  */
 export const vibrateLong: typeof Taro.vibrateLong = ({ success, fail, complete } = {}) => {
   const handle = new MethodHandler({ name: 'vibrateLong', success, fail, complete })
-  if (vibrator) {
-    vibrator(400)
+  if (vibrator(400)) {
     return handle.success()
   } else {
-    return handle.fail()
+    return handle.fail({ errMsg: 'style is not support' })
   }
 }

package/src/api/location/index.ts

@@ -18,5 +18,6 @@ export const offLocationChange = temporarilyNotSupport('offLocationChange')
 export { getLocation } from './getLocation'
 
 export const choosePoi = temporarilyNotSupport('choosePoi')
+export const getFuzzyLocation = temporarilyNotSupport('getFuzzyLocation')
 
 export { chooseLocation } from './chooseLocation'

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/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) {

package/src/api/ui/interaction/modal.ts

@@ -182,6 +182,7 @@ export default class Modal {
         this.title.style.display = 'block'
         this.text.setAttribute('style', inlineStyle(textStyle))
       } else {
+        this.title.textContent = ''
         // block => none
         this.title.style.display = 'none'
         const textCSS = {

package/src/api/wxml/selectorQuery.ts

@@ -38,7 +38,7 @@ function filter (fields, dom?: HTMLElement, selector?: string) {
         res.node = null
       }
     } else {
-      // TODO https://developers.weixin.qq.com/miniprogram/dev/component/scroll-view.html
+      // TODO https://developers.weixin.qq.com/miniprogram/dev/api/ui/scroll/ScrollViewContext.html
       // if (/^taro-scroll-view-core/i.test(tagName))
       res.nodeCanvasType = ''
       res.node = dom

package/types/api.d.ts

@@ -0,0 +1,4 @@
+declare module '@tarojs/api' {
+  import Taro from '@tarojs/taro'
+  export = Taro
+}

package/types/define.d.ts

@@ -0,0 +1,2 @@
+// NOTE: 允许用户自定义的常量
+declare const LOCATION_APIKEY: string | undefined

package/types/index.d.ts

@@ -0,0 +1,3 @@
+import TaroH5 from './type'
+
+export = TaroH5

package/types/overlay.d.ts

@@ -0,0 +1,9 @@
+import Taro from '@tarojs/taro'
+
+declare module '@tarojs/taro' {
+  namespace vibrateShort {
+    interface Option {
+      type?: 'heavy' | 'medium' | 'light'
+    }
+  }
+}

package/types/type.ts

@@ -0,0 +1,32 @@
+import Taro from '@tarojs/api'
+
+namespace Router {
+  export interface Location {
+    path: string
+    search: string
+    hash: string
+    state: {
+      key: string
+    }
+    params: {
+      [key: string]: string
+    }
+  }
+  export interface RouterParams {
+    path: string
+    scene: number
+    params: {
+      [key: string]: string
+    }
+    shareTicket: string
+    referrerInfo: Record<string, any>
+  }
+}
+
+interface TaroH5 {
+  _$router: Router.Location
+  $router: Router.RouterParams
+}
+
+const TaroH5: TaroH5 & typeof Taro = {} as any
+export default TaroH5

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/api/base/weapp/app-event.js

@@ -1,18 +0,0 @@
-import { temporarilyNotSupport } from '../../../utils';
-// 应用级事件
-export const onUnhandledRejection = temporarilyNotSupport('onUnhandledRejection');
-export const onThemeChange = temporarilyNotSupport('onThemeChange');
-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 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');