Skip to content

Commit 42c038e

Browse files
authored
fix: chain selector scroll index OK-31474 OK-31543 (#5602)
1 parent bfe3e26 commit 42c038e

File tree

7 files changed

+42
-25
lines changed

7 files changed

+42
-25
lines changed

apps/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@onekeyfe/react-native-animated-charts": "1.0.0",
3434
"@onekeyfe/react-native-ble-plx": "3.0.0",
3535
"@onekeyfe/react-native-lite-card": "1.0.9",
36-
"@onekeyfe/react-native-tab-page-view": "1.0.13",
36+
"@onekeyfe/react-native-tab-page-view": "1.0.14",
3737
"@onekeyhq/components": "*",
3838
"@onekeyhq/kit": "*",
3939
"@onekeyhq/shared": "*",

packages/components/src/layouts/TabView/StickyTabComponent/index.native.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export const TabComponent = (
2626
tabContentContainerStyle,
2727
style,
2828
onRefresh: onRefreshCallBack,
29+
initialHeaderHeight = 209,
2930
}: ITabProps,
3031
// fix missing forwardRef warnings.
3132
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -79,7 +80,7 @@ export const TabComponent = (
7980
? color.replace(/#(.{6})(.{2})/, '#$2$1')
8081
: color;
8182
}, []);
82-
const [headerHeight, setHeaderHeight] = useState(209);
83+
const [headerHeight, setHeaderHeight] = useState(initialHeaderHeight);
8384
const values = useMemo(
8485
() => data.map((item) => ({ name: item.title, label: item.title })),
8586
[data],

packages/components/src/layouts/TabView/StickyTabComponent/types.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ export interface ITabProps extends IScrollViewProps {
2323
onSelectedPageIndex?: (pageIndex: number) => void;
2424
shouldSelectedPageIndex?: (pageIndex: number) => boolean;
2525
onRefresh?: () => void;
26+
initialHeaderHeight?: number;
2627
}

packages/kit/src/views/ChainSelector/components/EditableChainSelector/ChainSelectorContent.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export const EditableChainSelectorContent = ({
221221
}, [sections, showAllNetworkHeader]);
222222

223223
const initialScrollIndex = useMemo(() => {
224-
if (searchText.trim()) {
224+
if (searchText.trim() || tempFrequentlyUsedItems !== frequentlyUsedItems) {
225225
return undefined;
226226
}
227227
let _initialScrollIndex:
@@ -267,6 +267,7 @@ export const EditableChainSelectorContent = ({
267267
return { sectionIndex: 0, itemIndex: undefined };
268268
}
269269
return _initialScrollIndex;
270+
// eslint-disable-next-line react-hooks/exhaustive-deps
270271
}, [sections, networkId, searchText]);
271272

272273
const context = useMemo<IEditableChainSelectorContext>(

packages/kit/src/views/CloudBackup/components/useBackupEntryStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function useBackupEntryStatus() {
4242
// @ts-ignore
4343
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
4444
const message = `${e?.message ?? e}`;
45-
if (!message.endsWith('Sign in action canceled')) {
45+
if (!message.endsWith('Sign in action cancelled')) {
4646
Toast.error({
4747
title: `google auth failed ${message}`,
4848
});

packages/kit/src/views/Market/MarketHome.tsx

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,25 +141,39 @@ function MarketHome() {
141141
});
142142
console.log('选中', index, index === 0 ? 1 : 0);
143143
}, []);
144+
const renderTabContainer = useCallback(() => {
145+
if (!tabConfig.length) {
146+
return (
147+
<Stack flex={1} ai="center" jc="center">
148+
<Spinner size="large" />
149+
</Stack>
150+
);
151+
}
152+
if (platformEnv.isNativeAndroid) {
153+
return (
154+
<Tab
155+
disableRefresh
156+
initialHeaderHeight={0}
157+
data={tabConfig}
158+
onSelectedPageIndex={handleSelectedPageIndex}
159+
/>
160+
);
161+
}
162+
return (
163+
<Tab.Page
164+
data={tabConfig}
165+
contentItemWidth={CONTENT_ITEM_WIDTH}
166+
contentWidth={screenWidth}
167+
headerProps={headerProps}
168+
onSelectedPageIndex={handleSelectedPageIndex}
169+
windowSize={3}
170+
/>
171+
);
172+
}, [handleSelectedPageIndex, headerProps, tabConfig, screenWidth]);
144173
return (
145174
<Page>
146175
{gtMd ? <MarketHomeHeader /> : <MDMarketHomeHeader />}
147-
<Page.Body>
148-
{tabConfig.length ? (
149-
<Tab.Page
150-
data={tabConfig}
151-
contentItemWidth={CONTENT_ITEM_WIDTH}
152-
contentWidth={screenWidth}
153-
headerProps={headerProps}
154-
onSelectedPageIndex={handleSelectedPageIndex}
155-
windowSize={3}
156-
/>
157-
) : (
158-
<Stack flex={1} ai="center" jc="center">
159-
<Spinner size="large" />
160-
</Stack>
161-
)}
162-
</Page.Body>
176+
<Page.Body>{renderTabContainer()}</Page.Body>
163177
</Page>
164178
);
165179
}

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5966,13 +5966,13 @@ __metadata:
59665966
languageName: node
59675967
linkType: hard
59685968

5969-
"@onekeyfe/react-native-tab-page-view@npm:1.0.13":
5970-
version: 1.0.13
5971-
resolution: "@onekeyfe/react-native-tab-page-view@npm:1.0.13"
5969+
"@onekeyfe/react-native-tab-page-view@npm:1.0.14":
5970+
version: 1.0.14
5971+
resolution: "@onekeyfe/react-native-tab-page-view@npm:1.0.14"
59725972
peerDependencies:
59735973
react: "*"
59745974
react-native: "*"
5975-
checksum: 10/9b62229c0fa75f00d610f1f8af5c094553b75a8bdb81018add41ec83646ad57dbbbe57b5b3d970e374b0a9e66e000b3536bbffb581098df1faa9b1dc8497af4e
5975+
checksum: 10/abf9ed7f0bcbf5344a5d50283a5c33581055e55a5d04af0ba698b04777269743466d17eeeea6c1018777843bef3bec3526bcd1da0d598b0ae66fc7115b747af7
59765976
languageName: node
59775977
linkType: hard
59785978

@@ -6327,7 +6327,7 @@ __metadata:
63276327
"@onekeyfe/react-native-animated-charts": "npm:1.0.0"
63286328
"@onekeyfe/react-native-ble-plx": "npm:3.0.0"
63296329
"@onekeyfe/react-native-lite-card": "npm:1.0.9"
6330-
"@onekeyfe/react-native-tab-page-view": "npm:1.0.13"
6330+
"@onekeyfe/react-native-tab-page-view": "npm:1.0.14"
63316331
"@onekeyhq/components": "npm:*"
63326332
"@onekeyhq/kit": "npm:*"
63336333
"@onekeyhq/shared": "npm:*"

0 commit comments

Comments
 (0)