@mpxjs/core 2.10.16-beta.3 → 2.10.16-beta.6

package/@types/global.d.ts

@@ -1,5 +1,5 @@
 // declaration for mpx mode
-declare let __mpx_mode__: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'web' | 'dd' | 'qa' | 'jd' | 'android' | 'ios' | 'harmony'
+declare let __mpx_mode__: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'web' | 'dd' | 'qa' | 'jd' | 'android' | 'ios' | 'harmony' | 'ks'
 
 // declaration for mpx env
 declare let __mpx_env__: string

package/@types/index.d.ts

@@ -381,6 +381,13 @@ export interface RnConfig {
    * @param packages 分包名数组
    */
   downloadChunkAsync?: (packages: Array<string>) => void
+
+  /**
+   * bundle 中是否关闭 android 键盘避让功能，如果关闭需要将该配置设置为 false，使用 mpx 内置的键盘避让逻辑
+   * @platform android
+   * @default true
+   */
+  enableNativeKeyboardAvoiding?: boolean
 }
 
 interface MpxConfig {
@@ -405,7 +412,7 @@ interface MpxConfig {
   rnConfig: RnConfig,
 }
 
-type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'
+type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'| 'ks' | 'jd' | 'dd'
 
 interface ImplementOptions {
   modes?: Array<SupportedMode>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.16-beta.3",
+  "version": "2.10.16-beta.6",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -25,8 +25,8 @@
   },
   "peerDependencies": {
     "@d11/react-native-fast-image": "*",
-    "@mpxjs/api-proxy": "*",
-    "@mpxjs/store": "*",
+    "@mpxjs/api-proxy": "^2.9.0",
+    "@mpxjs/store": "^2.9.0",
     "@react-navigation/native": "*",
     "@react-navigation/native-stack": "*",
     "react": "*",

package/src/convertor/convertor.js

@@ -9,6 +9,7 @@ import wxToTtRule from './wxToTt'
 import wxToDdRule from './wxToDd'
 import wxToJdRule from './wxToJd'
 import wxToReactRule from './wxToReact'
+import wxToKsRule from './wxToKs'
 
 /**
  * 转换规则包含四点
@@ -38,7 +39,8 @@ const rulesMap = {
   wxToJd: extend({}, defaultConvertRule, wxToJdRule),
   wxToIos: extend({}, defaultConvertRule, wxToReactRule),
   wxToAndroid: extend({}, defaultConvertRule, wxToReactRule),
-  wxToHarmony: extend({}, defaultConvertRule, wxToReactRule)
+  wxToHarmony: extend({}, defaultConvertRule, wxToReactRule),
+  wxToKs: extend({}, defaultConvertRule, wxToKsRule)
 }
 
 export function getConvertRule (convertMode) {

package/src/convertor/getConvertMode.js

@@ -8,7 +8,8 @@ const convertModes = {
   'wx-dd': 'wxToDd',
   'wx-ios': 'wxToIos',
   'wx-android': 'wxToAndroid',
-  'wx-harmony': 'wxToHarmony'
+  'wx-harmony': 'wxToHarmony',
+  'wx-ks': 'wxToKs'
 }
 
 export function getConvertMode (srcMode) {

package/src/convertor/wxToKs.js

@@ -0,0 +1,21 @@
+import { error } from '@mpxjs/utils'
+
+const BEHAVIORS_MAP = [
+  'wx://form-field',
+  'wx://form-field-group',
+  'wx://form-field-button',
+  'wx://component-export'
+]
+
+export default {
+  convert (options) {
+    if (options.behaviors) {
+      options.behaviors.forEach((behavior, idx) => {
+        if (BEHAVIORS_MAP.includes(behavior)) {
+          error(`Built-in behavior "${behavior}" is not supported in ks environment!`, global.currentResource || global.currentModuleId)
+          options.behaviors.splice(idx, 1)
+        }
+      })
+    }
+  }
+}

package/src/core/proxy.js

@@ -731,10 +731,10 @@ export default class MpxProxy {
   initRender () {
     if (this.options.__nativeRender__) return this.doRender()
 
-    const _i = this.target._i.bind(this.target)
-    const _c = this.target._c.bind(this.target)
-    const _r = this.target._r.bind(this.target)
-    const _sc = this.target._sc.bind(this.target)
+    const mpx_i = this.target.mpx_i.bind(this.target)
+    const mpx_c = this.target.mpx_c.bind(this.target)
+    const mpx_r = this.target.mpx_r.bind(this.target)
+    const mpx_sc = this.target.mpx_sc.bind(this.target)
     const _g = this.target._g?.bind(this.target)
     const __getAst = this.target.__getAst?.bind(this.target)
     const moduleId = this.target.__moduleId
@@ -748,7 +748,7 @@ export default class MpxProxy {
       if (dynamicTarget || __getAst) {
         try {
           const ast = getAst(__getAst, moduleId)
-          return _r(false, _g(ast, moduleId))
+          return mpx_r(false, _g(ast, moduleId))
         } catch (e) {
           e.errType = 'mpx-dynamic-render'
           e.errmsg = e.message
@@ -761,7 +761,7 @@ export default class MpxProxy {
       }
       if (this.target.__injectedRender) {
         try {
-          return this.target.__injectedRender(_i, _c, _r, _sc)
+          return this.target.__injectedRender(mpx_i, mpx_c, mpx_r, mpx_sc)
         } catch (e) {
           warn('Failed to execute render function, degrade to full-set-data mode.', this.options.mpxFileResource, e)
           this.render()

package/src/platform/builtInMixins/renderHelperMixin.js

@@ -3,7 +3,7 @@ import { getByPath, hasOwn, isObject } from '@mpxjs/utils'
 export default function renderHelperMixin () {
   return {
     methods: {
-      _i (val, handler) {
+      mpx_i (val, handler) {
         let i, l, keys, key
         if (Array.isArray(val) || typeof val === 'string') {
           for (i = 0, l = val.length; i < l; i++) {
@@ -22,7 +22,7 @@ export default function renderHelperMixin () {
         }
       },
       // collect
-      _c (key, value) {
+      mpx_c (key, value) {
         if (hasOwn(this.__mpxProxy.renderData, key)) {
           return this.__mpxProxy.renderData[key]
         }
@@ -33,10 +33,10 @@ export default function renderHelperMixin () {
         return value
       },
       // simple collect
-      _sc (key) {
+      mpx_sc (key) {
         return (this.__mpxProxy.renderData[key] = this[key])
       },
-      _r (skipPre, vnode) {
+      mpx_r (skipPre, vnode) {
         this.__mpxProxy.renderWithData(skipPre, vnode)
       }
     }

package/src/platform/createApp.ios.js

@@ -10,7 +10,7 @@ import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { initAppProvides } from './export/inject'
 import { NavigationContainer, createNativeStackNavigator, SafeAreaProvider, GestureHandlerRootView } from './env/navigationHelper'
-import { innerNav } from './env/nav'
+import MpxNav from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-nav'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
@@ -66,8 +66,8 @@ export default function createApp (options) {
               flex: 1
             }
           },
-          createElement(innerNav, {
-            pageConfig: pageConfig,
+          createElement(MpxNav, {
+            pageConfig,
             navigation
           }),
           children

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

@@ -17,7 +17,7 @@ import {
   RouteContext
 } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
 import { PortalHost, useSafeAreaInsets } from '../env/navigationHelper'
-import { useInnerHeaderHeight } from '../env/nav'
+import { useInnerHeaderHeight } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-nav'
 
 function getSystemInfo () {
   const windowDimensions = ReactNative.Dimensions.get('window')

package/src/platform/env/nav.js

@@ -1,137 +0,0 @@
-import { createElement, useState, useMemo, memo } from 'react'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { StatusBar, processColor, TouchableWithoutFeedback, Image, View, StyleSheet, Text } from 'react-native'
-import Mpx from '../../index'
-
-function convertToHex (color) {
-  try {
-    const intColor = processColor(color)
-    if (intColor === null || intColor === undefined) {
-      return null
-    }
-    // 将32位整数颜色值转换为RGBA
-    const r = (intColor >> 16) & 255
-    const g = (intColor >> 8) & 255
-    const b = intColor & 255
-    // 转换为十六进制
-    const hexR = r.toString(16).padStart(2, '0')
-    const hexG = g.toString(16).padStart(2, '0')
-    const hexB = b.toString(16).padStart(2, '0')
-    return `#${hexR}${hexG}${hexB}`
-  } catch (error) {
-    return null
-  }
-}
-
-const titleHeight = 44
-export function useInnerHeaderHeight (pageconfig) {
-  if (pageconfig.navigationStyle === 'custom') {
-    return 0
-  } else {
-    const safeAreaTop = useSafeAreaInsets()?.top || 0
-    const headerHeight = safeAreaTop + titleHeight
-    return headerHeight
-  }
-}
-
-const styles = StyleSheet.create({
-  header: {
-    elevation: 3
-  },
-  headerContent: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  backButton: {
-    position: 'absolute',
-    height: '100%',
-    width: 40,
-    left: 0,
-    top: 0,
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  backButtonImage: {
-    width: 22,
-    height: 22
-  },
-  title: {
-    fontSize: 17,
-    fontWeight: 600,
-    width: '60%',
-    textAlign: 'center'
-  }
-})
-const NavColor = {
-  White: '#ffffff',
-  Black: '#000000'
-}
-// navigationBarTextStyle只支持黑白'white'/'black
-const validBarTextStyle = (textStyle) => {
-  const textStyleColor = convertToHex(textStyle)
-  if (textStyle && [NavColor.White, NavColor.Black].includes(textStyleColor)) {
-    return textStyleColor
-  } else {
-    return NavColor.White
-  }
-}
-export const innerNav = memo(({ pageConfig, navigation }) => {
-  const [innerPageConfig, setPageConfig] = useState(pageConfig || {})
-  navigation.setPageConfig = (config) => {
-    const newConfig = Object.assign({}, innerPageConfig, config)
-    setPageConfig(newConfig)
-  }
-  const isCustom = innerPageConfig.navigationStyle === 'custom'
-  const navigationBarTextStyle = useMemo(() => validBarTextStyle(innerPageConfig.navigationBarTextStyle), [innerPageConfig.navigationBarTextStyle])
-  // 状态栏的颜色
-  const statusBarElement = createElement(StatusBar, {
-    translucent: true,
-    backgroundColor: 'transparent',
-    barStyle: (navigationBarTextStyle === NavColor.White) ? 'light-content' : 'dark-content' // 'default'/'light-content'/'dark-content'
-  })
-
-  if (isCustom) return statusBarElement
-  const safeAreaTop = useSafeAreaInsets()?.top || 0
-  // 假设是栈导航，获取栈的长度
-  const stackLength = navigation.getState()?.routes?.length
-  const onStackTopBack = Mpx.config?.rnConfig?.onStackTopBack
-  const isHandleStackTopBack = typeof onStackTopBack === 'function'
-
-  // 回退按钮与图标
-  const backElement = stackLength > 1 || isHandleStackTopBack
-    ? createElement(TouchableWithoutFeedback, {
-      onPress: () => {
-        if (stackLength <= 1 && isHandleStackTopBack) {
-          onStackTopBack()
-          return
-        }
-        navigation.goBack()
-      }
-    }, createElement(View, {
-      style: [styles.backButton]
-    }, createElement(Image, {
-      source: { uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==' },
-      // 回退按钮的颜色与设置的title文案颜色一致
-      style: [styles.backButtonImage, { tintColor: navigationBarTextStyle }]
-    })
-    ))
-    : null
-
-  return createElement(View, {
-    style: [styles.header, {
-      paddingTop: safeAreaTop,
-      backgroundColor: innerPageConfig.navigationBarBackgroundColor || '#000000'
-    }]
-  },
-    statusBarElement,
-    createElement(View, {
-      style: styles.headerContent,
-      height: titleHeight
-    }, backElement,
-      createElement(Text, {
-        style: [styles.title, { color: navigationBarTextStyle }],
-        numberOfLines: 1
-      }, innerPageConfig.navigationBarTitleText?.trim() || ''))
-  )
-})