@mpxjs/core 2.9.64 → 2.9.65

package/@types/index.d.ts

@@ -114,7 +114,7 @@ interface Context {
   refs: ObjectOf<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>
   asyncRefs: ObjectOf<Promise<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>>
 
-  forceUpdate (params?: object, callback?: () => void): void
+  forceUpdate (params?: object, options?: object | (() => void), callback?: () => void): void
 
   selectComponent: ReplaceWxComponentIns['selectComponent']
   selectAllComponents: ReplaceWxComponentIns['selectAllComponents']
@@ -183,7 +183,7 @@ export interface MpxComponentIns {
 
   $watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
 
-  $forceUpdate (params?: object, callback?: () => void): void
+  $forceUpdate (params?: object, options?: object | (() => void), callback?: () => void): void
 
   $nextTick (fn: () => void): void
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.64",
+  "version": "2.9.65",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.64",
+    "@mpxjs/utils": "^2.9.65",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -32,6 +32,7 @@
     "react": "*",
     "react-native": "*",
     "react-native-gesture-handler": "^2.19.0",
+    "react-native-linear-gradient": "^2.8.3",
     "react-native-safe-area-context": "^4.10.1",
     "react-native-webview": "^13.10.5",
     "vue": "^2.7.10",
@@ -75,6 +76,9 @@
     },
     "react-native-gesture-handler": {
       "optional": true
+    },
+    "react-native-linear-gradient": {
+      "optional": true
     }
   },
   "publishConfig": {
@@ -93,5 +97,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "803334dc0e600f219d514c27461aa7663b7a6653"
+  "gitHead": "24efa90e90b4d42c285ca61739cb9e4d0696976c"
 }

package/src/platform/builtInMixins/pageScrollMixin.web.js

@@ -14,23 +14,21 @@ function refreshMs () {
   }
 }
 
-let loading = null
-
 function showLoading (vm) {
   const { backgroundColor = 'transparent', backgroundTextStyle = 'dark' } = vm.$options.__mpxPageConfig
-  loading = document.createElement('div')
-  loading.className = 'pull-down-loading'
-  loading.style.cssText = `background-color: ${backgroundColor};`
+  vm.__mpxloading = document.createElement('div')
+  vm.__mpxloading.className = 'pull-down-loading'
+  vm.__mpxloading.style.cssText = `background-color: ${backgroundColor};`
   const dot = document.createElement('div')
   dot.className = `dot-flashing ${backgroundTextStyle}`
-  loading.append(dot)
-  vm.$el.prepend(loading)
+  vm.__mpxloading.append(dot)
+  vm.$el.prepend(vm.__mpxloading)
 }
 
 function hideLoading (vm) {
-  if (loading) {
-    vm.$el.removeChild(loading)
-    loading = null
+  if (vm.__mpxloading) {
+    vm.$el.removeChild(vm.__mpxloading)
+    vm.__mpxloading = null
   }
 }
 

package/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -16,12 +16,25 @@ function vh (value) {
   return value * height / 100
 }
 
-global.__unit = {
+const unit = {
   rpx,
   vw,
   vh
 }
-global.__hairlineWidth = StyleSheet.hairlineWidth
+
+function formatValue (value) {
+  let matched
+  if ((matched = numberRegExp.exec(value))) {
+    value = +matched[1]
+  } else if ((matched = unitRegExp.exec(value))) {
+    value = unit[matched[2]](+matched[1])
+  } else if (hairlineRegExp.test(value)) {
+    value = StyleSheet.hairlineWidth
+  }
+  return value
+}
+
+global.__formatValue = formatValue
 
 const escapeReg = /[()[\]{}#!.:,%'"+$]/g
 const escapeMap = {
@@ -97,7 +110,8 @@ const numberRegExp = /^\s*(-?\d+(\.\d+)?)(px)?\s*$/
 const hairlineRegExp = /^\s*hairlineWidth\s*$/
 const varRegExp = /^--/
 
-const parseStyleText = cached((cssText = '') => {
+const parseStyleText = cached((cssText) => {
+  if (typeof cssText !== 'string') return cssText
   const res = {}
   const arr = cssText.split(listDelimiter)
   for (let i = 0; i < arr.length; i++) {
@@ -134,19 +148,9 @@ function mergeObjectArray (arr) {
 }
 
 function transformStyleObj (styleObj) {
-  const keys = Object.keys(styleObj)
   const transformed = {}
-  keys.forEach((prop) => {
-    let value = styleObj[prop]
-    let matched
-    if ((matched = numberRegExp.exec(value))) {
-      value = +matched[1]
-    } else if ((matched = unitRegExp.exec(value))) {
-      value = global.__unit[matched[2]](+matched[1])
-    } else if (hairlineRegExp.test(value)) {
-      value = StyleSheet.hairlineWidth
-    }
-    transformed[prop] = value
+  Object.keys(styleObj).forEach((prop) => {
+    transformed[prop] = formatValue(styleObj[prop])
   })
   return transformed
 }

package/src/platform/patch/react/getDefaultOptions.ios.js

@@ -40,13 +40,18 @@ function createEffect (proxy, components) {
   }
   update.id = proxy.uid
   const getComponent = (tagName) => {
+    if (!tagName) return null
     if (tagName === 'block') return Fragment
     return components[tagName] || getByPath(ReactNative, tagName)
   }
+  const innerCreateElement = (type, ...rest) => {
+    if (!type) return null
+    return createElement(type, ...rest)
+  }
   proxy.effect = new ReactiveEffect(() => {
     // reset instance
     proxy.target.__resetInstance()
-    return proxy.target.__injectedRender(createElement, getComponent)
+    return proxy.target.__injectedRender(innerCreateElement, getComponent)
   }, () => queueJob(update), proxy.scope)
 }
 
@@ -412,17 +417,37 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     const { Provider, useSafeAreaInsets, GestureHandlerRootView } = global.__navigationHelper
     const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
     const Page = ({ navigation, route }) => {
+      const rootRef = useRef(null)
       const currentPageId = useMemo(() => ++pageId, [])
       usePageStatus(navigation, currentPageId)
 
       useLayoutEffect(() => {
+        rootRef.current?.measureInWindow((x, y, width, height) => {
+          navigation.layout = { x, y, width, height }
+        })
+        const isCustom = pageConfig.navigationStyle === 'custom'
+        let opt = {}
+        if (__mpx_mode__ === 'android') {
+          opt = {
+            statusBarTranslucent: isCustom,
+            statusBarStyle: pageConfig.statusBarStyle, // 枚举值 'auto' | 'dark' | 'light' 控制statusbar字体颜色
+            statusBarColor: isCustom ? 'transparent' : pageConfig.statusBarColor // 控制statusbar背景颜色
+          }
+        } else if (__mpx_mode__ === 'ios') {
+          opt = {
+            headerBackTitleVisible: false
+          }
+        }
         navigation.setOptions({
-          headerShown: pageConfig.navigationStyle !== 'custom',
+          headerShown: !isCustom,
+          headerShadowVisible: false,
           headerTitle: pageConfig.navigationBarTitleText || '',
           headerStyle: {
             backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
           },
-          headerTintColor: pageConfig.navigationBarTextStyle || 'white'
+          headerTitleAlign: 'center',
+          headerTintColor: pageConfig.navigationBarTextStyle || 'white',
+          ...opt
         })
       }, [])
 
@@ -434,9 +459,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
             flex: 1,
             backgroundColor: pageConfig.backgroundColor || '#ffffff'
           },
-          onLayout (e) {
-            navigation.layout = e.nativeEvent.layout
-          }
+          ref: rootRef
         },
         // todo custom portal host for active route
         createElement(Provider,