miso-capa wip

Author: functora

ghcjs/miso-capa/miso-capa.cabal

@@ -104,7 +104,7 @@ library
     Functora.Miso.Capa.Dialog
     Functora.Miso.Capa.Field
     Functora.Miso.Capa.FieldPairs
-    Functora.Miso.Capa.Frame
+    Functora.Miso.Capa.Flex
     Functora.Miso.Capa.Grid
     Functora.Miso.Capa.Header
     Functora.Miso.Capa.Money
@@ -138,7 +138,7 @@ test-suite miso-capa-test
       Functora.Miso.Capa.Dialog
       Functora.Miso.Capa.Field
       Functora.Miso.Capa.FieldPairs
-      Functora.Miso.Capa.Frame
+      Functora.Miso.Capa.Flex
       Functora.Miso.Capa.Grid
       Functora.Miso.Capa.Header
       Functora.Miso.Capa.Money

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

@@ -0,0 +1,10 @@
+module Functora.Miso.Capa.Flex
+  ( flex,
+  )
+where
+
+import Functora.Miso.Prelude
+
+flex :: [Attribute action] -> [View action] -> View action
+flex attrs =
+  div_ $ style_ [("display", "flex")] : attrs

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

@@ -5,16 +5,15 @@ module Functora.Miso.Capa.Switch
   )
 where
 
-import qualified Functora.Miso.Capa.Frame as Frame
+import qualified Functora.Miso.Capa.Flex as Flex
 import Functora.Miso.Prelude
-import qualified Material.Icon as Icon
-import qualified Material.Switch as Switch
+import Functora.Miso.Types
 import Miso hiding (at, view)
 
 data Args model action = Args
   { argsModel :: model,
     argsOptic :: ATraversal' model Bool,
-    argsAction :: JSM (model -> model) -> action
+    argsAction :: Updater model -> action
   }
   deriving stock (Generic)
 
@@ -39,18 +38,28 @@ switch ::
   Opts model action ->
   View action
 switch Args {argsModel = st, argsOptic = optic, argsAction = action} opts =
-  Frame.frame
+  Flex.flex mempty
     $ maybeToList
-      ( fmap (Icon.icon mempty)
+      ( fmap (\icon -> i_ [class_ icon] mempty)
           $ optsIcon opts
       )
     <> [ Miso.rawHtml "&nbsp;",
          Miso.text $ opts ^. #optsPlaceholder,
          Miso.rawHtml "&nbsp;&nbsp;",
-         Switch.switch
-          $ Switch.config
-          & Switch.setChecked
-            ( fromMaybe False $ st ^? cloneTraversal optic
-            )
-          & Switch.setOnChange (action $ pure (& cloneTraversal optic %~ not))
+         input_
+          [ type_ "checkbox",
+            disabled_
+              $ opts
+              ^. #optsDisabled,
+            checked_
+              . fromMaybe False
+              $ st
+              ^? cloneTraversal optic,
+            onChange
+              . const
+              . action
+              . PureUpdater
+              $ cloneTraversal optic
+              %~ not
+          ]
        ]

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

@@ -1,7 +1,9 @@
-module Functora.Miso.Css (fullWidth) where
+module Functora.Miso.Css
+  ( fullWidth,
+  )
+where
 
 import Functora.Miso.Prelude
 
 fullWidth :: Attribute action
-fullWidth =
-  style_ [("width", "100%")]
+fullWidth = style_ [("width", "100%")]

ghcjs/miso-capa/src/Functora/Miso/Css.hs

@@ -48,6 +48,7 @@ module Functora.Miso.Types
     StaticOrDynamic (..),
     LeadingOrTrailing (..),
     OpenedOrClosed (..),
+    Updater (..),
   )
 where
 
@@ -525,3 +526,9 @@ data OpenedOrClosed
   | Closed
   deriving stock (Eq, Ord, Show, Enum, Bounded, Data, Generic)
   deriving (Binary) via GenericType OpenedOrClosed
+
+data Updater model
+  = PureUpdater (model -> model)
+  | ImpureUpdater (model -> JSM model)
+  | PureAndImpureUpdater (model -> model) (model -> JSM model)
+  deriving stock (Generic)