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.

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

Fix WindowScroller scrollElement prop types for window #939

Merged
merged 1 commit into from
Jan 2, 2018

Conversation

TrySound
Copy link
Contributor

@TrySound TrySound commented Jan 2, 2018

Ref #938

@TrySound TrySound force-pushed the fix-window-scroller-prop-types branch from 8fcae64 to abd04bc Compare January 2, 2018 12:38
@codecov-io
Copy link

Codecov Report

Merging #939 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #939   +/-   ##
=======================================
  Coverage   89.87%   89.87%           
=======================================
  Files          57       57           
  Lines        1630     1630           
=======================================
  Hits         1465     1465           
  Misses        165      165
Impacted Files Coverage Δ
source/WindowScroller/WindowScroller.js 85.24% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e4d9aed...abd04bc. Read the comment docs.

@TrySound TrySound merged commit bb05a52 into master Jan 2, 2018
@TrySound TrySound deleted the fix-window-scroller-prop-types branch January 2, 2018 14:59
@Hypnosphi
Copy link
Contributor

For some reason, this change didn't get into actual 9.16.0 release:

mkdir test
cd test
yarn init --yes
yarn add react-virtualized
cat node_modules/react-virtualized/dist/es/WindowScroller/WindowScroller.js

Then you can see those lines:

/** Element to attach scroll event listeners. Defaults to window. */
  scrollElement: typeof Element === 'function' ? require('prop-types').instanceOf(Element) : require('prop-types').any,

Instead of the expected

/** Element to attach scroll event listeners. Defaults to window. */
  scrollElement: require('prop-types').oneOfType([require('prop-types').any, typeof Element === 'function' ? require('prop-types').instanceOf(Element) : require('prop-types').any]),

@TrySound
Copy link
Contributor Author

TrySound commented Jan 6, 2018

Yeah, merge collision. Will be fixed in 9.16.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants