#578 - Added extra checks for term selection

pnp · Jun 12, 2020 · 5be8a5d · 5be8a5d
1 parent 01af3c9
commit 5be8a5d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/controls/taxonomyPicker/Term.tsx b/src/controls/taxonomyPicker/Term.tsx
@@ -70,8 +70,8 @@ export default class Term extends React.Component<ITermProps, ITermState> {
     return styles.termEnabled;
   }
 
-  private termActionCallback = (updateAction: UpdateAction): void => {
-    if (updateAction == null) {
+  private termActionCallback = (updateAction: UpdateAction | null): void => {
+    if (!updateAction) {
       return;
     }
 
@@ -88,10 +88,13 @@ export default class Term extends React.Component<ITermProps, ITermState> {
         disabled: updateAction.value as boolean
       });
     } else if (updateAction.updateActionType === UpdateType.selectTerm) {
-      this.setState({
-        selected: updateAction.value as boolean
-      });
-      this.props.changedCallback(this.props.term, updateAction.value as boolean);
+      // Only select the term when not disabled or hidden
+      if (!this.state.disabled && !this.state.hidden) {
+        this.setState({
+          selected: updateAction.value as boolean
+        });
+        this.props.changedCallback(this.props.term, updateAction.value as boolean);
+      }
     } else {
       this.props.updateTaxonomyTree();
     }

diff --git a/src/controls/taxonomyPicker/termActions/ITermsActions.ts b/src/controls/taxonomyPicker/termActions/ITermsActions.ts
@@ -17,7 +17,7 @@ export interface ITermActionsControlProps {
   /**
    * Callback after execution term action.
    */
-  termActionCallback: (updateAction: UpdateAction) => void;
+  termActionCallback: (updateAction: UpdateAction | null) => void;
 }
 
 export interface ITermActionsControlState {
@@ -40,7 +40,7 @@ export interface IConcreteTermActionProps {
   term: ITerm;
   displayStyle: TermActionsDisplayStyle;
   spTermService: SPTermStorePickerService;
-  termActionCallback: (updateAction: UpdateAction) => void;
+  termActionCallback: (updateAction: UpdateAction | null) => void;
 }
 
 /**