Revert "Merge pull request #654 from cortex-engine/master"

This reverts commit 5039134, reversing changes made to db51e28.
haxeui · Nov 22, 2024 · c95480d · c95480d
1 parent 6477808
commit c95480d
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/haxe/ui/styles/elements/RuleElement.hx b/haxe/ui/styles/elements/RuleElement.hx
@@ -25,24 +25,7 @@ class RuleElement {
     }
 
     public function match(d:Component):Bool {
-        var res = 0;
-        for (s in selector.parts) {
-            res += ruleMatch(s, d) ? 1 : 0;
-            if (s.parent != null && d.parentComponent != null)
-                if (s.direct == true)
-                    res += ruleMatch(s.parent, d.parentComponent) ? 1 : 0;
-                else {
-                    var p = d.parentComponent;
-                    while (p != null) {
-                        if (ruleMatch(s.parent, p)) {
-                            res++;
-                            break;
-                        }
-                        p = p.parentComponent;
-                    }
-                }
-        }
-        return res == selector.parts.length;
+        return ruleMatch(selector.parts[selector.parts.length - 1], d);
     }
 
     private static function ruleMatch( c : SelectorPart, d : Component ):Bool {
@@ -76,6 +59,29 @@ class RuleElement {
             }
         }
 
+        if (c.parent != null) {
+            if (c.direct == true) {
+                var p = d.parentComponent;
+                if (p == null) {
+                    return false;
+                }
+                if (!ruleMatch(c.parent, p)) {
+                    return false;
+                }
+            } else {
+                var p = d.parentComponent;
+                while (p != null) {
+                    if (ruleMatch(c.parent, p)) {
+                        break;
+                    }
+                    p = p.parentComponent;
+                }
+                if (p == null) {
+                    return false;
+                }
+            }
+        }
+
         return true;
     }