Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] make provider injector function to get injectedApp back (#1318)
Shan He81bc6b37946a
diff --git a/src/components/container.js b/src/components/container.jsindex a96053566..ff563c1f1 100644--- a/src/components/container.js+++ b/src/components/container.js@@ -22,7 +22,7 @@ import React, {Component} from 'react';import {connect} from 'react-redux';import memoize from 'lodash.memoize';import {console as Console} from 'global/window';-import {injector, typeCheckRecipe} from './injector';+import {injector, provideRecipesToInjector, flattenDeps} from './injector';import KeplerGlFactory from './kepler-gl';import {forwardTo} from 'actions/action-wrapper';@@ -155,14 +155,6 @@ export function ContainerFactory(KeplerGl) {return connect(mapStateToProps, dispatchToProps)(Container);}-// entryPoint-function flattenDeps(allDeps, factory) {- const addToDeps = allDeps.concat([factory]);- return Array.isArray(factory.deps) && factory.deps.length- ? factory.deps.reduce((accu, dep) => flattenDeps(accu, dep), addToDeps)- : addToDeps;-}-const allDependencies = flattenDeps([], ContainerFactory);// provide all dependencies to appInjector@@ -173,20 +165,7 @@ export const appInjector = allDependencies.reduce(// Helper to inject custom components and return kepler.gl containerexport function injectComponents(recipes = []) {- return recipes- .reduce((inj, recipe) => {- if (!typeCheckRecipe(recipe)) {- return inj;- }-- // collect dependencies of custom factories, if there is any.- // Add them to the injector- const customDependencies = flattenDeps([], recipe[1]);- inj = customDependencies.reduce((ij, factory) => ij.provide(factory, factory), inj);-- return inj.provide(...recipe);- }, appInjector)- .get(ContainerFactory);+ return provideRecipesToInjector(recipes, appInjector).get(ContainerFactory);}const InjectedContainer = appInjector.get(ContainerFactory);diff --git a/src/components/index.js b/src/components/index.jsindex 28aaa4828..ce6214e09 100644--- a/src/components/index.js+++ b/src/components/index.js@@ -30,7 +30,7 @@ import PanelHeaderActionFactory from './side-panel/panel-header-action';import {appInjector} from './container';// Components-export {default as KeplerGl, default, injectComponents} from './container';+export {default as KeplerGl, default, injectComponents, ContainerFactory} from './container';// factoriesexport {default as KeplerGlFactory} from './kepler-gl';@@ -133,7 +133,7 @@ export {default as EditorFactory} from './editor/editor';export {default as FeatureActionPanelFactory} from './editor/feature-action-panel';// Injector-export {injector, withState} from './injector';+export {injector, provideRecipesToInjector, withState} from './injector';// Common Componentsexport {default as CloudTile} from './modals/cloud-tile';@@ -192,6 +192,7 @@ export const FieldToken = appInjector.get(FieldTokenFactory);export const PanelHeaderAction = appInjector.get(PanelHeaderActionFactory);export {+ appInjector,TimeRangeSliderFactory,RangeSliderFactory,VisConfigSliderFactory,diff --git a/src/components/injector.js b/src/components/injector.jsindex 6a7d2c1e0..96853d60c 100644--- a/src/components/injector.js+++ b/src/components/injector.js@@ -70,6 +70,41 @@ export function injector(map = new Map()) {};}+// entryPoint+export function flattenDeps(allDeps, factory) {+ const addToDeps = allDeps.concat([factory]);+ return Array.isArray(factory.deps) && factory.deps.length+ ? factory.deps.reduce((accu, dep) => flattenDeps(accu, dep), addToDeps)+ : addToDeps;+}++export function provideRecipesToInjector(recipes, appInjector) {+ const provided = new Map();++ return recipes.reduce((inj, recipe) => {+ if (!typeCheckRecipe(recipe)) {+ return inj;+ }++ // collect dependencies of custom factories, if there is any.+ // Add them to the appInjector+ const customDependencies = flattenDeps([], recipe[1]);+ inj = customDependencies.reduce((ij, factory) => {+ if (provided.get(factory)) {+ Console.warn(+ `${factory.name} already injected from ${provided.get(factory).name}, injecting ${+ recipe[0].name+ } after ${provided.get(factory).name} will override it`+ );+ }+ return ij.provide(factory, factory);+ }, inj);++ provided.set(recipe[0], recipe[1]);+ return inj.provide(...recipe);+ }, appInjector);+}+export function typeCheckRecipe(recipe) {if (!Array.isArray(recipe) || recipe.length < 2) {Console.error('Error injecting [factory, replacement]', recipe);