@colisweb/rescript-toolkit 5.0.0 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/hooks/Toolkit__Hooks.res

@@ -24,7 +24,6 @@ let useUpdateEffect = (fn, deps) => {
   , deps)
 }
 
-let useIsMounted = ReactUse.useMountedState
 let useTimeoutFn = ReactUse.useTimeoutFn
 let useDebounce = ReactUse.useDebounce
 let useDebounce2 = ReactUse.useDebounce2
@@ -198,7 +197,7 @@ let useRequest = (~debounce=true, fn, deps) => {
   let lastCallId = React.useRef(0)
   let canceled = React.useRef(false)
   let (state, set) = React.useState(() => NotAsked)
-  let isMounted = useIsMounted()
+  let isMounted = ReactUse.useMountedState(.)
 
   let trigger = React.useCallback(args => {
     lastCallId.current = lastCallId.current->SafeIncrement.increment
@@ -327,29 +326,13 @@ external useLocalStorageState: (
   localstorageStateOptions<'state>,
 ) => ('state, ('state => 'state) => unit) = "default"
 
-// ----------------------
-// useIsMounted
-// ----------------------
-
-let useIsMounted = () => {
-  let mountedRef = React.useRef(false)
-  let get = React.useCallback(() => mountedRef.current, [])
-
-  React.useEffectOnEveryRender(() => {
-    mountedRef.current = true
-    Some(() => mountedRef.current = false)
-  })
-
-  get
-}
-
 external promiseErrorToJsObj: Js.Promise.error => Js.Exn.t = "%identity"
 
 let usePromise = (~debounce=true, fn, deps) => {
   let lastCallId = React.useRef(0)
   let canceled = React.useRef(false)
   let (state, set) = React.useState(() => NotAsked)
-  let isMounted = useIsMounted()
+  let isMounted = ReactUse.useMountedState()
 
   let trigger = React.useCallback(args => {
     lastCallId.current = lastCallId.current->SafeIncrement.increment
@@ -384,7 +367,7 @@ let usePromiseV2 = (~debounce=true, fn, deps) => {
   let lastCallId = React.useRef(0)
   let canceled = React.useRef(false)
   let (state, set) = React.useState(() => NotAsked)
-  let isMounted = useIsMounted()
+  let isMounted = ReactUse.useMountedState()
 
   let trigger = React.useCallback(() => {
     lastCallId.current = lastCallId.current->SafeIncrement.increment
@@ -431,7 +414,7 @@ let usePromiseV3 = (~debounce=true, fn, deps) => {
   let lastCallId = React.useRef(0)
   let canceled = React.useRef(false)
   let (state, set) = React.useState(() => NotAsked)
-  let isMounted = useIsMounted()
+  let isMounted = ReactUse.useMountedState()
 
   let trigger = React.useCallback(() => {
     lastCallId.current = lastCallId.current->SafeIncrement.increment

package/src/mock/MockOverlay.res

@@ -12,9 +12,17 @@ let make = (~worker: Msw.worker, ~workerOptions: Msw.startOptions={}, ~className
 
   React.useLayoutEffect(() => {
     if mockEnabled {
-      worker->Msw.start(workerOptions)
-      setWorkerStarted(_ => true)
-      Browser.LocalStorage.setItem(localStorageKey, Js.Nullable.return("true"))
+      worker
+      ->Msw.start(workerOptions)
+      ->Promise.Js.toResult
+      ->Promise.tapOk(_ => {
+        setWorkerStarted(_ => true)
+        Browser.LocalStorage.setItem(localStorageKey, Js.Nullable.return("true"))
+      })
+      ->Promise.tapError(err => {
+        Toolkit.BrowserLogger.debug(err)
+      })
+      ->ignore
     } else {
       worker->Msw.stop
       setWorkerStarted(_ => false)

package/src/vendors/Msw.res

@@ -8,7 +8,7 @@ type rec startOptions = {serviceWorker?: serviceWorker, quiet?: bool}
 and serviceWorker = {url: string}
 
 @send
-external start: (worker, startOptions) => unit = "start"
+external start: (worker, startOptions) => Promise.Js.t<unit, unit> = "start"
 @send
 external stop: worker => unit = "stop"
 

package/src/vendors/ReactUse.res

@@ -26,7 +26,7 @@ external useTimeoutFn: (unit => unit, int) => (Js.Nullable.t<bool>, unit => unit
 external useFirstMountState: unit => bool = "useFirstMountState"
 
 @module("react-use")
-external useMountedState: unit => unit => bool = "useMountedState"
+external useMountedState: (. unit) => (. unit) => bool = "useMountedState"
 
 @module("react-use")
 external useUpdateEffect: (unit => option<unit => unit>, array<'a>) => unit = "useUpdateEffect"