Skip to content

Commit 407529c

Browse files
authored
Merge pull request #3 from ryanhefner/develop
v0.1.3
2 parents 66b9fd5 + 435c217 commit 407529c

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

README.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# React Scroll Trigger
1+
# react-scroll-trigger
22

33
React component that monitors `scroll` events to trigger callbacks when it enters,
44
exits and progresses through the viewport. All callback include the `progress` and
@@ -8,25 +8,20 @@ those values.
88
## Install
99

1010
Via [npm](https://npmjs.com/package/react-scroll-trigger)
11-
```
11+
12+
```sh
1213
npm install react-scroll-trigger
1314
```
1415

1516
Via [Yarn](http://yarn.fyi/react-scroll-trigger)
16-
```
17+
18+
```sh
1719
yarn add react-scroll-trigger
1820
```
1921

20-
### Requirements
21-
22-
* [react](https://npmjs.com/package/react)
23-
* [react-dom](https://npmjs.com/package/react-dom)
24-
* [prop-types](https://npmjs.com/package/prop-types)
25-
* [lodash](https://npmjs.com/package/lodash)
26-
2722
## How to use
2823

29-
```
24+
```js
3025
import ScrollTrigger from 'react-scroll-trigger';
3126

3227
...
@@ -59,14 +54,14 @@ import ScrollTrigger from 'react-scroll-trigger';
5954
The `ScrollTrigger` is intended to be used as a composable element, allowing you
6055
to either use it standalone within a page (ie. no children).
6156

62-
```
57+
```js
6358
<ScrollTrigger onEnter={this.onEnterViewport} onExit={this.onExitViewport} />
6459
```
6560

6661
Or, pass in children to receive events and `progress` based on the dimensions of
6762
those elements within the DOM.
6863

69-
```
64+
```js
7065
<ScrollTrigger onEnter={this.onEnterViewport} onExit={this.onExitViewport}>
7166
<List>
7267
[...list items...]

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"repository": "ryanhefner/react-scroll-trigger",
77
"author": "Ryan Hefner <hi@ryanhefner.com> (https://www.ryanhefner.com)",
88
"files": [
9-
"index.js",
109
"es",
10+
"index.js",
11+
"src",
1112
"umd"
1213
],
1314
"directories": {
@@ -31,6 +32,7 @@
3132
},
3233
"dependencies": {
3334
"clean-react-props": "^0.1.1",
35+
"lodash.omit": "^4.5.0",
3436
"lodash.throttle": "^4.1.1",
3537
"prop-types": "^15.5.10",
3638
"react-dom": "^15.6.1"

src/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, {Component} from 'react';
22
import PropTypes from 'prop-types';
33
import ReactDOM from 'react-dom';
4+
import omit from 'lodash.omit';
45
import throttle from 'lodash.throttle';
56
import cleanProps from 'clean-react-props';
67

@@ -125,7 +126,7 @@ class ScrollTrigger extends Component {
125126

126127
return (
127128
<div
128-
{...cleanProps(this.props)}
129+
{...omit(cleanProps(this.props), ['onProgress'])}
129130
ref={(element) => {
130131
this.element = element;
131132
}}

yarn.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,6 +1948,10 @@ locate-path@^2.0.0:
19481948
p-locate "^2.0.0"
19491949
path-exists "^3.0.0"
19501950

1951+
lodash.omit@^4.5.0:
1952+
version "4.5.0"
1953+
resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
1954+
19511955
lodash.throttle@^4.1.1:
19521956
version "4.1.1"
19531957
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"

0 commit comments

Comments
 (0)