From 06ae6fb47115795d24a7f62b0ba11e534550df2d Mon Sep 17 00:00:00 2001 From: byron Date: Tue, 16 Apr 2019 22:28:05 -0400 Subject: [PATCH 1/2] :recycle: use safe way --- src/TreeContainer.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/TreeContainer.js b/src/TreeContainer.js index baeaeeaaa5..5501b537a9 100644 --- a/src/TreeContainer.js +++ b/src/TreeContainer.js @@ -98,6 +98,8 @@ class TreeContainer extends Component { } getComponent(_dashprivate_layout, children, loading_state, setProps) { + const { config } = this.props; + if (isEmpty(_dashprivate_layout)) { return null; } @@ -110,8 +112,8 @@ class TreeContainer extends Component { const element = Registry.resolve(_dashprivate_layout); const props = omit(['children'], _dashprivate_layout.props); - const config = window.store.getState().config; - return config.props_check && config.ui ? ( + + return config.props_check ? ( ({ dependencies: state.dependenciesRequest.content, paths: state.paths, - requestQueue: state.requestQueue + requestQueue: state.requestQueue, + config: state.config }), dispatch => ({dispatch}), (stateProps, dispatchProps, ownProps) => ({ @@ -294,6 +298,7 @@ export const AugmentedTreeContainer = connect( _dashprivate_loadingState: getLoadingState(ownProps._dashprivate_layout, stateProps.requestQueue), _dashprivate_paths: stateProps.paths, _dashprivate_requestQueue: stateProps.requestQueue, + config: stateProps.config, }) )(TreeContainer); From f614bea8639592ce3de657f5c306bd0ef66490c4 Mon Sep 17 00:00:00 2001 From: byron Date: Wed, 17 Apr 2019 11:23:19 -0400 Subject: [PATCH 2/2] :ok_hand: change to align _dashprivate --- src/TreeContainer.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TreeContainer.js b/src/TreeContainer.js index 5501b537a9..900a761b37 100644 --- a/src/TreeContainer.js +++ b/src/TreeContainer.js @@ -98,7 +98,7 @@ class TreeContainer extends Component { } getComponent(_dashprivate_layout, children, loading_state, setProps) { - const { config } = this.props; + const { _dashprivate_config } = this.props; if (isEmpty(_dashprivate_layout)) { return null; @@ -113,7 +113,7 @@ class TreeContainer extends Component { const props = omit(['children'], _dashprivate_layout.props); - return config.props_check ? ( + return _dashprivate_config.props_check ? (