Skip to content

Commit b15e7b5

Browse files
ZhijieZhangjustinjung04
authored andcommitted
[bugfix] Fix issue where an enabled element that has been disabled be… (#263)
* [bugfix] Fix issue where an enabled element that has been disabled before is not toggleable. Also update the disableElement API to disable left panel button as well if the left panel is disabled * remove - in the viewer comment
1 parent f517a77 commit b15e7b5

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/redux/actions/exposedActions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const closeElements = dataElements => dispatch => {
7575
export const toggleElement = dataElement => (dispatch, getState) => {
7676
const state = getState();
7777

78-
if (state.viewer.disabledElements[dataElement]) {
78+
if (state.viewer.disabledElements[dataElement] && state.viewer.disabledElements[dataElement].disabled) {
7979
return;
8080
}
8181

src/redux/actions/internalActions.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import core from 'core';
55

66
// viewer
77
export const disableElement = (dataElement, priority) => (dispatch, getState) => {
8-
if (dataElement === 'stylePopup') {
8+
if (dataElement === 'leftPanel') {
9+
dispatch(disableElements(['leftPanel', 'leftPanelButton'], priority));
10+
} else if (dataElement === 'stylePopup') {
911
dispatch(disableElements(['toolStylePopup', 'annotationStylePopup'], priority));
1012
} else {
1113
const currentPriority = selectors.getDisabledElementPriority(getState(), dataElement);
@@ -19,7 +21,9 @@ export const disableElements = (dataElements, priority) => (dispatch, getState)
1921
dispatch({ type: 'DISABLE_ELEMENTS', payload: { dataElements: filteredDataElements, priority } });
2022
};
2123
export const enableElement = (dataElement, priority) => (dispatch, getState) => {
22-
if (dataElement === 'stylePopup') {
24+
if (dataElement === 'leftPanel') {
25+
dispatch(enableElements(['leftPanel', 'leftPanelButton'], priority));
26+
} else if (dataElement === 'stylePopup') {
2327
dispatch(enableElements(['toolStylePopup', 'annotationStylePopup'], priority));
2428
} else {
2529
const currentPriority = selectors.getDisabledElementPriority(getState(), dataElement);

0 commit comments

Comments
 (0)