@@ -16,7 +16,6 @@ module Internal.Model exposing
16 , LayoutContext(..)
16 , LayoutContext(..)
17 , Length(..)
17 , Length(..)
18 , Location(..)
18 , Location(..)
20 , NodeName(..)
19 , NodeName(..)
21 , Option(..)
20 , Option(..)
22 , OptionRecord
21 , OptionRecord
@@ -30,7 +29,6 @@ module Internal.Model exposing
30 , TransformComponent(..)
29 , TransformComponent(..)
31 , Transformation(..)
30 , Transformation(..)
32 , VAlign(..)
31 , VAlign(..)
35 , addNodeName
33 , addNodeName
@@ -42,7 +40,7 @@ module Internal.Model exposing
42 , asParagraph
40 , asParagraph
44 , asTextColumn
42 , asTextColumn
45− , boxShadowClass
43+ , boxShadowName
46 , columnClass
44 , columnClass
47 , composeTransformation
45 , composeTransformation
48 , contextClasses
46 , contextClasses
@@ -70,7 +68,6 @@ module Internal.Model exposing
70 , getWidth
68 , getWidth
71 , gridClass
69 , gridClass
72 , htmlClass
70 , htmlClass
74 , lengthClassName
71 , lengthClassName
@@ -79,30 +76,41 @@ module Internal.Model exposing
79 , onlyStyles
76 , onlyStyles
80 , optionsToRecord
77 , optionsToRecord
81 , paddingName
78 , paddingName
83 , pageClass
79 , pageClass
84 , paragraphClass
80 , paragraphClass
85 , reduceRecursive
81 , reduceRecursive
82+ , reduceRecursiveCalcName
86 , reduceStyles
83 , reduceStyles
87 , reduceStylesRecursive
84 , reduceStylesRecursive
88 , removeNever
85 , removeNever
89 , renderFontClassName
88 , renderFontClassName
90 , renderHeight
89 , renderHeight
91 , renderRoot
90 , renderRoot
93 , renderWidth
91 , renderWidth
94 , rootStyle
92 , rootStyle
95 , rowClass
93 , rowClass
96 , singleClass
94 , singleClass
97 , spacingName
97 , spacingName
99− , textShadowClass
100+ , textElement
101 , toStyleSheet
104 , toStyleSheet
105+ , toStyleSheetString
102 , transformClass
106 , transformClass
103 , unstyled
109 , unstyled
104 , unwrapDecorations
111 , unwrapDecorations
105− , variantName
112+ , unwrapDecsHelper
@@ -112,7 +120,7 @@ import Html.Attributes
112import Html.Keyed
120import Html.Keyed
113import Internal.Flag as Flag exposing (Flag)
121import Internal.Flag as Flag exposing (Flag)
114import Internal.Style exposing (classes, dot)
122import Internal.Style exposing (classes, dot)
115−import Json.Encode as Encode
123+import Json.Encode as Json
116import Set exposing (Set)
124import Set exposing (Set)
117import VirtualDom
125import VirtualDom
@@ -173,8 +181,7 @@ type Style
173 | Single String String String
181 | Single String String String
174 | Colored String String Color
182 | Colored String String Color
175 | SpacingStyle String Int Int
183 | SpacingStyle String Int Int
176− | BorderWidth String Int Int Int Int
177− | PaddingStyle String Float Float Float Float
184+ | PaddingStyle String Int Int Int Int
178 | GridTemplateStyle
185 | GridTemplateStyle
179 { spacing : ( Length, Length )
186 { spacing : ( Length, Length )
180 , columns : List Length
187 , columns : List Length
@@ -205,86 +212,12 @@ type PseudoClass
209−type alias Adjustment =
219 | SansSerif
217 | SansSerif
220 | Monospace
218 | Monospace
221 | Typeface String
219 | Typeface String
222 | ImportFont String String
220 | ImportFont String String
225− , adjustment : Maybe Adjustment
226− , variants : List Variant
231− = VariantActive String
233− | VariantIndexed String Int
238− VariantActive name ->
239− "\"" ++ name ++ "\""
242− "\"" ++ name ++ "\" 0"
244− VariantIndexed name index ->
245− "\"" ++ name ++ "\" " ++ String.fromInt index
250− VariantActive name ->
256− VariantIndexed name index ->
257− name ++ "-" ++ String.fromInt index
260−renderVariants typeface =
263− Just (String.join ", " (List.map renderVariant font.variants))
271− VariantActive name ->
277− VariantIndexed name index ->
278− name == "smcp" && index == 1
281−hasSmallCaps typeface =
284− List.any isSmallCaps font.variants
290type Property
223type Property
@@ -372,13 +305,6 @@ type NodeName
372 | Embedded String String
305 | Embedded String String
375−type NearbyChildren msg
377− | ChildrenBehind (List (Html.Html msg))
378− | ChildrenInFront (List (Html.Html msg))
379− | ChildrenBehindAndInFront (List (Html.Html msg)) (List (Html.Html msg))
@@ -387,7 +313,7 @@ type alias Gathered msg =
387 { node : NodeName
313 { node : NodeName
388 , attributes : List (VirtualDom.Attribute msg)
314 , attributes : List (VirtualDom.Attribute msg)
389 , styles : List Style
315 , styles : List Style
390− , children : NearbyChildren msg
316+ , children : List (VirtualDom.Node msg)
391 , has : Flag.Field
317 , has : Flag.Field
@@ -455,10 +381,7 @@ finalizeNode has node attributes children embedMode parentContext =
455 Embedded nodeName internal ->
381 Embedded nodeName internal ->
456 VirtualDom.node nodeName
382 VirtualDom.node nodeName
457 attributes
383 attributes
458− [ createNode internal
459− [ Html.Attributes.class
460− (classes.any ++ " " ++ classes.single)
384+ [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
464 case parentContext of
387 case parentContext of
@@ -535,45 +458,49 @@ finalizeNode has node attributes children embedMode parentContext =
537embedWith static opts styles children =
460embedWith static opts styles children =
541− |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
543− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
545− |> toStyleSheet opts
547 if static then
461 if static then
548− staticRoot opts
462+ staticRoot
549− :: dynamicStyleSheet
463+ :: (styles
464+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
466+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
468+ |> toStyleSheet opts
550 :: children
470 :: children
553− dynamicStyleSheet
473+ (styles
474+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
476+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
478+ |> toStyleSheet opts
554 :: children
480 :: children
557embedKeyed static opts styles children =
483embedKeyed static opts styles children =
561− |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
563− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
565− |> toStyleSheet opts
567 if static then
484 if static then
568− ( "static-stylesheet", staticRoot opts )
485+ ( "static-stylesheet", staticRoot )
569 :: ( "dynamic-stylesheet"
486 :: ( "dynamic-stylesheet"
570− , dynamicStyleSheet
487+ , styles
488+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
490+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
492+ |> toStyleSheet opts
572 :: children
494 :: children
575 ( "dynamic-stylesheet"
497 ( "dynamic-stylesheet"
576− , dynamicStyleSheet
498+ , styles
499+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
501+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
503+ |> toStyleSheet opts
578 :: children
505 :: children
@@ -889,16 +816,7 @@ skippable flag style =
892−gatherAttrRecursive :
819+gatherAttrRecursive : String -> NodeName -> Flag.Field -> Transformation -> List Style -> List (VirtualDom.Attribute msg) -> List (VirtualDom.Node msg) -> List (Attribute aligned msg) -> Gathered msg
898− -> List (VirtualDom.Attribute msg)
899− -> NearbyChildren msg
900− -> List (Attribute aligned msg)
902gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
820gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
903 case elementAttrs of
821 case elementAttrs of
@@ -1032,7 +950,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
951 gatherAttrRecursive (classes ++ " " ++ newClass)
1035− (Flag.merge addToFlags (Flag.add Flag.width has))
953+ (Flag.merge addToFlags has)
1036 transform
954 transform
1037 (newStyles ++ styles)
955 (newStyles ++ styles)
@@ -1053,7 +971,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1054 "height-px-" ++ val
972 "height-px-" ++ val
1056− gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
974+ gatherAttrRecursive (name ++ " " ++ classes)
1058 (Flag.add Flag.height has)
976 (Flag.add Flag.height has)
1059 transform
977 transform
@@ -1110,7 +1028,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
1029 gatherAttrRecursive (classes ++ " " ++ newClass)
1113− (Flag.merge addToFlags (Flag.add Flag.height has))
1031+ (Flag.merge addToFlags has)
1114 transform
1032 transform
1115 (newStyles ++ styles)
1033 (newStyles ++ styles)
@@ -1142,15 +1060,20 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1060 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1144 Paragraph ->
1062 Paragraph ->
1145− -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
1063+ let
1146− -- Since we can't guaranteee that there are no divs, we need another strategy.
1064+ newNode =
1147− -- While it's not documented in many places, there apparently is a paragraph aria role
1065+ case node of
1148− -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
1066+ Generic ->
1149− -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
1067+ NodeName "p"
1150− -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
1068+
1151− gatherAttrRecursive
1075+ gatherAttrRecursive classes
1152− classes
1076+ newNode
1155 transform
1078 transform
@@ -1185,16 +1108,75 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1186 Styled styled ->
1109 Styled styled ->
1187 styles ++ styled.styles
1110 styles ++ styled.styles
1114+ [ Html.Attributes.class <|
1118+ [ Internal.Style.classes.nearby
1119+ , Internal.Style.classes.single
1120+ , Internal.Style.classes.above
1125+ [ Internal.Style.classes.nearby
1126+ , Internal.Style.classes.single
1127+ , Internal.Style.classes.below
1132+ [ Internal.Style.classes.nearby
1133+ , Internal.Style.classes.single
1134+ , Internal.Style.classes.onRight
1139+ [ Internal.Style.classes.nearby
1140+ , Internal.Style.classes.single
1141+ , Internal.Style.classes.onLeft
1146+ [ Internal.Style.classes.nearby
1147+ , Internal.Style.classes.single
1148+ , Internal.Style.classes.inFront
1153+ [ Internal.Style.classes.nearby
1154+ , Internal.Style.classes.single
1155+ , Internal.Style.classes.behind
1169+ styled.html NoStyleSheet asEl
1173+ if location == Behind then
1174+ Internal.Style.classes.hasBehind ++ " " ++ classes
1189− gatherAttrRecursive
1179+ gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1196− (addNearbyElement location elem children)
1199 AlignX x ->
1181 AlignX x ->
1200 if Flag.present Flag.xAlign has then
1182 if Flag.present Flag.xAlign has then
@@ -1250,106 +1232,6 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1250 remaining
1232 remaining
1253−addNearbyElement location elem existing =
1256− nearbyElement location elem
1259− NoNearbyChildren ->
1262− ChildrenBehind [ nearby ]
1265− ChildrenInFront [ nearby ]
1267− ChildrenBehind existingBehind ->
1270− ChildrenBehind (nearby :: existingBehind)
1273− ChildrenBehindAndInFront existingBehind [ nearby ]
1275− ChildrenInFront existingInFront ->
1278− ChildrenBehindAndInFront [ nearby ] existingInFront
1281− ChildrenInFront (nearby :: existingInFront)
1283− ChildrenBehindAndInFront existingBehind existingInFront ->
1286− ChildrenBehindAndInFront (nearby :: existingBehind) existingInFront
1289− ChildrenBehindAndInFront existingBehind (nearby :: existingInFront)
1292−nearbyElement location elem =
1294− [ Html.Attributes.class <|
1298− [ Internal.Style.classes.nearby
1299− , Internal.Style.classes.single
1300− , Internal.Style.classes.above
1305− [ Internal.Style.classes.nearby
1306− , Internal.Style.classes.single
1307− , Internal.Style.classes.below
1312− [ Internal.Style.classes.nearby
1313− , Internal.Style.classes.single
1314− , Internal.Style.classes.onRight
1319− [ Internal.Style.classes.nearby
1320− , Internal.Style.classes.single
1321− , Internal.Style.classes.onLeft
1326− [ Internal.Style.classes.nearby
1327− , Internal.Style.classes.single
1328− , Internal.Style.classes.inFront
1333− [ Internal.Style.classes.nearby
1334− , Internal.Style.classes.single
1335− , Internal.Style.classes.behind
1349− styled.html NoStyleSheet asEl
1353renderWidth w =
1235renderWidth w =
1354 case w of
1236 case w of
1355 Px px ->
1237 Px px ->
@@ -1436,7 +1318,7 @@ renderHeight h =
1436 "height-px-" ++ val
1318 "height-px-" ++ val
1438 ( Flag.none
1320 ( Flag.none
1439− , Internal.Style.classes.heightExact ++ " " ++ name
1321+ , name
1440 , [ Single name "height" (val ++ "px") ]
1322 , [ Single name "height" (val ++ "px") ]
@@ -1459,7 +1341,7 @@ renderHeight h =
1459 , [ Single
1341 , [ Single
1460 (Internal.Style.classes.any
1342 (Internal.Style.classes.any
1462− ++ Internal.Style.classes.column
1344+ ++ Internal.Style.classes.row
1463 ++ " > "
1345 ++ " > "
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1346 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1478,9 +1360,7 @@ renderHeight h =
1480 "min-height"
1362 "min-height"
1481− -- This needs to be !important because we're using `min-height: min-content`
1482− -- to correct for safari's incorrect implementation of flexbox.
1483− (String.fromInt minSize ++ "px !important")
1363+ (String.fromInt minSize ++ "px")
1485 ( newFlag, newAttrs, newStyle ) =
1365 ( newFlag, newAttrs, newStyle ) =
1486 renderHeight len
1366 renderHeight len
@@ -1558,7 +1438,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1558element context node attributes children =
1438element context node attributes children =
1559 attributes
1439 attributes
1560 |> List.reverse
1440 |> List.reverse
1561− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1441+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1562 |> createElement context children
1442 |> createElement context children
@@ -1566,6 +1446,13 @@ untransformed =
1566 Untransformed
1446 Untransformed
1451+-- VirtualDom.text " "
1569createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1456createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1570createElement context children rendered =
1457createElement context children rendered =
@@ -1607,33 +1494,36 @@ createElement context children rendered =
1607 -- Same if it's a column or row with one child and width-content, height-content
1494 -- Same if it's a column or row with one child and width-content, height-content
1608 -- interferes with css grid
1495 -- interferes with css grid
1609 -- Maybe we could unpack text elements in a paragraph as well,
1496 -- Maybe we could unpack text elements in a paragraph as well,
1610− -- however, embedded elements that are larger than the line height will overlap with exisitng text.
1497+ -- however embedded style elements that are larger than the line height will overlap with exisitng text.
1611 -- I don't think that's what we want.
1498 -- I don't think that's what we want.
1613− -- context
1500+ context
1614− -- == asEl
1501+ == asEl
1615− -- || context
1502+ || context
1616− -- == asParagraph
1503+ == asParagraph
1618− -- ( VirtualDom.text
1505+ ( VirtualDom.text
1619− -- (if context == asParagraph then
1506+ (if context == asParagraph then
1620− -- str
1507+ str ++ " "
1624− -- :: htmls
1512+ :: htmls
1625− -- , existingStyles
1513+ , existingStyles
1628− ( (if context == asEl then
1629− textElementFill str
1632− textElement str
1517+ ( textElement
1518+ (if context == asParagraph then
1634− :: htmls
1524+ :: htmls
1635− , existingStyles
1525+ , existingStyles
1638 Empty ->
1528 Empty ->
1639 ( htmls, existingStyles )
1529 ( htmls, existingStyles )
@@ -1675,30 +1565,38 @@ createElement context children rendered =
1675 -- TEXT OPTIMIZATION
1565 -- TEXT OPTIMIZATION
1676 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1566 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1677 -- Same if it's a column or row with one child and width-content, height-content
1567 -- Same if it's a column or row with one child and width-content, height-content
1679− -- context
1569+ context
1680− -- == asEl
1570+ == asEl
1681− -- || context
1571+ || context
1682− -- == asParagraph
1572+ == asParagraph
1684− -- ( ( key
1574+ ( ( key
1685− -- , VirtualDom.text
1575+ , VirtualDom.text
1576+ (if context == asParagraph then
1688− -- :: htmls
1583+ :: htmls
1689− -- , existingStyles
1584+ , existingStyles
1693− , if context == asEl then
1694− textElementFill str
1697− textElement str
1589+ , textElement
1590+ (if context == asParagraph then
1699− :: htmls
1597+ :: htmls
1700− , existingStyles
1598+ , existingStyles
1703 Empty ->
1601 Empty ->
1704 ( htmls, existingStyles )
1602 ( htmls, existingStyles )
@@ -1721,9 +1619,7 @@ createElement context children rendered =
1721 (finalizeNode rendered.has
1619 (finalizeNode rendered.has
1722 rendered.node
1620 rendered.node
1723 rendered.attributes
1621 rendered.attributes
1725− (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1622+ (Keyed <| List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed)
1727 NoStyleSheet
1623 NoStyleSheet
@@ -1731,13 +1627,7 @@ createElement context children rendered =
1732 { styles = allStyles
1628 { styles = allStyles
1733 , html =
1629 , html =
1734− finalizeNode
1630+ finalizeNode rendered.has rendered.node rendered.attributes (Keyed (List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed))
1737− rendered.attributes
1739− (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1743 Unkeyed unkeyedChildren ->
1633 Unkeyed unkeyedChildren ->
@@ -1754,58 +1644,20 @@ createElement context children rendered =
1754 case newStyles of
1644 case newStyles of
1756 Unstyled
1646 Unstyled
1757− (finalizeNode
1647+ (finalizeNode rendered.has
1759 rendered.node
1648 rendered.node
1760 rendered.attributes
1649 rendered.attributes
1761− (Unkeyed (addChildren unkeyed rendered.children))
1650+ (Unkeyed <| rendered.children ++ unkeyed)
1762 NoStyleSheet
1651 NoStyleSheet
1765 allStyles ->
1654 allStyles ->
1767 { styles = allStyles
1656 { styles = allStyles
1768− , html =
1657+ , html = finalizeNode rendered.has rendered.node rendered.attributes (Unkeyed (rendered.children ++ unkeyed))
1772− rendered.attributes
1773− (Unkeyed (addChildren unkeyed rendered.children))
1777−addChildren existing nearbyChildren =
1778− case nearbyChildren of
1779− NoNearbyChildren ->
1782− ChildrenBehind behind ->
1785− ChildrenInFront inFront ->
1786− existing ++ inFront
1788− ChildrenBehindAndInFront behind inFront ->
1789− behind ++ existing ++ inFront
1792−addKeyedChildren key existing nearbyChildren =
1793− case nearbyChildren of
1794− NoNearbyChildren ->
1797− ChildrenBehind behind ->
1798− List.map (\x -> ( key, x )) behind ++ existing
1800− ChildrenInFront inFront ->
1801− existing ++ List.map (\x -> ( key, x )) inFront
1803− ChildrenBehindAndInFront behind inFront ->
1804− List.map (\x -> ( key, x )) behind
1806− ++ List.map (\x -> ( key, x )) inFront
@@ -1817,20 +1669,8 @@ defaultOptions =
1820−staticRoot : OptionRecord -> VirtualDom.Node msg
1672+staticRoot =
1824− -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
1825− VirtualDom.node "div"
1827− [ VirtualDom.node "style" [] [ VirtualDom.text Internal.Style.rules ] ]
1673+ VirtualDom.node "style" [] [ VirtualDom.text Internal.Style.rules ]
1829− NoStaticStyleSheet ->
1833− VirtualDom.node "elm-ui-static-rules" [ VirtualDom.property "rules" (Encode.string Internal.Style.rules) ] []
1836addWhen ifThis x to =
1676addWhen ifThis x to =
@@ -1948,7 +1788,7 @@ type Spacing
1950type Padding
1790type Padding
1951− = Padding String Float Float Float Float
1791+ = Padding String Int Int Int Int
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1794extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -2044,44 +1884,35 @@ getHeight attrs =
2047−textElementClasses : String
2048−textElementClasses =
2053− ++ classes.widthContent
2055− ++ classes.heightContent
2058textElement : String -> VirtualDom.Node msg
1887textElement : String -> VirtualDom.Node msg
2059textElement str =
1888textElement str =
2060 Html.div
1889 Html.div
2061 [ Html.Attributes.class
1890 [ Html.Attributes.class
2062− textElementClasses
1891+ (String.join " "
1894+ , classes.widthContent
1895+ , classes.heightContent
2064 [ Html.text str ]
1899 [ Html.text str ]
2067−textElementFillClasses : String
2068−textElementFillClasses =
2073− ++ classes.widthFill
2075− ++ classes.heightFill
2078textElementFill : String -> VirtualDom.Node msg
1902textElementFill : String -> VirtualDom.Node msg
2079textElementFill str =
1903textElementFill str =
2080− Html.div
1904+ VirtualDom.node "div"
2081− [ Html.Attributes.class
1905+ [ VirtualDom.property "className"
2082− textElementFillClasses
1906+ (Json.string <|
1910+ , classes.widthFill
1911+ , classes.heightFill
2084− [ Html.text str ]
1915+ [ VirtualDom.text str ]
2087type Children x
1918type Children x
@@ -2089,6 +1920,10 @@ type Children x
2089 | Keyed (List ( String, x ))
1920 | Keyed (List ( String, x ))
1924+-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
2092toHtml mode el =
1927toHtml mode el =
2093 case el of
1928 case el of
2094 Unstyled html ->
1929 Unstyled html ->
@@ -2124,7 +1959,8 @@ renderRoot optionList attributes child =
2126type RenderMode
1961type RenderMode
2127− = Layout
1963+ | Layout
2128 | NoStaticStyleSheet
1964 | NoStaticStyleSheet
2129 | WithVirtualCss
1965 | WithVirtualCss
@@ -2173,8 +2009,8 @@ rootStyle =
2173 , SansSerif
2009 , SansSerif
2176− [ StyleClass Flag.bgColor (Colored ("bg-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2012+ [ StyleClass Flag.bgColor (Colored ("bg-color-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2177− , StyleClass Flag.fontColor (Colored ("fc-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2013+ , StyleClass Flag.fontColor (Colored ("font-color-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2178 , StyleClass Flag.fontSize (FontSize 20)
2014 , StyleClass Flag.fontSize (FontSize 20)
2179 , StyleClass Flag.fontFamily <|
2015 , StyleClass Flag.fontFamily <|
2180 FontFamily (List.foldl renderFontClassName "font-" families)
2016 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2206,49 +2042,14 @@ renderFontClassName font current =
2206 |> String.toLower
2042 |> String.toLower
2207 |> String.words
2043 |> String.words
2208 |> String.join "-"
2044 |> String.join "-"
2210− FontWith { name } ->
2218renderFocusStyle :
2048renderFocusStyle :
2219 FocusStyle
2049 FocusStyle
2220− -> List Style
2050+ -> Style
2221renderFocusStyle focus =
2051renderFocusStyle focus =
2222− [ Style (Internal.Style.dot classes.focusedWithin ++ ":focus-within")
2223− (List.filterMap identity
2224− [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2225− , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2228− Property "box-shadow"
2230− { color = shadow.color
2233− |> Tuple.mapFirst toFloat
2234− |> Tuple.mapSecond toFloat
2237− toFloat shadow.blur
2239− toFloat shadow.size
2244− , Just <| Property "outline" "none"
2248− ((Internal.Style.dot classes.any ++ ":focus .focusable, ")
2249− ++ (Internal.Style.dot classes.any ++ ".focusable:focus, ")
2052+ Style (Internal.Style.dot classes.any ++ ":focus .focusable, " ++ Internal.Style.dot classes.any ++ ".focusable:focus")
2250− ++ (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb")
2252 (List.filterMap identity
2053 (List.filterMap identity
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2054 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2055 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2271,7 +2072,6 @@ renderFocusStyle focus =
2271 , Just <| Property "outline" "none"
2072 , Just <| Property "outline" "none"
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
2077focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2283,7 +2083,7 @@ focusDefaultStyle =
2283 { color =
2083 { color =
2284 Rgba (155 / 255) (203 / 255) 1 1
2084 Rgba (155 / 255) (203 / 255) 1 1
2285 , offset = ( 0, 0 )
2085 , offset = ( 0, 0 )
2286− , blur = 0
2086+ , blur = 3
2287 , size = 3
2087 , size = 3
@@ -2351,734 +2151,498 @@ optionsToRecord options =
2354−toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2154+renderFont : List Font -> String
2355−toStyleSheet options styleSheet =
2155+renderFont families =
2356− case options.mode of
2358− -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
2359− VirtualDom.node "div"
2361− [ VirtualDom.node "style"
2363− [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2366− NoStaticStyleSheet ->
2367− -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
2368− VirtualDom.node "div"
2370− [ VirtualDom.node "style"
2372− [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2376− VirtualDom.node "elm-ui-rules"
2377− [ VirtualDom.property "rules"
2378− (encodeStyles options styleSheet)
2383−renderTopLevelValues rules =
2385− withImport font =
2157+ fontName font =
2386 case font of
2158 case font of
2387− ImportFont _ url ->
2159+ Serif ->
2388− Just ("@import url('" ++ url ++ "');")
2160+ "serif"
2390− -- FontWith with ->
2391− -- case with.url of
2393− -- Just ("@import url('" ++ x ++ "');")
2400− List.map Tuple.first rules
2402− fontImports ( name, typefaces ) =
2405− String.join "\n" (List.filterMap withImport typefaces)
2409− fontAdjustments ( name, typefaces ) =
2410− case typefaceAdjustment typefaces of
2413− (List.map (renderNullAdjustmentRule name) allNames)
2415− Just adjustment ->
2162+ SansSerif ->
2416− String.join ""
2163+ "sans-serif"
2417− (List.map (renderFontAdjustmentRule name adjustment) allNames)
2419− String.join "\n" (List.map fontImports rules)
2420− ++ String.join "\n" (List.map fontAdjustments rules)
2423−renderNullAdjustmentRule fontToAdjust otherFontName =
2168+ Typeface name ->
2424− let
2169+ "\"" ++ name ++ "\""
2426− if fontToAdjust == otherFontName then
2429− else
2171+ ImportFont name url ->
2430− otherFontName ++ " ." ++ fontToAdjust
2172+ "\"" ++ name ++ "\""
2175+ |> List.map fontName
2432− String.join " "
2176+ |> String.join ", "
2437− ++ classes.sizeByCapital
2442− ++ classes.sizeByCapital
2444− [ ( "line-height", "1" )
2450− ++ classes.sizeByCapital
2452− ++ Internal.Style.classes.text
2456− ++ classes.sizeByCapital
2458− ++ Internal.Style.classes.text
2460− [ ( "vertical-align", "0" )
2461− , ( "line-height", "1" )
2466−fontRule name modifier ( parentAdj, textAdjustment ) =
2179+toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2467− [ bracket
2180+toStyleSheet options styleSheet =
2468− ("."
2181+ VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2485− ++ Internal.Style.classes.text
2491− ++ Internal.Style.classes.text
2497−renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2184+toStyleSheetString : OptionRecord -> List Style -> String
2185+toStyleSheetString options stylesheet =
2499− name =
2187+ renderTopLevels rule =
2500− if fontToAdjust == otherFontName then
2188+ case rule of
2501− fontToAdjust
2189+ FontFamily name typefaces ->
2503− else
2191+ getImports font =
2504− otherFontName ++ " ." ++ fontToAdjust
2192+ case font of
2505− in
2193+ ImportFont _ url ->
2506− String.join " "
2194+ Just ("@import url('" ++ url ++ "');")
2507− (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2510−bracket selector rules =
2196+ _ ->
2512− renderPair ( name, val ) =
2513− name ++ ": " ++ val ++ ";"
2515− selector ++ " {" ++ String.join "" (List.map renderPair rules) ++ "}"
2199+ typefaces
2200+ |> List.filterMap getImports
2201+ |> String.join "\n"
2518−fontAdjustmentRules converted =
2207+ renderProps force (Property key val) existing =
2519− ( [ ( "display", "block" )
2208+ if force then
2520− ]
2209+ existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2521− , [ ( "display", "inline-block" )
2522− , ( "line-height", String.fromFloat converted.height )
2523− , ( "vertical-align", String.fromFloat converted.vertical ++ "em" )
2524− , ( "font-size", String.fromFloat converted.size ++ "em" )
2212+ existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2529−typefaceAdjustment typefaces =
2214+ renderStyle maybePseudo selector props =
2532− case found of
2215+ case maybePseudo of
2533 Nothing ->
2216 Nothing ->
2534− case face of
2217+ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2536− case with.adjustment of
2542− ( fontAdjustmentRules
2543− (.full (convertAdjustment adjustment))
2544− , fontAdjustmentRules
2545− (.capital (convertAdjustment adjustment))
2551− Just _ ->
2219+ Just pseudo ->
2552− found
2220+ case pseudo of
2554− Nothing
2222+ case options.hover of
2555− typefaces
2223+ NoHover ->
2570− "\"" ++ name ++ "\""
2572− ImportFont name url ->
2573− "\"" ++ name ++ "\""
2575− FontWith { name } ->
2576− "\"" ++ name ++ "\""
2579−topLevelValue rule =
2581− FontFamily name typefaces ->
2582− Just ( name, typefaces )
2588−renderProps force (Property key val) existing =
2590− existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2593− existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2596−encodeStyles options stylesheet =
2602− renderStyleRule options style Nothing
2604− ( getStyleName style, Encode.list Encode.string styled )
2609−toStyleSheetString : OptionRecord -> List Style -> String
2610−toStyleSheetString options stylesheet =
2612− combine style rendered =
2613− { rules = rendered.rules ++ renderStyleRule options style Nothing
2615− case topLevelValue style of
2619− Just topLevel ->
2226+ ForceHover ->
2620− topLevel :: rendered.topLevel
2227+ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2623− case List.foldl combine { topLevel = [], rules = [] } stylesheet of
2624− { topLevel, rules } ->
2625− renderTopLevelValues topLevel ++ String.concat rules
2230+ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2628−renderStyle : OptionRecord -> Maybe PseudoClass -> String -> List Property -> List String
2232+ Focus ->
2629−renderStyle options maybePseudo selector props =
2233+ let
2630− case maybePseudo of
2234+ renderedProps =
2632− [ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2235+ List.foldl (renderProps False) "" props
2246+ ++ "-fs:not(.focus) {"
2256+ , ".focusable-parent:focus ~ "
2634− Just pseudo ->
2266+ Active ->
2635− case pseudo of
2267+ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2637− case options.hover of
2641− ForceHover ->
2269+ renderStyleRule rule maybePseudo =
2642− [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2270+ case rule of
2271+ Style selector props ->
2272+ renderStyle maybePseudo selector props
2644− AllowHover ->
2274+ Shadows name prop ->
2645− [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2275+ renderStyle
2278+ [ Property "box-shadow" prop
2647− Focus ->
2281+ Transparency name transparency ->
2649− renderedProps =
2283+ opacity =
2650− List.foldl (renderProps False) "" props
2284+ (1 - transparency)
2652− [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2288+ renderStyle
2653− , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2289+ maybePseudo
2656− , (selector ++ "-fs:focus-within {")
2659− , (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb" ++ selector ++ "-fs {")
2665− [ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2668−renderStyleRule : OptionRecord -> Style -> Maybe PseudoClass -> List String
2669−renderStyleRule options rule maybePseudo =
2671− Style selector props ->
2672− renderStyle options maybePseudo selector props
2674− Shadows name prop ->
2675− renderStyle options
2677− ("." ++ name)
2290+ ("." ++ name)
2678− [ Property "box-shadow" prop
2681− Transparency name transparency ->
2688− renderStyle options
2691− [ Property "opacity" (String.fromFloat opacity)
2291+ [ Property "opacity" (String.fromFloat opacity)
2695− renderStyle options
2697− (".font-size-" ++ String.fromInt i)
2698− [ Property "font-size" (String.fromInt i ++ "px")
2701− FontFamily name typefaces ->
2294+ FontSize i ->
2702− let
2295+ renderStyle
2703− features =
2296+ maybePseudo
2704− typefaces
2297+ (".font-size-" ++ String.fromInt i)
2705− |> List.filterMap renderVariants
2706− |> String.join ", "
2709− [ Property "font-family"
2298+ [ Property "font-size" (String.fromInt i ++ "px")
2711− |> List.map fontName
2712− |> String.join ", "
2714− , Property "font-feature-settings" features
2715− , Property "font-variant"
2716− (if List.any hasSmallCaps typefaces then
2719− else
2301+ FontFamily name typefaces ->
2724− renderStyle options
2302+ renderStyle
2725− maybePseudo
2303+ maybePseudo
2726− ("." ++ name)
2304+ ("." ++ name)
2727− families
2305+ [ Property "font-family" (renderFont typefaces)
2729− Single class prop val ->
2308+ Single class prop val ->
2730− renderStyle options
2309+ renderStyle
2731− maybePseudo
2310+ maybePseudo
2732− ("." ++ class)
2311+ ("." ++ class)
2733− [ Property prop val
2312+ [ Property prop val
2736− Colored class prop color ->
2315+ Colored class prop color ->
2737− renderStyle options
2316+ renderStyle
2738− maybePseudo
2317+ maybePseudo
2739− ("." ++ class)
2318+ ("." ++ class)
2740− [ Property prop (formatColor color)
2319+ [ Property prop (formatColor color)
2743− SpacingStyle cls x y ->
2322+ SpacingStyle cls x y ->
2745− class =
2324+ class =
2746− "." ++ cls
2325+ "." ++ cls
2749− String.fromFloat (toFloat x / 2) ++ "px"
2328+ String.fromInt x ++ "px"
2752− String.fromFloat (toFloat y / 2) ++ "px"
2331+ String.fromInt y ++ "px"
2755− String.fromInt x ++ "px"
2334+ "." ++ Internal.Style.classes.row
2757− yPx =
2336+ wrappedRow =
2758− String.fromInt y ++ "px"
2337+ "." ++ Internal.Style.classes.wrapped ++ row
2760− row =
2339+ column =
2761− "." ++ Internal.Style.classes.row
2340+ "." ++ Internal.Style.classes.column
2763− wrappedRow =
2342+ page =
2764− "." ++ Internal.Style.classes.wrapped ++ row
2343+ "." ++ Internal.Style.classes.page
2766− column =
2345+ paragraph =
2767− "." ++ Internal.Style.classes.column
2346+ "." ++ Internal.Style.classes.paragraph
2770− "." ++ Internal.Style.classes.page
2349+ "." ++ Internal.Style.classes.alignLeft
2772− paragraph =
2351+ right =
2773− "." ++ Internal.Style.classes.paragraph
2352+ "." ++ Internal.Style.classes.alignRight
2776− "." ++ Internal.Style.classes.alignLeft
2355+ "." ++ Internal.Style.classes.any
2778− right =
2357+ single =
2779− "." ++ Internal.Style.classes.alignRight
2358+ "." ++ Internal.Style.classes.single
2361+ [ renderStyle maybePseudo (class ++ row ++ " > " ++ any) [ Property "margin-right" xPx ]
2781− any =
2363+ -- margins don't apply to last element of normal, unwrapped rows
2782− "." ++ Internal.Style.classes.any
2364+ , renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ ":last-child") [ Property "margin" "0" ]
2785− "." ++ Internal.Style.classes.single
2788− [ renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2790− -- margins don't apply to last element of normal, unwrapped rows
2791− -- , renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2792− -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2366+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2793− , renderStyle options
2794− maybePseudo
2367+ , renderStyle maybePseudo
2795− (class ++ wrappedRow ++ " > " ++ any)
2368+ (class ++ wrappedRow ++ " > " ++ any)
2796− [ Property "margin" (halfY ++ " " ++ halfX)
2369+ [ Property "margin" ("0 " ++ xPx ++ " " ++ yPx ++ " 0")
2371+ , renderStyle maybePseudo
2372+ (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2373+ [ Property "margin-right" "0"
2799− -- , renderStyle options maybePseudo
2800− -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2801− -- [ Property "margin-right" "0"
2803− -- columns
2376+ -- columns
2804− , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2377+ , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2805− , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2378+ , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2806− , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2379+ , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2807− , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2380+ , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2808− , renderStyle options
2381+ , renderStyle
2809− maybePseudo
2382+ maybePseudo
2810− (class ++ paragraph)
2383+ (class ++ paragraph)
2811− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2384+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2813− , renderStyle options
2386+ , renderStyle
2814− maybePseudo
2387+ maybePseudo
2815− ("textarea" ++ any ++ class)
2388+ ("textarea" ++ class)
2816− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2389+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2817− , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2820− -- , renderStyle options
2392+ -- , renderStyle
2821− -- maybePseudo
2393+ -- maybePseudo
2822− -- (class ++ paragraph ++ " > " ++ any)
2394+ -- (class ++ paragraph ++ " > " ++ any)
2823− -- [ Property "margin-right" xPx
2395+ -- [ Property "margin-right" xPx
2824− -- , Property "margin-bottom" yPx
2396+ -- , Property "margin-bottom" yPx
2826− , renderStyle options
2398+ , renderStyle
2827− maybePseudo
2399+ maybePseudo
2828− (class ++ paragraph ++ " > " ++ left)
2400+ (class ++ paragraph ++ " > " ++ left)
2829− [ Property "margin-right" xPx
2401+ [ Property "margin-right" xPx
2831− , renderStyle options
2403+ , renderStyle
2832− maybePseudo
2404+ maybePseudo
2833− (class ++ paragraph ++ " > " ++ right)
2405+ (class ++ paragraph ++ " > " ++ right)
2834− [ Property "margin-left" xPx
2406+ [ Property "margin-left" xPx
2836− , renderStyle options
2408+ , renderStyle
2837− maybePseudo
2409+ maybePseudo
2838− (class ++ paragraph ++ "::after")
2410+ (class ++ paragraph ++ "::after")
2839− [ Property "content" "''"
2411+ [ Property "content" "''"
2840− , Property "display" "block"
2412+ , Property "display" "block"
2841− , Property "height" "0"
2413+ , Property "height" "0"
2842− , Property "width" "0"
2414+ , Property "width" "0"
2843− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2415+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2845− , renderStyle options
2417+ , renderStyle
2846− maybePseudo
2418+ maybePseudo
2847− (class ++ paragraph ++ "::before")
2419+ (class ++ paragraph ++ "::before")
2848− [ Property "content" "''"
2420+ [ Property "content" "''"
2849− , Property "display" "block"
2421+ , Property "display" "block"
2850− , Property "height" "0"
2422+ , Property "height" "0"
2851− , Property "width" "0"
2423+ , Property "width" "0"
2852− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2424+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2856− PaddingStyle cls top right bottom left ->
2428+ PaddingStyle cls top right bottom left ->
2858− class =
2430+ class =
2862− renderStyle options
2434+ renderStyle
2863− maybePseudo
2435+ maybePseudo
2865− [ Property "padding"
2437+ [ Property "padding"
2866− (String.fromFloat top
2438+ (String.fromInt top
2867− ++ "px "
2439+ ++ "px "
2868− ++ String.fromFloat right
2440+ ++ String.fromInt right
2869− ++ "px "
2441+ ++ "px "
2870− ++ String.fromFloat bottom
2442+ ++ String.fromInt bottom
2871− ++ "px "
2443+ ++ "px "
2872− ++ String.fromFloat left
2444+ ++ String.fromInt left
2873− ++ "px"
2445+ ++ "px"
2877− BorderWidth cls top right bottom left ->
2449+ GridTemplateStyle template ->
2879− class =
2451+ class =
2880− "."
2452+ ".grid-rows-"
2881− ++ cls
2453+ ++ String.join "-" (List.map lengthClassName template.rows)
2455+ ++ String.join "-" (List.map lengthClassName template.columns)
2457+ ++ lengthClassName (Tuple.first template.spacing)
2459+ ++ lengthClassName (Tuple.second template.spacing)
2462+ toGridLength (Tuple.second template.spacing)
2465+ toGridLength (Tuple.first template.spacing)
2468+ toGridLengthHelper Nothing Nothing x
2470+ toGridLengthHelper minimum maximum x =
2473+ String.fromInt px ++ "px"
2476+ case ( minimum, maximum ) of
2477+ ( Nothing, Nothing ) ->
2480+ ( Just minSize, Nothing ) ->
2481+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2483+ ( Nothing, Just maxSize ) ->
2484+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2486+ ( Just minSize, Just maxSize ) ->
2487+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2490+ case ( minimum, maximum ) of
2491+ ( Nothing, Nothing ) ->
2492+ String.fromInt i ++ "fr"
2494+ ( Just minSize, Nothing ) ->
2495+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2497+ ( Nothing, Just maxSize ) ->
2498+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2500+ ( Just minSize, Just maxSize ) ->
2501+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2504+ toGridLengthHelper (Just m) maximum len
2507+ toGridLengthHelper minimum (Just m) len
2511+ |> List.map toGridLength
2512+ |> String.join ySpacing
2513+ |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2517+ |> List.map toGridLength
2518+ |> String.join ySpacing
2519+ |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2522+ class ++ "{" ++ msColumns ++ msRows ++ "}"
2526+ |> List.map toGridLength
2528+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2532+ |> List.map toGridLength
2534+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2537+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2540+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2543+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2546+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2883− renderStyle options
2548+ base ++ supports
2886− [ Property "border-width"
2887− (String.fromInt top
2889− ++ String.fromInt right
2891− ++ String.fromInt bottom
2893− ++ String.fromInt left
2898− GridTemplateStyle template ->
2550+ GridPosition position ->
2900− class =
2552+ class =
2901− ".grid-rows-"
2553+ ".grid-pos-"
2902− ++ String.join "-" (List.map lengthClassName template.rows)
2554+ ++ String.fromInt position.row
2556+ ++ String.fromInt position.col
2903− ++ "-cols-"
2557+ ++ "-"
2904− ++ String.join "-" (List.map lengthClassName template.columns)
2558+ ++ String.fromInt position.width
2905− ++ "-space-x-"
2559+ ++ "-"
2906− ++ lengthClassName (Tuple.first template.spacing)
2560+ ++ String.fromInt position.height
2907− ++ "-space-y-"
2561+
2908− ++ lengthClassName (Tuple.second template.spacing)
2562+ msPosition =
2909−
2563+ String.join " "
2910− ySpacing =
2564+ [ "-ms-grid-row: "
2911− toGridLength (Tuple.second template.spacing)
2565+ ++ String.fromInt position.row
2913− xSpacing =
2567+ , "-ms-grid-row-span: "
2914− toGridLength (Tuple.first template.spacing)
2568+ ++ String.fromInt position.height
2916− toGridLength x =
2570+ , "-ms-grid-column: "
2917− toGridLengthHelper Nothing Nothing x
2571+ ++ String.fromInt position.col
2919− toGridLengthHelper minimum maximum x =
2573+ , "-ms-grid-column-span: "
2920− case x of
2574+ ++ String.fromInt position.width
2921− Px px ->
2575+ ++ ";"
2579+ class ++ "{" ++ msPosition ++ "}"
2922− String.fromInt px ++ "px"
2584+ ++ String.fromInt position.row
2924− Content ->
2586+ ++ String.fromInt (position.row + position.height)
2925− case ( minimum, maximum ) of
2587+ ++ ";"
2926− ( Nothing, Nothing ) ->
2588+ , "grid-column: "
2929− ( Just minSize, Nothing ) ->
2930− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2589+ ++ String.fromInt position.col
2932− ( Nothing, Just maxSize ) ->
2591+ ++ String.fromInt (position.col + position.width)
2933− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2592+ ++ ";"
2935− ( Just minSize, Just maxSize ) ->
2594+
2936− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2595+ modernGrid =
2937−
2596+ class ++ "{" ++ modernPosition ++ "}"
2939− case ( minimum, maximum ) of
2598+ supports =
2940− ( Nothing, Nothing ) ->
2599+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2941− String.fromInt i ++ "fr"
2600+ in
2942−
2601+ base ++ supports
2943− ( Just minSize, Nothing ) ->
2944− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2946− ( Nothing, Just maxSize ) ->
2947− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2949− ( Just minSize, Just maxSize ) ->
2950− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2953− toGridLengthHelper (Just m) maximum len
2956− toGridLengthHelper minimum (Just m) len
2960− |> List.map toGridLength
2961− |> String.join ySpacing
2962− |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2966− |> List.map toGridLength
2967− |> String.join ySpacing
2968− |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2971− class ++ "{" ++ msColumns ++ msRows ++ "}"
2975− |> List.map toGridLength
2977− |> (\x -> "grid-template-columns: " ++ x ++ ";")
2979− rows =
2603+ PseudoSelector class styles ->
2980− template.rows
2604+ let
2981− |> List.map toGridLength
2605+ renderPseudoRule style =
2606+ renderStyleRule style (Just class)
2608+ List.map renderPseudoRule styles
2982 |> String.join " "
2609 |> String.join " "
2983− |> (\x -> "grid-template-rows: " ++ x ++ ";")
2986− "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2989− "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2992− class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2995− "@supports (display:grid) {" ++ modernGrid ++ "}"
3001− GridPosition position ->
2611+ Transform transform ->
3004− ".grid-pos-"
2614+ transformValue transform
3005− ++ String.fromInt position.row
3007− ++ String.fromInt position.col
3009− ++ String.fromInt position.width
3011− ++ String.fromInt position.height
3016− ++ String.fromInt position.row
3018− , "-ms-grid-row-span: "
3019− ++ String.fromInt position.height
3021− , "-ms-grid-column: "
3022− ++ String.fromInt position.col
3024− , "-ms-grid-column-span: "
3025− ++ String.fromInt position.width
3030− class ++ "{" ++ msPosition ++ "}"
3035− ++ String.fromInt position.row
3037− ++ String.fromInt (position.row + position.height)
3040− ++ String.fromInt position.col
3042− ++ String.fromInt (position.col + position.width)
3047− class ++ "{" ++ modernPosition ++ "}"
3050− "@supports (display:grid) {" ++ modernGrid ++ "}"
3056− PseudoSelector class styles ->
2616+ class =
3057− let
2617+ transformClass transform
3058− renderPseudoRule style =
3059− renderStyleRule options style (Just class)
3061− List.concatMap renderPseudoRule styles
2619+ case ( class, val ) of
2620+ ( Just cls, Just v ) ->
2624+ [ Property "transform"
3063− Transform transform ->
2628+ _ ->
3066− transformValue transform
3068− class =
2631+ combine style rendered =
3069− transformClass transform
2632+ { rendered
3070− in
2633+ | rules = rendered.rules ++ renderStyleRule style Nothing
3071− case ( class, val ) of
2634+ , topLevel =
3072− ( Just cls, Just v ) ->
2635+ case renderTopLevels style of
3073− renderStyle options
2636+ Nothing ->
3074− maybePseudo
2637+ rendered.topLevel
3076− [ Property "transform"
3080− _ ->
2639+ Just topLevel ->
3081− []
2640+ rendered.topLevel ++ topLevel
2643+ case List.foldl combine { rules = "", topLevel = "" } stylesheet of
2644+ { topLevel, rules } ->
3084lengthClassName : Length -> String
2648lengthClassName : Length -> String
@@ -3118,12 +2682,12 @@ formatTextShadow shadow =
3121−textShadowClass shadow =
2685+textShadowName shadow =
3122 String.concat
2686 String.concat
3124− , floatClass (Tuple.first shadow.offset) ++ "px"
2688+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3125− , floatClass (Tuple.second shadow.offset) ++ "px"
2689+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3126− , floatClass shadow.blur ++ "px"
2690+ , String.fromFloat shadow.blur ++ "px"
3127 , formatColorClass shadow.color
2691 , formatColorClass shadow.color
@@ -3144,17 +2708,17 @@ formatBoxShadow shadow =
3147−boxShadowClass shadow =
2711+boxShadowName shadow =
3148 String.concat <|
2712 String.concat <|
3149 [ if shadow.inset then
2713 [ if shadow.inset then
3150 "box-inset"
2714 "box-inset"
3154− , floatClass (Tuple.first shadow.offset) ++ "px"
2718+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3155− , floatClass (Tuple.second shadow.offset) ++ "px"
2719+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3156− , floatClass shadow.blur ++ "px"
2720+ , String.fromFloat shadow.blur ++ "px"
3157− , floatClass shadow.size ++ "px"
2721+ , String.fromFloat shadow.size ++ "px"
3158 , formatColorClass shadow.color
2722 , formatColorClass shadow.color
@@ -3199,17 +2763,6 @@ paddingName top right bottom left =
3199 ++ String.fromInt left
2763 ++ String.fromInt left
3202−paddingNameFloat top right bottom left =
3206− ++ floatClass right
3208− ++ floatClass bottom
3213getStyleName : Style -> String
2766getStyleName : Style -> String
3214getStyleName style =
2767getStyleName style =
3215 case style of
2768 case style of
@@ -3240,9 +2793,6 @@ getStyleName style =
3240 PaddingStyle cls top right bottom left ->
2793 PaddingStyle cls top right bottom left ->
3243− BorderWidth cls top right bottom left ->
3246 GridTemplateStyle template ->
2796 GridTemplateStyle template ->
3247 "grid-rows-"
2797 "grid-rows-"
3248 ++ String.join "-" (List.map lengthClassName template.rows)
2798 ++ String.join "-" (List.map lengthClassName template.rows)
@@ -3475,76 +3025,3 @@ onlyStyles attr =
3481−{- Font Adjustments -}
3484−convertAdjustment adjustment =
3500− ((ascender - newBaseline) / 2) + newBaseline
3503− ((ascender - descender) / 2) + descender
3506− [ adjustment.capital
3507− , adjustment.baseline
3508− , adjustment.descender
3509− , adjustment.lowercase
3513− Maybe.withDefault adjustment.capital (List.maximum lines)
3516− Maybe.withDefault adjustment.descender (List.minimum lines)
3520− |> List.filter (\x -> x /= descender)
3522− |> Maybe.withDefault adjustment.baseline
3528− 1 / (ascender - newBaseline)
3531− 1 / (ascender - descender)
3536− -- (oldMiddle - newFullMiddle) * 2
3539− adjust fullSize (ascender - descender) fullVertical
3541− adjust capitalSize (ascender - newBaseline) capitalVertical
3545−adjust size height vertical =
3546− { vertical = vertical