@@ -16,6 +16,7 @@ module Internal.Model exposing
16 , LayoutContext(..)
16 , LayoutContext(..)
17 , Length(..)
17 , Length(..)
18 , Location(..)
18 , Location(..)
19 , NodeName(..)
20 , NodeName(..)
20 , Option(..)
21 , Option(..)
21 , OptionRecord
22 , OptionRecord
@@ -41,7 +42,7 @@ module Internal.Model exposing
41 , asParagraph
42 , asParagraph
43 , asTextColumn
44 , asTextColumn
44− , boxShadowName
45+ , boxShadowClass
45 , columnClass
46 , columnClass
46 , composeTransformation
47 , composeTransformation
47 , contextClasses
48 , contextClasses
@@ -78,31 +79,30 @@ module Internal.Model exposing
78 , onlyStyles
79 , onlyStyles
79 , optionsToRecord
80 , optionsToRecord
80 , paddingName
81 , paddingName
81 , pageClass
83 , pageClass
82 , paragraphClass
84 , paragraphClass
83 , reduceRecursive
85 , reduceRecursive
84 , reduceStyles
86 , reduceStyles
85 , reduceStylesRecursive
87 , reduceStylesRecursive
86 , removeNever
88 , removeNever
90 , renderFontClassName
89 , renderFontClassName
91 , renderHeight
90 , renderHeight
92 , renderRoot
91 , renderRoot
93 , renderWidth
93 , renderWidth
94 , rootStyle
94 , rootStyle
95 , rowClass
95 , rowClass
96 , singleClass
96 , singleClass
97 , spacingName
97 , spacingName
100− , textShadowName
99+ , textShadowClass
102 , toStyleSheet
101 , toStyleSheet
103 , transformClass
102 , transformClass
104 , unstyled
103 , unstyled
105 , unwrapDecorations
104 , unwrapDecorations
@@ -112,7 +112,7 @@ import Html.Attributes
112import Html.Keyed
112import Html.Keyed
113import Internal.Flag as Flag exposing (Flag)
113import Internal.Flag as Flag exposing (Flag)
114import Internal.Style exposing (classes, dot)
114import Internal.Style exposing (classes, dot)
115−import Json.Encode as Json
115+import Json.Encode as Encode
116import Set exposing (Set)
116import Set exposing (Set)
117import VirtualDom
117import VirtualDom
@@ -174,7 +174,7 @@ type Style
174 | Colored String String Color
174 | Colored String String Color
175 | SpacingStyle String Int Int
175 | SpacingStyle String Int Int
176 | BorderWidth String Int Int Int Int
176 | BorderWidth String Int Int Int Int
177− | PaddingStyle String Int Int Int Int
177+ | PaddingStyle String Float Float Float Float
178 | GridTemplateStyle
178 | GridTemplateStyle
179 { spacing : ( Length, Length )
179 { spacing : ( Length, Length )
180 , columns : List Length
180 , columns : List Length
@@ -222,8 +222,7 @@ type Font
222 | ImportFont String String
222 | ImportFont String String
223 | FontWith
223 | FontWith
224 { name : String
224 { name : String
225− , url : Maybe String
226− , adjustment : Adjustment
225+ , adjustment : Maybe Adjustment
227 , variants : List Variant
226 , variants : List Variant
@@ -246,6 +245,18 @@ renderVariant var =
246 "\"" ++ name ++ "\" " ++ String.fromInt index
245 "\"" ++ name ++ "\" " ++ String.fromInt index
250+ VariantActive name ->
256+ VariantIndexed name index ->
257+ name ++ "-" ++ String.fromInt index
249renderVariants typeface =
260renderVariants typeface =
250 case typeface of
261 case typeface of
251 FontWith font ->
262 FontWith font ->
@@ -361,6 +372,13 @@ type NodeName
361 | 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))
@@ -369,7 +387,7 @@ type alias Gathered msg =
369 { node : NodeName
387 { node : NodeName
370 , attributes : List (VirtualDom.Attribute msg)
388 , attributes : List (VirtualDom.Attribute msg)
371 , styles : List Style
389 , styles : List Style
372− , children : List (VirtualDom.Node msg)
390+ , children : NearbyChildren msg
373 , has : Flag.Field
391 , has : Flag.Field
@@ -437,7 +455,10 @@ finalizeNode has node attributes children embedMode parentContext =
437 Embedded nodeName internal ->
455 Embedded nodeName internal ->
438 VirtualDom.node nodeName
456 VirtualDom.node nodeName
439 attributes
457 attributes
458+ [ createNode internal
459+ [ Html.Attributes.class
440− [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
460+ (classes.any ++ " " ++ classes.single)
443 case parentContext of
464 case parentContext of
@@ -514,49 +535,45 @@ finalizeNode has node attributes children embedMode parentContext =
516embedWith 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
517 if static then
547 if static then
518− staticRoot
548+ staticRoot opts
519− :: (styles
549+ :: dynamicStyleSheet
520− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
522− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
524− |> toStyleSheet opts
526 :: children
550 :: children
529− (styles
553+ dynamicStyleSheet
530− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
532− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
534− |> toStyleSheet opts
536 :: children
554 :: children
539embedKeyed 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
540 if static then
567 if static then
541− ( "static-stylesheet", staticRoot )
568+ ( "static-stylesheet", staticRoot opts )
542 :: ( "dynamic-stylesheet"
569 :: ( "dynamic-stylesheet"
543− , styles
570+ , dynamicStyleSheet
544− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
546− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
548− |> toStyleSheet opts
550 :: children
572 :: children
553 ( "dynamic-stylesheet"
575 ( "dynamic-stylesheet"
554− , styles
576+ , dynamicStyleSheet
555− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
557− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
559− |> toStyleSheet opts
561 :: children
578 :: children
@@ -872,7 +889,16 @@ skippable flag style =
875−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)
876gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
902gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
877 case elementAttrs of
903 case elementAttrs of
@@ -1006,7 +1032,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1007 gatherAttrRecursive (classes ++ " " ++ newClass)
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
1009− (Flag.merge addToFlags has)
1035+ (Flag.merge addToFlags (Flag.add Flag.width has))
1010 transform
1036 transform
1011 (newStyles ++ styles)
1037 (newStyles ++ styles)
@@ -1027,7 +1053,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1028 "height-px-" ++ val
1054 "height-px-" ++ val
1030− gatherAttrRecursive (name ++ " " ++ classes)
1056+ gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
1032 (Flag.add Flag.height has)
1058 (Flag.add Flag.height has)
1033 transform
1059 transform
@@ -1084,7 +1110,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1085 gatherAttrRecursive (classes ++ " " ++ newClass)
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
1087− (Flag.merge addToFlags has)
1113+ (Flag.merge addToFlags (Flag.add Flag.height has))
1088 transform
1114 transform
1089 (newStyles ++ styles)
1115 (newStyles ++ styles)
@@ -1116,20 +1142,15 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1116 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1118 Paragraph ->
1144 Paragraph ->
1119− let
1145+ -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
1120− newNode =
1146+ -- Since we can't guaranteee that there are no divs, we need another strategy.
1121− case node of
1147+ -- While it's not documented in many places, there apparently is a paragraph aria role
1122− Generic ->
1148+ -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
1123− NodeName "p"
1149+ -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
1124−
1150+ -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
1131− gatherAttrRecursive classes
1151+ gatherAttrRecursive
1132− newNode
1152+ classes
1134 transform
1155 transform
@@ -1164,75 +1185,16 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1165 Styled styled ->
1186 Styled styled ->
1166 styles ++ styled.styles
1187 styles ++ styled.styles
1170− [ Html.Attributes.class <|
1174− [ Internal.Style.classes.nearby
1175− , Internal.Style.classes.single
1176− , Internal.Style.classes.above
1181− [ Internal.Style.classes.nearby
1182− , Internal.Style.classes.single
1183− , Internal.Style.classes.below
1188− [ Internal.Style.classes.nearby
1189− , Internal.Style.classes.single
1190− , Internal.Style.classes.onRight
1195− [ Internal.Style.classes.nearby
1196− , Internal.Style.classes.single
1197− , Internal.Style.classes.onLeft
1202− [ Internal.Style.classes.nearby
1203− , Internal.Style.classes.single
1204− , Internal.Style.classes.inFront
1209− [ Internal.Style.classes.nearby
1210− , Internal.Style.classes.single
1211− , Internal.Style.classes.behind
1225− styled.html NoStyleSheet asEl
1229− if location == Behind then
1230− Internal.Style.classes.hasBehind ++ " " ++ classes
1235− gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1189+ gatherAttrRecursive
1196+ (addNearbyElement location elem children)
1237 AlignX x ->
1199 AlignX x ->
1238 if Flag.present Flag.xAlign has then
1200 if Flag.present Flag.xAlign has then
@@ -1288,6 +1250,106 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1288 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
1291renderWidth w =
1353renderWidth w =
1292 case w of
1354 case w of
1293 Px px ->
1355 Px px ->
@@ -1374,7 +1436,7 @@ renderHeight h =
1374 "height-px-" ++ val
1436 "height-px-" ++ val
1376 ( Flag.none
1438 ( Flag.none
1377− , name
1439+ , Internal.Style.classes.heightExact ++ " " ++ name
1378 , [ Single name "height" (val ++ "px") ]
1440 , [ Single name "height" (val ++ "px") ]
@@ -1397,7 +1459,7 @@ renderHeight h =
1397 , [ Single
1459 , [ Single
1398 (Internal.Style.classes.any
1460 (Internal.Style.classes.any
1400− ++ Internal.Style.classes.row
1462+ ++ Internal.Style.classes.column
1401 ++ " > "
1463 ++ " > "
1402 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1416,7 +1478,9 @@ renderHeight h =
1418 "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.
1419− (String.fromInt minSize ++ "px")
1483+ (String.fromInt minSize ++ "px !important")
1421 ( newFlag, newAttrs, newStyle ) =
1485 ( newFlag, newAttrs, newStyle ) =
1422 renderHeight len
1486 renderHeight len
@@ -1494,7 +1558,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1494element context node attributes children =
1558element context node attributes children =
1495 attributes
1559 attributes
1496 |> List.reverse
1560 |> List.reverse
1497− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1561+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1498 |> createElement context children
1562 |> createElement context children
@@ -1561,13 +1625,12 @@ createElement context children rendered =
1561 -- , existingStyles
1625 -- , existingStyles
1565− (if context == asParagraph then
1628+ ( (if context == asEl then
1566− str
1629+ textElementFill str
1569− str
1632+ textElement str
1571 :: htmls
1634 :: htmls
1572 , existingStyles
1635 , existingStyles
@@ -1627,8 +1690,11 @@ createElement context children rendered =
1693+ , if context == asEl then
1694+ textElementFill str
1630− , textElement
1697+ textElement str
1633 :: htmls
1699 :: htmls
1634 , existingStyles
1700 , existingStyles
@@ -1655,13 +1721,8 @@ createElement context children rendered =
1655 (finalizeNode rendered.has
1721 (finalizeNode rendered.has
1656 rendered.node
1722 rendered.node
1657 rendered.attributes
1723 rendered.attributes
1658− (Keyed <|
1724+ (Keyed
1662− ( "nearby-elements-pls", x )
1664− rendered.children
1725+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1666 NoStyleSheet
1727 NoStyleSheet
@@ -1675,13 +1736,7 @@ createElement context children rendered =
1675 rendered.node
1736 rendered.node
1676 rendered.attributes
1737 rendered.attributes
1681− ( "nearby-elements-pls", x )
1683− rendered.children
1739+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
@@ -1703,7 +1758,7 @@ createElement context children rendered =
1703 rendered.has
1758 rendered.has
1704 rendered.node
1759 rendered.node
1705 rendered.attributes
1760 rendered.attributes
1706− (Unkeyed <| unkeyed ++ rendered.children)
1761+ (Unkeyed (addChildren unkeyed rendered.children))
1707 NoStyleSheet
1762 NoStyleSheet
@@ -1715,10 +1770,42 @@ createElement context children rendered =
1715 rendered.has
1770 rendered.has
1716 rendered.node
1771 rendered.node
1717 rendered.attributes
1772 rendered.attributes
1718− (Unkeyed (unkeyed ++ rendered.children))
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
@@ -1730,8 +1817,20 @@ defaultOptions =
1733−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"
1734− 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) ] []
1737addWhen ifThis x to =
1836addWhen ifThis x to =
@@ -1849,7 +1948,7 @@ type Spacing
1851type Padding
1950type Padding
1852− = Padding String Int Int Int Int
1951+ = Padding String Float Float Float Float
1855extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -1945,35 +2044,44 @@ getHeight attrs =
2047+textElementClasses : String
2048+textElementClasses =
2053+ ++ classes.widthContent
2055+ ++ classes.heightContent
1948textElement : String -> VirtualDom.Node msg
2058textElement : String -> VirtualDom.Node msg
1949textElement str =
2059textElement str =
1950 Html.div
2060 Html.div
1951 [ Html.Attributes.class
2061 [ Html.Attributes.class
1952− (String.join " "
2062+ textElementClasses
1955− , classes.widthContent
1956− , classes.heightContent
1960 [ Html.text str ]
2064 [ Html.text str ]
2067+textElementFillClasses : String
2068+textElementFillClasses =
2073+ ++ classes.widthFill
2075+ ++ classes.heightFill
1963textElementFill : String -> VirtualDom.Node msg
2078textElementFill : String -> VirtualDom.Node msg
1964textElementFill str =
2079textElementFill str =
1965− VirtualDom.node "div"
2080+ Html.div
1966− [ VirtualDom.property "className"
2081+ [ Html.Attributes.class
1967− (Json.string <|
2082+ textElementFillClasses
1971− , classes.widthFill
1972− , classes.heightFill
1976− [ VirtualDom.text str ]
2084+ [ Html.text str ]
1979type Children x
2087type Children x
@@ -1981,10 +2089,6 @@ type Children x
1981 | Keyed (List ( String, x ))
2089 | Keyed (List ( String, x ))
1985−-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
1988toHtml mode el =
2092toHtml mode el =
1989 case el of
2093 case el of
1990 Unstyled html ->
2094 Unstyled html ->
@@ -2020,8 +2124,7 @@ renderRoot optionList attributes child =
2022type RenderMode
2126type RenderMode
2024− | Layout
2127+ = Layout
2025 | NoStaticStyleSheet
2128 | NoStaticStyleSheet
2026 | WithVirtualCss
2129 | WithVirtualCss
@@ -2070,8 +2173,8 @@ rootStyle =
2070 , SansSerif
2173 , SansSerif
2073− [ 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))
2074− , 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))
2075 , StyleClass Flag.fontSize (FontSize 20)
2178 , StyleClass Flag.fontSize (FontSize 20)
2076 , StyleClass Flag.fontFamily <|
2179 , StyleClass Flag.fontFamily <|
2077 FontFamily (List.foldl renderFontClassName "font-" families)
2180 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2114,9 +2217,38 @@ renderFontClassName font current =
2115renderFocusStyle :
2218renderFocusStyle :
2116 FocusStyle
2219 FocusStyle
2117− -> Style
2220+ -> List Style
2118renderFocusStyle 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, ")
2119− 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")
2120 (List.filterMap identity
2252 (List.filterMap identity
2121 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2122 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2139,6 +2271,7 @@ renderFocusStyle focus =
2139 , Just <| Property "outline" "none"
2271 , Just <| Property "outline" "none"
2144focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2150,7 +2283,7 @@ focusDefaultStyle =
2150 { color =
2283 { color =
2151 Rgba (155 / 255) (203 / 255) 1 1
2284 Rgba (155 / 255) (203 / 255) 1 1
2152 , offset = ( 0, 0 )
2285 , offset = ( 0, 0 )
2153− , blur = 3
2286+ , blur = 0
2154 , size = 3
2287 , size = 3
@@ -2220,7 +2353,31 @@ optionsToRecord options =
2221toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2354toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2222toStyleSheet options styleSheet =
2355toStyleSheet 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"
2223− VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2372+ [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2376+ VirtualDom.node "elm-ui-rules"
2377+ [ VirtualDom.property "rules"
2378+ (encodeStyles options styleSheet)
2226renderTopLevelValues rules =
2383renderTopLevelValues rules =
@@ -2230,14 +2387,12 @@ renderTopLevelValues rules =
2230 ImportFont _ url ->
2387 ImportFont _ url ->
2231 Just ("@import url('" ++ url ++ "');")
2388 Just ("@import url('" ++ url ++ "');")
2233− FontWith with ->
2390+ -- FontWith with ->
2234− case with.url of
2391+ -- case with.url of
2235− Just x ->
2392+ -- Just x ->
2236− Just ("@import url('" ++ x ++ "');")
2393+ -- Just ("@import url('" ++ x ++ "');")
2238− Nothing ->
2394+ -- Nothing ->
2239− Nothing
2395+ -- Nothing
@@ -2308,7 +2463,38 @@ renderNullAdjustmentRule fontToAdjust otherFontName =
2466+fontRule name modifier ( parentAdj, textAdjustment ) =
2485+ ++ Internal.Style.classes.text
2491+ ++ Internal.Style.classes.text
2311−renderFontAdjustmentRule fontToAdjust ( parentAdj, textAdjustment ) otherFontName =
2497+renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2314 if fontToAdjust == otherFontName then
2500 if fontToAdjust == otherFontName then
@@ -2318,34 +2504,7 @@ renderFontAdjustmentRule fontToAdjust ( parentAdj, textAdjustment ) otherFontNam
2318 otherFontName ++ " ." ++ fontToAdjust
2504 otherFontName ++ " ." ++ fontToAdjust
2320 String.join " "
2506 String.join " "
2325− ++ classes.sizeByCapital
2330− ++ classes.sizeByCapital
2507+ (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2337− ++ classes.sizeByCapital
2339− ++ Internal.Style.classes.text
2343− ++ classes.sizeByCapital
2345− ++ Internal.Style.classes.text
2351bracket selector rules =
2510bracket selector rules =
@@ -2358,17 +2517,12 @@ bracket selector rules =
2359fontAdjustmentRules converted =
2518fontAdjustmentRules converted =
2360 ( [ ( "display", "block" )
2519 ( [ ( "display", "block" )
2362− -- , ( "line-height", String.fromFloat converted.height )
2363− -- , ( "font-size", String.fromFloat (1 + converted.height + converted.vertical) ++ "em" )
2365 , [ ( "display", "inline-block" )
2521 , [ ( "display", "inline-block" )
2366 , ( "line-height", String.fromFloat converted.height )
2522 , ( "line-height", String.fromFloat converted.height )
2367 , ( "vertical-align", String.fromFloat converted.vertical ++ "em" )
2523 , ( "vertical-align", String.fromFloat converted.vertical ++ "em" )
2368 , ( "font-size", String.fromFloat converted.size ++ "em" )
2524 , ( "font-size", String.fromFloat converted.size ++ "em" )
2370− -- , [ ( "font-size", String.fromFloat converted.size ++ "em" )
@@ -2379,10 +2533,17 @@ typefaceAdjustment typefaces =
2379 Nothing ->
2533 Nothing ->
2380 case face of
2534 case face of
2381 FontWith with ->
2535 FontWith with ->
2383− (fontAdjustmentRules
2384− (.capital (convertAdjustment with.adjustment))
2536+ case with.adjustment of
2542+ ( fontAdjustmentRules
2543+ (.full (convertAdjustment adjustment))
2544+ , fontAdjustmentRules
2545+ (.capital (convertAdjustment adjustment))
@@ -2432,489 +2593,492 @@ renderProps force (Property key val) existing =
2432 existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2593 existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2596+encodeStyles options stylesheet =
2602+ renderStyleRule options style Nothing
2604+ ( getStyleName style, Encode.list Encode.string styled )
2435toStyleSheetString : OptionRecord -> List Style -> String
2609toStyleSheetString : OptionRecord -> List Style -> String
2436toStyleSheetString options stylesheet =
2610toStyleSheetString options stylesheet =
2438− renderStyle maybePseudo selector props =
2612+ combine style rendered =
2439− case maybePseudo of
2613+ { rules = rendered.rules ++ renderStyleRule options style Nothing
2440− Nothing ->
2614+ , topLevel =
2441− selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2615+ case topLevelValue style of
2443− Just pseudo ->
2619+ Just topLevel ->
2444− case pseudo of
2620+ topLevel :: rendered.topLevel
2446− case options.hover of
2622+ in
2447− NoHover ->
2623+ case List.foldl combine { topLevel = [], rules = [] } stylesheet of
2448− ""
2624+ { topLevel, rules } ->
2625+ renderTopLevelValues topLevel ++ String.concat rules
2451− selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2453− AllowHover ->
2628+renderStyle : OptionRecord -> Maybe PseudoClass -> String -> List Property -> List String
2629+renderStyle options maybePseudo selector props =
2630+ case maybePseudo of
2454− selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2632+ [ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2456− Focus ->
2634+ Just pseudo ->
2457− let
2635+ case pseudo of
2458− renderedProps =
2636+ Hover ->
2459− List.foldl (renderProps False) "" props
2637+ case options.hover of
2470− ++ "-fs:not(.focus) {"
2480− , ".focusable-parent:focus ~ "
2490− Active ->
2641+ ForceHover ->
2491− selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2642+ [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2493− renderStyleRule rule maybePseudo =
2644+ AllowHover ->
2494− case rule of
2645+ [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2495− Style selector props ->
2496− renderStyle maybePseudo selector props
2498− Shadows name prop ->
2647+ Focus ->
2502− [ Property "box-shadow" prop
2505− Transparency name transparency ->
2507− opacity =
2649+ renderedProps =
2508− (1 - transparency)
2650+ List.foldl (renderProps False) "" props
2512− renderStyle
2652+ [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2513− maybePseudo
2653+ , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2514− ("." ++ name)
2654+ ++ renderedProps
2515− [ 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 {")
2518− FontSize i ->
2664+ Active ->
2519− renderStyle
2665+ [ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2521− (".font-size-" ++ String.fromInt i)
2522− [ Property "font-size" (String.fromInt i ++ "px")
2525− FontFamily name typefaces ->
2529− |> List.filterMap renderVariants
2530− |> String.join ", "
2533− [ Property "font-family"
2535− |> List.map fontName
2536− |> String.join ", "
2538− , Property "font-feature-settings" features
2539− , Property "font-variant"
2540− (if List.any hasSmallCaps typefaces then
2543− else
2668+renderStyleRule : OptionRecord -> Style -> Maybe PseudoClass -> List String
2544− "normal"
2669+renderStyleRule options rule maybePseudo =
2545− )
2670+ case rule of
2546− ]
2671+ Style selector props ->
2547− in
2672+ renderStyle options maybePseudo selector props
2548− String.join " "
2673+
2674+ Shadows name prop ->
2549− [ renderStyle
2675+ renderStyle options
2550− maybePseudo
2676+ maybePseudo
2551− ("." ++ name)
2677+ ("." ++ name)
2552− families
2678+ [ Property "box-shadow" prop
2555− Single class prop val ->
2681+ Transparency name transparency ->
2556− renderStyle
2688+ renderStyle options
2557− maybePseudo
2689+ maybePseudo
2558− ("." ++ class)
2690+ ("." ++ name)
2559− [ Property prop val
2691+ [ Property "opacity" (String.fromFloat opacity)
2562− Colored class prop color ->
2694+ FontSize i ->
2563− renderStyle
2695+ renderStyle options
2564− maybePseudo
2696+ maybePseudo
2565− ("." ++ class)
2697+ (".font-size-" ++ String.fromInt i)
2566− [ Property prop (formatColor color)
2698+ [ Property "font-size" (String.fromInt i ++ "px")
2569− SpacingStyle cls x y ->
2701+ FontFamily name typefaces ->
2571− class =
2703+ features =
2572− "." ++ cls
2704+ typefaces
2705+ |> List.filterMap renderVariants
2706+ |> String.join ", "
2709+ [ Property "font-family"
2711+ |> List.map fontName
2712+ |> String.join ", "
2714+ , Property "font-feature-settings" features
2715+ , Property "font-variant"
2716+ (if List.any hasSmallCaps typefaces then
2575− String.fromFloat (toFloat x / 2) ++ "px"
2720+ "normal"
2724+ renderStyle options
2577− halfY =
2729+ Single class prop val ->
2578− String.fromFloat (toFloat y / 2) ++ "px"
2730+ renderStyle options
2733+ [ Property prop val
2580− xPx =
2736+ Colored class prop color ->
2581− String.fromInt x ++ "px"
2737+ renderStyle options
2740+ [ Property prop (formatColor color)
2583− yPx =
2743+ SpacingStyle cls x y ->
2584− String.fromInt y ++ "px"
2744+ let
2587− "." ++ Internal.Style.classes.row
2749+ String.fromFloat (toFloat x / 2) ++ "px"
2589− wrappedRow =
2751+ halfY =
2590− "." ++ Internal.Style.classes.wrapped ++ row
2752+ String.fromFloat (toFloat y / 2) ++ "px"
2592− column =
2754+ xPx =
2593− "." ++ Internal.Style.classes.column
2755+ String.fromInt x ++ "px"
2596− "." ++ Internal.Style.classes.page
2758+ String.fromInt y ++ "px"
2598− paragraph =
2760+ row =
2599− "." ++ Internal.Style.classes.paragraph
2761+ "." ++ Internal.Style.classes.row
2601− left =
2763+ wrappedRow =
2602− "." ++ Internal.Style.classes.alignLeft
2764+ "." ++ Internal.Style.classes.wrapped ++ row
2604− right =
2766+ column =
2605− "." ++ Internal.Style.classes.alignRight
2767+ "." ++ Internal.Style.classes.column
2608− "." ++ Internal.Style.classes.any
2770+ "." ++ Internal.Style.classes.page
2610− single =
2772+ paragraph =
2611− "." ++ Internal.Style.classes.single
2773+ "." ++ Internal.Style.classes.paragraph
2614− [ renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2616− -- margins don't apply to last element of normal, unwrapped rows
2617− -- , renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2618− -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2619− , renderStyle maybePseudo
2620− (class ++ wrappedRow ++ " > " ++ any)
2621− [ Property "margin" (halfY ++ " " ++ halfX)
2624− -- , renderStyle maybePseudo
2775+ left =
2625− -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2776+ "." ++ Internal.Style.classes.alignLeft
2626− -- [ Property "margin-right" "0"
2629− , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2630− , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2631− , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2632− , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2635− (class ++ paragraph)
2636− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2640− ("textarea" ++ class)
2641− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2646− -- (class ++ paragraph ++ " > " ++ any)
2647− -- [ Property "margin-right" xPx
2648− -- , Property "margin-bottom" yPx
2652− (class ++ paragraph ++ " > " ++ left)
2653− [ Property "margin-right" xPx
2657− (class ++ paragraph ++ " > " ++ right)
2778+ right =
2658− [ Property "margin-left" xPx
2779+ "." ++ Internal.Style.classes.alignRight
2662− (class ++ paragraph ++ "::after")
2663− [ Property "content" "''"
2664− , Property "display" "block"
2665− , Property "height" "0"
2666− , Property "width" "0"
2667− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2671− (class ++ paragraph ++ "::before")
2672− [ Property "content" "''"
2673− , Property "display" "block"
2674− , Property "height" "0"
2675− , Property "width" "0"
2676− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2680− PaddingStyle cls top right bottom left ->
2781+ any =
2681− let
2782+ "." ++ Internal.Style.classes.any
2689− [ Property "padding"
2690− (String.fromInt top
2692− ++ String.fromInt right
2694− ++ String.fromInt bottom
2696− ++ String.fromInt left
2701− BorderWidth cls top right bottom left ->
2784+ single =
2702− let
2785+ "." ++ Internal.Style.classes.single
2707− renderStyle
2787+ List.concat
2708− maybePseudo
2788+ [ renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2710− [ Property "border-width"
2790+ -- margins don't apply to last element of normal, unwrapped rows
2711− (String.fromInt top
2791+ -- , renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2712− ++ "px "
2792+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2713− ++ String.fromInt right
2793+ , renderStyle options
2714− ++ "px "
2794+ maybePseudo
2715− ++ String.fromInt bottom
2795+ (class ++ wrappedRow ++ " > " ++ any)
2716− ++ "px "
2796+ [ Property "margin" (halfY ++ " " ++ halfX)
2717− ++ String.fromInt left
2722− GridTemplateStyle template ->
2799+ -- , renderStyle options maybePseudo
2723− let
2800+ -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2724− class =
2801+ -- [ Property "margin-right" "0"
2725− ".grid-rows-"
2802+ -- ]
2726− ++ String.join "-" (List.map lengthClassName template.rows)
2728− ++ String.join "-" (List.map lengthClassName template.columns)
2730− ++ lengthClassName (Tuple.first template.spacing)
2732− ++ lengthClassName (Tuple.second template.spacing)
2735− toGridLength (Tuple.second template.spacing)
2738− toGridLength (Tuple.first template.spacing)
2741− toGridLengthHelper Nothing Nothing x
2743− toGridLengthHelper minimum maximum x =
2746− String.fromInt px ++ "px"
2749− case ( minimum, maximum ) of
2750− ( Nothing, Nothing ) ->
2753− ( Just minSize, Nothing ) ->
2754− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2756− ( Nothing, Just maxSize ) ->
2757− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2759− ( Just minSize, Just maxSize ) ->
2760− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2763− case ( minimum, maximum ) of
2764− ( Nothing, Nothing ) ->
2765− String.fromInt i ++ "fr"
2767− ( Just minSize, Nothing ) ->
2768− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2770− ( Nothing, Just maxSize ) ->
2771− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2773− ( Just minSize, Just maxSize ) ->
2774− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2777− toGridLengthHelper (Just m) maximum len
2780− toGridLengthHelper minimum (Just m) len
2784− |> List.map toGridLength
2785− |> String.join ySpacing
2786− |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2790− |> List.map toGridLength
2791− |> String.join ySpacing
2792− |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2795− class ++ "{" ++ msColumns ++ msRows ++ "}"
2798− template.columns
2803+ -- columns
2799− |> List.map toGridLength
2804+ , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2800− |> String.join " "
2805+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2801− |> (\x -> "grid-template-columns: " ++ x ++ ";")
2806+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2802−
2807+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2803− rows =
2808+ , renderStyle options
2804− template.rows
2809+ maybePseudo
2805− |> List.map toGridLength
2810+ (class ++ paragraph)
2806− |> String.join " "
2811+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2807− |> (\x -> "grid-template-rows: " ++ x ++ ";")
2812+ ]
2808−
2813+ , renderStyle options
2809− gapX =
2814+ maybePseudo
2810− "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2815+ ("textarea" ++ any ++ class)
2811−
2816+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2812− gapY =
2817+ , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2813− "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2818+ ]
2816− class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2819− "@supports (display:grid) {" ++ modernGrid ++ "}"
2823− GridPosition position ->
2820+ -- , renderStyle options
2824− let
2821+ -- maybePseudo
2825− class =
2822+ -- (class ++ paragraph ++ " > " ++ any)
2826− ".grid-pos-"
2823+ -- [ Property "margin-right" xPx
2827− ++ String.fromInt position.row
2824+ -- , Property "margin-bottom" yPx
2829− ++ String.fromInt position.col
2826+ , renderStyle options
2830− ++ "-"
2827+ maybePseudo
2831− ++ String.fromInt position.width
2828+ (class ++ paragraph ++ " > " ++ left)
2832− ++ "-"
2829+ [ Property "margin-right" xPx
2833− ++ String.fromInt position.height
2830+ ]
2834−
2831+ , renderStyle options
2835− msPosition =
2832+ maybePseudo
2836− String.join " "
2833+ (class ++ paragraph ++ " > " ++ right)
2837− [ "-ms-grid-row: "
2834+ [ Property "margin-left" xPx
2838− ++ String.fromInt position.row
2835+ ]
2839− ++ ";"
2836+ , renderStyle options
2840− , "-ms-grid-row-span: "
2837+ maybePseudo
2841− ++ String.fromInt position.height
2838+ (class ++ paragraph ++ "::after")
2842− ++ ";"
2839+ [ Property "content" "''"
2843− , "-ms-grid-column: "
2840+ , Property "display" "block"
2844− ++ String.fromInt position.col
2841+ , Property "height" "0"
2845− ++ ";"
2842+ , Property "width" "0"
2846− , "-ms-grid-column-span: "
2843+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2847− ++ String.fromInt position.width
2844+ ]
2848− ++ ";"
2845+ , renderStyle options
2850−
2847+ (class ++ paragraph ++ "::before")
2851− base =
2848+ [ Property "content" "''"
2852− class ++ "{" ++ msPosition ++ "}"
2849+ , Property "display" "block"
2853−
2850+ , Property "height" "0"
2854− modernPosition =
2851+ , Property "width" "0"
2855− String.join " "
2852+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2856− [ "grid-row: "
2853+ ]
2857− ++ String.fromInt position.row
2854+ ]
2859− ++ String.fromInt (position.row + position.height)
2862− ++ String.fromInt position.col
2864− ++ String.fromInt (position.col + position.width)
2869− class ++ "{" ++ modernPosition ++ "}"
2872− "@supports (display:grid) {" ++ modernGrid ++ "}"
2876− PseudoSelector class styles ->
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 ->
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 ->
2878− renderPseudoRule style =
2900+ class =
2879− renderStyleRule style (Just class)
2901+ ".grid-rows-"
2880− in
2902+ ++ String.join "-" (List.map lengthClassName template.rows)
2881− List.map renderPseudoRule styles
2903+ ++ "-cols-"
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
2882 |> String.join " "
2976 |> String.join " "
2977+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2884− Transform transform ->
2979+ rows =
2885− let
2980+ template.rows
2886− val =
2981+ |> List.map toGridLength
2887− transformValue transform
2982+ |> String.join " "
2983+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2889− class =
2985+ gapX =
2890− transformClass transform
2986+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2892− case ( class, val ) of
2893− ( Just cls, Just v ) ->
2897− [ Property "transform"
2902− ""
2989+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2904− combine style rendered =
2991+ modernGrid =
2905− { rules = rendered.rules ++ renderStyleRule style Nothing
2992+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2907− case topLevelValue style of
2911− Just topLevel ->
2994+ supports =
2912− topLevel :: rendered.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 ++ "}"
2915− case List.foldl combine { topLevel = [], rules = "" } stylesheet of
3052+ [ base
2916− { topLevel, rules } ->
3053+ , supports
2917− renderTopLevelValues 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"
2920lengthClassName : Length -> String
3084lengthClassName : Length -> String
@@ -2954,12 +3118,12 @@ formatTextShadow shadow =
2957−textShadowName shadow =
3121+textShadowClass shadow =
2958 String.concat
3122 String.concat
2960− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3124+ , floatClass (Tuple.first shadow.offset) ++ "px"
2961− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3125+ , floatClass (Tuple.second shadow.offset) ++ "px"
2962− , String.fromFloat shadow.blur ++ "px"
3126+ , floatClass shadow.blur ++ "px"
2963 , formatColorClass shadow.color
3127 , formatColorClass shadow.color
@@ -2980,17 +3144,17 @@ formatBoxShadow shadow =
2983−boxShadowName shadow =
3147+boxShadowClass shadow =
2984 String.concat <|
3148 String.concat <|
2985 [ if shadow.inset then
3149 [ if shadow.inset then
2986 "box-inset"
3150 "box-inset"
2990− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3154+ , floatClass (Tuple.first shadow.offset) ++ "px"
2991− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3155+ , floatClass (Tuple.second shadow.offset) ++ "px"
2992− , String.fromFloat shadow.blur ++ "px"
3156+ , floatClass shadow.blur ++ "px"
2993− , String.fromFloat shadow.size ++ "px"
3157+ , floatClass shadow.size ++ "px"
2994 , formatColorClass shadow.color
3158 , formatColorClass shadow.color
@@ -3035,6 +3199,17 @@ paddingName top right bottom left =
3035 ++ String.fromInt left
3199 ++ String.fromInt left
3202+paddingNameFloat top right bottom left =
3206+ ++ floatClass right
3208+ ++ floatClass bottom
3038getStyleName : Style -> String
3213getStyleName : Style -> String
3039getStyleName style =
3214getStyleName style =
3040 case style of
3215 case style of
@@ -3352,16 +3527,16 @@ convertAdjustment adjustment =
3352 capitalSize =
3527 capitalSize =
3353 1 / (ascender - newBaseline)
3528 1 / (ascender - newBaseline)
3531+ 1 / (ascender - descender)
3355 fullVertical =
3533 fullVertical =
3356− (oldMiddle - newFullMiddle) * 2
3536+ -- (oldMiddle - newFullMiddle) * 2
3358 { full =
3538 { full =
3359− { vertical = fullVertical
3361− (ascender - descender)
3539+ adjust fullSize (ascender - descender) fullVertical
3365 , capital =
3540 , capital =
3366 adjust capitalSize (ascender - newBaseline) capitalVertical
3541 adjust capitalSize (ascender - newBaseline) capitalVertical
@@ -3371,7 +3546,5 @@ adjust size height vertical =
3371 { vertical = vertical
3546 { vertical = vertical
3372 , height =
3547 , height =
3373 height / size
3548 height / size
3376 , size = size
3549 , size = size