Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] fix: checking for style updates of sibling nodes. #403

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 129 additions & 0 deletions integration_tests/specs/css/css-selectors/child-selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,4 +304,133 @@ describe('css child selector', () => {
document.body.appendChild(p9);
await snapshot();
});

it("015", async () => {
const style = (
<style>{`
.list {
align-items: center;
border-bottom: solid 1px #f2f2f2;
display: flex;
flex-shrink: 0;
overflow-x: auto;
padding: 24px 54px;
white-space: nowrap;
width: 100%;
}
.item {
flex-shrink: 0;
height: 40px;
width: 40px;
background: black;
margin-right: 20px;
position: relative;
color: white;
}
.item:last-child {
margin-right: 0px;
}
`}</style>
);
const div = <div class='list'></div>;
const item1 = <div class='item'> 1 </div>;
const item2 = <div class='item'> 2 </div>;
div.appendChild(item1);
div.appendChild(item2);
document.head.appendChild(style);
document.body.appendChild(div);
await snapshot();

const item3 = <div class='item'> 3 </div>;
div.appendChild(item3);
await snapshot(0.5);

div.removeChild(item2);
await snapshot(0.5);
});


it("016", async () => {
const style = (
<style>{`
.list {
align-items: center;
border: #000000;
display: flex;
flex-shrink: 0;
overflow-x: auto;
padding: 24px 54px;
white-space: nowrap;
width: 100%;
}
.item {
flex-shrink: 0;
height: 40px;
width: 40px;
background: black;
margin-left: 20px;
position: relative;
color: white;
}
.item:first-child {
margin-left: 0px;
}
`}</style>
);
const div = <div class='list'></div>;
const item1 = <div class='item'> 1 </div>;
const item2 = <div class='item'> 2 </div>;
div.appendChild(item1);
div.appendChild(item2);
document.head.appendChild(style);
document.body.appendChild(div);
await snapshot();

const item3 = <div class='item'> 3 </div>;
div.appendChild(item3);
await snapshot(0.5);

div.removeChild(item1);
await snapshot(0.5);
});

fit("017", async () => {
const style = (
<style>{`
.list {
align-items: center;
border: #000000;
display: flex;
flex-shrink: 0;
overflow-x: auto;
padding: 24px 54px;
white-space: nowrap;
width: 100%;
}
.item {
flex-shrink: 0;
height: 40px;
width: 40px;
background: red;
margin-left: 20px;
position: relative;
color: white;
}
.item:only-child {
background: green;
}
`}</style>
);
const div = <div class='list'></div>;
const item1 = <div class='item'> 1 </div>;
const item2 = <div class='item'> 2 </div>;
div.appendChild(item1);
div.appendChild(item2);
document.head.appendChild(style);
document.body.appendChild(div);
await snapshot();

div.removeChild(item2);
await snapshot(0.5);
});
});
25 changes: 23 additions & 2 deletions webf/lib/src/css/query_selector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,19 @@ class SelectorEvaluator extends SelectorVisitor {

// http://dev.w3.org/csswg/selectors-4/#the-first-child-pseudo
case 'first-child':
if (_element!.parentElement != null) {
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByFirstChildRules);
}
if (_element!.previousElementSibling != null) {
return _element!.previousElementSibling is HeadElement;
}
return true;

// http://dev.w3.org/csswg/selectors-4/#the-last-child-pseudo
case 'last-child':
if (_element!.nextSibling != null && _element!.parentElement != null) {
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByLastChildRules);
}
return _element!.nextSibling == null;

//http://drafts.csswg.org/selectors-4/#first-of-type-pseudo
Expand All @@ -218,14 +224,23 @@ class SelectorEvaluator extends SelectorVisitor {
var isLast = index == children.length - 1;

if (isFirst && node.name == 'first-of-type') {
if (_element!.parentElement != null) {
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByForwardPositionalRules);
}
return true;
}

if (isLast && node.name == 'last-of-type') {
if (_element!.parentElement != null) {
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByBackwardPositionalRules);
}
return true;
}

if (isFirst && isLast && node.name == 'only-of-type') {
if (_element!.parentElement != null) {
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByFirstChildRules);
}
return true;
}

Expand All @@ -235,8 +250,14 @@ class SelectorEvaluator extends SelectorVisitor {
break;
// http://dev.w3.org/csswg/selectors-4/#the-only-child-pseudo
case 'only-child':
return _element!.previousSibling == null && _element!.nextSibling == null;

if (_element!.parentElement != null) {
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByFirstChildRules);
_element!.parentElement!.addFlag(DynamicRestyleFlag.ChildrenAffectedByLastChildRules);
}
if (_element!.previousSibling == null && _element!.nextSibling == null) {
return true;
}
return false;
// http://dev.w3.org/csswg/selectors-4/#link
case 'link':
return _element!.attributes['href'] != null;
Expand Down
94 changes: 94 additions & 0 deletions webf/lib/src/dom/container_node.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,27 @@ import 'package:webf/src/dom/node_traversal.dart';

typedef InsertNodeHandler = void Function(ContainerNode container, Node child, Node? next);

enum DynamicRestyleFlag {
ChildrenAffectedByFirstChildRules,
ChildrenAffectedByLastChildRules,
ChildrenAffectedByDirectAdjacentRules,
ChildrenAffectedByForwardPositionalRules,
ChildrenAffectedByBackwardPositionalRules,
}

