-
Notifications
You must be signed in to change notification settings - Fork 159
refactor(tree): add raf check for tree SSR #16102
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
Open
tishko0
wants to merge
2
commits into
20.0.x
Choose a base branch
from
ttonev/tree-fix-ssr-20.x
base: 20.0.x
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.
+8
−3
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 |
---|---|---|
|
@@ -29,7 +29,7 @@ import { IgxTreeNodeComponent } from './tree-node/tree-node.component'; | |
import { IgxTreeSelectionService } from './tree-selection.service'; | ||
import { IgxTreeService } from './tree.service'; | ||
import { growVerIn, growVerOut } from 'igniteui-angular/animations'; | ||
import { resizeObservable } from '../core/utils'; | ||
import { PlatformUtil, resizeObservable } from '../core/utils'; | ||
|
||
/** | ||
* @hidden @internal | ||
|
@@ -327,6 +327,7 @@ export class IgxTreeComponent implements IgxTree, OnInit, AfterViewInit, OnDestr | |
private selectionService: IgxTreeSelectionService, | ||
private treeService: IgxTreeService, | ||
private element: ElementRef<HTMLElement>, | ||
private platform: PlatformUtil | ||
) { | ||
this.selectionService.register(this); | ||
this.treeService.register(this); | ||
|
@@ -501,9 +502,13 @@ export class IgxTreeComponent implements IgxTree, OnInit, AfterViewInit, OnDestr | |
private subToChanges() { | ||
this.unsubChildren$.next(); | ||
const toBeSelected = [...this.forceSelect]; | ||
requestAnimationFrame(() => { | ||
if(this.platform.isBrowser) { | ||
requestAnimationFrame(() => { | ||
this.selectionService.selectNodesWithNoEvent(toBeSelected); | ||
}); | ||
} else { | ||
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. Is it needed to set the selection on the server? I assume that when the view hydrates it would go through the same logic and apply selection if needed, so maybe the |
||
this.selectionService.selectNodesWithNoEvent(toBeSelected); | ||
}); | ||
} | ||
this.forceSelect = []; | ||
this.nodes.forEach(node => { | ||
node.expandedChange.pipe(takeUntil(this.unsubChildren$)).subscribe(nodeState => { | ||
|
Oops, something went wrong.
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.
There are some failing tests due to the constructor changes. Those should be fixed.