fix(hippy-react): text nest

Tencent · Mar 17, 2020 · da5ca3b · da5ca3b
1 parent 48258d4
commit da5ca3b
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/packages/hippy-react/src/components/text.tsx b/packages/hippy-react/src/components/text.tsx
@@ -3,7 +3,7 @@
 import React from 'react';
 import Style from '@localTypes/style';
 import { LayoutableProps, ClickableProps } from '../types';
-import { warn, unicodeToChar } from '../utils';
+import { unicodeToChar } from '../utils';
 
 interface TextProps extends LayoutableProps, ClickableProps {
   /**
@@ -66,12 +66,6 @@ function Text({ style, ...nativeProps }: TextProps) {
     }
   }
 
-  if (process.env.NODE_ENV !== 'production') {
-    if (typeof nativeProps.children !== 'string' && typeof nativeProps.children !== 'number') {
-      warn('The children of Text component only suppport string type', nativeProps);
-    }
-  }
-
   nativeProps.text = ''; // Important: Text must recevie text props.
   if (typeof nativeProps.children === 'string') {
     nativeProps.text = unicodeToChar(nativeProps.children);
@@ -81,8 +75,11 @@ function Text({ style, ...nativeProps }: TextProps) {
     const text = nativeProps.children
       .filter(t => typeof t === 'string' || typeof t === 'number')
       .join('');
-    nativeProps.text = unicodeToChar(text);
-    nativeProps.children = nativeProps.text;
+    // FIXME: if Text is nested, all child components of this component need to be wrapped by Text
+    if (text) {
+      nativeProps.text = unicodeToChar(text);
+      nativeProps.children = nativeProps.text;
+    }
   }
 
   return (