@mpxjs/core 2.9.67 → 2.9.69-beta.0

package/src/platform/createApp.ios.js

@@ -1,14 +1,15 @@
 import transferOptions from '../core/transferOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
-import { makeMap, spreadProp, parseUrlQuery } from '@mpxjs/utils'
+import { makeMap, spreadProp, parseUrlQuery, getFocusedNavigation, hasOwn, extend } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
-import * as wxLifecycle from '../platform/patch/wx/lifecycle'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
+import { Image } from 'react-native'
 import { ref } from '../observer/ref'
 
-const appHooksMap = makeMap(mergeLifecycle(wxLifecycle.LIFECYCLE).app)
+const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
 function getOrientation (window = ReactNative.Dimensions.get('window')) {
   return window.width > window.height ? 'landscape' : 'portrait'
@@ -30,11 +31,7 @@ function filterOptions (options, appData) {
 }
 
 function createAppInstance (appData) {
-  const instance = {
-    ...Mpx.prototype,
-    ...appData
-  }
-  return instance
+  return extend({}, Mpx.prototype, appData)
 }
 
 export default function createApp (option, config = {}) {
@@ -84,12 +81,6 @@ export default function createApp (option, config = {}) {
     }
   }
 
-  global.__mpxAppCbs = global.__mpxAppCbs || {
-    show: [],
-    hide: [],
-    error: []
-  }
-
   global.__mpxAppLaunched = false
 
   global.__mpxAppFocusedState = ref('show')
@@ -140,18 +131,39 @@ export default function createApp (option, config = {}) {
       if (defaultOptions.onError) {
         global.__mpxAppCbs.error.push(defaultOptions.onError.bind(instance))
       }
+      if (defaultOptions.onUnhandledRejection) {
+        global.__mpxAppCbs.rejection.push(defaultOptions.onUnhandledRejection.bind(instance))
+      }
 
       const changeSubscription = ReactNative.AppState.addEventListener('change', (currentState) => {
         if (currentState === 'active') {
+          let options = global.__mpxEnterOptions
+          const navigation = getFocusedNavigation()
+          if (navigation) {
+            const state = navigation.getState()
+            const current = state.routes[state.index]
+            options = {
+              path: current.name,
+              query: current.params,
+              scene: 0,
+              shareTicket: '',
+              referrerInfo: {}
+            }
+          }
           global.__mpxAppCbs.show.forEach((cb) => {
-            cb(global.__mpxEnterOptions)
+            cb(options)
           })
-          global.__mpxAppFocusedState.value = 'show'
-        } else if (currentState === 'inactive') {
+          if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+            global.__mpxPageStatusMap[navigation.pageId] = 'show'
+          }
+        } else if (currentState === 'inactive' || currentState === 'background') {
           global.__mpxAppCbs.hide.forEach((cb) => {
             cb()
           })
-          global.__mpxAppFocusedState.value = 'hide'
+          const navigation = getFocusedNavigation()
+          if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+            global.__mpxPageStatusMap[navigation.pageId] = 'hide'
+          }
         }
       })
 
@@ -161,7 +173,10 @@ export default function createApp (option, config = {}) {
         const orientation = getOrientation(window)
         if (orientation === lastOrientation) return
         lastOrientation = orientation
-        global.__mpxAppFocusedState.value = `resize${count++}`
+        const navigation = getFocusedNavigation()
+        if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+          global.__mpxPageStatusMap[navigation.pageId] = `resize${count++}`
+        }
       })
       return () => {
         changeSubscription && changeSubscription.remove()
@@ -170,6 +185,20 @@ export default function createApp (option, config = {}) {
     }, [])
 
     const { initialRouteName, initialParams } = initialRouteRef.current
