rules, declarations

Author: seanhess

example/app/Main.hs

@@ -151,7 +151,7 @@ tooltips = do
     css
       "tooltips"
       ".tooltips:hover > .tooltip"
-      [Declaration "visibility" "visible"]
+      (declarations hidden)
 
   red = HexColor "#F00"
 
@@ -224,8 +224,8 @@ texts = col ~ gap 10 . pad 20 $ do
   -- el ~ bg Error . bg Warning ~ if True then bold else id $ "Warning"
 
   el ~ pad 10 $ do
-    el ~ descendentOf "htmx-request" flexRow . hide $ "Loading..."
-    el ~ descendentOf "htmx-request" hide . flexRow $ "Normal Content"
+    el ~ descendentOf "htmx-request" flexRow . display None $ "Loading..."
+    el ~ descendentOf "htmx-request" (display None) . flexRow $ "Normal Content"
 
   el ~ italic $ "Italic Text"
   el ~ underline $ "Underline Text"

src/Web/Atomic/CSS/Layout.hs

@@ -196,11 +196,6 @@ left :: (Styleable h) => Length -> CSS h -> CSS h
 left l = utility ("left" -. l) ["left" :. style l]
 
 
--- | Hide an element. See 'display'
-hide :: (Styleable h) => CSS h -> CSS h
-hide = display None
-
-
 data FlexDirection
   = Row
   | Column
@@ -270,10 +265,6 @@ visible :: (Styleable h) => CSS h -> CSS h
 visible = utility "hidden" ["visibility" :. "visible"]
 
 
--- what if you set flex-shrink later?
--- it has undefined behavior
---
-
 -- | Set to a specific width
 width :: (Styleable h) => Length -> CSS h -> CSS h
 width n =

src/Web/Atomic/Types/Rule.hs

@@ -139,15 +139,6 @@ ruleSelectorF rs =
     GeneratedRule _ f -> f
 
 
--- where
---  pseudos = mconcat . fmap pseudoSuffix
-
--- rulePseudo :: Rule -> [Pseudo]
--- rulePseudo r =
---   case r.selector of
---     CustomRule _ -> []
---     FromClass ps _ -> ps
-
 ruleCustomSelector :: Rule -> Maybe Selector
 ruleCustomSelector r =
   case r.selector of

src/Web/Atomic/Types/Styleable.hs

@@ -44,12 +44,6 @@ newtype CSS h = CSS {rules :: [Rule]}
   deriving newtype (Monoid, Semigroup)
 
 
-runCSS :: (CSS h -> CSS h) -> [Rule]
-runCSS f =
-  let CSS rs = f mempty
-   in rs
-
-
 mapRules :: (Rule -> Rule) -> CSS a -> CSS a
 mapRules f (CSS rs) = CSS $ fmap f rs
 
@@ -70,5 +64,14 @@ utility cn ds (CSS rs) =
   CSS $ rule cn ds : rs
 
 
-test :: (Styleable h) => Int -> CSS h -> CSS h
-test n = utility "woot" ["key" :. style n]
+-- | Get all the rules for combined utilities
+rules :: (CSS [Rule] -> CSS [Rule]) -> [Rule]
+rules f =
+  let CSS rs = f mempty
+   in rs
+
+
+-- | Get all the declarations for a utility or combination of them
+declarations :: (CSS [Rule] -> CSS [Rule]) -> [Declaration]
+declarations f =
+  mconcat $ fmap (.properties) (rules f)

test/Test/StyleSpec.hs

@@ -16,15 +16,15 @@ mainSpec :: Spec
 mainSpec = do
   describe "PropertyStyle" $ do
     it "should compile, and set both the className and styles" $ do
-      let rs = runCSS @[Rule] $ list Decimal
+      let rs = rules $ list Decimal
       length rs `shouldBe` 1
       [c] <- pure rs
       ruleClassName c `shouldBe` ClassName "list-decimal"
       ruleSelector c `shouldBe` ".list-decimal"
       c.properties `shouldBe` ["list-style-type" :. "decimal"]
 
     it "should work with outside member None" $ do
-      let rs = runCSS @[Rule] $ list None
+      let rs = rules $ list None
       length rs `shouldBe` 1
       [c] <- pure rs
       ruleClassName c `shouldBe` ClassName "list-none"