diff --git a/develop/GMap.js b/develop/GMap.js
index 11bdd33..bdd0dc1 100644
--- a/develop/GMap.js
+++ b/develop/GMap.js
@@ -33,16 +33,18 @@ export const gMap = (
}
) => (
{markers}
diff --git a/develop/GMapHeatmap.js b/develop/GMapHeatmap.js
index 51f2358..c19d0c1 100644
--- a/develop/GMapHeatmap.js
+++ b/develop/GMapHeatmap.js
@@ -33,17 +33,20 @@ export const gMapHeatmap = (
}
) => (
{markers}
diff --git a/develop/GMapLayers.js b/develop/GMapLayers.js
index ca44b79..bca133d 100644
--- a/develop/GMapLayers.js
+++ b/develop/GMapLayers.js
@@ -33,21 +33,23 @@ export const gMap = (
}
) => (
12
? []
: zoom > 10 ? ['TrafficLayer'] : ['TrafficLayer', 'TransitLayer']
}
- onChange={onChange}
- onChildMouseEnter={onChildMouseEnter}
- onChildMouseLeave={onChildMouseLeave}
- heatmapLibrary
>
{markers}
diff --git a/develop/GMapOptim.js b/develop/GMapOptim.js
index 280914b..97abfc0 100644
--- a/develop/GMapOptim.js
+++ b/develop/GMapOptim.js
@@ -39,17 +39,19 @@ export const gMap = (
}
) => (
{markers}
diff --git a/develop/GMapResizable.js b/develop/GMapResizable.js
index 559fa96..4842250 100644
--- a/develop/GMapResizable.js
+++ b/develop/GMapResizable.js
@@ -18,6 +18,7 @@ import GoogleMapReact from '../src';
import SimpleMarker from './markers/SimpleMarker';
import ptInBounds from './utils/ptInBounds';
+import withStateSelector from './utils/withStateSelector';
export const gMapResizable = (
{
@@ -33,18 +34,19 @@ export const gMapResizable = (
}
) => (
{markers}
diff --git a/develop/Layout.sass b/develop/Layout.sass
index 7d37df8..fbf15e9 100644
--- a/develop/Layout.sass
+++ b/develop/Layout.sass
@@ -3,7 +3,7 @@
min-height: 90vh
flex-direction: column
margin: 0 1px 0 1px
- width: 100vh
+ width: 100vw
.header
height: 2em
background-color: #004336
diff --git a/develop/utils/utils/createEagerElementUtil.js b/develop/utils/createEagerElementUtil.js
similarity index 100%
rename from develop/utils/utils/createEagerElementUtil.js
rename to develop/utils/createEagerElementUtil.js
diff --git a/develop/utils/createEagerFactory.js b/develop/utils/createEagerFactory.js
index 3850689..541475e 100644
--- a/develop/utils/createEagerFactory.js
+++ b/develop/utils/createEagerFactory.js
@@ -1,4 +1,4 @@
-import createEagerElementUtil from './utils/createEagerElementUtil';
+import createEagerElementUtil from './createEagerElementUtil';
import isReferentiallyTransparentFunctionComponent
from './isReferentiallyTransparentFunctionComponent';
diff --git a/develop/utils/createHelper.js b/develop/utils/createHelper.js
new file mode 100644
index 0000000..3d9ace4
--- /dev/null
+++ b/develop/utils/createHelper.js
@@ -0,0 +1,29 @@
+import { wrapDisplayName } from 'recompose';
+
+const createHelper = (
+ func,
+ helperName,
+ setDisplayName = true,
+ noArgs = false
+) => {
+ if (process.env.NODE_ENV !== 'production' && setDisplayName) {
+ if (noArgs) {
+ return BaseComponent => {
+ const Component = func(BaseComponent);
+ Component.displayName = wrapDisplayName(BaseComponent, helperName);
+ return Component;
+ };
+ }
+
+ return (...args) =>
+ BaseComponent => {
+ const Component = func(...args)(BaseComponent);
+ Component.displayName = wrapDisplayName(BaseComponent, helperName);
+ return Component;
+ };
+ }
+
+ return func;
+};
+
+export default createHelper;
diff --git a/develop/utils/omit.js b/develop/utils/omit.js
deleted file mode 100644
index 23159ea..0000000
--- a/develop/utils/omit.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// https://github.com/acdlite/recompose/blob/master/src/packages/recompose/utils/omit.js
-const omit = (obj, keys) => {
- const { ...rest } = obj;
- for (let i = 0; i < keys.length; i++) {
- const key = keys[i];
- if (key in rest) {
- delete rest[key];
- }
- }
- return rest;
-};
-
-export default omit;
diff --git a/develop/utils/pick.js b/develop/utils/pick.js
deleted file mode 100644
index 1d8a6d7..0000000
--- a/develop/utils/pick.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// https://github.com/acdlite/recompose/blob/master/src/packages/recompose/utils/pick.js
-
-const pick = (obj, keys) => {
- const result = {};
- for (let i = 0; i < keys.length; i++) {
- const key = keys[i];
- if (key in obj) {
- result[key] = obj[key];
- }
- }
- return result;
-};
-
-export default pick;
diff --git a/develop/utils/props2Stream.js b/develop/utils/props2Stream.js
index 8fe0f6a..1f05a40 100644
--- a/develop/utils/props2Stream.js
+++ b/develop/utils/props2Stream.js
@@ -1,9 +1,11 @@
import { Component } from 'react';
-import createHelper from 'recompose/createHelper';
+import omit from 'lodash.omit';
+
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import 'rxjs/add/operator/distinctUntilChanged';
+
+import createHelper from './createHelper';
import createEagerFactory from './createEagerFactory';
-import omit from './omit';
const prop2Stream = (propName, comparator = (a, b) => a === b) =>
BaseComponent => {
diff --git a/develop/utils/stream2Props.js b/develop/utils/stream2Props.js
index d890148..9ddb5a3 100644
--- a/develop/utils/stream2Props.js
+++ b/develop/utils/stream2Props.js
@@ -1,5 +1,5 @@
import { Component } from 'react';
-import createHelper from 'recompose/createHelper';
+import createHelper from './createHelper';
import createEagerFactory from './createEagerFactory';
// if stream prop will change this will fail,
diff --git a/develop/utils/withStateSelector.js b/develop/utils/withStateSelector.js
index 9ad07ce..3058ab0 100644
--- a/develop/utils/withStateSelector.js
+++ b/develop/utils/withStateSelector.js
@@ -1,5 +1,5 @@
import { Component } from 'react';
-import createHelper from 'recompose/createHelper';
+import createHelper from './createHelper';
import createEagerFactory from './createEagerFactory';
const withStateSelector = (stateName, stateUpdaterName, selectorFactory) =>
diff --git a/package.json b/package.json
index c5c17fa..aa49ce8 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
"jsdom": "^6.5.1",
"kotatsu": "^0.14.0",
"lint-staged": "^3.4.0",
+ "lodash.omit": "^4.5.0",
"mocha": "^2.3.3",
"node-sass": "^3.7.0",
"normalize.css": "^4.1.1",
diff --git a/webpack.config.base.js b/webpack.config.base.js
index acd2089..8165a67 100644
--- a/webpack.config.base.js
+++ b/webpack.config.base.js
@@ -1,31 +1,27 @@
-var webpack = require('webpack');
-
-var reactExternal = {
+const reactExternal = {
root: 'React',
commonjs2: 'react',
commonjs: 'react',
- amd: 'react'
+ amd: 'react',
};
-var reactDomExternal = {
+const reactDomExternal = {
root: 'ReactDOM',
commonjs2: 'react-dom',
commonjs: 'react-dom',
- amd: 'react-dom'
+ amd: 'react-dom',
};
module.exports = {
output: {
library: 'GoogleMapReact',
- libraryTarget: 'umd'
+ libraryTarget: 'umd',
},
externals: {
- 'react': reactExternal,
+ react: reactExternal,
'react-dom': reactDomExternal,
},
module: {
- loaders: [
- { test: /\.js$/, exclude: /node_modules/, loader: 'babel' }
- ]
+ loaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'babel' }],
},
};
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index bf2c1a9..350c508 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -1,12 +1,12 @@
-var webpack = require('webpack');
-var baseConfig = require('./webpack.config.base');
+const webpack = require('webpack');
+const baseConfig = require('./webpack.config.base');
-var config = Object.create(baseConfig);
+const config = Object.create(baseConfig);
config.plugins = [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify('development')
- })
+ 'process.env.NODE_ENV': JSON.stringify('development'),
+ }),
];
module.exports = config;
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 49cc3a4..86bbb69 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -1,19 +1,18 @@
-/* eslint-disable */
-var webpack = require('webpack');
-var baseConfig = require('./webpack.config.base');
+const webpack = require('webpack');
+const baseConfig = require('./webpack.config.base');
-var config = Object.create(baseConfig);
+const config = Object.create(baseConfig);
config.plugins = [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify('production')
+ 'process.env.NODE_ENV': JSON.stringify('production'),
}),
new webpack.optimize.UglifyJsPlugin({
compressor: {
screw_ie8: true,
- warnings: false
- }
- })
+ warnings: false,
+ },
+ }),
];
module.exports = config;
diff --git a/yarn.lock b/yarn.lock
index 96d4626..3c00f49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3431,6 +3431,10 @@ lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+lodash.omit@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+
lodash.pickby@^4.0.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
@@ -5375,8 +5379,8 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
ua-parser-js@^0.7.9:
- version "0.7.14"
- resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca"
+ version "0.7.17"
+ resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
uglify-js@~2.7.3:
version "2.7.5"