@mpxjs/core 2.9.69 → 2.9.70-alpha.1

package/src/platform/createApp.ios.js

@@ -1,14 +1,14 @@
 import transferOptions from '../core/transferOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
-import { makeMap, spreadProp, parseUrlQuery, getFocusedNavigation } 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 { 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 +30,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 = {}) {
@@ -159,12 +155,17 @@ export default function createApp (option, config = {}) {
           global.__mpxAppCbs.show.forEach((cb) => {
             cb(options)
           })
-          global.__mpxAppFocusedState.value = 'show'
+          if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+            global.__mpxPageStatusMap[navigation.pageId] = 'show'
+          }
         } else if (currentState === 'inactive') {
           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'
+          }
         }
       })
 
@@ -174,7 +175,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()
@@ -216,4 +220,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'
 
-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]
@@ -66,6 +66,13 @@ export default function createApp (option, config = {}) {
         }
       }
     })
+  } else if (__mpx_mode__ === 'tenon') {
+    // todo add tenon mixins
+    builtInMixins.push({
+      onLaunch () {
+        // console.log('tenon mixins')
+      }
+    })
   } else {
     builtInMixins.push({
       onLaunch () {
@@ -78,7 +85,7 @@ export default function createApp (option, config = {}) {
   rawOptions.mixins = builtInMixins
   const defaultOptions = filterOptions(spreadProp(mergeOptions(rawOptions, 'app', false), 'methods'), appData)
 
-  if (__mpx_mode__ === 'web') {
+  if (__mpx_mode__ === 'web' || __mpx_mode__ === 'tenon') {
     global.__mpxOptionsMap = global.__mpxOptionsMap || {}
     global.__mpxOptionsMap[currentInject.moduleId] = defaultOptions
     global.getApp = function () {

package/src/platform/export/apiInject.tenon.js

@@ -0,0 +1 @@
+export { provide, inject } from '@hummer/tenon-vue'

package/src/platform/export/index.tenon.js

@@ -0,0 +1,78 @@
+import {
+  effectScope as vueEffectScope,
+  getCurrentScope as getCurrentVueScope,
+  onScopeDispose
+} from '@hummer/tenon-vue'
+
+import {
+  hasOwn,
+  isValidArrayIndex
+} from '@mpxjs/utils'
+
+export {
+  // watch
+  watchEffect,
+  watchSyncEffect,
+  watchPostEffect,
+  watch,
+  // reactive
+  reactive,
+  isReactive,
+  shallowReactive,
+  markRaw,
+  // ref
+  ref,
+  unref,
+  toRef,
+  toRefs,
+  isRef,
+  customRef,
+  shallowRef,
+  triggerRef,
+  // computed
+  computed,
+  // instance
+  getCurrentInstance,
+  provide,
+  inject
+} from '@hummer/tenon-vue'
+
+export function set (target, key, val) {
+  if (Array.isArray(target) && isValidArrayIndex(key)) {
+    target.length = Math.max(target.length, key)
+    target.splice(key, 1, val)
+    return val
+  }
+  target[key] = val
+  return val
+}
+
+export function del (target, key) {
+  if (Array.isArray(target) && isValidArrayIndex(key)) {
+    target.splice(key, 1)
+    return
+  }
+  if (!hasOwn(target, key)) {
+    return
+  }
+  delete target[key]
+}
+
+const noop = () => {
+}
+
+const fixEffectScope = (scope) => {
+  scope.pause = noop
+  scope.resume = noop
+  return scope
+}
+
+const effectScope = (detached) => fixEffectScope(vueEffectScope(detached))
+const getCurrentScope = () => fixEffectScope(getCurrentVueScope())
+
+export {
+  // effectScope
+  effectScope,
+  getCurrentScope,
+  onScopeDispose
+}

package/src/platform/patch/builtInKeysMap.js

@@ -3,7 +3,7 @@ import { makeMap } from '@mpxjs/utils'
 
 let builtInKeys
 
-if (__mpx_mode__ === 'web') {
+if (__mpx_mode__ === 'web' || __mpx_mode__ === 'tenon') {
   builtInKeys = [
     'proto',
     'mixins',

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