fix: loading support text style

hippy-contrib · Jun 5, 2024 · 6118c9f · 6118c9f
1 parent 165fd5d
commit 6118c9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/hippy_ui_react/src/components/Loading/PropsType.tsx b/packages/hippy_ui_react/src/components/Loading/PropsType.tsx
@@ -11,7 +11,7 @@ export interface LoadingProps {
   loadingGifProps?: LoadingGifProps;
   /** 点击事件 */
   onPress?: () => void;
-  /** 容器样式 */
+  /** 容器样式（可设置文字样式，会被透传下去） */
   style?: GenericStyleProp<ViewStyle>;
   /** 开启无障碍阅读 */
   accessible?: boolean;

diff --git a/packages/hippy_ui_react/src/components/Loading/README.md b/packages/hippy_ui_react/src/components/Loading/README.md
@@ -6,7 +6,7 @@
   <Loading/>
   <Loading text={"加载中..."}/>
   <Loading loadingGifProps={{percent: 50}} text={"加载中..."}/>
-  <Loading gif={null} text={"加载中..."}/>
+  <Loading style={{color:"#000"}} gif={null} text={"加载中..."}/>
   <Loading
     gif={
     <Image

diff --git a/packages/hippy_ui_react/src/components/Loading/renderInfo.tsx b/packages/hippy_ui_react/src/components/Loading/renderInfo.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { ViewStyle } from '@hippy/react';
 import { LoadingRenderParams, LoadingRenderInfo, loadingConfig } from './config';
-import { transferStyle } from '../../utils/Styles';
+import { pickTextStyle, transferStyle } from '../../utils/Styles';
 import LoadingGif from '../LoadingGif';
 import HiText from '../HiText';
 
@@ -28,7 +28,11 @@ export default function getRenderInfo(params: LoadingRenderParams): LoadingRende
       typeof text === 'string' ? (
         <HiText
           {...themeConfig.loadingTextProps}
-          style={transferStyle([{ color: themeConfig.colorTextSecondary }, themeConfig.loadingTextProps.style])}
+          style={transferStyle([
+            { color: themeConfig.colorTextSecondary },
+            themeConfig.loadingTextProps.style,
+            pickTextStyle(wrapStyle),
+          ])}
         >
           {text}
         </HiText>