Merge pull request #580 from panbibi/dev

fix(Typography):调整Div组件
uiwjs · Apr 10, 2023 · 9877e64 · 9877e64
2 parents d5588ab + 06488b9
commit 9877e64
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/packages/core/src/Typography/Div.tsx b/packages/core/src/Typography/Div.tsx
@@ -1,15 +1,12 @@
 import React, { Fragment } from 'react';
-import { Text, TextProps, ViewProps } from 'react-native';
-import { Theme } from '../theme';
-import { useTheme } from '@shopify/restyle';
+import { TextProps, ViewProps } from 'react-native';
+import Text from './Text';
 
 interface DivProps {
   children?: React.ReactNode;
 }
 
 export default function Div<T>({ children, ...otherProps }: DivProps & TextProps & ViewProps): JSX.Element | null {
-  const theme = useTheme<Theme>();
-  const textColor = theme.colors.primary_text || '#ccc';
   if (!children) {
     return null;
   }
@@ -18,7 +15,7 @@ export default function Div<T>({ children, ...otherProps }: DivProps & TextProps
     return typeof item === 'string' || (item && (item as any).type && (item as any).type.displayName === 'Text');
   });
   if (someStr) {
-    return <Text {...otherProps} children={children} style={{ color: textColor }} />;
+    return <Text color="text" {...otherProps} children={children} />;
   }
   return (
     <Fragment>