Update logic for detecting changes in Combobox items

vrk-kpa · Mar 16, 2021 · 576e769 · 576e769
1 parent 0695f56
commit 576e769
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/core/Form/Combobox/Combobox/Combobox.tsx b/src/core/Form/Combobox/Combobox/Combobox.tsx
@@ -83,6 +83,7 @@ interface ComboboxState<T extends ComboboxData> {
   currentSelection: string | null;
   selectedKeys: SelectedItemKeys;
   selectedItems: T[];
+  initialItems: T[];
 }
 
 function getSelectedKeys<T>(items: (T & ComboboxData)[]): SelectedItemKeys {
@@ -112,16 +113,18 @@ class BaseCombobox<T> extends Component<ComboboxProps<T & ComboboxData>> {
     currentSelection: null,
     selectedKeys: getSelectedKeys(this.props.defaultSelectedItems || []),
     selectedItems: this.props.defaultSelectedItems || [],
+    initialItems: this.props.items,
   };
 
   static getDerivedStateFromProps<U>(
     nextProps: ComboboxProps<U & ComboboxData>,
     prevState: ComboboxState<U & ComboboxData>,
   ) {
     const { items: propItems } = nextProps;
-    if (prevState.filteredItems !== propItems) {
+    if (propItems !== prevState.initialItems) {
       return {
         filteredItems: propItems,
+        initialItems: propItems,
       };
     }
     return null;