@oliasoft-open-source/react-ui-library 4.15.1-beta-8 → 4.15.1-beta-10

package/dist/index.js

@@ -20886,6 +20886,7 @@ const Trigger = ({
   maxTooltipWidth,
   placeholder: placeholder3,
   right: right2,
+  isMounted,
   testId
 }) => {
   var _a2;
@@ -20931,7 +20932,11 @@ const Trigger = ({
         onClick: (evt) => {
           onClickTrigger(evt);
           if (typeof setInputFocus === "function") {
-            setInputFocus();
+            requestAnimationFrame(() => {
+              if (isMounted == null ? void 0 : isMounted.current) {
+                setInputFocus();
+              }
+            });
           }
         },
         onFocus,
@@ -21186,21 +21191,27 @@ const useCustomSelectLogic = ({
   firstSelectedOptionIndex,
   createAble,
   listRef,
-  autoLayerWidth
+  autoLayerWidth,
+  isMounted
 }) => {
+  const safeDispatch = (action2) => {
+    if (isMounted.current) {
+      dispatch(action2);
+    }
+  };
   const closeLayer = () => {
     if (state.isLayerOpen) {
-      dispatch({ type: ActionTypes.CLOSE_LAYER });
+      safeDispatch({ type: ActionTypes.CLOSE_LAYER });
     }
     setTriggerFocus();
   };
-  const openLayer = () => dispatch({ type: ActionTypes.OPEN_LAYER });
+  const openLayer = () => safeDispatch({ type: ActionTypes.OPEN_LAYER });
   const isFirstRun = useRef(true);
   useEffect(() => {
     if (isFirstRun.current) {
       isFirstRun.current = false;
     } else {
-      dispatch({ type: ActionTypes.SET_VISIBLE_OPTIONS, options });
+      safeDispatch({ type: ActionTypes.SET_VISIBLE_OPTIONS, options });
     }
   }, [options]);
   const onSelectOption = (evt, option2, close2) => {
@@ -21238,7 +21249,7 @@ const useCustomSelectLogic = ({
           }
         }
       }
-      dispatch({ type: ActionTypes.CLEAR_SEARCH, options });
+      safeDispatch({ type: ActionTypes.CLEAR_SEARCH, options });
       setTriggerFocus();
     }
   };
@@ -21274,7 +21285,7 @@ const useCustomSelectLogic = ({
       closeLayer();
       return;
     }
-    dispatch({
+    safeDispatch({
       type: ActionTypes.RESET_LAYER_FOCUS,
       options,
       firstSelectedOptionIndex
@@ -21287,7 +21298,7 @@ const useCustomSelectLogic = ({
       isFirstRender.current = false;
     } else {
       if (!state.isLayerOpen) {
-        dispatch({ type: ActionTypes.CLEAR_SEARCH, options });
+        safeDispatch({ type: ActionTypes.CLEAR_SEARCH, options });
       }
     }
   }, [state.isLayerOpen]);
@@ -21303,7 +21314,7 @@ const useCustomSelectLogic = ({
       onChange(evt, newSelectedOptions);
     }
   };
-  const onChangeSearch = (value) => dispatch({
+  const onChangeSearch = (value) => safeDispatch({
     type: ActionTypes.ON_CHANGE_SEARCH,
     options,
     value,
@@ -21311,7 +21322,7 @@ const useCustomSelectLogic = ({
   });
   const clickTrigger = () => {
     openLayer();
-    dispatch({ type: ActionTypes.BLUR_TRIGGER_INPUTS });
+    safeDispatch({ type: ActionTypes.BLUR_TRIGGER_INPUTS });
   };
   const scrollToItem = (index2) => {
     if (listRef.current && Number.isInteger(index2)) {
@@ -21320,11 +21331,14 @@ const useCustomSelectLogic = ({
   };
   const focusNextLayerOption = (ICustomSelectDirection2) => {
     const next2 = nextLayerFocus(ICustomSelectDirection2, state.layerFocus);
-    dispatch({ type: ActionTypes.FOCUS_LAYER_OPTIONS, nextLayerFocus: next2 });
+    safeDispatch({
+      type: ActionTypes.FOCUS_LAYER_OPTIONS,
+      nextLayerFocus: next2
+    });
     scrollToItem(next2.current);
   };
   const focusTriggerInputs = (ICustomSelectDirection2) => {
-    dispatch({
+    safeDispatch({
       type: ActionTypes.FOCUS_TRIGGER_INPUTS,
       ICustomSelectDirection: ICustomSelectDirection2,
       selectedOptions
@@ -21445,6 +21459,12 @@ const CustomSelect = (props) => {
       isLayerOpen: false
     })
   );
+  const isMounted = useRef(true);
+  useEffect(() => {
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
   const {
     getTriggerWidth,
     onKeyEvent,
@@ -21468,7 +21488,8 @@ const CustomSelect = (props) => {
     disabledContext,
     isFontLoaded,
     createAble,
-    listRef
+    listRef,
+    isMounted
   });
   return /* @__PURE__ */ jsx("div", { style: { width: getTriggerWidth() }, children: /* @__PURE__ */ jsxs(
     KeyboardEventHandler,
@@ -21504,7 +21525,8 @@ const CustomSelect = (props) => {
             maxTooltipWidth,
             placeholder: placeholder3,
             right: right2,
-            testId
+            testId,
+            isMounted
           }
         ),
         state.isLayerOpen && renderLayer(