fix(DualList): refactor helpers functions signatures (patternfly#1190)

redallen · Jan 15, 2019 · 378e44e · 378e44e
1 parent 52f2eca
commit 378e44e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/packages/patternfly-3/patternfly-react/src/components/DualListSelector/DualList.js b/packages/patternfly-3/patternfly-react/src/components/DualListSelector/DualList.js
@@ -39,19 +39,19 @@ class DualList extends React.Component {
       [side]: { selectCount: originalSelectCount, items: originalItems, isSortAsc, filterTerm }
     } = this.props;
     const items = cloneDeep(originalItems);
-    const item = getItem({ isSortAsc, position, items, parentPosition });
+    const item = getItem(isSortAsc, items, position, parentPosition);
     let selectCount = originalSelectCount;
     item.checked = checked;
     if (itemHasParent(item)) {
-      const parent = getItem({ isSortAsc, position: parentPosition, items });
+      const parent = getItem(isSortAsc, items, parentPosition);
       parent.checked = isAllChildrenChecked(parent);
-      selectCount = getUpdatedSelectCount({ selectCount, checked });
+      selectCount = getUpdatedSelectCount(selectCount, checked);
     } else if (itemHasChildren(item)) {
       const { children } = item;
       toggleAllItems(children, checked);
-      selectCount = getUpdatedSelectCount({ selectCount, checked, amount: children.length });
+      selectCount = getUpdatedSelectCount(selectCount, checked, children.length);
     } else {
-      selectCount = getUpdatedSelectCount({ selectCount, checked });
+      selectCount = getUpdatedSelectCount(selectCount, checked);
     }
     let isMainChecked = false;
     if (filterTerm) {

diff --git a/packages/patternfly-3/patternfly-react/src/components/DualListSelector/helpers.js b/packages/patternfly-3/patternfly-react/src/components/DualListSelector/helpers.js
@@ -87,7 +87,7 @@ export const getDefaultProps = () => ({
   isMainChecked: false
 });
 
-export const getCheckedAmount = ({ items }) => {
+export const getCheckedAmount = items => {
   let checkedAmount = 0;
   items.forEach(item => {
     if (isItemSelected(item)) {
@@ -117,19 +117,19 @@ export const adjustProps = ({ left, right, ...props }) => {
       ...defaultProps,
       ...left,
       items: leftItems,
-      selectCount: getCheckedAmount({ ...left })
+      selectCount: getCheckedAmount(leftItems)
     },
     right: {
       ...defaultProps,
       ...right,
       items: rightItems,
-      selectCount: getCheckedAmount({ ...right })
+      selectCount: getCheckedAmount(rightItems)
     }
   };
 };
 
 export const isAllChildrenChecked = ({ children }) =>
-  children.filter(({ checked }) => checked).length === children.length;
+  children && children.filter(({ checked }) => checked).length === children.length;
 
 export const getItemsLength = items => {
   let { length } = items;
@@ -150,7 +150,7 @@ export const reverseAllItemsOrder = items => {
   return reversedItems.map(item => (item.children ? { ...item, children: item.children.reverse() } : item));
 };
 
-export const getItem = ({ isSortAsc, items, position, parentPosition }) => {
+export const getItem = (isSortAsc, items, position, parentPosition) => {
   // if item is a child.
   if (parentPosition !== undefined) {
     const parent = items[getItemPosition(items, parentPosition, isSortAsc)];
@@ -159,7 +159,7 @@ export const getItem = ({ isSortAsc, items, position, parentPosition }) => {
   return items[getItemPosition(items, position, isSortAsc)];
 };
 
-export const getUpdatedSelectCount = ({ selectCount, checked, amount = 1 }) =>
+export const getUpdatedSelectCount = (selectCount, checked, amount = 1) =>
   selectCount + (checked ? amount : -1 * amount);
 
 export const itemHasParent = item => item.parentPosition !== undefined;