git.iko.soy/typeable/elm-ui
on master help sign in
Nearbys now rendered last to resolve z-index fighting.
d0d2ab8Matthew Griffith
src/Internal/Model.elm+31−14
compare with master
unifiedsplit
@@ -68,6 +68,7 @@ module Internal.Model exposing
68 , getWidth
68 , getWidth
69 , gridClass
69 , gridClass
70 , htmlClass
70 , htmlClass
71+ , isContent
71 , lengthClassName
72 , lengthClassName
72 , map
73 , map
73 , mapAttr
74 , mapAttr
@@ -110,7 +111,6 @@ module Internal.Model exposing
110 , untransformed
111 , untransformed
111 , unwrapDecorations
112 , unwrapDecorations
112 , unwrapDecsHelper
113 , unwrapDecsHelper
113− , isContent
114 )
114 )
115
115
116{-| -}
116{-| -}
@@ -330,7 +330,6 @@ unstyled =
330 Unstyled << always
330 Unstyled << always
331
331
332
332
333−
334finalizeNode has node attributes children embedMode parentContext =
333finalizeNode has node attributes children embedMode parentContext =
335 let
334 let
336 createNode nodeName attrs =
335 createNode nodeName attrs =
@@ -1448,13 +1447,6 @@ untransformed =
1448 Untransformed
1447 Untransformed
1449
1448
1450
1449
1451−
1452−-- space =
1453−-- VirtualDom.text " "
1454−-- keyedSpace =
1455−-- ( " ", space )
1456−
1457−
1458createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1450createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
1459createElement context children rendered =
1451createElement context children rendered =
1460 let
1452 let
@@ -1621,7 +1613,14 @@ createElement context children rendered =
1621 (finalizeNode rendered.has
1613 (finalizeNode rendered.has
1622 rendered.node
1614 rendered.node
1623 rendered.attributes
1615 rendered.attributes
1616+ (Keyed <|
1617+ keyed
1618+ ++ List.map
1619+ (\x ->
1624− (Keyed <| List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed)
1620+ ( "nearby-elements-pls", x )
1621+ )
1622+ rendered.children
1623+ )
1625 NoStyleSheet
1624 NoStyleSheet
1626 )
1625 )
1627
1626
@@ -1629,7 +1628,19 @@ createElement context children rendered =
1629 Styled
1628 Styled
1630 { styles = allStyles
1629 { styles = allStyles
1631 , html =
1630 , html =
1632− finalizeNode rendered.has rendered.node rendered.attributes (Keyed (List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed))
1631+ finalizeNode
1632+ rendered.has
1633+ rendered.node
1634+ rendered.attributes
1635+ (Keyed
1636+ (keyed
1637+ ++ List.map
1638+ (\x ->
1639+ ( "nearby-elements-pls", x )
1640+ )
1641+ rendered.children
1642+ )
1643+ )
1633 }
1644 }
1634
1645
1635 Unkeyed unkeyedChildren ->
1646 Unkeyed unkeyedChildren ->
@@ -1646,17 +1657,23 @@ createElement context children rendered =
1646 case newStyles of
1657 case newStyles of
1647 [] ->
1658 [] ->
1648 Unstyled
1659 Unstyled
1649− (finalizeNode rendered.has
1660+ (finalizeNode
1661+ rendered.has
1650 rendered.node
1662 rendered.node
1651 rendered.attributes
1663 rendered.attributes
1652− (Unkeyed <| rendered.children ++ unkeyed)
1664+ (Unkeyed <| unkeyed ++ rendered.children)
1653 NoStyleSheet
1665 NoStyleSheet
1654 )
1666 )
1655
1667
1656 allStyles ->
1668 allStyles ->
1657 Styled
1669 Styled
1658 { styles = allStyles
1670 { styles = allStyles
1659− , html = finalizeNode rendered.has rendered.node rendered.attributes (Unkeyed (rendered.children ++ unkeyed))
1671+ , html =
1672+ finalizeNode
1673+ rendered.has
1674+ rendered.node
1675+ rendered.attributes
1676+ (Unkeyed (unkeyed ++ rendered.children))
1660 }
1677 }
1661
1678
1662
1679
src/Internal/Style.elm−2
@@ -912,7 +912,6 @@ baseSheet =
912 , Child (dot classes.inFront)
912 , Child (dot classes.inFront)
913 [ Descriptor (dot classes.nearby)
913 [ Descriptor (dot classes.nearby)
914 [ Prop "position" "fixed"
914 [ Prop "position" "fixed"
915− , Prop "z-index" "20"
916 ]
915 ]
917 ]
916 ]
918 ]
917 ]
@@ -1002,7 +1001,6 @@ baseSheet =
1002 , Prop "left" "0"
1001 , Prop "left" "0"
1003 , Prop "top" "0"
1002 , Prop "top" "0"
1004 , Prop "margin" "0 !important"
1003 , Prop "margin" "0 !important"
1005− , Prop "z-index" "10"
1006 , Prop "pointer-events" "none"
1004 , Prop "pointer-events" "none"
1007 , Child "*"
1005 , Child "*"
1008 [ Prop "pointer-events" "auto"
1006 [ Prop "pointer-events" "auto"