Skip to content

Check for no wrap fix #9542

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
JasonGore merged 6 commits into from
Jun 24, 2019
+16 −5
Merged

Check for no wrap fix #9542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5e573f
fix checkForNoWrap
Jun 21, 2019
8835577
add change file
Jun 21, 2019
d50f23a
revert unintented change
Jun 21, 2019
a685181
revert unintented change
Jun 21, 2019
8a59a1e
add new line to change file
Jun 21, 2019
647d659
PR feedback
Jun 21, 2019
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 common/changes/office-ui-fabric-react/checkForNoWrapFix_2019-06-21-05-14.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": "FocusZone: fixed keyboard navigation when checkForNoWrap prop enabled.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "vichaudh@microsoft.com"
}
10 changes: 5 additions & 5 deletions packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ export class FocusZone extends React.Component<IFocusZoneProps, {}> implements I
// root props has been deprecated and should get removed.
// it needs to be marked as "any" since root props expects a div element, but really Tag can
// be any native element so typescript rightly flags this as a problem.
...rootProps as any
...(rootProps as any)
}
// Once the getClassName correctly memoizes inputs this should
// be replaced so that className is passed to getRootClass and is included there so
Expand Down Expand Up @@ -849,9 +849,9 @@ export class FocusZone extends React.Component<IFocusZoneProps, {}> implements I
// Going left at a leftmost rectangle will go down a line instead of up a line like in LTR.
// This is important, because we want to be comparing the top of the target rect
// with the bottom of the active rect.
topBottomComparison = targetRect.top.toFixed(3) < activeRect.bottom.toFixed(3);
topBottomComparison = parseFloat(targetRect.top.toFixed(3)) < parseFloat(activeRect.bottom.toFixed(3));
} else {
topBottomComparison = targetRect.bottom.toFixed(3) > activeRect.top.toFixed(3);
topBottomComparison = parseFloat(targetRect.bottom.toFixed(3)) > parseFloat(activeRect.top.toFixed(3));
}

if (topBottomComparison && targetRect.right <= activeRect.right && this.props.direction !== FocusZoneDirection.vertical) {
Expand Down Expand Up @@ -889,9 +889,9 @@ export class FocusZone extends React.Component<IFocusZoneProps, {}> implements I
// Going right at a rightmost rectangle will go up a line instead of down a line like in LTR.
// This is important, because we want to be comparing the bottom of the target rect
// with the top of the active rect.
topBottomComparison = targetRect.bottom.toFixed(3) > activeRect.top.toFixed(3);
topBottomComparison = parseFloat(targetRect.bottom.toFixed(3)) > parseFloat(activeRect.top.toFixed(3));
} else {
topBottomComparison = targetRect.top.toFixed(3) < activeRect.bottom.toFixed(3);
topBottomComparison = parseFloat(targetRect.top.toFixed(3)) < parseFloat(activeRect.bottom.toFixed(3));
}

if (topBottomComparison && targetRect.left >= activeRect.left && this.props.direction !== FocusZoneDirection.vertical) {
Expand Down