extension StructuralRules on DynamicRestyleFlag {
bool childrenAffectedByStructuralRules() {
if (this == DynamicRestyleFlag.ChildrenAffectedByFirstChildRules ||
this == DynamicRestyleFlag.ChildrenAffectedByLastChildRules ||
this == DynamicRestyleFlag.ChildrenAffectedByDirectAdjacentRules ||
this == DynamicRestyleFlag.ChildrenAffectedByForwardPositionalRules ||
this == DynamicRestyleFlag.ChildrenAffectedByBackwardPositionalRules) {
return true;
}
return false;
}
}

bool collectChildrenAndRemoveFromOldParent(Node node, List<Node> nodes) {
if (node is DocumentFragment) {
getChildNodes(node, nodes);
Expand All @@ -34,6 +55,15 @@ void getChildNodes(ContainerNode node, List<Node> nodes) {
abstract class ContainerNode extends Node {
ContainerNode(NodeType nodeType, [BindingContext? context]) : super(nodeType, context);

List<DynamicRestyleFlag>? restyleFlags;

void addFlag(DynamicRestyleFlag flag) {
restyleFlags ??= [];
if (restyleFlags?.contains(flag) == false) {
restyleFlags?.add(flag);
}
}

void _adoptAndAppendChild(ContainerNode container, Node child, Node? next) {
child.parentOrShadowHostNode = this;
if (lastChild != null) {
Expand Down Expand Up @@ -333,6 +363,70 @@ abstract class ContainerNode extends Node {
}
}

void checkForSiblingStyleChanges(Element parent, bool isRemoved, Node? nodeBeforeChange, Node? nodeAfterChange) {

if (!isRendererAttached) {
return;
}

final elementBeforeChange = nodeBeforeChange as Element?;
final elementAfterChange = nodeAfterChange as Element?;

// :first-child. In the parser callback case, we don't have to check anything, since we were right the first time.
// In the DOM case, we only need to do something if |afterChange| is not 0.
// |afterChange| is 0 in the parser case, so it works out that we'll skip this block.
if (elementAfterChange != null &&
restyleFlags?.contains(DynamicRestyleFlag.ChildrenAffectedByFirstChildRules) == true) {
// Find our new first child.
final newFirstElement = parent.firstChild as Element?;

// This is the insert/append case.
if (newFirstElement != elementAfterChange && elementAfterChange.isRendererAttached) {
elementAfterChange.recalculateStyle();
}

if (newFirstElement != null && isRemoved && newFirstElement == elementAfterChange) {
newFirstElement.recalculateStyle();
}
}

if (elementBeforeChange != null &&
restyleFlags?.contains(DynamicRestyleFlag.ChildrenAffectedByLastChildRules) == true) {
// Find our new first child.
final newLastElement = parent.lastChild as Element?;

// This is the insert/append case.
if (newLastElement != elementBeforeChange && elementBeforeChange.isRendererAttached) {
elementBeforeChange.recalculateStyle();
}

if (newLastElement != null && isRemoved && newLastElement == elementBeforeChange) {
newLastElement.recalculateStyle();
}
}

// The + selector. We need to invalidate the first element following the insertion point. It is the only possible element
// that could be affected by this DOM change.
if (restyleFlags?.contains(DynamicRestyleFlag.ChildrenAffectedByDirectAdjacentRules) == true && elementAfterChange != null) {
elementAfterChange.recalculateStyle();
}

// Forward positional selectors include the ~ selector, nth-child, nth-of-type, first-of-type and only-of-type.
// Backward positional selectors include nth-last-child, nth-last-of-type, last-of-type and only-of-type.
// We have to invalidate everything following the insertion point in the forward case, and everything before the insertion point in the
// backward case.
// |afterChange| is 0 in the parser callback case, so we won't do any work for the forward case if we don't have to.
// For performance reasons we just mark the parent node as changed, since we don't want to make childrenChanged O(n^2) by crawling all our kids
// here. recalcStyle will then force a walk of the children when it sees that this has happened.
if (elementAfterChange != null &&
restyleFlags?.contains(DynamicRestyleFlag.ChildrenAffectedByForwardPositionalRules) == true) {
parent.recalculateStyle();
} else if (elementBeforeChange != null &&
restyleFlags?.contains(DynamicRestyleFlag.ChildrenAffectedByBackwardPositionalRules) == true) {
parent.recalculateStyle();
}
}

Node? _firstChild;

@override
Expand Down
15 changes: 15 additions & 0 deletions webf/lib/src/dom/element.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,20 @@ abstract class Element extends ContainerNode with ElementBase, ElementEventMixin
}
}

@override
void childrenChanged(ChildrenChange change) {
super.childrenChanged(change);

if (change.byParser != ChildrenChangeSource.PARSER && change.isChildElementChange()) {
final changedElement = change.siblingChanged as Element?;
final removed = change.type == ChildrenChangeType.ELEMENT_REMOVED;
if (changedElement != null) {
checkForSiblingStyleChanges(this, removed, change.siblingBeforeChange,
change.siblingAfterChange);
}
}
}

void _updateNameMap(String? newName, {String? oldName}) {
if (oldName != null && oldName.isNotEmpty) {
final elements = ownerDocument.elementsByName[oldName];
Expand Down Expand Up @@ -1796,6 +1810,7 @@ abstract class Element extends ContainerNode with ElementBase, ElementEventMixin
}

void _applySheetStyle(CSSStyleDeclaration style) {

CSSStyleDeclaration matchRule = _elementRuleCollector.collectionFromRuleSet(ownerDocument.ruleSet, this);
style.union(matchRule);
}
Expand Down
Loading