miso-capa wip

Author: functora

ghcjs/miso-capa/src/Functora/Miso/Capa/BrowserLink.hs

@@ -6,11 +6,12 @@ where
 
 import qualified Functora.Miso.Jsm as Jsm
 import Functora.Miso.Prelude
+import Functora.Miso.Types
 
 data Args model action = Args
   { argsLink :: URI,
     argsLabel :: Unicode,
-    argsAction :: (model -> JSM model) -> action
+    argsAction :: Update model -> action
   }
   deriving stock (Generic)
 

ghcjs/miso-capa/src/Functora/Miso/Capa/Currency.hs

@@ -23,8 +23,8 @@ import qualified Text.Fuzzy as Fuzzy
 data Args model action = Args
   { argsModel :: model,
     argsOptic :: ATraversal' model (Currency Unique),
-    argsAction :: (model -> JSM model) -> action,
-    argsEmitter :: (model -> JSM model) -> JSM (),
+    argsAction :: Update model -> action,
+    argsEmitter :: Update model -> JSM (),
     argsCurrencies :: Getter' model (NonEmpty CurrencyInfo)
   }
   deriving stock (Generic)
@@ -109,9 +109,8 @@ selectCurrency
           ]
     where
       opened =
-        action $ \prev ->
-          pure
-            $ prev
+        action . PureUpdate $ \prev ->
+          prev
             & cloneTraversal optic
             . #currencyModalState
             .~ Opened
@@ -122,9 +121,8 @@ selectCurrency
             .~ mempty
             & extraOnClick
       closed =
-        action $ \prev ->
-          pure
-            $ prev
+        action . PureUpdate $ \prev ->
+          prev
             & cloneTraversal optic
             . #currencyModalState
             .~ Closed
@@ -211,9 +209,8 @@ currencyListItemWidget
                 else Nothing
             )
           & ListItem.setOnClick
-            ( action $ \st ->
-                pure
-                  $ st
+            ( action . PureUpdate $ \st ->
+                st
                   & cloneTraversal optic
                   . #currencyModalState
                   .~ Closed

ghcjs/miso-capa/src/Functora/Miso/Capa/Dialog.hs

@@ -14,7 +14,7 @@ import qualified Material.Dialog as Dialog
 data Args model action = Args
   { argsModel :: model,
     argsOptic :: ATraversal' model OpenedOrClosed,
-    argsAction :: (model -> JSM model) -> action,
+    argsAction :: Update model -> action,
     argsContent :: [View action]
   }
   deriving stock (Generic)
@@ -52,4 +52,4 @@ dialog args =
     optic :: ATraversal' model OpenedOrClosed
     optic = args ^. #argsOptic
     action :: (action -> f action -> f action) -> f action -> f action
-    action = ($ args ^. #argsAction $ pure . (& cloneTraversal optic .~ Closed))
+    action = ($ args ^. #argsAction $ PureUpdate $ cloneTraversal optic .~ Closed)