@@ -1,109 +1,4 @@
1−module Internal.Model exposing
1+module Internal.Model exposing (Aligned(..), Angle, Attribute(..), Axis(..), Children(..), Color(..), Description(..), Element(..), EmbedStyle(..), FocusStyle, Font(..), Gathered, HAlign(..), HoverSetting(..), LayoutContext(..), Length(..), Location(..), NodeName(..), Option(..), OptionRecord, Padding(..), Property(..), PseudoClass(..), RenderMode(..), Shadow, Spacing(..), Style(..), TransformComponent(..), Transformation(..), VAlign(..), XYZ, addNodeName, addWhen, alignXName, alignYName, asColumn, asEl, asGrid, asParagraph, asRow, asTextColumn, boxShadowName, columnClass, composeTransformation, contextClasses, createElement, defaultOptions, div, element, embedKeyed, embedWith, extractSpacingAndPadding, filter, finalizeNode, floatClass, focusDefaultStyle, formatBoxShadow, formatColor, formatColorClass, formatDropShadow, formatTextShadow, gatherAttrRecursive, get, getHeight, getSpacing, getStyleName, getWidth, gridClass, htmlClass, lengthClassName, map, mapAttr, mapAttrFromStyle, noStyleSheet, onlyStyles, optionsToRecord, paddingName, pageClass, paragraphClass, reduceRecursive, reduceRecursiveCalcName, reduceStyles, reduceStylesRecursive, removeNever, renderFocusStyle, renderFont, renderFontClassName, renderHeight, renderRoot, renderWidth, rootStyle, rowClass, singleClass, skippable, sortedReduce, spacingName, staticRoot, tag, textElement, textElementFill, textShadowName, toHtml, toStyleSheet, toStyleSheetString, transformClass, transformValue, unit, unstyled, untransformed, unwrapDecorations, unwrapDecsHelper)
30− , TransformComponent(..)
47− , composeTransformation
55− , extractSpacingAndPadding
65− , gatherAttrRecursive
87− , reduceStylesRecursive
89− , renderFontClassName
@@ -112,7 +7,7 @@ import Html.Attributes
112import Html.Keyed
7import Html.Keyed
113import Internal.Flag as Flag exposing (Flag)
8import Internal.Flag as Flag exposing (Flag)
114import Internal.Style exposing (classes, dot)
9import Internal.Style exposing (classes, dot)
115−import Json.Encode as Encode
10+import Json.Encode as Json
116import Set exposing (Set)
11import Set exposing (Set)
117import VirtualDom
12import VirtualDom
@@ -173,8 +68,7 @@ type Style
173 | Single String String String
68 | Single String String String
174 | Colored String String Color
69 | Colored String String Color
175 | SpacingStyle String Int Int
70 | SpacingStyle String Int Int
176− | BorderWidth String Int Int Int Int
177− | PaddingStyle String Float Float Float Float
71+ | PaddingStyle String Int Int Int Int
178 | GridTemplateStyle
72 | GridTemplateStyle
179 { spacing : ( Length, Length )
73 { spacing : ( Length, Length )
180 , columns : List Length
74 , columns : List Length
@@ -205,86 +99,12 @@ type PseudoClass
209−type alias Adjustment =
219 | SansSerif
104 | SansSerif
220 | Monospace
105 | Monospace
221 | Typeface String
106 | Typeface String
222 | ImportFont String String
107 | 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
110type Property
@@ -372,13 +192,6 @@ type NodeName
372 | Embedded String String
192 | 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 +200,7 @@ type alias Gathered msg =
387 { node : NodeName
200 { node : NodeName
388 , attributes : List (VirtualDom.Attribute msg)
201 , attributes : List (VirtualDom.Attribute msg)
389 , styles : List Style
202 , styles : List Style
390− , children : NearbyChildren msg
203+ , children : List (VirtualDom.Node msg)
391 , has : Flag.Field
204 , has : Flag.Field
@@ -455,10 +268,7 @@ finalizeNode has node attributes children embedMode parentContext =
455 Embedded nodeName internal ->
268 Embedded nodeName internal ->
456 VirtualDom.node nodeName
269 VirtualDom.node nodeName
457 attributes
270 attributes
458− [ createNode internal
459− [ Html.Attributes.class
460− (classes.any ++ " " ++ classes.single)
271+ [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
464 case parentContext of
274 case parentContext of
@@ -535,45 +345,49 @@ finalizeNode has node attributes children embedMode parentContext =
537embedWith static opts styles children =
347embedWith 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
348 if static then
548− staticRoot opts
349+ staticRoot
549− :: dynamicStyleSheet
350+ :: (styles
351+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
353+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
355+ |> toStyleSheet opts
550 :: children
357 :: children
553− dynamicStyleSheet
360+ (styles
361+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
363+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
365+ |> toStyleSheet opts
554 :: children
367 :: children
557embedKeyed static opts styles children =
370embedKeyed 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
371 if static then
568− ( "static-stylesheet", staticRoot opts )
372+ ( "static-stylesheet", staticRoot )
569 :: ( "dynamic-stylesheet"
373 :: ( "dynamic-stylesheet"
570− , dynamicStyleSheet
374+ , styles
375+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
377+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
379+ |> toStyleSheet opts
572 :: children
381 :: children
575 ( "dynamic-stylesheet"
384 ( "dynamic-stylesheet"
576− , dynamicStyleSheet
385+ , styles
386+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
388+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
390+ |> toStyleSheet opts
578 :: children
392 :: children
@@ -889,16 +703,7 @@ skippable flag style =
892−gatherAttrRecursive :
706+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 =
707gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
903 case elementAttrs of
708 case elementAttrs of
@@ -1032,7 +837,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
838 gatherAttrRecursive (classes ++ " " ++ newClass)
1035− (Flag.merge addToFlags (Flag.add Flag.width has))
840+ (Flag.merge addToFlags has)
1036 transform
841 transform
1037 (newStyles ++ styles)
842 (newStyles ++ styles)
@@ -1053,7 +858,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1054 "height-px-" ++ val
859 "height-px-" ++ val
1056− gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
861+ gatherAttrRecursive (name ++ " " ++ classes)
1058 (Flag.add Flag.height has)
863 (Flag.add Flag.height has)
1059 transform
864 transform
@@ -1110,7 +915,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
916 gatherAttrRecursive (classes ++ " " ++ newClass)
1113− (Flag.merge addToFlags (Flag.add Flag.height has))
918+ (Flag.merge addToFlags has)
1114 transform
919 transform
1115 (newStyles ++ styles)
920 (newStyles ++ styles)
@@ -1142,15 +947,20 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
947 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1144 Paragraph ->
949 Paragraph ->
1145− -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
950+ let
1146− -- Since we can't guaranteee that there are no divs, we need another strategy.
951+ newNode =
1147− -- While it's not documented in many places, there apparently is a paragraph aria role
952+ case node of
1148− -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
953+ Generic ->
1149− -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
954+ NodeName "p"
1150− -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
955+
1151− gatherAttrRecursive
962+ gatherAttrRecursive classes
1152− classes
963+ newNode
1155 transform
965 transform
@@ -1185,16 +995,75 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1186 Styled styled ->
996 Styled styled ->
1187 styles ++ styled.styles
997 styles ++ styled.styles
1001+ [ Html.Attributes.class <|
1005+ [ Internal.Style.classes.any
1006+ , Internal.Style.classes.single
1007+ , Internal.Style.classes.above
1012+ [ Internal.Style.classes.any
1013+ , Internal.Style.classes.single
1014+ , Internal.Style.classes.below
1019+ [ Internal.Style.classes.any
1020+ , Internal.Style.classes.single
1021+ , Internal.Style.classes.onRight
1026+ [ Internal.Style.classes.any
1027+ , Internal.Style.classes.single
1028+ , Internal.Style.classes.onLeft
1033+ [ Internal.Style.classes.any
1034+ , Internal.Style.classes.single
1035+ , Internal.Style.classes.inFront
1040+ [ Internal.Style.classes.any
1041+ , Internal.Style.classes.single
1042+ , Internal.Style.classes.behind
1056+ styled.html NoStyleSheet asEl
1060+ if location == Behind then
1061+ Internal.Style.classes.hasBehind ++ " " ++ classes
1189− gatherAttrRecursive
1066+ gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1196− (addNearbyElement location elem children)
1199 AlignX x ->
1068 AlignX x ->
1200 if Flag.present Flag.xAlign has then
1069 if Flag.present Flag.xAlign has then
@@ -1250,106 +1119,6 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1250 remaining
1119 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 =
1122renderWidth w =
1354 case w of
1123 case w of
1355 Px px ->
1124 Px px ->
@@ -1436,7 +1205,7 @@ renderHeight h =
1436 "height-px-" ++ val
1205 "height-px-" ++ val
1438 ( Flag.none
1207 ( Flag.none
1439− , Internal.Style.classes.heightExact ++ " " ++ name
1208+ , name
1440 , [ Single name "height" (val ++ "px") ]
1209 , [ Single name "height" (val ++ "px") ]
@@ -1459,7 +1228,7 @@ renderHeight h =
1459 , [ Single
1228 , [ Single
1460 (Internal.Style.classes.any
1229 (Internal.Style.classes.any
1462− ++ Internal.Style.classes.column
1231+ ++ Internal.Style.classes.row
1463 ++ " > "
1232 ++ " > "
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1233 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1478,9 +1247,7 @@ renderHeight h =
1480 "min-height"
1249 "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")
1250+ (String.fromInt minSize ++ "px")
1485 ( newFlag, newAttrs, newStyle ) =
1252 ( newFlag, newAttrs, newStyle ) =
1486 renderHeight len
1253 renderHeight len
@@ -1558,7 +1325,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1558element context node attributes children =
1325element context node attributes children =
1559 attributes
1326 attributes
1560 |> List.reverse
1327 |> List.reverse
1561− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1328+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1562 |> createElement context children
1329 |> createElement context children
@@ -1566,6 +1333,13 @@ untransformed =
1566 Untransformed
1333 Untransformed
1338+-- VirtualDom.text " "
1569createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1343createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1570createElement context children rendered =
1344createElement context children rendered =
@@ -1607,33 +1381,36 @@ createElement context children rendered =
1607 -- Same if it's a column or row with one child and width-content, height-content
1381 -- Same if it's a column or row with one child and width-content, height-content
1608 -- interferes with css grid
1382 -- interferes with css grid
1609 -- Maybe we could unpack text elements in a paragraph as well,
1383 -- 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.
1384+ -- 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.
1385 -- I don't think that's what we want.
1613− -- context
1387+ context
1614− -- == asEl
1388+ == asEl
1615− -- || context
1389+ || context
1616− -- == asParagraph
1390+ == asParagraph
1618− -- ( VirtualDom.text
1392+ ( VirtualDom.text
1619− -- (if context == asParagraph then
1393+ (if context == asParagraph then
1620− -- str
1394+ str ++ " "
1624− -- :: htmls
1399+ :: htmls
1625− -- , existingStyles
1400+ , existingStyles
1628− ( (if context == asEl then
1629− textElementFill str
1632− textElement str
1404+ ( textElement
1405+ (if context == asParagraph then
1634− :: htmls
1411+ :: htmls
1635− , existingStyles
1412+ , existingStyles
1638 Empty ->
1415 Empty ->
1639 ( htmls, existingStyles )
1416 ( htmls, existingStyles )
@@ -1675,30 +1452,38 @@ createElement context children rendered =
1675 -- TEXT OPTIMIZATION
1452 -- TEXT OPTIMIZATION
1676 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1453 -- 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
1454 -- Same if it's a column or row with one child and width-content, height-content
1679− -- context
1456+ context
1680− -- == asEl
1457+ == asEl
1681− -- || context
1458+ || context
1682− -- == asParagraph
1459+ == asParagraph
1684− -- ( ( key
1461+ ( ( key
1685− -- , VirtualDom.text
1462+ , VirtualDom.text
1463+ (if context == asParagraph then
1688− -- :: htmls
1470+ :: htmls
1689− -- , existingStyles
1471+ , existingStyles
1693− , if context == asEl then
1694− textElementFill str
1697− textElement str
1476+ , textElement
1477+ (if context == asParagraph then
1699− :: htmls
1484+ :: htmls
1700− , existingStyles
1485+ , existingStyles
1703 Empty ->
1488 Empty ->
1704 ( htmls, existingStyles )
1489 ( htmls, existingStyles )
@@ -1721,9 +1506,7 @@ createElement context children rendered =
1721 (finalizeNode rendered.has
1506 (finalizeNode rendered.has
1722 rendered.node
1507 rendered.node
1723 rendered.attributes
1508 rendered.attributes
1725− (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1509+ (Keyed <| List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed)
1727 NoStyleSheet
1510 NoStyleSheet
@@ -1731,13 +1514,7 @@ createElement context children rendered =
1732 { styles = allStyles
1515 { styles = allStyles
1733 , html =
1516 , html =
1734− finalizeNode
1517+ 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 ->
1520 Unkeyed unkeyedChildren ->
@@ -1754,58 +1531,20 @@ createElement context children rendered =
1754 case newStyles of
1531 case newStyles of
1756 Unstyled
1533 Unstyled
1757− (finalizeNode
1534+ (finalizeNode rendered.has
1759 rendered.node
1535 rendered.node
1760 rendered.attributes
1536 rendered.attributes
1761− (Unkeyed (addChildren unkeyed rendered.children))
1537+ (Unkeyed <| rendered.children ++ unkeyed)
1762 NoStyleSheet
1538 NoStyleSheet
1765 allStyles ->
1541 allStyles ->
1767 { styles = allStyles
1543 { styles = allStyles
1768− , html =
1544+ , 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 +1556,8 @@ defaultOptions =
1820−staticRoot : OptionRecord -> VirtualDom.Node msg
1559+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 ] ]
1560+ 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 =
1563addWhen ifThis x to =
@@ -1913,21 +1640,6 @@ filter attrs =
1931get : List (Attribute aligned msg) -> (Attribute aligned msg -> Bool) -> List (Attribute aligned msg)
1643get : List (Attribute aligned msg) -> (Attribute aligned msg -> Bool) -> List (Attribute aligned msg)
1932get attrs isAttr =
1644get attrs isAttr =
@@ -1948,7 +1660,7 @@ type Spacing
1950type Padding
1662type Padding
1951− = Padding String Float Float Float Float
1663+ = Padding String Int Int Int Int
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1666extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -2044,44 +1756,35 @@ getHeight attrs =
2047−textElementClasses : String
2048−textElementClasses =
2053− ++ classes.widthContent
2055− ++ classes.heightContent
2058textElement : String -> VirtualDom.Node msg
1759textElement : String -> VirtualDom.Node msg
2059textElement str =
1760textElement str =
2060 Html.div
1761 Html.div
2061 [ Html.Attributes.class
1762 [ Html.Attributes.class
2062− textElementClasses
1763+ (String.join " "
1766+ , classes.widthContent
1767+ , classes.heightContent
2064 [ Html.text str ]
1771 [ Html.text str ]
2067−textElementFillClasses : String
2068−textElementFillClasses =
2073− ++ classes.widthFill
2075− ++ classes.heightFill
2078textElementFill : String -> VirtualDom.Node msg
1774textElementFill : String -> VirtualDom.Node msg
2079textElementFill str =
1775textElementFill str =
2080− Html.div
1776+ VirtualDom.node "div"
2081− [ Html.Attributes.class
1777+ [ VirtualDom.property "className"
2082− textElementFillClasses
1778+ (Json.string <|
1782+ , classes.widthFill
1783+ , classes.heightFill
2084− [ Html.text str ]
1787+ [ VirtualDom.text str ]
2087type Children x
1790type Children x
@@ -2089,6 +1792,10 @@ type Children x
2089 | Keyed (List ( String, x ))
1792 | Keyed (List ( String, x ))
1796+-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
2092toHtml mode el =
1799toHtml mode el =
2093 case el of
1800 case el of
2094 Unstyled html ->
1801 Unstyled html ->
@@ -2124,7 +1831,8 @@ renderRoot optionList attributes child =
2126type RenderMode
1833type RenderMode
2127− = Layout
1835+ | Layout
2128 | NoStaticStyleSheet
1836 | NoStaticStyleSheet
2129 | WithVirtualCss
1837 | WithVirtualCss
@@ -2173,8 +1881,10 @@ rootStyle =
2173 , SansSerif
1881 , SansSerif
2176− [ StyleClass Flag.bgColor (Colored ("bg-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
1884+ [ StyleClass Flag.bgColor (Colored ("bg-color-" ++ formatColorClass (Rgba 1 1 1 1)) "background-color" (Rgba 1 1 1 1))
2177− , StyleClass Flag.fontColor (Colored ("fc-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
1885+ , StyleClass Flag.fontColor (Colored ("font-color-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
1887+ -- , StyleClass Flag.fontSize (Single "font-size-20" "font-size" "20px")
2178 , StyleClass Flag.fontSize (FontSize 20)
1888 , StyleClass Flag.fontSize (FontSize 20)
2179 , StyleClass Flag.fontFamily <|
1889 , StyleClass Flag.fontFamily <|
2180 FontFamily (List.foldl renderFontClassName "font-" families)
1890 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2206,49 +1916,14 @@ renderFontClassName font current =
2206 |> String.toLower
1916 |> String.toLower
2207 |> String.words
1917 |> String.words
2208 |> String.join "-"
1918 |> String.join "-"
2210− FontWith { name } ->
2218renderFocusStyle :
1922renderFocusStyle :
2219 FocusStyle
1923 FocusStyle
2220− -> List Style
1924+ -> Style
2221renderFocusStyle focus =
1925renderFocusStyle 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, ")
1926+ 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
1927 (List.filterMap identity
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
1928 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
1929 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2271,7 +1946,6 @@ renderFocusStyle focus =
2271 , Just <| Property "outline" "none"
1946 , Just <| Property "outline" "none"
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
1951focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2283,7 +1957,7 @@ focusDefaultStyle =
2283 { color =
1957 { color =
2284 Rgba (155 / 255) (203 / 255) 1 1
1958 Rgba (155 / 255) (203 / 255) 1 1
2285 , offset = ( 0, 0 )
1959 , offset = ( 0, 0 )
2286− , blur = 0
1960+ , blur = 3
2287 , size = 3
1961 , size = 3
@@ -2351,734 +2025,498 @@ optionsToRecord options =
2354−toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2028+renderFont : List Font -> String
2355−toStyleSheet options styleSheet =
2029+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 =
2031+ fontName font =
2386 case font of
2032 case font of
2387− ImportFont _ url ->
2033+ Serif ->
2388− Just ("@import url('" ++ url ++ "');")
2034+ "serif"
2390− -- FontWith with ->
2391− -- case with.url of
2393− -- Just ("@import url('" ++ x ++ "');")
2399− allNames =
2036+ SansSerif ->
2400− List.map Tuple.first rules
2037+ "sans-serif"
2402− fontImports ( name, typefaces ) =
2039+ Monospace ->
2403− let
2040+ "monospace"
2405− String.join "\n" (List.filterMap withImport typefaces)
2409− fontAdjustments ( name, typefaces ) =
2042+ Typeface name ->
2410− case typefaceAdjustment typefaces of
2043+ "\"" ++ name ++ "\""
2413− (List.map (renderNullAdjustmentRule name) allNames)
2415− Just adjustment ->
2045+ ImportFont name url ->
2416− String.join ""
2046+ "\"" ++ name ++ "\""
2417− (List.map (renderFontAdjustmentRule name adjustment) allNames)
2419− String.join "\n" (List.map fontImports rules)
2048+ families
2049+ |> List.map fontName
2420− ++ String.join "\n" (List.map fontAdjustments rules)
2050+ |> String.join ", "
2423−renderNullAdjustmentRule fontToAdjust otherFontName =
2426− if fontToAdjust == otherFontName then
2429− else
2053+toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2430− otherFontName ++ " ." ++ fontToAdjust
2054+toStyleSheet options styleSheet =
2431− in
2055+ VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
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 ) =
2485− ++ Internal.Style.classes.text
2491− ++ Internal.Style.classes.text
2497−renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2058+toStyleSheetString : OptionRecord -> List Style -> String
2059+toStyleSheetString options stylesheet =
2499− name =
2061+ renderTopLevels rule =
2500− if fontToAdjust == otherFontName then
2062+ case rule of
2501− fontToAdjust
2063+ FontFamily name typefaces ->
2503− else
2065+ getImports font =
2504− otherFontName ++ " ." ++ fontToAdjust
2066+ case font of
2505− in
2067+ ImportFont _ url ->
2506− String.join " "
2068+ Just ("@import url('" ++ url ++ "');")
2507− (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2510−bracket selector rules =
2070+ _ ->
2512− renderPair ( name, val ) =
2513− name ++ ": " ++ val ++ ";"
2515− selector ++ " {" ++ String.join "" (List.map renderPair rules) ++ "}"
2073+ typefaces
2074+ |> List.filterMap getImports
2075+ |> String.join "\n"
2518−fontAdjustmentRules converted =
2081+ renderProps force (Property key val) existing =
2519− ( [ ( "display", "block" )
2082+ if force then
2520− ]
2083+ 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" )
2086+ existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2529−typefaceAdjustment typefaces =
2088+ renderStyle maybePseudo selector props =
2532− case found of
2089+ case maybePseudo of
2533 Nothing ->
2090 Nothing ->
2534− case face of
2091+ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2536− case with.adjustment of
2542− ( fontAdjustmentRules
2543− (.full (convertAdjustment adjustment))
2544− , fontAdjustmentRules
2545− (.capital (convertAdjustment adjustment))
2570− "\"" ++ name ++ "\""
2572− ImportFont name url ->
2573− "\"" ++ name ++ "\""
2575− FontWith { name } ->
2576− "\"" ++ name ++ "\""
2579−topLevelValue rule =
2581− FontFamily name typefaces ->
2582− Just ( name, typefaces )
2096+ case options.hover of
2588−renderProps force (Property key val) existing =
2100+ ForceHover ->
2589− if force then
2101+ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2590− existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2592− else
2103+ AllowHover ->
2593− existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2104+ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2596−encodeStyles options stylesheet =
2602− renderStyleRule options style Nothing
2604− ( getStyleName style, Encode.list Encode.string styled )
2109+ List.foldl (renderProps False) "" props
2120+ ++ "-fs:not(.focus) {"
2130+ , ".focusable-parent:focus ~ "
2609−toStyleSheetString : OptionRecord -> List Style -> String
2140+ Active ->
2610−toStyleSheetString options stylesheet =
2612− combine style rendered =
2613− { rules = rendered.rules ++ renderStyleRule options style Nothing
2615− case topLevelValue style of
2620− topLevel :: rendered.topLevel
2623− case List.foldl combine { topLevel = [], rules = [] } stylesheet of
2624− { topLevel, rules } ->
2625− renderTopLevelValues topLevel ++ String.concat rules
2628−renderStyle : OptionRecord -> Maybe PseudoClass -> String -> List Property -> List String
2629−renderStyle options maybePseudo selector props =
2630− case maybePseudo of
2632− [ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2141+ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2637− case options.hover of
2641− ForceHover ->
2143+ renderStyleRule rule maybePseudo =
2642− [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2144+ case rule of
2145+ Style selector props ->
2146+ renderStyle maybePseudo selector props
2644− AllowHover ->
2148+ Shadows name prop ->
2645− [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2149+ renderStyle
2152+ [ Property "box-shadow" prop
2647− Focus ->
2155+ Transparency name transparency ->
2649− renderedProps =
2157+ opacity =
2650− List.foldl (renderProps False) "" props
2158+ (1 - transparency)
2652− [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2162+ renderStyle
2653− , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2163+ 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)
2164+ ("." ++ name)
2678− [ Property "box-shadow" prop
2681− Transparency name transparency ->
2688− renderStyle options
2691− [ Property "opacity" (String.fromFloat opacity)
2165+ [ 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 ->
2168+ FontSize i ->
2702− let
2169+ renderStyle
2703− features =
2170+ maybePseudo
2704− typefaces
2171+ (".font-size-" ++ String.fromInt i)
2705− |> List.filterMap renderVariants
2706− |> String.join ", "
2709− [ Property "font-family"
2172+ [ 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
2175+ FontFamily name typefaces ->
2724− renderStyle options
2176+ renderStyle
2725− maybePseudo
2177+ maybePseudo
2726− ("." ++ name)
2178+ ("." ++ name)
2727− families
2179+ [ Property "font-family" (renderFont typefaces)
2729− Single class prop val ->
2182+ Single class prop val ->
2730− renderStyle options
2183+ renderStyle
2731− maybePseudo
2184+ maybePseudo
2732− ("." ++ class)
2185+ ("." ++ class)
2733− [ Property prop val
2186+ [ Property prop val
2736− Colored class prop color ->
2189+ Colored class prop color ->
2737− renderStyle options
2190+ renderStyle
2738− maybePseudo
2191+ maybePseudo
2739− ("." ++ class)
2192+ ("." ++ class)
2740− [ Property prop (formatColor color)
2193+ [ Property prop (formatColor color)
2743− SpacingStyle cls x y ->
2196+ SpacingStyle cls x y ->
2745− class =
2198+ class =
2746− "." ++ cls
2199+ "." ++ cls
2749− String.fromFloat (toFloat x / 2) ++ "px"
2202+ String.fromInt x ++ "px"
2752− String.fromFloat (toFloat y / 2) ++ "px"
2205+ String.fromInt y ++ "px"
2755− String.fromInt x ++ "px"
2208+ "." ++ Internal.Style.classes.row
2757− yPx =
2210+ wrappedRow =
2758− String.fromInt y ++ "px"
2211+ "." ++ Internal.Style.classes.wrapped ++ row
2760− row =
2213+ column =
2761− "." ++ Internal.Style.classes.row
2214+ "." ++ Internal.Style.classes.column
2763− wrappedRow =
2216+ page =
2764− "." ++ Internal.Style.classes.wrapped ++ row
2217+ "." ++ Internal.Style.classes.page
2766− column =
2219+ paragraph =
2767− "." ++ Internal.Style.classes.column
2220+ "." ++ Internal.Style.classes.paragraph
2770− "." ++ Internal.Style.classes.page
2223+ "." ++ Internal.Style.classes.alignLeft
2772− paragraph =
2225+ right =
2773− "." ++ Internal.Style.classes.paragraph
2226+ "." ++ Internal.Style.classes.alignRight
2776− "." ++ Internal.Style.classes.alignLeft
2229+ "." ++ Internal.Style.classes.any
2778− right =
2231+ single =
2779− "." ++ Internal.Style.classes.alignRight
2232+ "." ++ Internal.Style.classes.single
2235+ [ renderStyle maybePseudo (class ++ row ++ " > " ++ any) [ Property "margin-right" xPx ]
2781− any =
2237+ -- margins don't apply to last element of normal, unwrapped rows
2782− "." ++ Internal.Style.classes.any
2238+ , 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.
2240+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2793− , renderStyle options
2794− maybePseudo
2241+ , renderStyle maybePseudo
2795− (class ++ wrappedRow ++ " > " ++ any)
2242+ (class ++ wrappedRow ++ " > " ++ any)
2796− [ Property "margin" (halfY ++ " " ++ halfX)
2243+ [ Property "margin" ("0 " ++ xPx ++ " " ++ yPx ++ " 0")
2245+ , renderStyle maybePseudo
2246+ (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2247+ [ Property "margin-right" "0"
2799− -- , renderStyle options maybePseudo
2800− -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2801− -- [ Property "margin-right" "0"
2803− -- columns
2250+ -- columns
2804− , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2251+ , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2805− , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2252+ , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2806− , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2253+ , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2807− , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2254+ , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2808− , renderStyle options
2255+ , renderStyle
2809− maybePseudo
2256+ maybePseudo
2810− (class ++ paragraph)
2257+ (class ++ paragraph)
2811− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2258+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2813− , renderStyle options
2260+ , renderStyle
2814− maybePseudo
2261+ maybePseudo
2815− ("textarea" ++ any ++ class)
2262+ ("textarea" ++ class)
2816− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2263+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2817− , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2820− -- , renderStyle options
2266+ -- , renderStyle
2821− -- maybePseudo
2267+ -- maybePseudo
2822− -- (class ++ paragraph ++ " > " ++ any)
2268+ -- (class ++ paragraph ++ " > " ++ any)
2823− -- [ Property "margin-right" xPx
2269+ -- [ Property "margin-right" xPx
2824− -- , Property "margin-bottom" yPx
2270+ -- , Property "margin-bottom" yPx
2826− , renderStyle options
2272+ , renderStyle
2827− maybePseudo
2273+ maybePseudo
2828− (class ++ paragraph ++ " > " ++ left)
2274+ (class ++ paragraph ++ " > " ++ left)
2829− [ Property "margin-right" xPx
2275+ [ Property "margin-right" xPx
2831− , renderStyle options
2277+ , renderStyle
2832− maybePseudo
2278+ maybePseudo
2833− (class ++ paragraph ++ " > " ++ right)
2279+ (class ++ paragraph ++ " > " ++ right)
2834− [ Property "margin-left" xPx
2280+ [ Property "margin-left" xPx
2836− , renderStyle options
2282+ , renderStyle
2837− maybePseudo
2283+ maybePseudo
2838− (class ++ paragraph ++ "::after")
2284+ (class ++ paragraph ++ "::after")
2839− [ Property "content" "''"
2285+ [ Property "content" "''"
2840− , Property "display" "block"
2286+ , Property "display" "block"
2841− , Property "height" "0"
2287+ , Property "height" "0"
2842− , Property "width" "0"
2288+ , Property "width" "0"
2843− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2289+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2845− , renderStyle options
2291+ , renderStyle
2846− maybePseudo
2292+ maybePseudo
2847− (class ++ paragraph ++ "::before")
2293+ (class ++ paragraph ++ "::before")
2848− [ Property "content" "''"
2294+ [ Property "content" "''"
2849− , Property "display" "block"
2295+ , Property "display" "block"
2850− , Property "height" "0"
2296+ , Property "height" "0"
2851− , Property "width" "0"
2297+ , Property "width" "0"
2852− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2298+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2856− PaddingStyle cls top right bottom left ->
2302+ PaddingStyle cls top right bottom left ->
2858− class =
2304+ class =
2862− renderStyle options
2308+ renderStyle
2863− maybePseudo
2309+ maybePseudo
2865− [ Property "padding"
2311+ [ Property "padding"
2866− (String.fromFloat top
2312+ (String.fromInt top
2867− ++ "px "
2313+ ++ "px "
2868− ++ String.fromFloat right
2314+ ++ String.fromInt right
2869− ++ "px "
2315+ ++ "px "
2870− ++ String.fromFloat bottom
2316+ ++ String.fromInt bottom
2871− ++ "px "
2317+ ++ "px "
2872− ++ String.fromFloat left
2318+ ++ String.fromInt left
2873− ++ "px"
2319+ ++ "px"
2877− BorderWidth cls top right bottom left ->
2323+ GridTemplateStyle template ->
2879− class =
2325+ class =
2880− "."
2326+ ".grid-rows-"
2881− ++ cls
2327+ ++ String.join "-" (List.map lengthClassName template.rows)
2329+ ++ String.join "-" (List.map lengthClassName template.columns)
2331+ ++ lengthClassName (Tuple.first template.spacing)
2333+ ++ lengthClassName (Tuple.second template.spacing)
2336+ toGridLength (Tuple.second template.spacing)
2339+ toGridLength (Tuple.first template.spacing)
2342+ toGridLengthHelper Nothing Nothing x
2344+ toGridLengthHelper minimum maximum x =
2347+ String.fromInt px ++ "px"
2350+ case ( minimum, maximum ) of
2351+ ( Nothing, Nothing ) ->
2354+ ( Just minSize, Nothing ) ->
2355+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2357+ ( Nothing, Just maxSize ) ->
2358+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2360+ ( Just minSize, Just maxSize ) ->
2361+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2364+ case ( minimum, maximum ) of
2365+ ( Nothing, Nothing ) ->
2366+ String.fromInt i ++ "fr"
2368+ ( Just minSize, Nothing ) ->
2369+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2371+ ( Nothing, Just maxSize ) ->
2372+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2374+ ( Just minSize, Just maxSize ) ->
2375+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2378+ toGridLengthHelper (Just m) maximum len
2381+ toGridLengthHelper minimum (Just m) len
2385+ |> List.map toGridLength
2386+ |> String.join ySpacing
2387+ |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2391+ |> List.map toGridLength
2392+ |> String.join ySpacing
2393+ |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2396+ class ++ "{" ++ msColumns ++ msRows ++ "}"
2400+ |> List.map toGridLength
2402+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2406+ |> List.map toGridLength
2408+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2411+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2414+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2417+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2420+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2883− renderStyle options
2422+ 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 ->
2424+ GridPosition position ->
2900− class =
2426+ class =
2901− ".grid-rows-"
2427+ ".grid-pos-"
2902− ++ String.join "-" (List.map lengthClassName template.rows)
2428+ ++ String.fromInt position.row
2430+ ++ String.fromInt position.col
2903− ++ "-cols-"
2431+ ++ "-"
2904− ++ String.join "-" (List.map lengthClassName template.columns)
2432+ ++ String.fromInt position.width
2905− ++ "-space-x-"
2433+ ++ "-"
2906− ++ lengthClassName (Tuple.first template.spacing)
2434+ ++ String.fromInt position.height
2907− ++ "-space-y-"
2435+
2908− ++ lengthClassName (Tuple.second template.spacing)
2436+ msPosition =
2909−
2437+ String.join " "
2910− ySpacing =
2438+ [ "-ms-grid-row: "
2911− toGridLength (Tuple.second template.spacing)
2439+ ++ String.fromInt position.row
2913− xSpacing =
2441+ , "-ms-grid-row-span: "
2914− toGridLength (Tuple.first template.spacing)
2442+ ++ String.fromInt position.height
2916− toGridLength x =
2444+ , "-ms-grid-column: "
2917− toGridLengthHelper Nothing Nothing x
2445+ ++ String.fromInt position.col
2919− toGridLengthHelper minimum maximum x =
2447+ , "-ms-grid-column-span: "
2920− case x of
2448+ ++ String.fromInt position.width
2921− Px px ->
2449+ ++ ";"
2453+ class ++ "{" ++ msPosition ++ "}"
2922− String.fromInt px ++ "px"
2458+ ++ String.fromInt position.row
2924− Content ->
2460+ ++ String.fromInt (position.row + position.height)
2925− case ( minimum, maximum ) of
2461+ ++ ";"
2926− ( Nothing, Nothing ) ->
2462+ , "grid-column: "
2929− ( Just minSize, Nothing ) ->
2930− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2463+ ++ String.fromInt position.col
2932− ( Nothing, Just maxSize ) ->
2465+ ++ String.fromInt (position.col + position.width)
2933− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2466+ ++ ";"
2935− ( Just minSize, Just maxSize ) ->
2468+
2936− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2469+ modernGrid =
2937−
2470+ class ++ "{" ++ modernPosition ++ "}"
2939− case ( minimum, maximum ) of
2472+ supports =
2940− ( Nothing, Nothing ) ->
2473+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2941− String.fromInt i ++ "fr"
2474+ in
2942−
2475+ 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 =
2477+ PseudoSelector class styles ->
2980− template.rows
2478+ let
2981− |> List.map toGridLength
2479+ renderPseudoRule style =
2480+ renderStyleRule style (Just class)
2482+ List.map renderPseudoRule styles
2982 |> String.join " "
2483 |> 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 ->
2485+ Transform transform ->
3004− ".grid-pos-"
2488+ 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 ->
2490+ class =
3057− let
2491+ transformClass transform
3058− renderPseudoRule style =
3059− renderStyleRule options style (Just class)
3061− List.concatMap renderPseudoRule styles
2493+ case ( class, val ) of
2494+ ( Just cls, Just v ) ->
2498+ [ Property "transform"
3063− Transform transform ->
2502+ _ ->
3066− transformValue transform
3068− class =
2505+ combine style rendered =
3069− transformClass transform
2506+ { rendered
3070− in
2507+ | rules = rendered.rules ++ renderStyleRule style Nothing
3071− case ( class, val ) of
2508+ , topLevel =
3072− ( Just cls, Just v ) ->
2509+ case renderTopLevels style of
3073− renderStyle options
2510+ Nothing ->
3074− maybePseudo
2511+ rendered.topLevel
3076− [ Property "transform"
3080− _ ->
2513+ Just topLevel ->
3081− []
2514+ rendered.topLevel ++ topLevel
2517+ case List.foldl combine { rules = "", topLevel = "" } stylesheet of
2518+ { topLevel, rules } ->
3084lengthClassName : Length -> String
2522lengthClassName : Length -> String
@@ -3118,12 +2556,12 @@ formatTextShadow shadow =
3121−textShadowClass shadow =
2559+textShadowName shadow =
3122 String.concat
2560 String.concat
3124− , floatClass (Tuple.first shadow.offset) ++ "px"
2562+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3125− , floatClass (Tuple.second shadow.offset) ++ "px"
2563+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3126− , floatClass shadow.blur ++ "px"
2564+ , String.fromFloat shadow.blur ++ "px"
3127 , formatColorClass shadow.color
2565 , formatColorClass shadow.color
@@ -3144,17 +2582,17 @@ formatBoxShadow shadow =
3147−boxShadowClass shadow =
2585+boxShadowName shadow =
3148 String.concat <|
2586 String.concat <|
3149 [ if shadow.inset then
2587 [ if shadow.inset then
3150 "box-inset"
2588 "box-inset"
3154− , floatClass (Tuple.first shadow.offset) ++ "px"
2592+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3155− , floatClass (Tuple.second shadow.offset) ++ "px"
2593+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3156− , floatClass shadow.blur ++ "px"
2594+ , String.fromFloat shadow.blur ++ "px"
3157− , floatClass shadow.size ++ "px"
2595+ , String.fromFloat shadow.size ++ "px"
3158 , formatColorClass shadow.color
2596 , formatColorClass shadow.color
@@ -3199,17 +2637,6 @@ paddingName top right bottom left =
3199 ++ String.fromInt left
2637 ++ String.fromInt left
3202−paddingNameFloat top right bottom left =
3206− ++ floatClass right
3208− ++ floatClass bottom
3213getStyleName : Style -> String
2640getStyleName : Style -> String
3214getStyleName style =
2641getStyleName style =
3215 case style of
2642 case style of
@@ -3240,9 +2667,6 @@ getStyleName style =
3240 PaddingStyle cls top right bottom left ->
2667 PaddingStyle cls top right bottom left ->
3243− BorderWidth cls top right bottom left ->
3246 GridTemplateStyle template ->
2670 GridTemplateStyle template ->
3247 "grid-rows-"
2671 "grid-rows-"
3248 ++ String.join "-" (List.map lengthClassName template.rows)
2672 ++ String.join "-" (List.map lengthClassName template.rows)
@@ -3475,76 +2899,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