Merge branch 'master' into master

Author: ErrorPro

README.md

@@ -43,6 +43,7 @@ A `types` props means type of places in [google place API](https://developers.go
 A [componentRestrictions](https://developers.google.com/maps/documentation/javascript/reference#ComponentRestrictions) prop by default is empty.
 A [bounds](https://developers.google.com/maps/documentation/javascript/reference#AutocompleteOptions) prop by default is empty.
 You also can pass any props you want to the final input. You can also set [fields](https://developers.google.com/maps/documentation/javascript/reference/places-service#PlaceResult) prop if you need extra information, now it defaults to basic data in order to control expenses.
+The `options`(optional) prop is the optional configuration to your Autocomplete instance. You can see full options [here](https://developers.google.com/maps/documentation/javascript/places-autocomplete#add_autocomplete) 
 
 ## Contribution
 

lib/index.js

@@ -65,20 +65,23 @@ var ReactGoogleAutocomplete = function (_React$Component) {
     value: function componentDidMount() {
       var _this2 = this;
 
+      // TODO: only take options as configuration object, remove config props from the components props.
       var _props = this.props,
           _props$types = _props.types,
           types = _props$types === undefined ? ['(cities)'] : _props$types,
           componentRestrictions = _props.componentRestrictions,
           bounds = _props.bounds,
           apiKey = _props.apiKey,
           _props$fields = _props.fields,
-          fields = _props$fields === undefined ? ['address_components', 'geometry.location', 'place_id', 'formatted_address'] : _props$fields;
+          fields = _props$fields === undefined ? ['address_components', 'geometry.location', 'place_id', 'formatted_address'] : _props$fields,
+          _props$options = _props.options,
+          options = _props$options === undefined ? {} : _props$options;
 
-      var config = {
+      var config = _extends({}, options, {
         types: types,
         bounds: bounds,
         fields: fields
-      };
+      });
 
       if (componentRestrictions) {
         config.componentRestrictions = componentRestrictions;
@@ -139,9 +142,10 @@ var ReactGoogleAutocomplete = function (_React$Component) {
           types = _props2.types,
           componentRestrictions = _props2.componentRestrictions,
           bounds = _props2.bounds,
+          options = _props2.options,
           apiKey = _props2.apiKey,
           inputAutocompleteValue = _props2.inputAutocompleteValue,
-          rest = _objectWithoutProperties(_props2, ['onPlaceSelected', 'types', 'componentRestrictions', 'bounds', 'apiKey', 'inputAutocompleteValue']);
+          rest = _objectWithoutProperties(_props2, ['onPlaceSelected', 'types', 'componentRestrictions', 'bounds', 'options', 'apiKey', 'inputAutocompleteValue']);
 
       return _react2.default.createElement('input', _extends({ ref: 'input' }, rest));
     }
@@ -152,11 +156,21 @@ var ReactGoogleAutocomplete = function (_React$Component) {
 
 ReactGoogleAutocomplete.propTypes = {
   onPlaceSelected: _propTypes2.default.func,
-  types: _propTypes2.default.array,
+  types: _propTypes2.default.arrayOf(_propTypes2.default.string),
   componentRestrictions: _propTypes2.default.object,
   bounds: _propTypes2.default.object,
   fields: _propTypes2.default.array,
   inputAutocompleteValue: _propTypes2.default.string,
+  options: _propTypes2.default.shape({
+    componentRestrictions: _propTypes2.default.object,
+    bounds: _propTypes2.default.object,
+    location: _propTypes2.default.object,
+    offset: _propTypes2.default.number,
+    origin: _propTypes2.default.object,
+    radius: _propTypes2.default.number,
+    sessionToken: _propTypes2.default.object,
+    types: _propTypes2.default.arrayOf(_propTypes2.default.string)
+  }),
   apiKey: _propTypes2.default.string
 };
 exports.default = ReactGoogleAutocomplete;

src/index.js

@@ -4,11 +4,21 @@ import PropTypes from 'prop-types';
 export default class ReactGoogleAutocomplete extends React.Component {
   static propTypes = {
     onPlaceSelected: PropTypes.func,
-    types: PropTypes.array,
+    types: PropTypes.arrayOf(PropTypes.string),
     componentRestrictions: PropTypes.object,
     bounds: PropTypes.object,
     fields: PropTypes.array,
     inputAutocompleteValue: PropTypes.string,
+    options: PropTypes.shape({
+      componentRestrictions: PropTypes.object,
+      bounds: PropTypes.object,
+      location: PropTypes.object,
+      offset: PropTypes.number,
+      origin: PropTypes.object,
+      radius: PropTypes.number,
+      sessionToken: PropTypes.object,
+      types: PropTypes.arrayOf(PropTypes.string)
+    }),
     apiKey: PropTypes.string
   };
 
@@ -19,6 +29,7 @@ export default class ReactGoogleAutocomplete extends React.Component {
   }
 
   componentDidMount() {
+    // TODO: only take options as configuration object, remove config props from the components props.
     const {
       types = ['(cities)'],
       componentRestrictions,
@@ -29,9 +40,11 @@ export default class ReactGoogleAutocomplete extends React.Component {
         'geometry.location',
         'place_id',
         'formatted_address'
-      ]
+      ],
+      options = {}
     } = this.props;
     const config = {
+      ...options,
       types,
       bounds,
       fields
@@ -115,6 +128,7 @@ export default class ReactGoogleAutocomplete extends React.Component {
       types,
       componentRestrictions,
       bounds,
+      options,
       apiKey,
       inputAutocompleteValue,
       ...rest