@@ -1,4 +1,109 @@
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)
1+module Internal.Model exposing
30+ , TransformComponent(..)
47+ , composeTransformation
55+ , extractSpacingAndPadding
65+ , gatherAttrRecursive
87+ , reduceStylesRecursive
89+ , renderFontClassName
@@ -7,7 +112,7 @@ import Html.Attributes
7import Html.Keyed
112import Html.Keyed
8import Internal.Flag as Flag exposing (Flag)
113import Internal.Flag as Flag exposing (Flag)
9import Internal.Style exposing (classes, dot)
114import Internal.Style exposing (classes, dot)
10−import Json.Encode as Json
115+import Json.Encode as Encode
11import Set exposing (Set)
116import Set exposing (Set)
12import VirtualDom
117import VirtualDom
@@ -68,7 +173,8 @@ type Style
68 | Single String String String
173 | Single String String String
69 | Colored String String Color
174 | Colored String String Color
70 | SpacingStyle String Int Int
175 | SpacingStyle String Int Int
176+ | BorderWidth String Int Int Int Int
71− | PaddingStyle String Int Int Int Int
177+ | PaddingStyle String Float Float Float Float
72 | GridTemplateStyle
178 | GridTemplateStyle
73 { spacing : ( Length, Length )
179 { spacing : ( Length, Length )
74 , columns : List Length
180 , columns : List Length
@@ -99,12 +205,86 @@ type PseudoClass
209+type alias Adjustment =
104 | SansSerif
219 | SansSerif
105 | Monospace
220 | Monospace
106 | Typeface String
221 | Typeface String
107 | ImportFont String String
222 | 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
110type Property
290type Property
@@ -192,6 +372,13 @@ type NodeName
192 | Embedded String String
372 | 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))
@@ -200,7 +387,7 @@ type alias Gathered msg =
200 { node : NodeName
387 { node : NodeName
201 , attributes : List (VirtualDom.Attribute msg)
388 , attributes : List (VirtualDom.Attribute msg)
202 , styles : List Style
389 , styles : List Style
203− , children : List (VirtualDom.Node msg)
390+ , children : NearbyChildren msg
204 , has : Flag.Field
391 , has : Flag.Field
@@ -268,7 +455,10 @@ finalizeNode has node attributes children embedMode parentContext =
268 Embedded nodeName internal ->
455 Embedded nodeName internal ->
269 VirtualDom.node nodeName
456 VirtualDom.node nodeName
270 attributes
457 attributes
458+ [ createNode internal
459+ [ Html.Attributes.class
271− [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
460+ (classes.any ++ " " ++ classes.single)
274 case parentContext of
464 case parentContext of
@@ -345,49 +535,45 @@ finalizeNode has node attributes children embedMode parentContext =
347embedWith static opts styles children =
537embedWith static opts styles children =
541+ |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
543+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
545+ |> toStyleSheet opts
348 if static then
547 if static then
349− staticRoot
548+ staticRoot opts
350− :: (styles
549+ :: dynamicStyleSheet
351− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
353− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
355− |> toStyleSheet opts
357 :: children
550 :: children
360− (styles
553+ dynamicStyleSheet
361− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
363− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
365− |> toStyleSheet opts
367 :: children
554 :: children
370embedKeyed static opts styles children =
557embedKeyed static opts styles children =
561+ |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
563+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
565+ |> toStyleSheet opts
371 if static then
567 if static then
372− ( "static-stylesheet", staticRoot )
568+ ( "static-stylesheet", staticRoot opts )
373 :: ( "dynamic-stylesheet"
569 :: ( "dynamic-stylesheet"
374− , styles
570+ , dynamicStyleSheet
375− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
377− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
379− |> toStyleSheet opts
381 :: children
572 :: children
384 ( "dynamic-stylesheet"
575 ( "dynamic-stylesheet"
385− , styles
576+ , dynamicStyleSheet
386− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
388− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
390− |> toStyleSheet opts
392 :: children
578 :: children
@@ -703,7 +889,16 @@ skippable flag style =
706−gatherAttrRecursive : String -> NodeName -> Flag.Field -> Transformation -> List Style -> List (VirtualDom.Attribute msg) -> List (VirtualDom.Node msg) -> List (Attribute aligned msg) -> Gathered msg
892+gatherAttrRecursive :
898+ -> List (VirtualDom.Attribute msg)
899+ -> NearbyChildren msg
900+ -> List (Attribute aligned msg)
707gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
902gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
708 case elementAttrs of
903 case elementAttrs of
@@ -837,7 +1032,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
838 gatherAttrRecursive (classes ++ " " ++ newClass)
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
840− (Flag.merge addToFlags has)
1035+ (Flag.merge addToFlags (Flag.add Flag.width has))
841 transform
1036 transform
842 (newStyles ++ styles)
1037 (newStyles ++ styles)
@@ -858,7 +1053,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
859 "height-px-" ++ val
1054 "height-px-" ++ val
861− gatherAttrRecursive (name ++ " " ++ classes)
1056+ gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
863 (Flag.add Flag.height has)
1058 (Flag.add Flag.height has)
864 transform
1059 transform
@@ -915,7 +1110,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
916 gatherAttrRecursive (classes ++ " " ++ newClass)
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
918− (Flag.merge addToFlags has)
1113+ (Flag.merge addToFlags (Flag.add Flag.height has))
919 transform
1114 transform
920 (newStyles ++ styles)
1115 (newStyles ++ styles)
@@ -947,20 +1142,15 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
947 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
949 Paragraph ->
1144 Paragraph ->
950− let
1145+ -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
951− newNode =
1146+ -- Since we can't guaranteee that there are no divs, we need another strategy.
952− case node of
1147+ -- While it's not documented in many places, there apparently is a paragraph aria role
953− Generic ->
1148+ -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
954− NodeName "p"
1149+ -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
955−
1150+ -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
962− gatherAttrRecursive classes
1151+ gatherAttrRecursive
963− newNode
1152+ classes
965 transform
1155 transform
@@ -995,83 +1185,16 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
996 Styled styled ->
1186 Styled styled ->
997 styles ++ styled.styles
1187 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
1074− gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1189+ gatherAttrRecursive
1196+ (addNearbyElement location elem children)
1076 AlignX x ->
1199 AlignX x ->
1077 if Flag.present Flag.xAlign has then
1200 if Flag.present Flag.xAlign has then
@@ -1127,6 +1250,106 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1127 remaining
1250 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
1130renderWidth w =
1353renderWidth w =
1131 case w of
1354 case w of
1132 Px px ->
1355 Px px ->
@@ -1213,7 +1436,7 @@ renderHeight h =
1213 "height-px-" ++ val
1436 "height-px-" ++ val
1215 ( Flag.none
1438 ( Flag.none
1216− , name
1439+ , Internal.Style.classes.heightExact ++ " " ++ name
1217 , [ Single name "height" (val ++ "px") ]
1440 , [ Single name "height" (val ++ "px") ]
@@ -1236,7 +1459,7 @@ renderHeight h =
1236 , [ Single
1459 , [ Single
1237 (Internal.Style.classes.any
1460 (Internal.Style.classes.any
1239− ++ Internal.Style.classes.row
1462+ ++ Internal.Style.classes.column
1240 ++ " > "
1463 ++ " > "
1241 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1255,7 +1478,9 @@ renderHeight h =
1257 "min-height"
1480 "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.
1258− (String.fromInt minSize ++ "px")
1483+ (String.fromInt minSize ++ "px !important")
1260 ( newFlag, newAttrs, newStyle ) =
1485 ( newFlag, newAttrs, newStyle ) =
1261 renderHeight len
1486 renderHeight len
@@ -1333,7 +1558,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1333element context node attributes children =
1558element context node attributes children =
1334 attributes
1559 attributes
1335 |> List.reverse
1560 |> List.reverse
1336− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1561+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1337 |> createElement context children
1562 |> createElement context children
@@ -1341,13 +1566,6 @@ untransformed =
1341 Untransformed
1566 Untransformed
1346−-- VirtualDom.text " "
1351createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1569createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1352createElement context children rendered =
1570createElement context children rendered =
@@ -1389,36 +1607,33 @@ createElement context children rendered =
1389 -- Same if it's a column or row with one child and width-content, height-content
1607 -- Same if it's a column or row with one child and width-content, height-content
1390 -- interferes with css grid
1608 -- interferes with css grid
1391 -- Maybe we could unpack text elements in a paragraph as well,
1609 -- Maybe we could unpack text elements in a paragraph as well,
1392− -- however embedded style elements that are larger than the line height will overlap with exisitng text.
1610+ -- however, embedded elements that are larger than the line height will overlap with exisitng text.
1393 -- I don't think that's what we want.
1611 -- I don't think that's what we want.
1395− context
1613+ -- context
1396− == asEl
1614+ -- == asEl
1397− || context
1615+ -- || context
1398− == asParagraph
1616+ -- == asParagraph
1400− ( VirtualDom.text
1618+ -- ( VirtualDom.text
1401− (if context == asParagraph then
1619+ -- (if context == asParagraph then
1402− str ++ " "
1620+ -- str
1407− :: htmls
1624+ -- :: htmls
1408− , existingStyles
1625+ -- , existingStyles
1628+ ( (if context == asEl then
1629+ textElementFill str
1412− ( textElement
1632+ textElement str
1413− (if context == asParagraph then
1419− :: htmls
1634+ :: htmls
1420− , existingStyles
1635+ , existingStyles
1423 Empty ->
1638 Empty ->
1424 ( htmls, existingStyles )
1639 ( htmls, existingStyles )
@@ -1460,38 +1675,30 @@ createElement context children rendered =
1460 -- TEXT OPTIMIZATION
1675 -- TEXT OPTIMIZATION
1461 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1676 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1462 -- Same if it's a column or row with one child and width-content, height-content
1677 -- Same if it's a column or row with one child and width-content, height-content
1464− context
1679+ -- context
1465− == asEl
1680+ -- == asEl
1466− || context
1681+ -- || context
1467− == asParagraph
1682+ -- == asParagraph
1469− ( ( key
1684+ -- ( ( key
1470− , VirtualDom.text
1685+ -- , VirtualDom.text
1471− (if context == asParagraph then
1478− :: htmls
1688+ -- :: htmls
1479− , existingStyles
1689+ -- , existingStyles
1693+ , if context == asEl then
1694+ textElementFill str
1485− (if context == asParagraph then
1489− str
1697+ textElement str
1492− :: htmls
1699+ :: htmls
1493− , existingStyles
1700+ , existingStyles
1496 Empty ->
1703 Empty ->
1497 ( htmls, existingStyles )
1704 ( htmls, existingStyles )
@@ -1514,7 +1721,9 @@ createElement context children rendered =
1514 (finalizeNode rendered.has
1721 (finalizeNode rendered.has
1515 rendered.node
1722 rendered.node
1516 rendered.attributes
1723 rendered.attributes
1517− (Keyed <| List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed)
1725+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1518 NoStyleSheet
1727 NoStyleSheet
@@ -1522,7 +1731,13 @@ createElement context children rendered =
1523 { styles = allStyles
1732 { styles = allStyles
1524 , html =
1733 , html =
1525− finalizeNode rendered.has rendered.node rendered.attributes (Keyed (List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed))
1734+ finalizeNode
1737+ rendered.attributes
1739+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1528 Unkeyed unkeyedChildren ->
1743 Unkeyed unkeyedChildren ->
@@ -1539,20 +1754,58 @@ createElement context children rendered =
1539 case newStyles of
1754 case newStyles of
1541 Unstyled
1756 Unstyled
1542− (finalizeNode rendered.has
1757+ (finalizeNode
1543 rendered.node
1759 rendered.node
1544 rendered.attributes
1760 rendered.attributes
1545− (Unkeyed <| rendered.children ++ unkeyed)
1761+ (Unkeyed (addChildren unkeyed rendered.children))
1546 NoStyleSheet
1762 NoStyleSheet
1549 allStyles ->
1765 allStyles ->
1551 { styles = allStyles
1767 { styles = allStyles
1552− , html = finalizeNode rendered.has rendered.node rendered.attributes (Unkeyed (rendered.children ++ unkeyed))
1768+ , html =
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
@@ -1564,8 +1817,20 @@ defaultOptions =
1567−staticRoot =
1820+staticRoot : OptionRecord -> VirtualDom.Node msg
1824+ -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
1825+ VirtualDom.node "div"
1568− VirtualDom.node "style" [] [ VirtualDom.text Internal.Style.rules ]
1827+ [ 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) ] []
1571addWhen ifThis x to =
1836addWhen ifThis x to =
@@ -1648,6 +1913,21 @@ filter attrs =
1651get : List (Attribute aligned msg) -> (Attribute aligned msg -> Bool) -> List (Attribute aligned msg)
1931get : List (Attribute aligned msg) -> (Attribute aligned msg -> Bool) -> List (Attribute aligned msg)
1652get attrs isAttr =
1932get attrs isAttr =
@@ -1668,7 +1948,7 @@ type Spacing
1670type Padding
1950type Padding
1671− = Padding String Int Int Int Int
1951+ = Padding String Float Float Float Float
1674extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -1764,35 +2044,44 @@ getHeight attrs =
2047+textElementClasses : String
2048+textElementClasses =
2053+ ++ classes.widthContent
2055+ ++ classes.heightContent
1767textElement : String -> VirtualDom.Node msg
2058textElement : String -> VirtualDom.Node msg
1768textElement str =
2059textElement str =
1769 Html.div
2060 Html.div
1770 [ Html.Attributes.class
2061 [ Html.Attributes.class
1771− (String.join " "
2062+ textElementClasses
1774− , classes.widthContent
1775− , classes.heightContent
1779 [ Html.text str ]
2064 [ Html.text str ]
2067+textElementFillClasses : String
2068+textElementFillClasses =
2073+ ++ classes.widthFill
2075+ ++ classes.heightFill
1782textElementFill : String -> VirtualDom.Node msg
2078textElementFill : String -> VirtualDom.Node msg
1783textElementFill str =
2079textElementFill str =
1784− VirtualDom.node "div"
2080+ Html.div
1785− [ VirtualDom.property "className"
2081+ [ Html.Attributes.class
1786− (Json.string <|
2082+ textElementFillClasses
1790− , classes.widthFill
1791− , classes.heightFill
1795− [ VirtualDom.text str ]
2084+ [ Html.text str ]
1798type Children x
2087type Children x
@@ -1800,10 +2089,6 @@ type Children x
1800 | Keyed (List ( String, x ))
2089 | Keyed (List ( String, x ))
1804−-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
1807toHtml mode el =
2092toHtml mode el =
1808 case el of
2093 case el of
1809 Unstyled html ->
2094 Unstyled html ->
@@ -1839,8 +2124,7 @@ renderRoot optionList attributes child =
1841type RenderMode
2126type RenderMode
1843− | Layout
2127+ = Layout
1844 | NoStaticStyleSheet
2128 | NoStaticStyleSheet
1845 | WithVirtualCss
2129 | WithVirtualCss
@@ -1889,8 +2173,8 @@ rootStyle =
1889 , SansSerif
2173 , SansSerif
1892− [ StyleClass Flag.bgColor (Colored ("bg-color-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2176+ [ StyleClass Flag.bgColor (Colored ("bg-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
1893− , StyleClass Flag.fontColor (Colored ("font-color-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2177+ , StyleClass Flag.fontColor (Colored ("fc-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
1894 , StyleClass Flag.fontSize (FontSize 20)
2178 , StyleClass Flag.fontSize (FontSize 20)
1895 , StyleClass Flag.fontFamily <|
2179 , StyleClass Flag.fontFamily <|
1896 FontFamily (List.foldl renderFontClassName "font-" families)
2180 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -1922,14 +2206,49 @@ renderFontClassName font current =
1922 |> String.toLower
2206 |> String.toLower
1923 |> String.words
2207 |> String.words
1924 |> String.join "-"
2208 |> String.join "-"
2210+ FontWith { name } ->
1928renderFocusStyle :
2218renderFocusStyle :
1929 FocusStyle
2219 FocusStyle
1930− -> Style
2220+ -> List Style
1931renderFocusStyle focus =
2221renderFocusStyle 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, ")
1932− Style (Internal.Style.dot classes.any ++ ":focus .focusable, " ++ Internal.Style.dot classes.any ++ ".focusable:focus")
2249+ ++ (Internal.Style.dot classes.any ++ ".focusable:focus, ")
2250+ ++ (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb")
1933 (List.filterMap identity
2252 (List.filterMap identity
1934 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
1935 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -1952,6 +2271,7 @@ renderFocusStyle focus =
1952 , Just <| Property "outline" "none"
2271 , Just <| Property "outline" "none"
1957focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -1963,7 +2283,7 @@ focusDefaultStyle =
1963 { color =
2283 { color =
1964 Rgba (155 / 255) (203 / 255) 1 1
2284 Rgba (155 / 255) (203 / 255) 1 1
1965 , offset = ( 0, 0 )
2285 , offset = ( 0, 0 )
1966− , blur = 3
2286+ , blur = 0
1967 , size = 3
2287 , size = 3
@@ -2031,498 +2351,734 @@ optionsToRecord options =
2034−renderFont : List Font -> String
2354+toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2035−renderFont families =
2355+toStyleSheet options styleSheet =
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 =
2037− fontName font =
2385+ withImport font =
2038 case font of
2386 case font of
2039− Serif ->
2387+ ImportFont _ url ->
2040− "serif"
2388+ Just ("@import url('" ++ url ++ "');")
2390+ -- FontWith with ->
2391+ -- case with.url of
2393+ -- Just ("@import url('" ++ x ++ "');")
2042− SansSerif ->
2399+ allNames =
2043− "sans-serif"
2400+ List.map Tuple.first rules
2045− Monospace ->
2402+ fontImports ( name, typefaces ) =
2046− "monospace"
2403+ let
2405+ String.join "\n" (List.filterMap withImport typefaces)
2048− Typeface name ->
2409+ fontAdjustments ( name, typefaces ) =
2049− "\"" ++ name ++ "\""
2410+ case typefaceAdjustment typefaces of
2413+ (List.map (renderNullAdjustmentRule name) allNames)
2051− ImportFont name url ->
2415+ Just adjustment ->
2052− "\"" ++ name ++ "\""
2416+ String.join ""
2417+ (List.map (renderFontAdjustmentRule name adjustment) allNames)
2054− families
2419+ String.join "\n" (List.map fontImports rules)
2055− |> List.map fontName
2056− |> String.join ", "
2420+ ++ String.join "\n" (List.map fontAdjustments rules)
2059−toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2423+renderNullAdjustmentRule fontToAdjust otherFontName =
2060−toStyleSheet options styleSheet =
2424+ let
2061− VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2425+ name =
2426+ if fontToAdjust == otherFontName then
2430+ otherFontName ++ " ." ++ fontToAdjust
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" )
2064−toStyleSheetString : OptionRecord -> List Style -> String
2466+fontRule name modifier ( parentAdj, textAdjustment ) =
2065−toStyleSheetString options stylesheet =
2467+ [ bracket
2485+ ++ Internal.Style.classes.text
2491+ ++ Internal.Style.classes.text
2497+renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2067− renderTopLevels rule =
2499+ name =
2068− case rule of
2500+ if fontToAdjust == otherFontName then
2069− FontFamily name typefaces ->
2501+ fontToAdjust
2073− ImportFont _ url ->
2074− Just ("@import url('" ++ url ++ "');")
2077− Nothing
2504+ otherFontName ++ " ." ++ fontToAdjust
2080− |> List.filterMap getImports
2081− |> String.join "\n"
2506+ String.join " "
2082− |> Just
2507+ (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2087− renderProps force (Property key val) existing =
2510+bracket selector rules =
2088− if force then
2511+ let
2089− existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2512+ renderPair ( name, val ) =
2513+ name ++ ": " ++ val ++ ";"
2515+ selector ++ " {" ++ String.join "" (List.map renderPair rules) ++ "}"
2092− existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2094− renderStyle maybePseudo selector props =
2518+fontAdjustmentRules converted =
2519+ ( [ ( "display", "block" )
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" )
2529+typefaceAdjustment typefaces =
2095− case maybePseudo of
2532+ case found of
2096 Nothing ->
2533 Nothing ->
2097− selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2534+ case face of
2536+ case with.adjustment of
2542+ ( fontAdjustmentRules
2543+ (.full (convertAdjustment adjustment))
2544+ , fontAdjustmentRules
2545+ (.capital (convertAdjustment adjustment))
2099− Just pseudo ->
2551+ Just _ ->
2100− case pseudo of
2552+ found
2102− case options.hover of
2554+ Nothing
2103− NoHover ->
2555+ typefaces
2107− selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2109− AllowHover ->
2558+fontName font =
2110− selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2559+ case font of
2112− Focus ->
2563+ SansSerif ->
2113− let
2564+ "sans-serif"
2115− List.foldl (renderProps False) "" props
2126− ++ "-fs:not(.focus) {"
2136− , ".focusable-parent:focus ~ "
2146− Active ->
2566+ Monospace ->
2147− selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2567+ "monospace"
2149− renderStyleRule rule maybePseudo =
2569+ Typeface name ->
2570+ "\"" ++ name ++ "\""
2572+ ImportFont name url ->
2573+ "\"" ++ name ++ "\""
2575+ FontWith { name } ->
2576+ "\"" ++ name ++ "\""
2579+topLevelValue rule =
2150− case rule of
2580+ case rule of
2151− Style selector props ->
2581+ FontFamily name typefaces ->
2152− renderStyle maybePseudo selector props
2582+ Just ( name, typefaces )
2154− Shadows name prop ->
2158− [ Property "box-shadow" prop
2161− Transparency name transparency ->
2588+renderProps force (Property key val) existing =
2590+ existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2593+ existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2596+encodeStyles options stylesheet =
2602+ renderStyleRule options style Nothing
2604+ ( getStyleName style, Encode.list Encode.string styled )
2609+toStyleSheetString : OptionRecord -> List Style -> String
2610+toStyleSheetString options stylesheet =
2612+ combine style rendered =
2613+ { rules = rendered.rules ++ renderStyleRule options style Nothing
2615+ case topLevelValue style of
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}" ]
2637+ case options.hover of
2642+ [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2645+ [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2163− opacity =
2649+ renderedProps =
2164− (1 - transparency)
2650+ List.foldl (renderProps False) "" props
2168− renderStyle
2652+ [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2169− maybePseudo
2653+ , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2170− ("." ++ name)
2654+ ++ renderedProps
2171− [ Property "opacity" (String.fromFloat opacity)
2655+ ++ "\n}"
2656+ , (selector ++ "-fs:focus-within {")
2659+ , (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb" ++ selector ++ "-fs {")
2174− FontSize i ->
2664+ Active ->
2175− renderStyle
2665+ [ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2177− (".font-size-" ++ String.fromInt i)
2178− [ Property "font-size" (String.fromInt i ++ "px")
2181− FontFamily name typefaces ->
2185− [ Property "font-family" (renderFont typefaces)
2188− Single class prop val ->
2668+renderStyleRule : OptionRecord -> Style -> Maybe PseudoClass -> List String
2669+renderStyleRule options rule maybePseudo =
2671+ Style selector props ->
2189− renderStyle
2672+ renderStyle options maybePseudo selector props
2192− [ Property prop val
2195− Colored class prop color ->
2674+ Shadows name prop ->
2196− renderStyle
2675+ renderStyle options
2197− maybePseudo
2676+ maybePseudo
2198− ("." ++ class)
2677+ ("." ++ name)
2199− [ Property prop (formatColor color)
2678+ [ Property "box-shadow" prop
2202− SpacingStyle cls x y ->
2681+ Transparency name transparency ->
2204− class =
2683+ opacity =
2205− "." ++ cls
2684+ (1 - transparency)
2688+ renderStyle options
2691+ [ Property "opacity" (String.fromFloat opacity)
2207− xPx =
2694+ FontSize i ->
2695+ renderStyle options
2697+ (".font-size-" ++ String.fromInt i)
2208− String.fromInt x ++ "px"
2698+ [ Property "font-size" (String.fromInt i ++ "px")
2210− yPx =
2701+ FontFamily name typefaces ->
2705+ |> List.filterMap renderVariants
2706+ |> String.join ", "
2709+ [ Property "font-family"
2711+ |> List.map fontName
2211− String.fromInt y ++ "px"
2712+ |> String.join ", "
2714+ , Property "font-feature-settings" features
2715+ , Property "font-variant"
2716+ (if List.any hasSmallCaps typefaces then
2214− "." ++ Internal.Style.classes.row
2720+ "normal"
2724+ renderStyle options
2216− wrappedRow =
2729+ Single class prop val ->
2217− "." ++ Internal.Style.classes.wrapped ++ row
2730+ renderStyle options
2733+ [ Property prop val
2219− column =
2736+ Colored class prop color ->
2220− "." ++ Internal.Style.classes.column
2737+ renderStyle options
2740+ [ Property prop (formatColor color)
2222− page =
2743+ SpacingStyle cls x y ->
2223− "." ++ Internal.Style.classes.page
2744+ let
2225− paragraph =
2748+ halfX =
2226− "." ++ Internal.Style.classes.paragraph
2749+ String.fromFloat (toFloat x / 2) ++ "px"
2228− left =
2751+ halfY =
2229− "." ++ Internal.Style.classes.alignLeft
2752+ String.fromFloat (toFloat y / 2) ++ "px"
2232− "." ++ Internal.Style.classes.alignRight
2755+ String.fromInt x ++ "px"
2235− "." ++ Internal.Style.classes.any
2758+ String.fromInt y ++ "px"
2237− single =
2760+ row =
2238− "." ++ Internal.Style.classes.single
2761+ "." ++ Internal.Style.classes.row
2241− [ renderStyle maybePseudo (class ++ row ++ " > " ++ any) [ Property "margin-right" xPx ]
2243− -- margins don't apply to last element of normal, unwrapped rows
2763+ wrappedRow =
2244− , renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ ":last-child") [ Property "margin" "0" ]
2764+ "." ++ Internal.Style.classes.wrapped ++ row
2246− -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2766+ column =
2247− , renderStyle maybePseudo
2767+ "." ++ Internal.Style.classes.column
2248− (class ++ wrappedRow ++ " > " ++ any)
2249− [ Property "margin" ("0 " ++ xPx ++ " " ++ yPx ++ " 0")
2251− , renderStyle maybePseudo
2252− (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2253− [ Property "margin-right" "0"
2256− -- columns
2769+ page =
2257− , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2770+ "." ++ Internal.Style.classes.page
2258− , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2259− , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2260− , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2263− (class ++ paragraph)
2264− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2268− ("textarea" ++ class)
2269− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2274− -- (class ++ paragraph ++ " > " ++ any)
2275− -- [ Property "margin-right" xPx
2276− -- , Property "margin-bottom" yPx
2280− (class ++ paragraph ++ " > " ++ left)
2281− [ Property "margin-right" xPx
2285− (class ++ paragraph ++ " > " ++ right)
2286− [ Property "margin-left" xPx
2290− (class ++ paragraph ++ "::after")
2772+ paragraph =
2291− [ Property "content" "''"
2773+ "." ++ Internal.Style.classes.paragraph
2292− , Property "display" "block"
2293− , Property "height" "0"
2294− , Property "width" "0"
2295− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2299− (class ++ paragraph ++ "::before")
2300− [ Property "content" "''"
2301− , Property "display" "block"
2302− , Property "height" "0"
2303− , Property "width" "0"
2304− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2308− PaddingStyle cls top right bottom left ->
2775+ left =
2309− let
2776+ "." ++ Internal.Style.classes.alignLeft
2317− [ Property "padding"
2318− (String.fromInt top
2320− ++ String.fromInt right
2322− ++ String.fromInt bottom
2324− ++ String.fromInt left
2329− GridTemplateStyle template ->
2778+ right =
2330− let
2779+ "." ++ Internal.Style.classes.alignRight
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 ++ "}"
2430− GridPosition position ->
2781+ any =
2431− let
2782+ "." ++ Internal.Style.classes.any
2434− ++ String.fromInt position.row
2436− ++ String.fromInt position.col
2438− ++ String.fromInt position.width
2440− ++ String.fromInt position.height
2445− ++ String.fromInt position.row
2447− , "-ms-grid-row-span: "
2448− ++ String.fromInt position.height
2450− , "-ms-grid-column: "
2451− ++ String.fromInt position.col
2453− , "-ms-grid-column-span: "
2454− ++ String.fromInt position.width
2459− class ++ "{" ++ msPosition ++ "}"
2464− ++ String.fromInt position.row
2466− ++ String.fromInt (position.row + position.height)
2469− ++ String.fromInt position.col
2471− ++ String.fromInt (position.col + position.width)
2476− class ++ "{" ++ modernPosition ++ "}"
2479− "@supports (display:grid) {" ++ modernGrid ++ "}"
2483− PseudoSelector class styles ->
2784+ single =
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.
2793+ , renderStyle options
2795+ (class ++ wrappedRow ++ " > " ++ any)
2796+ [ Property "margin" (halfY ++ " " ++ halfX)
2799+ -- , renderStyle options maybePseudo
2800+ -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2801+ -- [ Property "margin-right" "0"
2804+ , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2805+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2806+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2807+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2808+ , renderStyle options
2810+ (class ++ paragraph)
2811+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2813+ , renderStyle options
2815+ ("textarea" ++ any ++ class)
2816+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2817+ , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2820+ -- , renderStyle options
2822+ -- (class ++ paragraph ++ " > " ++ any)
2823+ -- [ Property "margin-right" xPx
2824+ -- , Property "margin-bottom" yPx
2826+ , renderStyle options
2828+ (class ++ paragraph ++ " > " ++ left)
2829+ [ Property "margin-right" xPx
2831+ , renderStyle options
2833+ (class ++ paragraph ++ " > " ++ right)
2834+ [ Property "margin-left" xPx
2836+ , renderStyle options
2838+ (class ++ paragraph ++ "::after")
2839+ [ Property "content" "''"
2840+ , Property "display" "block"
2841+ , Property "height" "0"
2842+ , Property "width" "0"
2843+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2845+ , renderStyle options
2847+ (class ++ paragraph ++ "::before")
2848+ [ Property "content" "''"
2849+ , Property "display" "block"
2850+ , Property "height" "0"
2851+ , Property "width" "0"
2852+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2856+ PaddingStyle cls top right bottom left ->
2862+ renderStyle options
2865+ [ Property "padding"
2866+ (String.fromFloat top
2868+ ++ String.fromFloat right
2870+ ++ String.fromFloat bottom
2872+ ++ String.fromFloat left
2877+ BorderWidth cls top right bottom left ->
2485− renderPseudoRule style =
2879+ class =
2486− renderStyleRule style (Just class)
2880+ "."
2488− List.map renderPseudoRule styles
2882+ in
2883+ renderStyle options
2886+ [ Property "border-width"
2887+ (String.fromInt top
2889+ ++ String.fromInt right
2891+ ++ String.fromInt bottom
2893+ ++ String.fromInt left
2898+ GridTemplateStyle template ->
2902+ ++ String.join "-" (List.map lengthClassName template.rows)
2904+ ++ String.join "-" (List.map lengthClassName template.columns)
2906+ ++ lengthClassName (Tuple.first template.spacing)
2908+ ++ lengthClassName (Tuple.second template.spacing)
2911+ toGridLength (Tuple.second template.spacing)
2914+ toGridLength (Tuple.first template.spacing)
2917+ toGridLengthHelper Nothing Nothing x
2919+ toGridLengthHelper minimum maximum x =
2922+ String.fromInt px ++ "px"
2925+ case ( minimum, maximum ) of
2926+ ( Nothing, Nothing ) ->
2929+ ( Just minSize, Nothing ) ->
2930+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2932+ ( Nothing, Just maxSize ) ->
2933+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2935+ ( Just minSize, Just maxSize ) ->
2936+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2939+ case ( minimum, maximum ) of
2940+ ( Nothing, Nothing ) ->
2941+ String.fromInt i ++ "fr"
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
2489 |> String.join " "
2976 |> String.join " "
2977+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2491− Transform transform ->
2979+ rows =
2492− let
2980+ template.rows
2493− val =
2981+ |> List.map toGridLength
2494− transformValue transform
2982+ |> String.join " "
2983+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2496− class =
2985+ gapX =
2497− transformClass transform
2986+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2499− case ( class, val ) of
2500− ( Just cls, Just v ) ->
2504− [ Property "transform"
2509− ""
2989+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2511− combine style rendered =
2991+ modernGrid =
2512− { rendered
2992+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2513− | rules = rendered.rules ++ renderStyleRule style Nothing
2515− case renderTopLevels style of
2519− Just topLevel ->
2994+ supports =
2520− rendered.topLevel ++ topLevel
2995+ "@supports (display:grid) {" ++ modernGrid ++ "}"
3001+ GridPosition position ->
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 ++ "}"
2523− case List.foldl combine { rules = "", topLevel = "" } stylesheet of
3052+ [ base
2524− { topLevel, rules } ->
3053+ , supports
2525− topLevel ++ rules
3054+ ]
3056+ PseudoSelector class styles ->
3058+ renderPseudoRule style =
3059+ renderStyleRule options style (Just class)
3061+ List.concatMap renderPseudoRule styles
3063+ Transform transform ->
3066+ transformValue transform
3069+ transformClass transform
3071+ case ( class, val ) of
3072+ ( Just cls, Just v ) ->
3073+ renderStyle options
3076+ [ Property "transform"
2528lengthClassName : Length -> String
3084lengthClassName : Length -> String
@@ -2562,12 +3118,12 @@ formatTextShadow shadow =
2565−textShadowName shadow =
3121+textShadowClass shadow =
2566 String.concat
3122 String.concat
2568− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3124+ , floatClass (Tuple.first shadow.offset) ++ "px"
2569− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3125+ , floatClass (Tuple.second shadow.offset) ++ "px"
2570− , String.fromFloat shadow.blur ++ "px"
3126+ , floatClass shadow.blur ++ "px"
2571 , formatColorClass shadow.color
3127 , formatColorClass shadow.color
@@ -2588,17 +3144,17 @@ formatBoxShadow shadow =
2591−boxShadowName shadow =
3147+boxShadowClass shadow =
2592 String.concat <|
3148 String.concat <|
2593 [ if shadow.inset then
3149 [ if shadow.inset then
2594 "box-inset"
3150 "box-inset"
2598− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3154+ , floatClass (Tuple.first shadow.offset) ++ "px"
2599− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3155+ , floatClass (Tuple.second shadow.offset) ++ "px"
2600− , String.fromFloat shadow.blur ++ "px"
3156+ , floatClass shadow.blur ++ "px"
2601− , String.fromFloat shadow.size ++ "px"
3157+ , floatClass shadow.size ++ "px"
2602 , formatColorClass shadow.color
3158 , formatColorClass shadow.color
@@ -2643,6 +3199,17 @@ paddingName top right bottom left =
2643 ++ String.fromInt left
3199 ++ String.fromInt left
3202+paddingNameFloat top right bottom left =
3206+ ++ floatClass right
3208+ ++ floatClass bottom
2646getStyleName : Style -> String
3213getStyleName : Style -> String
2647getStyleName style =
3214getStyleName style =
2648 case style of
3215 case style of
@@ -2673,6 +3240,9 @@ getStyleName style =
2673 PaddingStyle cls top right bottom left ->
3240 PaddingStyle cls top right bottom left ->
3243+ BorderWidth cls top right bottom left ->
2676 GridTemplateStyle template ->
3246 GridTemplateStyle template ->
2677 "grid-rows-"
3247 "grid-rows-"
2678 ++ String.join "-" (List.map lengthClassName template.rows)
3248 ++ String.join "-" (List.map lengthClassName template.rows)
@@ -2905,3 +3475,76 @@ 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