Merge pull request #779 from thundersdata-frontend/list-issue

fix: 修复 Card 组件自定义 header 的bug
thundersdata-frontend · Nov 30, 2023 · 889090e · 889090e
2 parents 90fb451 + 9c1d33e
commit 889090e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.changeset/few-rats-move.md b/.changeset/few-rats-move.md
@@ -0,0 +1,5 @@
+---
+'@td-design/react-native': patch
+---
+
+修复 Card 组件自定义 header 的bug
diff --git a/packages/react-native/src/card/index.tsx b/packages/react-native/src/card/index.tsx
@@ -55,7 +55,7 @@ const Card: FC<CardProps> = ({
       borderRadius={'x2'}
       style={containerStyle}
     >
-      <Header {...{ hideHeader, icon, title, extra, renderHeader }} />
+      {renderHeader ? renderHeader() : <Header {...{ hideHeader, icon, title, extra }} />}
       <Body {...{ footer, contentStyle }}>{children}</Body>
       {!!footer && <Box padding="x2">{footer}</Box>}
     </Box>
@@ -66,13 +66,7 @@ Card.displayName = 'Card';
 export default Card;
 
 const Header = memo(
-  ({
-    hideHeader,
-    icon,
-    title,
-    extra,
-    renderHeader,
-  }: Pick<CardProps, 'hideHeader' | 'icon' | 'title' | 'extra' | 'renderHeader'>) => {
+  ({ hideHeader, icon, title, extra }: Pick<CardProps, 'hideHeader' | 'icon' | 'title' | 'extra'>) => {
     if (hideHeader) return null;
 
     const Header = (
@@ -115,7 +109,7 @@ const Header = memo(
         paddingVertical={'x2'}
         justifyContent="center"
       >
-        {renderHeader ? renderHeader() : Header}
+        {Header}
       </Box>
     );
   }