Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[Bug] remove argument.length check in injector (#899)

Shan He3d8f81914c3d
diff --git a/src/components/injector.js b/src/components/injector.js
index 616cb7c4e..44e1ff3b5 100644
--- a/src/components/injector.js
+++ b/src/components/injector.js
@@ -30,12 +30,7 @@ export const errorMsg = {
noDep: (fac, parent) =>
`${fac.name} is required as a dependency of ${parent.name}, ` +
`but is not provided to injectComponents. It will not be rendered.`,
- notFunc: '`factory and its replacement should be a function`',
- incompatibleDeps: (
- fac,
- given
- ) => `${fac.name} is expecting ${fac.length} arguments, but ${given} is given,
- You are likely forget to declare ${fac.name}.deps = []`
+ notFunc: '`factory and its replacement should be a function`'
};
export function injector(map = new Map()) {
@@ -49,22 +44,11 @@ export function injector(map = new Map()) {
}
// check if custom factory deps is declared
- const depsLength = factory.deps ? factory.deps.length : 0;
- let instances;
- if (factory.length !== depsLength) {
- Console.error(errorMsg.incompatibleDeps(factory, depsLength));
-
- const MissingDeps = () => (
- <div className="factory-missing-deps">{factory.name} is missing dependencies</div>
+ const instances =
+ cache.get(factory) ||
+ factory(
+ ...(factory.deps ? factory.deps.map(dep => get(dep, factory)) : [])
);
- instances = MissingDeps;
- } else {
- instances =
- cache.get(factory) ||
- factory(
- ...(factory.deps ? factory.deps.map(dep => get(dep, factory)) : [])
- );
- }
cache.set(fac, instances);
return instances;
diff --git a/test/browser/components/injector-test.js b/test/browser/components/injector-test.js
index fe0016a67..356f0c686 100644
--- a/test/browser/components/injector-test.js
+++ b/test/browser/components/injector-test.js
@@ -26,7 +26,13 @@ import {Provider} from 'react-redux';
import sinon from 'sinon';
import {console as Console} from 'global/window';
-import {withState, injectComponents, PanelHeaderFactory} from 'components';
+import {
+ withState,
+ injectComponents,
+ PanelHeaderFactory,
+ MapContainerFactory
+} from 'components';
+
import coreReducer from 'reducers/core';
import {keplerGlInit} from 'actions/actions';
import {errorMsg} from 'components/injector';
@@ -184,15 +190,21 @@ test('Components -> injector -> wrong replacement type', t => {
t.end();
});
-test('Components -> injector -> missing dep', t => {
- const spy = sinon.spy(Console, 'error');
+test('Components -> injector -> replace and render existing', t => {
+ myCustomHeaderFactory.deps = PanelHeaderFactory.deps;
- const myCustomHeaderFactory = Missing => () => <Missing />;
+ function myCustomHeaderFactory(...deps) {
+ const PanelHeader = PanelHeaderFactory(...deps);
+ PanelHeader.defaultProps
+ const MyHeader = props => {
+ return <PanelHeader {...props} appName="taro" />;
+ };
+ return MyHeader;
+ }
const KeplerGl = injectComponents([
[PanelHeaderFactory, myCustomHeaderFactory]
]);
-
// assume instance reducer is already mounted
const store = mockStore({
keplerGl: {
@@ -200,30 +212,16 @@ test('Components -> injector -> missing dep', t => {
}
});
- const wrapper = mount(
- <Provider store={store}>
- <KeplerGl id="foo" mapboxApiAccessToken="smoothie_and_milkshake" />
- </Provider>
- );
-
- t.ok(spy.calledOnce, 'should call Console.error twice');
- t.equal(
- spy.getCall(0).args[0],
- `${errorMsg.incompatibleDeps(myCustomHeaderFactory, 0)}`,
- 'should warn when deps of custom factory is not provided'
- );
-
- t.ok(
- wrapper.find('.factory-missing-deps'),
- 'should render missing deps component'
- );
- t.equal(
- wrapper.find('.factory-missing-deps').html(),
- '<div class="factory-missing-deps">myCustomHeaderFactory is missing dependencies</div>',
- 'should render missing deps component'
- );
+ let wrapper;
+ t.doesNotThrow(() => {
+ wrapper = mount(
+ <Provider store={store}>
+ <KeplerGl id="foo" mapboxApiAccessToken="smoothie_and_milkshake" />
+ </Provider>
+ );
+ }, 'should not throw error when replace and render existing component');
- spy.restore();
+ t.equal(wrapper.find('.logo__link').text(), 'taro', 'should render provided prop');
t.end();
});