@@ -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,83 @@ 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 <|
1006+ Internal.Style.classes.nearby
1007+ , Internal.Style.classes.single
1008+ , Internal.Style.classes.above
1014+ Internal.Style.classes.nearby
1015+ , Internal.Style.classes.single
1016+ , Internal.Style.classes.below
1022+ Internal.Style.classes.nearby
1023+ , Internal.Style.classes.single
1024+ , Internal.Style.classes.onRight
1032+ Internal.Style.classes.nearby
1033+ , Internal.Style.classes.single
1034+ , Internal.Style.classes.onLeft
1040+ Internal.Style.classes.nearby
1041+ , Internal.Style.classes.single
1042+ , Internal.Style.classes.inFront
1048+ Internal.Style.classes.nearby
1049+ , Internal.Style.classes.single
1050+ , Internal.Style.classes.behind
1064+ styled.html NoStyleSheet asEl
1068+ if location == Behind then
1069+ Internal.Style.classes.hasBehind ++ " " ++ classes
1189− gatherAttrRecursive
1074+ gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1196− (addNearbyElement location elem children)
1199 AlignX x ->
1076 AlignX x ->
1200 if Flag.present Flag.xAlign has then
1077 if Flag.present Flag.xAlign has then
@@ -1250,106 +1127,6 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1250 remaining
1127 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 =
1130renderWidth w =
1354 case w of
1131 case w of
1355 Px px ->
1132 Px px ->
@@ -1436,7 +1213,7 @@ renderHeight h =
1436 "height-px-" ++ val
1213 "height-px-" ++ val
1438 ( Flag.none
1215 ( Flag.none
1439− , Internal.Style.classes.heightExact ++ " " ++ name
1216+ , name
1440 , [ Single name "height" (val ++ "px") ]
1217 , [ Single name "height" (val ++ "px") ]
@@ -1459,7 +1236,7 @@ renderHeight h =
1459 , [ Single
1236 , [ Single
1460 (Internal.Style.classes.any
1237 (Internal.Style.classes.any
1462− ++ Internal.Style.classes.column
1239+ ++ Internal.Style.classes.row
1463 ++ " > "
1240 ++ " > "
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1241 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1478,9 +1255,7 @@ renderHeight h =
1480 "min-height"
1257 "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")
1258+ (String.fromInt minSize ++ "px")
1485 ( newFlag, newAttrs, newStyle ) =
1260 ( newFlag, newAttrs, newStyle ) =
1486 renderHeight len
1261 renderHeight len
@@ -1558,7 +1333,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1558element context node attributes children =
1333element context node attributes children =
1559 attributes
1334 attributes
1560 |> List.reverse
1335 |> List.reverse
1561− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1336+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1562 |> createElement context children
1337 |> createElement context children
@@ -1566,6 +1341,13 @@ untransformed =
1566 Untransformed
1341 Untransformed
1346+-- VirtualDom.text " "
1569createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1351createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1570createElement context children rendered =
1352createElement context children rendered =
@@ -1607,33 +1389,36 @@ createElement context children rendered =
1607 -- Same if it's a column or row with one child and width-content, height-content
1389 -- Same if it's a column or row with one child and width-content, height-content
1608 -- interferes with css grid
1390 -- interferes with css grid
1609 -- Maybe we could unpack text elements in a paragraph as well,
1391 -- 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.
1392+ -- 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.
1393 -- I don't think that's what we want.
1613− -- context
1395+ context
1614− -- == asEl
1396+ == asEl
1615− -- || context
1397+ || context
1616− -- == asParagraph
1398+ == asParagraph
1618− -- ( VirtualDom.text
1400+ ( VirtualDom.text
1619− -- (if context == asParagraph then
1401+ (if context == asParagraph then
1620− -- str
1402+ str ++ " "
1624− -- :: htmls
1407+ :: htmls
1625− -- , existingStyles
1408+ , existingStyles
1628− ( (if context == asEl then
1629− textElementFill str
1632− textElement str
1412+ ( textElement
1413+ (if context == asParagraph then
1634− :: htmls
1419+ :: htmls
1635− , existingStyles
1420+ , existingStyles
1638 Empty ->
1423 Empty ->
1639 ( htmls, existingStyles )
1424 ( htmls, existingStyles )
@@ -1675,30 +1460,38 @@ createElement context children rendered =
1675 -- TEXT OPTIMIZATION
1460 -- TEXT OPTIMIZATION
1676 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1461 -- 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
1462 -- Same if it's a column or row with one child and width-content, height-content
1679− -- context
1464+ context
1680− -- == asEl
1465+ == asEl
1681− -- || context
1466+ || context
1682− -- == asParagraph
1467+ == asParagraph
1684− -- ( ( key
1469+ ( ( key
1685− -- , VirtualDom.text
1470+ , VirtualDom.text
1471+ (if context == asParagraph then
1688− -- :: htmls
1478+ :: htmls
1689− -- , existingStyles
1479+ , existingStyles
1693− , if context == asEl then
1694− textElementFill str
1697− textElement str
1484+ , textElement
1485+ (if context == asParagraph then
1699− :: htmls
1492+ :: htmls
1700− , existingStyles
1493+ , existingStyles
1703 Empty ->
1496 Empty ->
1704 ( htmls, existingStyles )
1497 ( htmls, existingStyles )
@@ -1721,9 +1514,7 @@ createElement context children rendered =
1721 (finalizeNode rendered.has
1514 (finalizeNode rendered.has
1722 rendered.node
1515 rendered.node
1723 rendered.attributes
1516 rendered.attributes
1725− (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1517+ (Keyed <| List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed)
1727 NoStyleSheet
1518 NoStyleSheet
@@ -1731,13 +1522,7 @@ createElement context children rendered =
1732 { styles = allStyles
1523 { styles = allStyles
1733 , html =
1524 , html =
1734− finalizeNode
1525+ 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 ->
1528 Unkeyed unkeyedChildren ->
@@ -1754,58 +1539,20 @@ createElement context children rendered =
1754 case newStyles of
1539 case newStyles of
1756 Unstyled
1541 Unstyled
1757− (finalizeNode
1542+ (finalizeNode rendered.has
1759 rendered.node
1543 rendered.node
1760 rendered.attributes
1544 rendered.attributes
1761− (Unkeyed (addChildren unkeyed rendered.children))
1545+ (Unkeyed <| rendered.children ++ unkeyed)
1762 NoStyleSheet
1546 NoStyleSheet
1765 allStyles ->
1549 allStyles ->
1767 { styles = allStyles
1551 { styles = allStyles
1768− , html =
1552+ , 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 +1564,8 @@ defaultOptions =
1820−staticRoot : OptionRecord -> VirtualDom.Node msg
1567+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 ] ]
1568+ 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 =
1571addWhen ifThis x to =
@@ -1913,21 +1648,6 @@ filter attrs =
1931get : List (Attribute aligned msg) -> (Attribute aligned msg -> Bool) -> List (Attribute aligned msg)
1651get : List (Attribute aligned msg) -> (Attribute aligned msg -> Bool) -> List (Attribute aligned msg)
1932get attrs isAttr =
1652get attrs isAttr =
@@ -1948,7 +1668,7 @@ type Spacing
1950type Padding
1670type Padding
1951− = Padding String Float Float Float Float
1671+ = Padding String Int Int Int Int
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1674extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -2044,44 +1764,35 @@ getHeight attrs =
2047−textElementClasses : String
2048−textElementClasses =
2053− ++ classes.widthContent
2055− ++ classes.heightContent
2058textElement : String -> VirtualDom.Node msg
1767textElement : String -> VirtualDom.Node msg
2059textElement str =
1768textElement str =
2060 Html.div
1769 Html.div
2061 [ Html.Attributes.class
1770 [ Html.Attributes.class
2062− textElementClasses
1771+ (String.join " "
1774+ , classes.widthContent
1775+ , classes.heightContent
2064 [ Html.text str ]
1779 [ Html.text str ]
2067−textElementFillClasses : String
2068−textElementFillClasses =
2073− ++ classes.widthFill
2075− ++ classes.heightFill
2078textElementFill : String -> VirtualDom.Node msg
1782textElementFill : String -> VirtualDom.Node msg
2079textElementFill str =
1783textElementFill str =
2080− Html.div
1784+ VirtualDom.node "div"
2081− [ Html.Attributes.class
1785+ [ VirtualDom.property "className"
2082− textElementFillClasses
1786+ (Json.string <|
1790+ , classes.widthFill
1791+ , classes.heightFill
2084− [ Html.text str ]
1795+ [ VirtualDom.text str ]
2087type Children x
1798type Children x
@@ -2089,6 +1800,10 @@ type Children x
2089 | Keyed (List ( String, x ))
1800 | Keyed (List ( String, x ))
1804+-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
2092toHtml mode el =
1807toHtml mode el =
2093 case el of
1808 case el of
2094 Unstyled html ->
1809 Unstyled html ->
@@ -2124,7 +1839,8 @@ renderRoot optionList attributes child =
2126type RenderMode
1841type RenderMode
2127− = Layout
1843+ | Layout
2128 | NoStaticStyleSheet
1844 | NoStaticStyleSheet
2129 | WithVirtualCss
1845 | WithVirtualCss
@@ -2173,8 +1889,8 @@ rootStyle =
2173 , SansSerif
1889 , SansSerif
2176− [ StyleClass Flag.bgColor (Colored ("bg-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
1892+ [ 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))
1893+ , StyleClass Flag.fontColor (Colored ("font-color-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2178 , StyleClass Flag.fontSize (FontSize 20)
1894 , StyleClass Flag.fontSize (FontSize 20)
2179 , StyleClass Flag.fontFamily <|
1895 , StyleClass Flag.fontFamily <|
2180 FontFamily (List.foldl renderFontClassName "font-" families)
1896 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2206,49 +1922,14 @@ renderFontClassName font current =
2206 |> String.toLower
1922 |> String.toLower
2207 |> String.words
1923 |> String.words
2208 |> String.join "-"
1924 |> String.join "-"
2210− FontWith { name } ->
2218renderFocusStyle :
1928renderFocusStyle :
2219 FocusStyle
1929 FocusStyle
2220− -> List Style
1930+ -> Style
2221renderFocusStyle focus =
1931renderFocusStyle 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, ")
1932+ 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
1933 (List.filterMap identity
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
1934 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
1935 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2271,7 +1952,6 @@ renderFocusStyle focus =
2271 , Just <| Property "outline" "none"
1952 , Just <| Property "outline" "none"
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
1957focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2283,7 +1963,7 @@ focusDefaultStyle =
2283 { color =
1963 { color =
2284 Rgba (155 / 255) (203 / 255) 1 1
1964 Rgba (155 / 255) (203 / 255) 1 1
2285 , offset = ( 0, 0 )
1965 , offset = ( 0, 0 )
2286− , blur = 0
1966+ , blur = 3
2287 , size = 3
1967 , size = 3
@@ -2351,734 +2031,498 @@ optionsToRecord options =
2354−toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2034+renderFont : List Font -> String
2355−toStyleSheet options styleSheet =
2035+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 =
2037+ fontName font =
2386 case font of
2038 case font of
2387− ImportFont _ url ->
2039+ Serif ->
2388− Just ("@import url('" ++ url ++ "');")
2040+ "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 ->
2042+ SansSerif ->
2416− String.join ""
2043+ "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 =
2048+ Typeface name ->
2424− let
2049+ "\"" ++ name ++ "\""
2426− if fontToAdjust == otherFontName then
2429− else
2051+ ImportFont name url ->
2430− otherFontName ++ " ." ++ fontToAdjust
2052+ "\"" ++ name ++ "\""
2055+ |> List.map fontName
2432− String.join " "
2056+ |> 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 ) =
2059+toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2467− [ bracket
2060+toStyleSheet options styleSheet =
2468− ("."
2061+ VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2485− ++ Internal.Style.classes.text
2491− ++ Internal.Style.classes.text
2497−renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2064+toStyleSheetString : OptionRecord -> List Style -> String
2065+toStyleSheetString options stylesheet =
2499− name =
2067+ renderTopLevels rule =
2500− if fontToAdjust == otherFontName then
2068+ case rule of
2501− fontToAdjust
2069+ FontFamily name typefaces ->
2503− else
2071+ getImports font =
2504− otherFontName ++ " ." ++ fontToAdjust
2072+ case font of
2505− in
2073+ ImportFont _ url ->
2506− String.join " "
2074+ Just ("@import url('" ++ url ++ "');")
2507− (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2510−bracket selector rules =
2076+ _ ->
2512− renderPair ( name, val ) =
2513− name ++ ": " ++ val ++ ";"
2515− selector ++ " {" ++ String.join "" (List.map renderPair rules) ++ "}"
2079+ typefaces
2080+ |> List.filterMap getImports
2081+ |> String.join "\n"
2518−fontAdjustmentRules converted =
2087+ renderProps force (Property key val) existing =
2519− ( [ ( "display", "block" )
2088+ if force then
2520− ]
2089+ 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" )
2092+ existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2529−typefaceAdjustment typefaces =
2094+ renderStyle maybePseudo selector props =
2532− case found of
2095+ case maybePseudo of
2533 Nothing ->
2096 Nothing ->
2534− case face of
2097+ 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 )
2102+ case options.hover of
2588−renderProps force (Property key val) existing =
2106+ ForceHover ->
2589− if force then
2107+ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2590− existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2592− else
2109+ AllowHover ->
2593− existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2110+ 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 )
2115+ List.foldl (renderProps False) "" props
2126+ ++ "-fs:not(.focus) {"
2136+ , ".focusable-parent:focus ~ "
2609−toStyleSheetString : OptionRecord -> List Style -> String
2146+ 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}" ]
2147+ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2637− case options.hover of
2641− ForceHover ->
2149+ renderStyleRule rule maybePseudo =
2642− [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2150+ case rule of
2151+ Style selector props ->
2152+ renderStyle maybePseudo selector props
2644− AllowHover ->
2154+ Shadows name prop ->
2645− [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2155+ renderStyle
2158+ [ Property "box-shadow" prop
2647− Focus ->
2161+ Transparency name transparency ->
2649− renderedProps =
2163+ opacity =
2650− List.foldl (renderProps False) "" props
2164+ (1 - transparency)
2652− [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2168+ renderStyle
2653− , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2169+ 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)
2170+ ("." ++ name)
2678− [ Property "box-shadow" prop
2681− Transparency name transparency ->
2688− renderStyle options
2691− [ Property "opacity" (String.fromFloat opacity)
2171+ [ 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 ->
2174+ FontSize i ->
2702− let
2175+ renderStyle
2703− features =
2176+ maybePseudo
2704− typefaces
2177+ (".font-size-" ++ String.fromInt i)
2705− |> List.filterMap renderVariants
2706− |> String.join ", "
2709− [ Property "font-family"
2178+ [ 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
2181+ FontFamily name typefaces ->
2724− renderStyle options
2182+ renderStyle
2725− maybePseudo
2183+ maybePseudo
2726− ("." ++ name)
2184+ ("." ++ name)
2727− families
2185+ [ Property "font-family" (renderFont typefaces)
2729− Single class prop val ->
2188+ Single class prop val ->
2730− renderStyle options
2189+ renderStyle
2731− maybePseudo
2190+ maybePseudo
2732− ("." ++ class)
2191+ ("." ++ class)
2733− [ Property prop val
2192+ [ Property prop val
2736− Colored class prop color ->
2195+ Colored class prop color ->
2737− renderStyle options
2196+ renderStyle
2738− maybePseudo
2197+ maybePseudo
2739− ("." ++ class)
2198+ ("." ++ class)
2740− [ Property prop (formatColor color)
2199+ [ Property prop (formatColor color)
2743− SpacingStyle cls x y ->
2202+ SpacingStyle cls x y ->
2745− class =
2204+ class =
2746− "." ++ cls
2205+ "." ++ cls
2749− String.fromFloat (toFloat x / 2) ++ "px"
2208+ String.fromInt x ++ "px"
2752− String.fromFloat (toFloat y / 2) ++ "px"
2211+ String.fromInt y ++ "px"
2755− String.fromInt x ++ "px"
2214+ "." ++ Internal.Style.classes.row
2757− yPx =
2216+ wrappedRow =
2758− String.fromInt y ++ "px"
2217+ "." ++ Internal.Style.classes.wrapped ++ row
2760− row =
2219+ column =
2761− "." ++ Internal.Style.classes.row
2220+ "." ++ Internal.Style.classes.column
2763− wrappedRow =
2222+ page =
2764− "." ++ Internal.Style.classes.wrapped ++ row
2223+ "." ++ Internal.Style.classes.page
2766− column =
2225+ paragraph =
2767− "." ++ Internal.Style.classes.column
2226+ "." ++ Internal.Style.classes.paragraph
2770− "." ++ Internal.Style.classes.page
2229+ "." ++ Internal.Style.classes.alignLeft
2772− paragraph =
2231+ right =
2773− "." ++ Internal.Style.classes.paragraph
2232+ "." ++ Internal.Style.classes.alignRight
2776− "." ++ Internal.Style.classes.alignLeft
2235+ "." ++ Internal.Style.classes.any
2778− right =
2237+ single =
2779− "." ++ Internal.Style.classes.alignRight
2238+ "." ++ Internal.Style.classes.single
2241+ [ renderStyle maybePseudo (class ++ row ++ " > " ++ any) [ Property "margin-right" xPx ]
2781− any =
2243+ -- margins don't apply to last element of normal, unwrapped rows
2782− "." ++ Internal.Style.classes.any
2244+ , 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.
2246+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2793− , renderStyle options
2794− maybePseudo
2247+ , renderStyle maybePseudo
2795− (class ++ wrappedRow ++ " > " ++ any)
2248+ (class ++ wrappedRow ++ " > " ++ any)
2796− [ Property "margin" (halfY ++ " " ++ halfX)
2249+ [ Property "margin" ("0 " ++ xPx ++ " " ++ yPx ++ " 0")
2251+ , renderStyle maybePseudo
2252+ (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2253+ [ Property "margin-right" "0"
2799− -- , renderStyle options maybePseudo
2800− -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2801− -- [ Property "margin-right" "0"
2803− -- columns
2256+ -- columns
2804− , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2257+ , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2805− , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2258+ , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2806− , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2259+ , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2807− , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2260+ , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2808− , renderStyle options
2261+ , renderStyle
2809− maybePseudo
2262+ maybePseudo
2810− (class ++ paragraph)
2263+ (class ++ paragraph)
2811− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2264+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2813− , renderStyle options
2266+ , renderStyle
2814− maybePseudo
2267+ maybePseudo
2815− ("textarea" ++ any ++ class)
2268+ ("textarea" ++ class)
2816− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2269+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2817− , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2820− -- , renderStyle options
2272+ -- , renderStyle
2821− -- maybePseudo
2273+ -- maybePseudo
2822− -- (class ++ paragraph ++ " > " ++ any)
2274+ -- (class ++ paragraph ++ " > " ++ any)
2823− -- [ Property "margin-right" xPx
2275+ -- [ Property "margin-right" xPx
2824− -- , Property "margin-bottom" yPx
2276+ -- , Property "margin-bottom" yPx
2826− , renderStyle options
2278+ , renderStyle
2827− maybePseudo
2279+ maybePseudo
2828− (class ++ paragraph ++ " > " ++ left)
2280+ (class ++ paragraph ++ " > " ++ left)
2829− [ Property "margin-right" xPx
2281+ [ Property "margin-right" xPx
2831− , renderStyle options
2283+ , renderStyle
2832− maybePseudo
2284+ maybePseudo
2833− (class ++ paragraph ++ " > " ++ right)
2285+ (class ++ paragraph ++ " > " ++ right)
2834− [ Property "margin-left" xPx
2286+ [ Property "margin-left" xPx
2836− , renderStyle options
2288+ , renderStyle
2837− maybePseudo
2289+ maybePseudo
2838− (class ++ paragraph ++ "::after")
2290+ (class ++ paragraph ++ "::after")
2839− [ Property "content" "''"
2291+ [ Property "content" "''"
2840− , Property "display" "block"
2292+ , Property "display" "block"
2841− , Property "height" "0"
2293+ , Property "height" "0"
2842− , Property "width" "0"
2294+ , Property "width" "0"
2843− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2295+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2845− , renderStyle options
2297+ , renderStyle
2846− maybePseudo
2298+ maybePseudo
2847− (class ++ paragraph ++ "::before")
2299+ (class ++ paragraph ++ "::before")
2848− [ Property "content" "''"
2300+ [ Property "content" "''"
2849− , Property "display" "block"
2301+ , Property "display" "block"
2850− , Property "height" "0"
2302+ , Property "height" "0"
2851− , Property "width" "0"
2303+ , Property "width" "0"
2852− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2304+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2856− PaddingStyle cls top right bottom left ->
2308+ PaddingStyle cls top right bottom left ->
2858− class =
2310+ class =
2862− renderStyle options
2314+ renderStyle
2863− maybePseudo
2315+ maybePseudo
2865− [ Property "padding"
2317+ [ Property "padding"
2866− (String.fromFloat top
2318+ (String.fromInt top
2867− ++ "px "
2319+ ++ "px "
2868− ++ String.fromFloat right
2320+ ++ String.fromInt right
2869− ++ "px "
2321+ ++ "px "
2870− ++ String.fromFloat bottom
2322+ ++ String.fromInt bottom
2871− ++ "px "
2323+ ++ "px "
2872− ++ String.fromFloat left
2324+ ++ String.fromInt left
2873− ++ "px"
2325+ ++ "px"
2877− BorderWidth cls top right bottom left ->
2329+ GridTemplateStyle template ->
2879− class =
2331+ class =
2880− "."
2332+ ".grid-rows-"
2881− ++ cls
2333+ ++ String.join "-" (List.map lengthClassName template.rows)
2335+ ++ String.join "-" (List.map lengthClassName template.columns)
2337+ ++ lengthClassName (Tuple.first template.spacing)
2339+ ++ lengthClassName (Tuple.second template.spacing)
2342+ toGridLength (Tuple.second template.spacing)
2345+ toGridLength (Tuple.first template.spacing)
2348+ toGridLengthHelper Nothing Nothing x
2350+ toGridLengthHelper minimum maximum x =
2353+ String.fromInt px ++ "px"
2356+ case ( minimum, maximum ) of
2357+ ( Nothing, Nothing ) ->
2360+ ( Just minSize, Nothing ) ->
2361+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2363+ ( Nothing, Just maxSize ) ->
2364+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2366+ ( Just minSize, Just maxSize ) ->
2367+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2370+ case ( minimum, maximum ) of
2371+ ( Nothing, Nothing ) ->
2372+ String.fromInt i ++ "fr"
2374+ ( Just minSize, Nothing ) ->
2375+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2377+ ( Nothing, Just maxSize ) ->
2378+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2380+ ( Just minSize, Just maxSize ) ->
2381+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2384+ toGridLengthHelper (Just m) maximum len
2387+ toGridLengthHelper minimum (Just m) len
2391+ |> List.map toGridLength
2392+ |> String.join ySpacing
2393+ |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2397+ |> List.map toGridLength
2398+ |> String.join ySpacing
2399+ |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2402+ class ++ "{" ++ msColumns ++ msRows ++ "}"
2406+ |> List.map toGridLength
2408+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2412+ |> List.map toGridLength
2414+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2417+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2420+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2423+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2426+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2883− renderStyle options
2428+ 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 ->
2430+ GridPosition position ->
2900− class =
2432+ class =
2901− ".grid-rows-"
2433+ ".grid-pos-"
2902− ++ String.join "-" (List.map lengthClassName template.rows)
2434+ ++ String.fromInt position.row
2436+ ++ String.fromInt position.col
2903− ++ "-cols-"
2437+ ++ "-"
2904− ++ String.join "-" (List.map lengthClassName template.columns)
2438+ ++ String.fromInt position.width
2905− ++ "-space-x-"
2439+ ++ "-"
2906− ++ lengthClassName (Tuple.first template.spacing)
2440+ ++ String.fromInt position.height
2907− ++ "-space-y-"
2441+
2908− ++ lengthClassName (Tuple.second template.spacing)
2442+ msPosition =
2909−
2443+ String.join " "
2910− ySpacing =
2444+ [ "-ms-grid-row: "
2911− toGridLength (Tuple.second template.spacing)
2445+ ++ String.fromInt position.row
2913− xSpacing =
2447+ , "-ms-grid-row-span: "
2914− toGridLength (Tuple.first template.spacing)
2448+ ++ String.fromInt position.height
2916− toGridLength x =
2450+ , "-ms-grid-column: "
2917− toGridLengthHelper Nothing Nothing x
2451+ ++ String.fromInt position.col
2919− toGridLengthHelper minimum maximum x =
2453+ , "-ms-grid-column-span: "
2920− case x of
2454+ ++ String.fromInt position.width
2921− Px px ->
2455+ ++ ";"
2459+ class ++ "{" ++ msPosition ++ "}"
2922− String.fromInt px ++ "px"
2464+ ++ String.fromInt position.row
2924− Content ->
2466+ ++ String.fromInt (position.row + position.height)
2925− case ( minimum, maximum ) of
2467+ ++ ";"
2926− ( Nothing, Nothing ) ->
2468+ , "grid-column: "
2929− ( Just minSize, Nothing ) ->
2930− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2469+ ++ String.fromInt position.col
2932− ( Nothing, Just maxSize ) ->
2471+ ++ String.fromInt (position.col + position.width)
2933− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2472+ ++ ";"
2935− ( Just minSize, Just maxSize ) ->
2474+
2936− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2475+ modernGrid =
2937−
2476+ class ++ "{" ++ modernPosition ++ "}"
2939− case ( minimum, maximum ) of
2478+ supports =
2940− ( Nothing, Nothing ) ->
2479+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2941− String.fromInt i ++ "fr"
2480+ in
2942−
2481+ 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 =
2483+ PseudoSelector class styles ->
2980− template.rows
2484+ let
2981− |> List.map toGridLength
2485+ renderPseudoRule style =
2486+ renderStyleRule style (Just class)
2488+ List.map renderPseudoRule styles
2982 |> String.join " "
2489 |> 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 ->
2491+ Transform transform ->
3004− ".grid-pos-"
2494+ 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 ->
2496+ class =
3057− let
2497+ transformClass transform
3058− renderPseudoRule style =
3059− renderStyleRule options style (Just class)
3061− List.concatMap renderPseudoRule styles
2499+ case ( class, val ) of
2500+ ( Just cls, Just v ) ->
2504+ [ Property "transform"
3063− Transform transform ->
2508+ _ ->
3066− transformValue transform
3068− class =
2511+ combine style rendered =
3069− transformClass transform
2512+ { rendered
3070− in
2513+ | rules = rendered.rules ++ renderStyleRule style Nothing
3071− case ( class, val ) of
2514+ , topLevel =
3072− ( Just cls, Just v ) ->
2515+ case renderTopLevels style of
3073− renderStyle options
2516+ Nothing ->
3074− maybePseudo
2517+ rendered.topLevel
3076− [ Property "transform"
3080− _ ->
2519+ Just topLevel ->
3081− []
2520+ rendered.topLevel ++ topLevel
2523+ case List.foldl combine { rules = "", topLevel = "" } stylesheet of
2524+ { topLevel, rules } ->
3084lengthClassName : Length -> String
2528lengthClassName : Length -> String
@@ -3118,12 +2562,12 @@ formatTextShadow shadow =
3121−textShadowClass shadow =
2565+textShadowName shadow =
3122 String.concat
2566 String.concat
3124− , floatClass (Tuple.first shadow.offset) ++ "px"
2568+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3125− , floatClass (Tuple.second shadow.offset) ++ "px"
2569+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3126− , floatClass shadow.blur ++ "px"
2570+ , String.fromFloat shadow.blur ++ "px"
3127 , formatColorClass shadow.color
2571 , formatColorClass shadow.color
@@ -3144,17 +2588,17 @@ formatBoxShadow shadow =
3147−boxShadowClass shadow =
2591+boxShadowName shadow =
3148 String.concat <|
2592 String.concat <|
3149 [ if shadow.inset then
2593 [ if shadow.inset then
3150 "box-inset"
2594 "box-inset"
3154− , floatClass (Tuple.first shadow.offset) ++ "px"
2598+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3155− , floatClass (Tuple.second shadow.offset) ++ "px"
2599+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3156− , floatClass shadow.blur ++ "px"
2600+ , String.fromFloat shadow.blur ++ "px"
3157− , floatClass shadow.size ++ "px"
2601+ , String.fromFloat shadow.size ++ "px"
3158 , formatColorClass shadow.color
2602 , formatColorClass shadow.color
@@ -3199,17 +2643,6 @@ paddingName top right bottom left =
3199 ++ String.fromInt left
2643 ++ String.fromInt left
3202−paddingNameFloat top right bottom left =
3206− ++ floatClass right
3208− ++ floatClass bottom
3213getStyleName : Style -> String
2646getStyleName : Style -> String
3214getStyleName style =
2647getStyleName style =
3215 case style of
2648 case style of
@@ -3240,9 +2673,6 @@ getStyleName style =
3240 PaddingStyle cls top right bottom left ->
2673 PaddingStyle cls top right bottom left ->
3243− BorderWidth cls top right bottom left ->
3246 GridTemplateStyle template ->
2676 GridTemplateStyle template ->
3247 "grid-rows-"
2677 "grid-rows-"
3248 ++ String.join "-" (List.map lengthClassName template.rows)
2678 ++ String.join "-" (List.map lengthClassName template.rows)
@@ -3475,76 +2905,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