fix: ListItem titleNoHeight

hippy-contrib · May 10, 2024 · 081594e · 081594e
1 parent 5f835df
commit 081594e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/packages/hippy_ui_react/src/components/ListItem/renderInfo.tsx b/packages/hippy_ui_react/src/components/ListItem/renderInfo.tsx
@@ -1,5 +1,5 @@
 import React, { isValidElement, cloneElement, ReactElement } from 'react';
-import { TextStyle, ViewStyle } from '@hippy/react';
+import { ViewStyle } from '@hippy/react';
 import { ListItemRenderInfo, ListItemRenderParams } from '../../themeConfig/types/listItem';
 import { transferStyle } from '../../utils/Styles';
 import { isNullOrUndefined, replenishNum } from '../../utils/Utils';
@@ -26,7 +26,6 @@ export default function getRenderInfo(params: ListItemRenderParams): ListItemRen
     thumb,
     rank,
     buttonProps,
-    titleNoHeight,
   } = props;
   const wrapProps = themeConfig.listItemWrapPropsFn(params);
   const rankProps = themeConfig.listItemRankPropsFn(params);
@@ -35,10 +34,6 @@ export default function getRenderInfo(params: ListItemRenderParams): ListItemRen
   const noteProps = themeConfig.listItemNotePropsFn(params);
   const moreNoteProps = themeConfig.listItemMoreNotePropsFn(params);
 
-  if (titleNoHeight) {
-    delete (titleProps.style as TextStyle).height;
-  }
-
   const result: ListItemRenderInfo = {
     wrapProps: {
       accessible,

diff --git a/packages/hippy_ui_react/src/themeConfig/listItem.tsx b/packages/hippy_ui_react/src/themeConfig/listItem.tsx
@@ -77,16 +77,29 @@ export const listItemConfig: ThemeConfigListItem = {
       },
     };
   },
-  listItemTitlePropsFn: () => {
-    return {
-      numberOfLines: 1,
-      style: {
-        fontSize: 16,
-        flex: 1,
-        flexShrink: 1,
-        height: 20,
-      },
-    };
+  listItemTitlePropsFn: (params) => {
+    const {
+      props: { titleNoHeight },
+    } = params;
+    return titleNoHeight
+      ? {
+          numberOfLines: 1,
+          style: {
+            fontSize: 16,
+            flex: 1,
+            flexShrink: 1,
+            lineHeight: undefined,
+          },
+        }
+      : {
+          numberOfLines: 1,
+          style: {
+            fontSize: 16,
+            flex: 1,
+            flexShrink: 1,
+            height: 20,
+          },
+        };
   },
   listItemNotePropsFn: (params) => {
     const { consumerValue } = params;