@patternfly/react-core 4.202.23 → 4.202.24

package/dist/umd/react-core.js

@@ -6482,10 +6482,11 @@
         constructor(props) {
             super(props);
             this.onDocClick = (event) => {
-                const { parentRef, menuRef, isOpen, onToggle, onClose } = this.props;
+                const { parentRef, menuRef, footerRef, isOpen, onToggle, onClose } = this.props;
                 const clickedOnToggle = parentRef && parentRef.current && parentRef.current.contains(event.target);
                 const clickedWithinMenu = menuRef && menuRef.current && menuRef.current.contains && menuRef.current.contains(event.target);
-                if (isOpen && !(clickedOnToggle || clickedWithinMenu)) {
+                const clickedWithinFooter = footerRef && footerRef.current && footerRef.current.contains && footerRef.current.contains(event.target);
+                if (isOpen && !(clickedOnToggle || clickedWithinMenu || clickedWithinFooter)) {
                     onToggle(false, event);
                     onClose();
                 }
@@ -10582,25 +10583,6 @@
             this.addSelectedButtonRef = React__namespace.createRef();
             this.removeSelectedButtonRef = React__namespace.createRef();
             this.removeAllButtonRef = React__namespace.createRef();
-            this.originalAvailableCopy = JSON.parse(JSON.stringify(this.props.availableOptions));
-            this.originalChosenCopy = JSON.parse(JSON.stringify(this.props.chosenOptions));
-            // If the DualListSelector uses trees, concat the two initial arrays and merge duplicate folder IDs
-            this.mergedCopy = this.props.isTree
-                ? Object.values(this.originalAvailableCopy
-                    .concat(this.originalChosenCopy)
-                    .reduce((mapObj, item) => {
-                    const key = item.id;
-                    if (mapObj[key]) {
-                        // If map already has an item ID, add the dupe ID's children to the existing map
-                        mapObj[key].children.push(...item.children);
-                    }
-                    else {
-                        // Else clone the item data
-                        mapObj[key] = Object.assign({}, item);
-                    }
-                    return mapObj;
-                }, {}))
-                : null;
             this.onFilterUpdate = (newFilteredOptions, paneType, isSearchReset) => {
                 const { isTree } = this.props;
                 if (paneType === 'available') {
@@ -10675,7 +10657,7 @@
                         .filter(item => filterRestTreeItems(item, movedOptions));
                     const currChosen = flattenTree(prevState.chosenOptions);
                     const nextChosenOptions = currChosen.concat(movedOptions);
-                    const newChosen = this.mergedCopy
+                    const newChosen = this.createMergedCopy()
                         .map(opt => Object.assign({}, opt))
                         .filter(item => filterTreeItemsWithoutFolders(item, nextChosenOptions));
                     this.props.addAll && this.props.addAll(newAvailable, newChosen);
@@ -10722,7 +10704,7 @@
                     // Get next chosen options from current + new nodes and remap from base
                     const currChosen = flattenTree(prevState.chosenOptions);
                     const nextChosenOptions = currChosen.concat(prevState.availableTreeOptionsChecked);
-                    const newChosen = this.mergedCopy
+                    const newChosen = this.createMergedCopy()
                         .map(opt => Object.assign({}, opt))
                         .filter(item => filterTreeItemsWithoutFolders(item, nextChosenOptions));
                     this.props.addSelected && this.props.addSelected(newAvailable, newChosen);
@@ -10768,7 +10750,7 @@
                         .filter(item => filterRestTreeItems(item, movedOptions));
                     const currAvailable = flattenTree(prevState.availableOptions);
                     const nextAvailableOptions = currAvailable.concat(movedOptions);
-                    const newAvailable = this.mergedCopy
+                    const newAvailable = this.createMergedCopy()
                         .map(opt => Object.assign({}, opt))
                         .filter(item => filterTreeItemsWithoutFolders(item, nextAvailableOptions));
                     this.props.removeAll && this.props.removeAll(newAvailable, newChosen);
@@ -10813,7 +10795,7 @@
                     // Get next chosen options from current and remap from base
                     const currAvailable = flattenTree(prevState.availableOptions);
                     const nextAvailableOptions = currAvailable.concat(prevState.chosenTreeOptionsChecked);
-                    const newAvailable = this.mergedCopy
+                    const newAvailable = this.createMergedCopy()
                         .map(opt => Object.assign({}, opt))
                         .filter(item => filterTreeItemsWithoutFolders(item, nextAvailableOptions));
                     this.props.removeSelected && this.props.removeSelected(newAvailable, newChosen);
@@ -10928,6 +10910,27 @@
                 chosenTreeOptionsChecked: []
             };
         }
+        // If the DualListSelector uses trees, concat the two initial arrays and merge duplicate folder IDs
+        createMergedCopy() {
+            const copyOfAvailable = JSON.parse(JSON.stringify(this.props.availableOptions));
+            const copyOfChosen = JSON.parse(JSON.stringify(this.props.chosenOptions));
+            return this.props.isTree
+                ? Object.values(copyOfAvailable
+                    .concat(copyOfChosen)
+                    .reduce((mapObj, item) => {
+                    const key = item.id;
+                    if (mapObj[key]) {
+                        // If map already has an item ID, add the dupe ID's children to the existing map
+                        mapObj[key].children.push(...item.children);
+                    }
+                    else {
+                        // Else clone the item data
+                        mapObj[key] = Object.assign({}, item);
+                    }
+                    return mapObj;
+                }, {}))
+                : null;
+        }
         componentDidUpdate() {
             if (JSON.stringify(this.props.availableOptions) !== JSON.stringify(this.state.availableOptions) ||
                 JSON.stringify(this.props.chosenOptions) !== JSON.stringify(this.state.chosenOptions)) {