Skip to content

[DetailsList] Fixed focus test #4087

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

Merged
lambertwang-zz merged 2 commits into from
Feb 24, 2018
Merged

[DetailsList] Fixed focus test #4087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3affc11
Mock test
lambertwang-zz Feb 24, 2018
f3ac795
Change files
lambertwang-zz Feb 24, 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
11 changes: 11 additions & 0 deletions ...changes/@uifabric/example-app-base/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/example-app-base",
"type": "none"
}
],
"packageName": "@uifabric/example-app-base",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/experiments/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/experiments",
"type": "none"
}
],
"packageName": "@uifabric/experiments",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions ...n/changes/@uifabric/fabric-website/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/fabric-website",
"type": "none"
}
],
"packageName": "@uifabric/fabric-website",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions .../changes/@uifabric/file-type-icons/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/file-type-icons",
"type": "none"
}
],
"packageName": "@uifabric/file-type-icons",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/icons/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/icons",
"type": "none"
}
],
"packageName": "@uifabric/icons",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/styling/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/styling",
"type": "none"
}
],
"packageName": "@uifabric/styling",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/variants/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/variants",
"type": "none"
}
],
"packageName": "@uifabric/variants",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/magellan-fixDetailsListFocusTest_2018-02-24-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "[DetailsList] Fixed test by mocking visiblity",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
19 changes: 14 additions & 5 deletions packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ describe('DetailsList', () => {
expect(component).toBeDefined();
(component as IDetailsList).focusIndex(2);
setTimeout(() => {
expect(document.activeElement.className.split(' ')).toContain('ms-DetailsRow');
expect(document.activeElement.textContent).toEqual('2');
expect(document.activeElement.className.split(' ')).toContain('ms-DetailsRow');
}, 0);
jest.runOnlyPendingTimers();
});
Expand Down Expand Up @@ -96,17 +96,26 @@ describe('DetailsList', () => {
/>);

expect(component).toBeDefined();
(component as IDetailsList).focusIndex(2);
(component as IDetailsList).focusIndex(3);
setTimeout(() => {
expect(document.activeElement.textContent).toEqual('3');
expect(document.activeElement.className.split(' ')).toContain('ms-DetailsRow');
expect(document.activeElement.textContent).toEqual('2');
}, 0);
jest.runOnlyPendingTimers();

(component as IDetailsList).focusIndex(2, true);
// Set element visibility manually as a test workaround
(component as IDetailsList).focusIndex(4);
setTimeout(() => {
(document.activeElement.children[1] as any).isVisible = true;
(document.activeElement.children[1].children[0] as any).isVisible = true;
(document.activeElement.children[1].children[0].children[0] as any).isVisible = true;
}, 0);

jest.runOnlyPendingTimers();
(component as IDetailsList).focusIndex(4, true);
setTimeout(() => {
expect(document.activeElement.textContent).toEqual('4');
expect(document.activeElement.className.split(' ')).toContain('test-column');
expect(document.activeElement.textContent).toEqual('2');
}, 0);
jest.runOnlyPendingTimers();
});
Expand Down