Merge branch 'master' into 6277-tabs-nonmobile-overflow

carbon-design-system · Jun 23, 2020 · 032ef98 · 032ef98
2 parents 22139a7 + afc0642
commit 032ef98
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/react/src/internal/Selection.js b/packages/react/src/internal/Selection.js
@@ -15,6 +15,7 @@ export function useSelection({
   initialSelectedItems = [],
 }) {
   const isMounted = useRef(false);
+  const savedOnChange = useRef(onChange);
   const [selectedItems, setSelectedItems] = useState(initialSelectedItems);
   const onItemChange = useCallback(
     (item) => {
@@ -49,10 +50,14 @@ export function useSelection({
   }, [disabled]);
 
   useEffect(() => {
-    if (isMounted.current === true && onChange) {
-      onChange({ selectedItems });
+    savedOnChange.current = onChange;
+  }, [onChange]);
+
+  useEffect(() => {
+    if (isMounted.current === true && savedOnChange.current) {
+      savedOnChange.current({ selectedItems });
     }
-  }, [onChange, selectedItems]);
+  }, [selectedItems]);
 
   useEffect(() => {
     isMounted.current = true;