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

feat: Migrating Grid.js to getDerivedStateFromProps #1053

Merged
merged 18 commits into from
May 6, 2018
Merged

feat: Migrating Grid.js to getDerivedStateFromProps #1053

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d65df0b
migrating Grid to getDerivedStateFromProps
wuweiweiwu Apr 2, 2018
6ba4da9
debugger
wuweiweiwu Apr 3, 2018
0f4b799
adding debugger statements
wuweiweiwu Apr 3, 2018
a8319c0
setting scrollbarSize ... im so stupid
wuweiweiwu Apr 4, 2018
48b4a95
new test
wuweiweiwu Apr 4, 2018
8eb76d4
fixing 2 more tests. cleaning up code
wuweiweiwu Apr 4, 2018
f0fcf07
updating test
wuweiweiwu Apr 5, 2018
ddeb38b
update this test to use the static methods
wuweiweiwu Apr 5, 2018
bc517ed
i cant believe this fixed 4 tests....
wuweiweiwu Apr 5, 2018
1992ffc
updating tests :)
wuweiweiwu Apr 5, 2018
37877f6
typo
wuweiweiwu Apr 5, 2018
4d99d4e
fixing some bugs and introducing new ones lol
wuweiweiwu Apr 7, 2018
c2ba26d
fixing the last 2 tests
wuweiweiwu Apr 9, 2018
f2ce672
react back to 16.2 + polyfilling
wuweiweiwu Apr 9, 2018
8e0d0b7
remove SingeTest
wuweiweiwu Apr 9, 2018
7d8bbc2
fixing last test !!!!
wuweiweiwu Apr 28, 2018
cecedb9
fix lint
wuweiweiwu Apr 28, 2018
f08d8b9
moving getter updates into configure
wuweiweiwu Apr 30, 2018
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
39 changes: 26 additions & 13 deletions source/Grid/Grid.jest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,8 +1561,8 @@ describe('Grid', () => {
rowHeight: 20,
}),
);
expect(grid._getEstimatedColumnSize(grid.props)).toEqual(100);
expect(grid._getEstimatedRowSize(grid.props)).toEqual(20);
expect(Grid._getEstimatedColumnSize(grid.props)).toEqual(100);
expect(Grid._getEstimatedRowSize(grid.props)).toEqual(20);
});

it('should estimate row and column sizes if actual sizes are functions', () => {
Expand All @@ -1574,8 +1574,8 @@ describe('Grid', () => {
rowHeight: () => 20,
}),
);
expect(grid._getEstimatedColumnSize(grid.props)).toEqual(150);
expect(grid._getEstimatedRowSize(grid.props)).toEqual(15);
expect(Grid._getEstimatedColumnSize(grid.props)).toEqual(150);
expect(Grid._getEstimatedRowSize(grid.props)).toEqual(15);
});
});

Expand Down Expand Up @@ -1950,11 +1950,19 @@ describe('Grid', () => {
width: 0,
}),
);
expect(grid._columnSizeAndPositionManager.getTotalSize()).toEqual(1500);
expect(grid._rowSizeAndPositionManager.getTotalSize()).toEqual(150);
expect(
grid.state.instanceProps.columnSizeAndPositionManager.getTotalSize(),
).toEqual(1500);
expect(
grid.state.instanceProps.rowSizeAndPositionManager.getTotalSize(),
).toEqual(150);
grid.measureAllCells();
expect(grid._columnSizeAndPositionManager.getTotalSize()).toEqual(1000);
expect(grid._rowSizeAndPositionManager.getTotalSize()).toEqual(200);
expect(
grid.state.instanceProps.columnSizeAndPositionManager.getTotalSize(),
).toEqual(1000);
expect(
grid.state.instanceProps.rowSizeAndPositionManager.getTotalSize(),
).toEqual(200);
});
});

Expand Down Expand Up @@ -2059,7 +2067,9 @@ describe('Grid', () => {
rendered.querySelector('.ReactVirtualized__Grid__innerScrollContainer')
.style.height,
).toEqual('2000px'); // 100 rows * 20px rowHeight
expect(grid._rowSizeAndPositionManager.getTotalSize()).toEqual(2000);
expect(
grid.state.instanceProps.rowSizeAndPositionManager.getTotalSize(),
).toEqual(2000);
});
});

Expand Down Expand Up @@ -2091,7 +2101,9 @@ describe('Grid', () => {
rendered.querySelector('.ReactVirtualized__Grid__innerScrollContainer')
.style.width,
).toEqual('2500px'); // 50 columns * 50px columnWidth
expect(grid._columnSizeAndPositionManager.getTotalSize()).toEqual(2500);
expect(
grid.state.instanceProps.columnSizeAndPositionManager.getTotalSize(),
).toEqual(2500);
});
});

Expand Down Expand Up @@ -2301,10 +2313,11 @@ describe('Grid', () => {
});

// cellRendererCalls[0] is the element at rowIndex 0
const firstProps = cellRendererCalls[1];
const secondProps = cellRendererCalls[2];
// only two calls. Since the scrollTop is updated in getDerivedStateFromProps
const firstProps = cellRendererCalls[0];
const secondProps = cellRendererCalls[1];

expect(cellRendererCalls.length).toEqual(3);
expect(cellRendererCalls.length).toEqual(2);
expect(firstProps.style).not.toBe(secondProps.style);
});

Expand Down
Loading