+    const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
+    const navScreenOpts = {
+      gestureEnabled: true,
+      // 7.x替换headerBackTitleVisible
+      // headerBackButtonDisplayMode: 'minimal',
+      headerBackTitleVisible: false,
+      // 安卓上会出现初始化时闪现导航条的问题
+      headerShown: false
+    }
+    if (headerBackImageProps) {
+      navScreenOpts.headerBackImage = () => {
+        return createElement(Image, headerBackImageProps)
+      }
+    }
     return createElement(SafeAreaProvider,
       null,
       createElement(NavigationContainer,
@@ -180,9 +209,7 @@ export default function createApp (option, config = {}) {
         createElement(Stack.Navigator,
           {
             initialRouteName,
-            headerBackButtonDisplayMode: 'minimal',
-            headerMode: 'float',
-            gestureEnabled: true
+            screenOptions: navScreenOpts
           },
           ...getPageScreens(initialRouteName, initialParams)
         )
@@ -191,7 +218,7 @@ export default function createApp (option, config = {}) {
   })
 
   global.getCurrentPages = function () {
-    const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
+    const navigation = getFocusedNavigation()
     if (navigation) {
       return navigation.getState().routes.map((route) => {
         return global.__mpxPagesMap[route.key] && global.__mpxPagesMap[route.key][0]
@@ -199,4 +226,11 @@ export default function createApp (option, config = {}) {
     }
     return []
   }
+
+  global.setCurrentPageStatus = function (status) {
+    const navigation = getFocusedNavigation()
+    if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+      global.__mpxPageStatusMap[navigation.pageId] = status
+    }
+  }
 }

package/src/platform/createApp.js

@@ -3,11 +3,11 @@ import mergeOptions from '../core/mergeOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
 import { makeMap, spreadProp, isBrowser } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
-import * as webLifecycle from '../platform/patch/web/lifecycle'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
-import { initAppProvides } from './export/apiInject'
+import { initAppProvides } from './export/inject'
 
-const webAppHooksMap = makeMap(mergeLifecycle(webLifecycle.LIFECYCLE).app)
+const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
 function filterOptions (options, appData) {
   const newOptions = {}
@@ -15,7 +15,7 @@ function filterOptions (options, appData) {
     if (builtInKeysMap[key]) {
       return
     }
-    if (__mpx_mode__ === 'web' && !webAppHooksMap[key] && key !== 'provide') {
+    if (__mpx_mode__ === 'web' && !appHooksMap[key] && key !== 'provide') {
       appData[key] = options[key]
     } else {
       newOptions[key] = options[key]
@@ -47,11 +47,6 @@ export default function createApp (option, config = {}) {
         }
         global.__mpxEnterOptions = options
         this.$options.onLaunch && this.$options.onLaunch.call(this, options)
-        global.__mpxAppCbs = global.__mpxAppCbs || {
-          show: [],
-          hide: [],
-          error: []
-        }
         if (isBrowser) {
           if (this.$options.onShow) {
             this.$options.onShow.call(this, options)
@@ -63,6 +58,9 @@ export default function createApp (option, config = {}) {
           if (this.$options.onError) {
             global.__mpxAppCbs.error.push(this.$options.onError.bind(this))
           }
+          if (this.$options.onUnhandledRejection) {
+            global.__mpxAppCbs.rejection.push(this.$options.onUnhandledRejection.bind(this))
+          }
         }
       }
     })

package/src/platform/env/event.js

@@ -0,0 +1,108 @@
+import { isBrowser } from '@mpxjs/utils'
+
+function extendEvent (e, extendObj = {}) {
+  Object.keys(extendObj).forEach((key) => {
+    Object.defineProperty(e, key, {
+      value: extendObj[key],
+      enumerable: true,
+      configurable: true,
+      writable: true
+    })
+  })
+}
+
+function MpxEvent (layer) {
+  this.targetElement = null
+  this.touches = []
+  this.touchStartX = 0
+  this.touchStartY = 0
+  this.startTimer = null
+  this.needTap = true
+  this.isTouchDevice = document && ('ontouchstart' in document.documentElement)
+
+  this.onTouchStart = (event) => {
+    if (event.targetTouches?.length > 1) {
+      return true
+    }
+    this.touches = event.targetTouches
+    this.targetElement = event.target
+    this.needTap = true
+    this.startTimer = null
+    this.touchStartX = this.touches[0].pageX
+    this.touchStartY = this.touches[0].pageY
+    this.startTimer = setTimeout(() => {
+      this.needTap = false
+      this.sendEvent(this.targetElement, 'longpress', event)
+      this.sendEvent(this.targetElement, 'longtap', event)
+    }, 350)
+  }
+
+  this.onTouchMove = (event) => {
+    const touch = event.changedTouches[0]
+    if (Math.abs(touch.pageX - this.touchStartX) > 1 || Math.abs(touch.pageY - this.touchStartY) > 1) {
+      this.needTap = false
+      this.startTimer && clearTimeout(this.startTimer)
+      this.startTimer = null
+    }
+  }
+
+  this.onTouchEnd = (event) => {
+    if (event.targetTouches?.length > 1) {
+      return true
+    }
+    this.startTimer && clearTimeout(this.startTimer)
+    this.startTimer = null
+    if (this.needTap) {
+      this.sendEvent(this.targetElement, 'tap', event)
+    }
+  }
+
+  this.onClick = (event) => {
+    this.targetElement = event.target
+    this.sendEvent(this.targetElement, 'tap', event)
+  }
+  this.sendEvent = (targetElement, type, event) => {
+    const touchEvent = new CustomEvent(type, {
+      bubbles: true,
+      cancelable: true
+    })
+    const changedTouches = event.changedTouches || []
+    extendEvent(touchEvent, {
+      timeStamp: event.timeStamp,
+      changedTouches,
+      touches: changedTouches,
+      detail: {
+        // pc端点击事件可能没有changedTouches，所以直接从 event中取
+        x: changedTouches[0]?.pageX || event.pageX || 0,
+        y: changedTouches[0]?.pageY || event.pageY || 0
+      }
+    })
+    targetElement && targetElement.dispatchEvent(touchEvent)
+  }
+
+  this.addListener = () => {
+    if (this.isTouchDevice) {
+      layer.addEventListener('touchstart', this.onTouchStart, true)
+      layer.addEventListener('touchmove', this.onTouchMove, true)
+      layer.addEventListener('touchend', this.onTouchEnd, true)
+    } else {
+      layer.addEventListener('click', this.onClick, true)
+    }
+  }
+  this.addListener()
+}
+
+export function initEvent () {
+  if (isBrowser && !global.__mpxCreatedEvent) {
+    global.__mpxCreatedEvent = true
+    if (document.readyState === 'complete' || document.readyState === 'interactive') {
+      // eslint-disable-next-line no-new
+      new MpxEvent(document.body)
+    } else {
+      document.addEventListener('DOMContentLoaded', function () {
+        // eslint-disable-next-line no-new
+        new MpxEvent(document.body)
+      }, false)
+    }
+  }
+}

package/src/platform/env/index.ios.js

@@ -0,0 +1,51 @@
+import { createI18n } from '../builtInMixins/i18nMixin'
+
+export function init (Mpx) {
+  global.__mpx = Mpx
+  global.__mpxAppCbs = global.__mpxAppCbs || {
+    show: [],
+    hide: [],
+    error: [],
+    rejection: []
+  }
+  if (global.i18n) {
+    Mpx.i18n = createI18n(global.i18n)
+  }
+  initGlobalErrorHandling()
+}
+
+function initGlobalErrorHandling () {
+  if (global.ErrorUtils) {
+    const defaultHandler = global.ErrorUtils.getGlobalHandler()
+    global.ErrorUtils.setGlobalHandler((error, isFatal) => {
+      if (global.__mpxAppCbs && global.__mpxAppCbs.error && global.__mpxAppCbs.error.length) {
+        global.__mpxAppCbs.error.forEach((cb) => {
+          cb(error)
+        })
+      } else if (defaultHandler) {
+        defaultHandler(error, isFatal)
+      } else {
+        console.error(`${error.name}: ${error.message}\n`)
+      }
+    })
+  }
+
+  const rejectionTrackingOptions = {
+    allRejections: true,
+    onUnhandled (id, error) {
+      if (global.__mpxAppCbs && global.__mpxAppCbs.rejection && global.__mpxAppCbs.rejection.length) {
+        global.__mpxAppCbs.rejection.forEach((cb) => {
+          cb(error, id)
+        })
+      } else {
+        console.warn(`UNHANDLED PROMISE REJECTION (id: ${id}): ${error}\n`)
+      }
+    }
+  }
+
+  if (global?.HermesInternal?.hasPromise?.()) {
+    global.HermesInternal?.enablePromiseRejectionTracker?.(rejectionTrackingOptions)
+  } else {
+    require('promise/setimmediate/rejection-tracking').enable(rejectionTrackingOptions)
+  }
+}

package/src/platform/env/index.js

@@ -0,0 +1,8 @@
+import { createI18n } from '../builtInMixins/i18nMixin'
+
+export function init (Mpx) {
+  global.__mpx = Mpx
+  if (global.i18n) {
+    Mpx.i18n = createI18n(global.i18n)
+  }
+}

package/src/platform/env/index.web.js

@@ -0,0 +1,48 @@
+import Vue from 'vue'
+import install from './vuePlugin'
+import { isBrowser, error, warn } from '@mpxjs/utils'
+import { initEvent } from './event'
+
+export function init (Mpx) {
+  global.__mpx = Mpx
+  global.__mpxAppCbs = global.__mpxAppCbs || {
+    show: [],
+    hide: [],
+    error: [],
+    rejection: []
+  }
+  Mpx.__vue = Vue
+  Vue.use(install)
+  initEvent()
+  initGlobalErrorHandling()
+}
+
+function initGlobalErrorHandling () {
+  Vue.config.errorHandler = (e, vm, info) => {
+    error(`Unhandled error occurs${info ? ` during execution of [${info}]` : ''}!`, vm?.__mpxProxy?.options.mpxFileResource, e)
+  }
+  Vue.config.warnHandler = (msg, vm, trace) => {
+    warn(msg, vm?.__mpxProxy?.options.mpxFileResource, trace)
+  }
+
+  if (isBrowser) {
+    window.addEventListener('error', (event) => {
+      if (global.__mpxAppCbs && global.__mpxAppCbs.error && global.__mpxAppCbs.error.length) {
+        global.__mpxAppCbs.error.forEach((cb) => {
+          cb(event.error)
+        })
+      } else {
+        console.error(`${event.type}: ${event.message}\n`)
+      }
+    })
+    window.addEventListener('unhandledrejection', (event) => {
+      if (global.__mpxAppCbs && global.__mpxAppCbs.rejection && global.__mpxAppCbs.rejection.length) {
+        global.__mpxAppCbs.rejection.forEach((cb) => {
+          cb(event.reason, event.promise)
+        })
+      } else {
+        console.warn(`UNHANDLED PROMISE REJECTION: ${event.reason}\n`)
+      }
+    })
+  }
+}

package/src/{external → platform/env}/vuePlugin.js

@@ -1,7 +1,7 @@
 import { walkChildren, parseSelector, error, hasOwn, collectDataset } from '@mpxjs/utils'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 import { EffectScope } from 'vue'
-import { PausedState } from '../helper/const'
+import { PausedState } from '../../helper/const'
 
 const hackEffectScope = () => {
   EffectScope.prototype.pause = function () {

package/src/platform/export/index.js

@@ -46,4 +46,4 @@ export {
 export {
   provide,
   inject
-} from './apiInject'
+} from './inject'

package/src/platform/patch/{ali/getDefaultOptions.js → getDefaultOptions.ali.js}

@@ -1,6 +1,6 @@
-import MpxProxy from '../../../core/proxy'
-import builtInKeysMap from '../builtInKeysMap'
-import mergeOptions from '../../../core/mergeOptions'
+import MpxProxy from '../../core/proxy'
+import builtInKeysMap from './builtInKeysMap'
+import mergeOptions from '../../core/mergeOptions'
 import { error, diffAndCloneA, hasOwn, noop, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 
 function transformApiForProxy (context, currentInject) {