fix: Android tabs issue on v5.2.1 (#5910)

* fix: some tab issues on android (#5888) * fix: the tab issues on android (#5895) --------- Co-authored-by: hublot <hublot@aliyun.com>
OneKeyHQ · Sep 24, 2024 · c8c85c0 · c8c85c0
1 parent 818d6f8
commit c8c85c0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/packages/components/src/layouts/TabView/StickyTabComponent/index.native.tsx b/packages/components/src/layouts/TabView/StickyTabComponent/index.native.tsx
@@ -26,7 +26,7 @@ export const TabComponent = (
     tabContentContainerStyle,
     style,
     onRefresh: onRefreshCallBack,
-    initialHeaderHeight = 250,
+    initialHeaderHeight = 0,
   }: ITabProps,
   // fix missing forwardRef warnings.
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -172,9 +172,18 @@ export const TabComponent = (
   );
 
   const onIndexChange = useCallback(() => {}, []);
-  const onLayout = useCallback(({ nativeEvent }: LayoutChangeEvent) => {
-    setHeaderHeight(nativeEvent.layout.height);
-  }, []);
+  const onLayout = useCallback(
+    ({ nativeEvent }: LayoutChangeEvent) => {
+      if (nativeEvent.layout.height === headerHeight) {
+        return;
+      }
+      if (platformEnv.isNativeAndroid && initialHeaderHeight > 0) {
+        return;
+      }
+      setHeaderHeight(nativeEvent.layout.height);
+    },
+    [headerHeight, initialHeaderHeight],
+  );
   return (
     // @ts-expect-error
     <NestedTabView

diff --git a/packages/kit/src/components/TokenListView/index.tsx b/packages/kit/src/components/TokenListView/index.tsx
@@ -137,8 +137,7 @@ function TokenListView(props: IProps) {
   if (
     (isTokenSelector && tokenSelectorSearchTokenState.isSearching) ||
     (!isTokenSelector && searchTokenState.isSearching) ||
-    (!tokenListState.initialized && tokenListState.isRefreshing) ||
-    (platformEnv.isNativeAndroid && isInRequest)
+    (!tokenListState.initialized && tokenListState.isRefreshing)
   ) {
     return (
       <NestedScrollView style={{ flex: 1 }}>

diff --git a/packages/kit/src/views/Home/pages/HomePageView.tsx b/packages/kit/src/views/Home/pages/HomePageView.tsx
@@ -140,6 +140,7 @@ export function HomePageView({
         data={tabs}
         ListHeaderComponent={<HomeHeaderContainer />}
         initialScrollIndex={0}
+        initialHeaderHeight={220}
         contentItemWidth={CONTENT_ITEM_WIDTH}
         contentWidth={screenWidth}
         showsVerticalScrollIndicator={false}

diff --git a/packages/kit/src/views/Market/MarketHome.tsx b/packages/kit/src/views/Market/MarketHome.tsx
@@ -153,7 +153,6 @@ function MarketHome() {
       return (
         <Tab
           disableRefresh
-          initialHeaderHeight={0}
           data={tabConfig}
           onSelectedPageIndex={handleSelectedPageIndex}
         />