getEntity method

AntoineReneleau · Aug 13, 2015 · bc32d37 · bc32d37
1 parent 035287b
commit bc32d37
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 23 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -11,7 +11,8 @@
     "react/jsx-uses-vars": 2,
     "react/react-in-jsx-scope": 2,
     "no-var": 2,
-    "max-len": [2, 80]
+    "max-len": [2, 80],
+    "semi": 2
   },
   "plugins": [
     "react"

diff --git a/dist/components/__tests__/entity-test.js b/dist/components/__tests__/entity-test.js
@@ -12,6 +12,8 @@ describe('Entity', function () {
     onClick: 'click'
   });
 
+  var entity = undefined;
+
   beforeEach(function () {
     window.google = {
       maps: {
@@ -26,8 +28,6 @@ describe('Entity', function () {
 
   describe('mounting', function () {
 
-    var entity = undefined;
-
     beforeEach(function () {
       window.google.maps.Entity = jest.genMockFunction();
       entity = TestUtils.renderIntoDocument(React.createElement(Entity, { onClick: jest.genMockFunction() }));
@@ -49,8 +49,6 @@ describe('Entity', function () {
 
   describe('unmounting', function () {
 
-    var entity = undefined;
-
     beforeEach(function () {
       window.google.maps.Entity = function () {
         return {
@@ -99,4 +97,13 @@ describe('Entity', function () {
       expect(parent.refs.child.entity.setOptions).toBeCalled();
     });
   });
+
+  describe('getEntity', function () {
+
+    it('calls `setOptions` when receive new props', function () {
+      window.google.maps.Entity = jest.genMockFunction();
+      entity = TestUtils.renderIntoDocument(React.createElement(Entity, null));
+      expect(entity.getEntity()).toBeDefined();
+    });
+  });
 });
diff --git a/dist/components/__tests__/gmaps-test.js b/dist/components/__tests__/gmaps-test.js
@@ -83,7 +83,9 @@ describe('Gmaps', function () {
   });
 
   it('clones children with map', function () {
-    expect(gmaps.getChildren()['.0'].props.map).toBeDefined();
+    React.Children.forEach(gmaps.getChildren(), function (child) {
+      expect(child.props.map).toBeDefined();
+    });
   });
 
   it('binds events', function () {

diff --git a/dist/components/entity.js b/dist/components/entity.js
@@ -42,6 +42,10 @@ exports['default'] = function (name, latLngProp, events) {
       this.entity = null;
     },
 
+    getEntity: function getEntity() {
+      return this.entity;
+    },
+
     getOptions: function getOptions(props) {
       return _extends({}, props, _defineProperty({}, latLngProp, new google.maps.LatLng(props.lat, props.lng)));
     },

diff --git a/dist/components/gmaps.js b/dist/components/gmaps.js
@@ -10,10 +10,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _reactLibCloneWithProps = require('react/lib/cloneWithProps');
-
-var _reactLibCloneWithProps2 = _interopRequireDefault(_reactLibCloneWithProps);
-
 var _reactLibObjectAssign = require('react/lib/Object.assign');
 
 var _reactLibObjectAssign2 = _interopRequireDefault(_reactLibObjectAssign);
@@ -91,7 +87,8 @@ var Gmaps = _react2['default'].createClass({
       if (!_react2['default'].isValidElement(child)) {
         return child;
       }
-      return (0, _reactLibCloneWithProps2['default'])(child, {
+      return _react2['default'].cloneElement(child, {
+        ref: child.ref,
         map: _this.map
       });
     });

diff --git a/src/components/__tests__/entity-test.js b/src/components/__tests__/entity-test.js
@@ -10,6 +10,8 @@ describe('Entity', () => {
     onClick: 'click'
   });
 
+  let entity;
+
   beforeEach(() => {
     window.google = {
       maps: {
@@ -24,8 +26,6 @@ describe('Entity', () => {
 
   describe('mounting', () => {
 
-    let entity;
-
     beforeEach(() => {
       window.google.maps.Entity = jest.genMockFunction();
       entity = TestUtils.renderIntoDocument(
@@ -50,13 +50,11 @@ describe('Entity', () => {
 
   describe('unmounting', () => {
 
-    let entity;
-
     beforeEach(() => {
       window.google.maps.Entity = () => {
         return {
           setMap: jest.genMockFunction()
-        }
+        };
       };
       entity = TestUtils.renderIntoDocument(
         <Entity onClick={jest.genMockFunction()} />
@@ -82,7 +80,7 @@ describe('Entity', () => {
       window.google.maps.Entity = () => {
         return {
           setOptions: jest.genMockFunction()
-        }
+        };
       };
       const Parent = React.createClass({
         getInitialState() {
@@ -91,7 +89,7 @@ describe('Entity', () => {
           };
         },
         render() {
-          return <Entity ref="child" />
+          return <Entity ref="child" />;
         }
       });
       const parent = TestUtils.renderIntoDocument(<Parent />);
@@ -103,5 +101,17 @@ describe('Entity', () => {
 
   });
 
+  describe('getEntity', () => {
+
+    it('calls `setOptions` when receive new props', () => {
+      window.google.maps.Entity = jest.genMockFunction();
+      entity = TestUtils.renderIntoDocument(
+        <Entity />
+      );
+      expect(entity.getEntity()).toBeDefined();
+    });
+
+  });
+
 });
 
diff --git a/src/components/__tests__/gmaps-test.js b/src/components/__tests__/gmaps-test.js
@@ -79,7 +79,9 @@ describe('Gmaps', () => {
   });
 
   it('clones children with map', () => {
-    expect(gmaps.getChildren()['.0'].props.map).toBeDefined();
+    React.Children.forEach(gmaps.getChildren(), (child) => {
+      expect(child.props.map).toBeDefined();
+    });
   });
 
   it('binds events', () => {

diff --git a/src/components/entity.js b/src/components/entity.js
@@ -25,6 +25,10 @@ export default (name, latLngProp, events) => {
       this.entity = null;
     },
 
+    getEntity() {
+      return this.entity;
+    },
+
     getOptions(props) {
       return {
         ...props,
@@ -37,4 +41,4 @@ export default (name, latLngProp, events) => {
     }
 
   });
-}
+};
diff --git a/src/components/gmaps.js b/src/components/gmaps.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import cloneWithProps from 'react/lib/cloneWithProps';
 import assign from 'react/lib/Object.assign';
 import MapEvents from '../events/map';
 import Listener from '../mixins/listener';
@@ -13,7 +12,7 @@ const Gmaps = React.createClass({
   getInitialState() {
     return {
       isMapCreated: false
-    }
+    };
   },
 
   componentDidMount() {
@@ -66,7 +65,8 @@ const Gmaps = React.createClass({
       if (!React.isValidElement(child)) {
         return child;
       }
-      return cloneWithProps(child, {
+      return React.cloneElement(child, {
+        ref: child.ref,
         map: this.map
       });
     });