Merge pull request #838 from thundersdata-frontend/rn-issue

feat: 弹窗Modal的几个方法的title属性支持传入自定义组件
thundersdata-frontend · Mar 6, 2024 · c65ab8b · c65ab8b
2 parents 8ee4d23 + dd79cf8
commit c65ab8b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 13 deletions.
diff --git a/.changeset/cool-melons-grab.md b/.changeset/cool-melons-grab.md
@@ -0,0 +1,5 @@
+---
+'@td-design/react-native': patch
+---
+
+feat: Modal的几个方法的title属性支持传入自定义组件
diff --git a/packages/react-native/src/modal/alert/AlertContainer.tsx b/packages/react-native/src/modal/alert/AlertContainer.tsx
@@ -69,9 +69,13 @@ const AlertContainer: FC<
         {!!icon && <Flex justifyContent="center">{icon}</Flex>}
         {!!title && (
           <Flex justifyContent="center" marginVertical="x2">
-            <Text variant="h1" color="text">
-              {title}
-            </Text>
+            {typeof title === 'string' ? (
+              <Text variant="h1" color="text">
+                {title}
+              </Text>
+            ) : (
+              title
+            )}
           </Flex>
         )}
         {typeof content === 'string' ? (

diff --git a/packages/react-native/src/modal/confirm/ConfirmContainer.tsx b/packages/react-native/src/modal/confirm/ConfirmContainer.tsx
@@ -39,9 +39,13 @@ const ConfirmContainer: FC<
       <Box marginBottom="x2">
         {!!icon && <Flex justifyContent="center">{icon}</Flex>}
         <Flex flexDirection="column" justifyContent="center" marginVertical="x2">
-          <Text variant="h1" color="text">
-            {title}
-          </Text>
+          {typeof title === 'string' ? (
+            <Text variant="h1" color="text">
+              {title}
+            </Text>
+          ) : (
+            title
+          )}
         </Flex>
         {typeof content === 'string' ? (
           <Flex justifyContent="center">

diff --git a/packages/react-native/src/modal/prompt/PromptContainer.tsx b/packages/react-native/src/modal/prompt/PromptContainer.tsx
@@ -46,9 +46,13 @@ const PromptContainer: FC<
       <Box marginBottom="x2">
         <Flex flexDirection="column" justifyContent="center" marginBottom="x2">
           <Flex justifyContent="center" marginVertical="x2">
-            <Text variant="h1" color="text">
-              {title}
-            </Text>
+            {typeof title === 'string' ? (
+              <Text variant="h1" color="text">
+                {title}
+              </Text>
+            ) : (
+              title
+            )}
           </Flex>
           {typeof content === 'string' ? (
             <Text variant="p1" color="text">

diff --git a/packages/react-native/src/modal/tip/TipContainer.tsx b/packages/react-native/src/modal/tip/TipContainer.tsx
@@ -57,9 +57,13 @@ const TipContainer: FC<
         <Box marginBottom="x2">
           {!!title && (
             <Flex justifyContent="center" marginVertical="x2">
-              <Text variant="h1" color="text">
-                {title}
-              </Text>
+              {typeof title === 'string' ? (
+                <Text variant="h1" color="text">
+                  {title}
+                </Text>
+              ) : (
+                title
+              )}
             </Flex>
           )}
           {typeof content === 'string' ? (

diff --git a/packages/react-native/src/modal/type.ts b/packages/react-native/src/modal/type.ts
@@ -34,7 +34,7 @@ export interface AlertProps {
   /** 警示性图标 */
   icon?: ReactNode;
   /** 标题 */
-  title: string;
+  title: ReactNode;
   /** 内容 */
   content?: ReactNode;
   /** 按钮文本 */