Merge master to v1.0-beta #475
Merged
Conversation
This file contains 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
… (Helps #440) This seems to have helped the screen reader identify where it is when focus is within the table. When using Narrator in Edge or Accessibility tools with Firefox, the screen reader says the roles correctly, reads the column with the cell, can tell which column it is in, and which row it is in.
| @@ -22,6 +22,7 @@ import PropTypes from 'prop-types'; | |||
| import ReactTouchHandler from 'ReactTouchHandler'; | |||
| import ReactWheelHandler from 'ReactWheelHandler'; | |||
| import Scrollbar from 'Scrollbar'; | |||
| import ariaAttributesSelector from 'ariaAttributes'; | |||
There was a problem hiding this comment.
I put this to a selector. Will be easier to manage in the near future.
| this._touchHandler.onTouchMove, | ||
| { passive: false } | ||
| ); | ||
| if (this.props.touchScrollEnabled) { |
There was a problem hiding this comment.
only add the touch event handler if the prop is on
| onTouchStart={this._touchHandler.onTouchStart} | ||
| onTouchEnd={this._touchHandler.onTouchEnd} | ||
| onTouchCancel={this._touchHandler.onTouchCancel} | ||
| onTouchStart={touchScrollEnabled ? this._touchHandler.onTouchStart : null} |
There was a problem hiding this comment.
don't register touch event handlers unless prop is on
| @@ -512,11 +512,11 @@ class Scrollbar extends React.PureComponent { | |||
| } | |||
|
|
|||
| getTouchX = (/*object*/ e) => { | |||
| return Math.round(e.targetTouches[0].pageX - e.target.getBoundingClientRect().x); | |||
| return Math.round(e.targetTouches[0].clientX - e.target.getBoundingClientRect().x); | |||
There was a problem hiding this comment.
fixes touch positioning of the scrollbar thumb
| * ariaRowIndexOffset: number | ||
| * }} | ||
| */ | ||
| function calculateAriaAttributes(rowsCount, useGroupHeader, useFooter) { |
There was a problem hiding this comment.
@Tanner-MS , can you review this function? I just copied your PR for master, and renamed/rearranged a bit.
Tanner-MS
approved these changes
Aug 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description, Motivation and Context
Merges latest master to v1.0-beta to prepare for 1.0-beta production release.
Improvements/bug fixes that gets merged from master:
How Has This Been Tested?
Tested on our examples and verified the role attributes and touch scrolling.
Types of changes
Checklist: