-
Notifications
You must be signed in to change notification settings - Fork 172
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.
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
修复 icestark App router prefetch 功能 #732
Open
huxfy
wants to merge
3
commits into
ice-lab:master
Choose a base branch
from
huxfy:fix/router-prefetch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,8 @@ export interface AppRouterProps { | |
basename?: string; | ||
fetch?: Fetch; | ||
prefetch?: Prefetch; | ||
apps?: AppConfig; | ||
children?: React.ReactChildren; | ||
} | ||
|
||
interface AppRouterState { | ||
|
@@ -74,11 +76,7 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter | |
started: false, | ||
}; | ||
|
||
const { fetch, prefetch: strategy, children } = props; | ||
|
||
if (strategy) { | ||
this.prefetch(strategy, children, fetch); | ||
} | ||
this.tryPrefetch(props); | ||
} | ||
|
||
componentDidMount() { | ||
|
@@ -113,6 +111,24 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter | |
this.setState({ started: false }); | ||
} | ||
|
||
componentWillReceiveProps(nextProps: Readonly<AppRouterProps>, nextContext: any): void { | ||
if (nextProps.apps !== this.props.apps) { | ||
this.tryPrefetch(nextProps); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 在 componentWillReceiveProps 阶段会存在多次执行的情况,需要增加额外机制判断 apps / url 信息是否已完成预加载 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok |
||
} | ||
} | ||
|
||
/** | ||
* try to prefetch again | ||
* @param props | ||
*/ | ||
tryPrefetch(props: AppRouterProps): void { | ||
const { fetch, prefetch: strategy, children } = props; | ||
|
||
if (strategy) { | ||
this.prefetch(strategy, children, fetch); | ||
} | ||
} | ||
|
||
/** | ||
* prefetch for resources. | ||
* no worry to excute `prefetch` many times, for all prefetched resources have been cached, and never request twice. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
不增加额外参数,直接以 children 上的信息进行判断是不是也可以
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
也行,可以做到 didupdate 里面,我找时间改下