Skip to content
This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

Expand All Fails After Adding Multiple Pages #1175

Merged
merged 2 commits into from
Sep 27, 2019
Merged

Expand All Fails After Adding Multiple Pages #1175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf12594
DNN-28054 Expand All Fails After Adding Multiple Pages
mikebigun Sep 26, 2019
af2120a
Merge branch 'release/3.0.x' into bug/DNN-28054-rework
mitchelsellers Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...Web/src/components/dnn-persona-bar-page-treeview/src/PersonaBarPageTreeviewInteractor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class PersonaBarPageTreeviewInteractor extends Component {
this.init();
}

static getDerivedStateFromProps(props) {
static getDerivedStateFromProps(props, state) {
let setTreeViewExpanded = null;
let pageList = null;
const {
Expand Down Expand Up @@ -72,12 +72,21 @@ class PersonaBarPageTreeviewInteractor extends Component {
}
}, pageListCopy);

return {
const newState = {
rootLoaded: true,
isTreeviewExpanded: setTreeViewExpanded,
initialCollapse: !setTreeViewExpanded,
pageList: pageList || pageListCopy
};

const prevPageListCount = (state.pageList || []).length;
const newPageListCount = (newState.pageList || []).length;

if (prevPageListCount !== newPageListCount) {
return { ...newState, isChildLoaded: false };
}

return newState;
}

componentDidUpdate() {
Expand Down