Skip to content

Commit

Permalink
Merge branch 'release/2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
shawnmcknight committed Jan 31, 2018
2 parents b16f4cc + 8fb3e82 commit fd8ae94
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 27 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## HEAD

## 2.1.0
###### _Jan 31, 2018_
- Lodash as a peerDependency was causing missing peerDependency errors. Lodash peerDep replaced with stifle dep (#7) @shawnmcknight
- Bump several dependency versions @shawnmcknight
- Configure npm to not generate package-lock file @shawnmcknight

## 2.0.0

###### _May 30, 2017_
Expand Down
47 changes: 22 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-scrollbar-size",
"private": true,
"version": "2.0.2",
"version": "2.1.0",
"description": "React component to calculate the size of browser scrollbars",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,45 +32,43 @@
},
"homepage": "https://github.com/STORIS/react-scrollbar-size#readme",
"peerDependencies": {
"lodash": "^4.17.0",
"react": "^15.3.0 || ^16.0.0"
},
"dependencies": {
"babel-runtime": "^6.23.0",
"prop-types": "^15.5.10",
"react-event-listener": "^0.5.0"
"babel-runtime": "^6.26.0",
"prop-types": "^15.6.0",
"react-event-listener": "^0.5.1",
"stifle": "^1.0.2"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.3",
"babel-plugin-istanbul": "^4.1.4",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.0.2",
"babel-plugin-istanbul": "^4.1.5",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-export-extensions": "^6.22.0",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.5",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.12",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.5.1",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.24.1",
"babel-register": "^6.24.1",
"babel-register": "^6.26.0",
"chai": "^4.0.0",
"cross-env": "^5.0.0",
"dotenv": "^4.0.0",
"enzyme": "^2.8.2",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-config-prettier": "^2.1.1",
"eslint-plugin-import": "^2.3.0",
"eslint-plugin-jsx-a11y": "^5.0.3",
"eslint-plugin-mocha": "^4.9.0",
"eslint-plugin-prettier": "^2.1.1",
"eslint-plugin-react": "^7.0.1",
"eslint": "^4.16.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-mocha": "^4.11.0",
"eslint-plugin-prettier": "^2.5.0",
"eslint-plugin-react": "^7.6.1",
"fs-extra": "^3.0.1",
"jsdom": "^11.0.0",
"lodash": "^4.17.4",
"mocha": "^3.4.2",
"nyc": "^10.3.2",
"prettier": "^1.3.1",
"prettier": "^1.10.2",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-test-renderer": "^15.5.4",
Expand All @@ -88,7 +86,6 @@
],
"plugins": [
"transform-class-properties",
"transform-export-extensions",
"transform-object-rest-spread",
"transform-runtime"
],
Expand Down
4 changes: 2 additions & 2 deletions src/ScrollbarSize.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import EventListener from 'react-event-listener';
import throttle from 'lodash/throttle';
import stifle from 'stifle';

const styles = {
width: '100px',
Expand Down Expand Up @@ -41,7 +41,7 @@ class ScrollbarSize extends Component {
this.scrollbarWidth = this.node.offsetWidth - this.node.clientWidth;
};

handleResize = throttle(() => {
handleResize = stifle(() => {
const { onChange } = this.props;

const prevHeight = this.scrollbarHeight;
Expand Down

0 comments on commit fd8ae94

Please sign in to comment.