Skip to content

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.

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

Open
wants to merge 1 commit into
base: 20.0.x
Choose a base branch
from
Open

refactor(tree): add raf check for tree SSR #16102

Show file tree
Hide file tree
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 projects/igniteui-angular/src/lib/tree/tree-navigation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { IgxTreeService } from './tree.service';
import { IgxTreeComponent } from './tree.component';
import { IgxTree, IgxTreeNode, IgxTreeSelectionType } from './common';
import { IgxTreeNodeComponent } from './tree-node/tree-node.component';
import { PlatformUtil } from '../core/utils';

describe('IgxTree - Navigation #treeView', () => {

Expand Down Expand Up @@ -780,7 +781,8 @@ describe('IgxTree - Navigation #treeView', () => {
spyOn(nav, 'update_disabled_cache');
spyOn(nav, 'update_visible_cache');
spyOn(nav, 'register');
const tree = new IgxTreeComponent(nav, mockSelectionService, mockTreeService, mockElementRef);
const mockPlatform = jasmine.createSpyObj('platform', ['isBrowser', 'isServer']);
const tree = new IgxTreeComponent(nav, mockSelectionService, mockTreeService, mockElementRef, mockPlatform);
tree.nodes = mockQuery;
expect(nav.register).toHaveBeenCalledWith(tree);
expect(nav.init_invisible_cache).not.toHaveBeenCalled();
Expand Down
4 changes: 3 additions & 1 deletion projects/igniteui-angular/src/lib/tree/tree-selection.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,9 @@ describe('IgxTree - Selection #treeView', () => {
const selectionService = new IgxTreeSelectionService();
const treeService = new IgxTreeService();
const navService = new IgxTreeNavigationService(treeService, selectionService);
const tree = new IgxTreeComponent(navService, selectionService, treeService, null);
const mockPlatform = jasmine.createSpyObj('platform', ['isBrowser', 'isServer']);
mockPlatform.isBrowser = true;
const tree = new IgxTreeComponent(navService, selectionService, treeService, null, mockPlatform);

beforeEach(() => {
mockNodes = TreeTestFunctions.createNodeSpies(0, 5);
Expand Down
5 changes: 5 additions & 0 deletions projects/igniteui-angular/src/lib/tree/tree.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,11 @@ export class IgxTreeComponent implements IgxTree, OnInit, AfterViewInit, OnDestr
requestAnimationFrame(() => {
this.selectionService.selectNodesWithNoEvent(toBeSelected);
});
if(this.platform.isBrowser) {
requestAnimationFrame(() => {
this.selectionService.selectNodesWithNoEvent(toBeSelected);
});
}
this.forceSelect = [];
this.nodes.forEach(node => {
node.expandedChange.pipe(takeUntil(this.unsubChildren$)).subscribe(nodeState => {
Expand Down
5 changes: 4 additions & 1 deletion projects/igniteui-angular/src/lib/tree/tree.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { IgxTreeNodeComponent } from './tree-node/tree-node.component';
import { IgxTreeSelectionService } from './tree-selection.service';
import { IgxTreeComponent } from './tree.component';
import { IgxTreeService } from './tree.service';
import { PlatformUtil } from '../core/utils';

const TREE_ROOT_CLASS = 'igx-tree__root';
const NODE_TAG = 'igx-tree-node';
Expand Down Expand Up @@ -45,8 +46,10 @@ describe('IgxTree #treeView', () => {
mockElementRef = jasmine.createSpyObj('elementRef', [], {
nativeElement: document.createElement('div')
});
const mockPlatform = jasmine.createSpyObj('platform', ['isBrowser', 'isServer']);
mockPlatform.isBrowser = true;
tree?.ngOnDestroy();
tree = new IgxTreeComponent(mockNavService, mockSelectionService, mockTreeService, mockElementRef);
tree = new IgxTreeComponent(mockNavService, mockSelectionService, mockTreeService, mockElementRef, mockPlatform);
mockNodes = jasmine.createSpyObj('mockList', ['toArray'], {
changes: new Subject<void>(),
get first() {
Expand Down
Loading