git.iko.soy/typeable/elm-ui
on master help sign in
Nearbys now rendered last to resolve z-index fighting.
commitd0d2ab8e2f1a0d39d25dee2ffb218239e69a672d authorMatthew Griffith <mdg.griffith@gmail.com> dateMon 17 Sep 2018, 14:27 (8 years ago) parent6a6c6b4
2 files changed+31−16
src/Internal/Model.elm+31−14 src/Internal/Style.elm−2
src/Internal/Model.elm+31−14
@@ -68,6 +68,7 @@ module Internal.Model exposing
6868 , getWidth
6969 , gridClass
7070 , htmlClass
71+ , isContent
7172 , lengthClassName
7273 , map
7374 , mapAttr
@@ -110,7 +111,6 @@ module Internal.Model exposing
110111 , untransformed
111112 , unwrapDecorations
112113 , unwrapDecsHelper
113− , isContent
114114 )
115115
116116{-| -}
@@ -330,7 +330,6 @@ unstyled =
330330 Unstyled << always
331331
332332
333−
334333finalizeNode has node attributes children embedMode parentContext =
335334 let
336335 createNode nodeName attrs =
@@ -1448,13 +1447,6 @@ untransformed =
14481447 Untransformed
14491448
14501449
1451−
1452−-- space =
1453−-- VirtualDom.text " "
1454−-- keyedSpace =
1455−-- ( " ", space )
1456−
1457−
14581450createElement : LayoutContext -> Children (Element msg) -> Gathered msg -> Element msg
14591451createElement context children rendered =
14601452 let
@@ -1621,7 +1613,14 @@ createElement context children rendered =
16211613 (finalizeNode rendered.has
16221614 rendered.node
16231615 rendered.attributes
1624− (Keyed <| List.map (\x -> ( "nearby-elements-pls", x )) rendered.children ++ keyed)
1616+ (Keyed <|
1617+ keyed
1618+ ++ List.map
1619+ (\x ->
1620+ ( "nearby-elements-pls", x )
1621+ )
1622+ rendered.children
1623+ )
16251624 NoStyleSheet
16261625 )
16271626
@@ -1629,7 +1628,19 @@ createElement context children rendered =
16291628 Styled
16301629 { styles = allStyles
16311630 , 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+ )
16331644 }
16341645
16351646 Unkeyed unkeyedChildren ->
@@ -1646,17 +1657,23 @@ createElement context children rendered =
16461657 case newStyles of
16471658 [] ->
16481659 Unstyled
1649− (finalizeNode rendered.has
1660+ (finalizeNode
1661+ rendered.has
16501662 rendered.node
16511663 rendered.attributes
1652− (Unkeyed <| rendered.children ++ unkeyed)
1664+ (Unkeyed <| unkeyed ++ rendered.children)
16531665 NoStyleSheet
16541666 )
16551667
16561668 allStyles ->
16571669 Styled
16581670 { 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))
16601677 }
16611678
16621679
src/Internal/Style.elm−2
@@ -912,7 +912,6 @@ baseSheet =
912912 , Child (dot classes.inFront)
913913 [ Descriptor (dot classes.nearby)
914914 [ Prop "position" "fixed"
915− , Prop "z-index" "20"
916915 ]
917916 ]
918917 ]
@@ -1002,7 +1001,6 @@ baseSheet =
10021001 , Prop "left" "0"
10031002 , Prop "top" "0"
10041003 , Prop "margin" "0 !important"
1005− , Prop "z-index" "10"
10061004 , Prop "pointer-events" "none"
10071005 , Child "*"
10081006 [ Prop "pointer-events" "auto"