Merge branch 'main' into develop

jason-liu22 · Apr 8, 2022 · a9b6d00 · a9b6d00
2 parents 3c8b25d + 4d760d3
commit a9b6d00
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.9.1
+1.9.2
diff --git a/frontend/src/Editor/Components/Multiselect.jsx b/frontend/src/Editor/Components/Multiselect.jsx
@@ -19,6 +19,7 @@ export const Multiselect = function Multiselect({
   setExposedVariable,
   onComponentClick,
   darkMode,
+  fireEvent,
 }) {
   const { label, value, values, display_values, showAllOption } = properties;
   const { borderRadius, visibility, disabledState } = styles;
@@ -62,13 +63,13 @@ export const Multiselect = function Multiselect({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  useEffect(() => {
+  const onChangeHandler = (items) => {
+    setSelected(items);
     setExposedVariable(
       'values',
-      selected.map((option) => option.value)
-    );
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selected]);
+      items.map((item) => item.value)
+    ).then(() => fireEvent('onSelect'));
+  };
 
   return (
     <div
@@ -88,7 +89,7 @@ export const Multiselect = function Multiselect({
           hasSelectAll={showAllOption ?? false}
           options={selectOptions}
           value={selected}
-          onChange={setSelected}
+          onChange={onChangeHandler}
           labelledBy={'Select'}
           disabled={disabledState}
           className={`multiselect-box${darkMode ? ' dark' : ''}`}

diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-1.8.0
+1.9.2