feat(alita-core wx-react): 添加直接渲染Fragment的警告提示

affects: @areslabs/alita-core, @areslabs/wx-react
areslabs · Apr 30, 2020 · e4596c7 · e4596c7
1 parent 96c7b92
commit e4596c7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/packages/alita-core/src/constants.ts b/packages/alita-core/src/constants.ts
@@ -17,6 +17,7 @@ export {
     touchableOpacityOrigin,
     touchableHighlightOrigin,
     errorViewOrigin,
+    reactFragmentFlag
 } from '@shared/constants'
 
 

diff --git a/packages/alita-core/src/tran/fragmentHadnler.ts b/packages/alita-core/src/tran/fragmentHadnler.ts
@@ -9,6 +9,7 @@
 import * as t from '@babel/types'
 import errorLogTraverse from '../util/ErrorLogTraverse'
 import {isReactFragment} from '../util/uast'
+import {reactFragmentFlag} from '../constants'
 
 /**
  * 处理 <> xxx </> 和  <React.Fragment> xxx </React.Fragment> 
@@ -42,7 +43,9 @@ function replaceElement(path) {
     let newEle = t.jsxElement(
         t.jsxOpeningElement(
             t.jsxIdentifier('block'),
-            []
+            [
+                t.jsxAttribute(t.jsxIdentifier(reactFragmentFlag), t.jsxExpressionContainer(t.booleanLiteral(true)))
+            ]
         ), 
         t.jsxClosingElement(
             t.jsxIdentifier('block')

diff --git a/packages/shared/constants.js b/packages/shared/constants.js
@@ -15,4 +15,7 @@ export const outerTextOrigin = "4"
 export const errorViewOrigin = "5"
 export const touchableWithoutFeedbackOrigin = "6"
 export const touchableOpacityOrigin = "7"
-export const touchableHighlightOrigin = "8"
+export const touchableHighlightOrigin = "8"
+
+
+export const reactFragmentFlag = "_FF"
diff --git a/packages/wx-react/src/render.js b/packages/wx-react/src/render.js
@@ -22,7 +22,8 @@ import {
 	originElementAttrName,
 	touchableWithoutFeedbackOrigin,
 	touchableOpacityOrigin,
-	touchableHighlightOrigin
+	touchableHighlightOrigin,
+	reactFragmentFlag
 } from '../../shared/constants'
 
 export function renderNextValidComps(inst) {
@@ -106,11 +107,6 @@ export function renderNextValidComps(inst) {
 export default function render(vnode, parentInst, parentContext, data, oldData, dataPath) {
 
     try {
-        if (Array.isArray(vnode)) {
-            console.warn('小程序暂不支持渲染数组！')
-            return
-        }
-
         if (typeof vnode === 'string'
             || typeof vnode === 'number'
             || typeof vnode === 'boolean'
@@ -121,6 +117,11 @@ export default function render(vnode, parentInst, parentContext, data, oldData,
             return
         }
 
+		if (Array.isArray(vnode) || (vnode.props && vnode.props[reactFragmentFlag])) {
+			console.warn('组件暂不支持直接render数组/Fragment！')
+			return
+		}
+
         const {ref, nodeName, tempName} = vnode
 
         if (typeof ref === "string") {