Fix resumable

Author: ajnsit

src/Concur/Core/Patterns.purs

@@ -12,7 +12,7 @@ import Data.Array as Array
 import Data.Either (Either(..), either)
 import Data.Foldable (fold)
 import Data.Function (applyFlipped, flip, (#), ($), (<<<), (>>>))
-import Data.Functor ((<$>), ($>))
+import Data.Functor ((<$>))
 import Data.Lens (Lens')
 import Data.Lens as L
 import Data.Maybe (fromMaybe)
@@ -162,30 +162,37 @@ with wire f = do
 
 type ResumableWidget v a =
   { handlerRef :: Ref (Result v a -> Effect Unit)
+  , view :: Ref v
   , canceler :: Effect Unit
   }
 
 resumeResumable :: forall v a. ResumableWidget v a -> Widget v a
-resumeResumable { handlerRef, canceler } = mkWidget \cb -> Ref.write cb handlerRef $> canceler
+resumeResumable { handlerRef, view, canceler } = mkWidget \cb -> do
+  Ref.write cb handlerRef
+  v <- Ref.read view
+  cb (View v)
+  pure canceler
 
 suspendResumable :: forall v a. ResumableWidget v a -> Effect Unit
 suspendResumable { handlerRef } = Ref.write mempty handlerRef
 
 cancelResumable :: forall v a. ResumableWidget v a -> Effect Unit
 cancelResumable { canceler } = canceler
 
-runResumable :: forall v a. Widget v a -> (Result v a -> Effect Unit) -> Effect (ResumableWidget v a)
-runResumable w handler = do
+runToResumable :: forall v a. Widget v a -> Ref v -> (Result v a -> Effect Unit) -> Effect (ResumableWidget v a)
+runToResumable w view handler = do
   handlerRef <- Ref.new handler
   canceler <- runWidget w \res -> Ref.read handlerRef >>= applyFlipped res
-  pure { handlerRef, canceler }
+  pure { handlerRef, view, canceler }
 
 resumableOrr :: forall v a. Monoid v => Array (Widget v a) -> Widget v { val :: a, others :: Array (ResumableWidget v a) }
 resumableOrr widgets = mkWidget \cb -> do
   viewsRef <- Ref.new (Array.replicate (Array.length widgets) mempty)
   resumables <- fixEffect \resumables -> forWithIndex widgets \i w -> do
-    fixEffect \s -> runResumable w case _ of
+    viewRef <- Ref.new mempty
+    fixEffect \s -> runToResumable w viewRef case _ of
       View v -> do
+        Ref.write v viewRef
         views <- Ref.read viewsRef
         Array.updateAt i v views # traverse_ \newViews -> do
           Ref.write newViews viewsRef
@@ -195,4 +202,5 @@ resumableOrr widgets = mkWidget \cb -> do
         let others = fromMaybe (resumables unit) $ Array.deleteAt i (resumables unit)
         traverse_ suspendResumable others
         cb (Completed { val, others })
-  pure do traverse_ _.canceler resumables
+  pure do traverse_ cancelResumable resumables
+