chore(docs): Changelog & Readme updates, fix redundant types

Author: STRML

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.6.0 (Jan 23, 2017)
+
+- Feature: Allow restricting by axis. (#40, thanks @dnissley-al)
+
 ### 1.5.0 (Jan 23, 2017)
 
 - Bugfix: Persist SyntheticEvents when needed (#45, #46)

README.md

@@ -23,15 +23,15 @@ Using [npm](https://www.npmjs.com/):
 
 ### Usage
 
-```javascript
-var Resizable = require('react-resizable').Resizable; // or,
-var ResizableBox = require('react-resizable').ResizableBox;
+```js
+const Resizable = require('react-resizable').Resizable; // or,
+const ResizableBox = require('react-resizable').ResizableBox;
 
-// Using ES6 transpiler
+// ES6
 import { Resizable, ResizableBox } from 'react-resizable';
 
-...
-render: function() {
+// ...
+render() {
   return (
     <ResizableBox width={200} height={200} draggableOpts={{...}}
         minConstraints={[100, 100]} maxConstraints={[300, 300]}>
@@ -41,41 +41,24 @@ render: function() {
 }
 ```
 
-### `<Resizable>` Options
-
-```js
-{
-// Functions
-onResizeStop: React.PropTypes.func,
-onResizeStart: React.PropTypes.func,
-onResize: React.PropTypes.func,
-
-width: React.PropTypes.number.isRequired,
-height: React.PropTypes.number.isRequired,
-// If you change this, be sure to update your css
-handleSize: React.PropTypes.array,
-// These will be passed wholesale to react-draggable
-draggableOpts: React.PropTypes.object
-}
-```
+### Props
 
-### `<ResizableBox>` Options
+These props apply to both `<Resizable>` and `<ResizableBox>`.
 
 ```js
 {
-// Preserves aspect ratio (default: false)
-lockAspectRatio: React.PropTypes.bool,
-
-// Restricts resizing to a particular axis (default: 'both')
-axis: React.PropTypes.oneOf(['both', 'x', 'y', 'none']),
-
-// Constaints coords, pass [x,y]
-minConstraints: React.PropTypes.arrayOf(React.PropTypes.number),
-maxConstraints: React.PropTypes.arrayOf(React.PropTypes.number),
-
-// Initial width/height - otherwise use CSS
-height: React.PropTypes.number,
-width: React.PropTypes.number
-}
-```
+  children: React.Element<any>,
+  width: number,
+  height: number,
+  // If you change this, be sure to update your css
+  handleSize: [number, number] = [10, 10],
+  lockAspectRatio: boolean = false,
+  axis: 'both' | 'x' | 'y' | 'none' = 'both',
+  minConstraints: [number, number] = [10, 10],
+  maxConstraints: [number, number] = [Infinity, Infinity],
+  onResizeStop?: ?(e: SyntheticEvent, data: ResizeCallbackData) => any,
+  onResizeStart?: ?(e: SyntheticEvent, data: ResizeCallbackData) => any,
+  onResize?: ?(e: SyntheticEvent, data: ResizeCallbackData) => any,
+  draggableOpts?: ?Object
+};
 ```

lib/ResizableBox.jsx

@@ -3,7 +3,6 @@ import {default as React, PropTypes} from 'react';
 import Resizable from './Resizable';
 import type {Props as ResizableProps} from './Resizable';
 
-type Props = {width: number, height: number};
 type State = {width: number, height: number};
 type Size = {width: number, height: number};
 type ResizeData = {element: Element, size: Size};
@@ -14,7 +13,7 @@ export default class ResizableBox extends React.Component {
     height: PropTypes.number,
     width: PropTypes.number
   };
-  props: Props & ResizableProps;
+  props: ResizableProps;
 
   static defaultProps = {
     handleSize: [20,20]
@@ -36,7 +35,7 @@ export default class ResizableBox extends React.Component {
     }
   };
 
-  componentWillReceiveProps(nextProps: typeof ResizableBox.prototype.props) {
+  componentWillReceiveProps(nextProps: ResizableProps) {
     if (nextProps.width !== this.props.width || nextProps.height !== this.props.height) {
       this.setState({
         width: nextProps.width,