Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(preload): fix preloadData fetch fail #70

Merged
merged 1 commit into from
Apr 24, 2024
Merged

fix(preload): fix preloadData fetch fail #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/hooks/src/useRouter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type { RouterInfo } from '@tarojs/taro';

import useFrom from '../useFrom';
import usePromise from '../usePromise';
import usePage from '../usePage';

import { stringfiyUrl } from '../utils/tool';

Expand Down Expand Up @@ -79,6 +80,7 @@ function useRouter<R extends RecordData, S extends RecordData = RecordData>(): [
type TaroRouterInfo = Omit<Route<R, S>, 'from'>;
const router = useRef<TaroRouterInfo>(useTaroRouter() as TaroRouterInfo);
const from = useFrom();
const [, { pageInstance }] = usePage();

const navigateToAsync =
usePromise<ExcludeOption<Taro.navigateTo.Option>>(navigateTo);
Expand Down Expand Up @@ -140,7 +142,7 @@ function useRouter<R extends RecordData, S extends RecordData = RecordData>(): [
const exit: Exit = exitMiniProgramAsync;

return [
{ ...router.current, from },
{ ...router.current, from, preloadData: pageInstance.preloadData as S },
{
navigate,
switchTab,
Expand Down
Loading