Merge pull request #332 from dmjio/to-html-fixes

Add pre-rendering attribute exceptions
dmjio · Jan 7, 2018 · da7bfbc · da7bfbc
2 parents b303146 + 662abfc
commit da7bfbc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 28 deletions.
diff --git a/examples/todo-mvc/Main.hs b/examples/todo-mvc/Main.hs
@@ -231,7 +231,7 @@ viewEntry Entry {..} = liKeyed_ (toKey eid)
 viewControls :: Model ->  MisoString -> [ Entry ] -> View Msg
 viewControls model visibility entries =
   footer_  [ class_ "footer"
-           , hidden_ (bool "" "hidden" $ null entries)
+           , hidden_ (null entries)
            ]
       [ viewControlsCount entriesLeft
       , viewControlsFilters visibility

diff --git a/examples/xhr/Main.hs b/examples/xhr/Main.hs
@@ -88,10 +88,7 @@ viewModel Model {..} = view
       where
         attrs = [ onClick FetchGitHub
                 , class_ $ pack "button is-large is-outlined"
-                ] ++
-                [ disabled_ $ pack "disabled"
-                | isJust info
-                ]
+                ] ++ [ disabled_ True | isJust info ]
 
 data APIInfo
   = APIInfo

diff --git a/ghc-src/Miso/Html/Internal.hs b/ghc-src/Miso/Html/Internal.hs
@@ -83,10 +83,24 @@ instance L.ToHtml (VTree action) where
     in L.with ele as
       where
         Props xs = vProps
-        as = [ L.makeAttribute k v'
+        as = [ L.makeAttribute k (if k `elem` exceptions && v == Bool True then k else v')
              | (k,v) <- M.toList xs
              , let v' = toHtmlFromJSON v
+             , not (k `elem` exceptions && v == Bool False)
              ]
+        exceptions = [ "checked"
+                     , "disabled"
+                     , "selected"
+                     , "hidden"
+                     , "readOnly"
+                     , "autoplay"
+                     , "required"
+                     , "default"
+                     , "autofocus"
+                     , "multiple"
+                     , "noValidate"
+                     , "autocomplete"
+                     ]
         toTag = T.toLower
         kids = foldMap L.toHtml vChildren
 

diff --git a/src/Miso/Html/Property.hs b/src/Miso/Html/Property.hs
@@ -151,8 +151,8 @@ title_ = textProp "title"
 selected_ ::  Bool -> Attribute action
 selected_ = boolProp "selected"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/hidden>
-hidden_ ::  MisoString -> Attribute action
-hidden_             = textProp "hidden"
+hidden_ ::  Bool -> Attribute action
+hidden_             = boolProp "hidden"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/value>
 value_ ::  MisoString -> Attribute action
 value_             = textProp "value"
@@ -169,14 +169,14 @@ acceptCharset_     = textProp "acceptCharset"
 action_ ::  MisoString -> Attribute action
 action_            = textProp "action"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/autocomplete>
-autocomplete_ ::  MisoString -> Attribute action
-autocomplete_      = textProp "autocomplete"
+autocomplete_ ::  Bool -> Attribute action
+autocomplete_ b = textProp "autocomplete" (if b then "on" else "off")
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/autosave>
 autosave_ ::  MisoString -> Attribute action
 autosave_          = textProp "autosave"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/disabled>
-disabled_ ::  MisoString -> Attribute action
-disabled_          = textProp "disabled"
+disabled_ ::  Bool -> Attribute action
+disabled_          = boolProp "disabled"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/enctype>
 enctype_ ::  MisoString -> Attribute action
 enctype_           = textProp "enctype"
@@ -196,20 +196,20 @@ minlength_         = textProp "minlength"
 method_ ::  MisoString -> Attribute action
 method_            = textProp "method"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/multiple>
-multiple_ ::  MisoString -> Attribute action
-multiple_          = textProp "multiple"
+multiple_ ::  Bool -> Attribute action
+multiple_          = boolProp "multiple"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/novalidate>
-novalidate_ ::  MisoString -> Attribute action
-novalidate_        = textProp "novalidate"
+novalidate_ ::  Bool -> Attribute action
+novalidate_        = boolProp "noValidate"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/pattern>
 pattern_ ::  MisoString -> Attribute action
 pattern_           = textProp "pattern"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/readonly>
-readonly_ ::  MisoString -> Attribute action
-readonly_          = textProp "readonly"
+readonly_ ::  Bool -> Attribute action
+readonly_          = boolProp "readOnly"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/required>
-required_ ::  MisoString -> Attribute action
-required_          = textProp "required"
+required_ ::  Bool -> Attribute action
+required_          = boolProp "required"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/size>
 size_ ::  MisoString -> Attribute action
 size_              = textProp "size"
@@ -283,23 +283,23 @@ width_             = textProp "width"
 alt_ ::  MisoString -> Attribute action
 alt_               = textProp "alt"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/autoplay>
-autoplay_ ::  MisoString -> Attribute action
-autoplay_          = textProp "autoplay"
+autoplay_ ::  Bool -> Attribute action
+autoplay_          = boolProp "autoplay"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/controls>
-controls_ ::  MisoString -> Attribute action
-controls_          = textProp "controls"
+controls_ ::  Bool -> Attribute action
+controls_          = boolProp "controls"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/loop>
-loop_ ::  MisoString -> Attribute action
-loop_              = textProp "loop"
+loop_ ::  Bool -> Attribute action
+loop_              = boolProp "loop"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/preload>
 preload_ ::  MisoString -> Attribute action
 preload_           = textProp "preload"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/poster>
 poster_ ::  MisoString -> Attribute action
 poster_            = textProp "poster"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/default>
-default_ ::  MisoString -> Attribute action
-default_           = textProp "default"
+default_ ::  Bool -> Attribute action
+default_           = boolProp "default"
 -- | <https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/Attribute/kind>
 kind_ ::  MisoString -> Attribute action
 kind_              = textProp "kind"