addition to #765

pnp · Dec 29, 2020 · fbc88c3 · fbc88c3
1 parent e95fdb6
commit fbc88c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/controls/taxonomyPicker/TaxonomyPicker.tsx b/src/controls/taxonomyPicker/TaxonomyPicker.tsx
@@ -275,8 +275,6 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
         // Add the checked term
         activeNodes.push(termItem);
 
-        // Filter out the duplicate terms
-        activeNodes = uniqBy(activeNodes, 'key');
       } else {
         // Only store the current selected item
         activeNodes = [termItem];
@@ -292,6 +290,10 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
           };
         }));
       }
+
+      // Filter out the duplicate terms
+      activeNodes = uniqBy(activeNodes, 'key');
+
     } else {
       // Remove the term from the list of active nodes
       activeNodes = activeNodes.filter(item => item.key !== term.Id);

diff --git a/src/controls/taxonomyPicker/Term.tsx b/src/controls/taxonomyPicker/Term.tsx
@@ -46,13 +46,13 @@ export default class Term extends React.Component<ITermProps, ITermState> {
    */
   public componentWillReceiveProps?(nextProps: ITermProps, nextContext: any): void {
     // If multi-selection is turned off, only a single term can be selected
-    if (!this.props.multiSelection) {
+    //if (!this.props.multiSelection) {
       let active = nextProps.activeNodes.filter(item => item.key === this.props.term.Id);
-      this.state = {
+      this.setState ({
         selected: active.length > 0,
         termLabel: this.state.termLabel
-      };
-    }
+      });
+    //}
   }
 
   /**

diff --git a/src/webparts/controlsTest/components/ControlsTest.tsx b/src/webparts/controlsTest/components/ControlsTest.tsx
@@ -697,6 +697,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
         <div className="ms-font-m">Services tester:
           <TaxonomyPicker
             allowMultipleSelections={true}
+            selectChildrenIfParentSelected={true}
             //termsetNameOrID="61837936-29c5-46de-982c-d1adb6664b32" // id to termset that has a custom sort
             termsetNameOrID="8ea5ac06-fd7c-4269-8d0d-02f541df8eb9"
             initialValues={[{