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.

Sign up for GitHub

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

feat(vue): revert css match #3528

Merged
merged 2 commits into from
Sep 25, 2023
Merged

feat(vue): revert css match #3528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
865bf66
feat(vue): revert css match
zealotchen0 Sep 23, 2023
b6a02c2
feat(vue): block PseudoClassSelector dynamic
zealotchen0 Sep 23, 2023
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
49 changes: 17 additions & 32 deletions driver/js/packages/hippy-vue/src/renderer/native/style/css-selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class PseudoClassSelector extends SimpleSelector {
super();
this.specificity = 0x00000100;
this.rarity = 0;
this.dynamic = true;
this.dynamic = false;
this.cssPseudoClass = cssPseudoClass;
}

Expand Down Expand Up @@ -457,48 +457,33 @@ class SiblingGroup {
class Selector extends SelectorCore {
constructor(selectors) {
super();
const supportedCombinator = [undefined, ' ', '>', '+', '~'];
let siblingGroup = [];
let lastGroup = [];
const supportedCombinator = [undefined, ' ', '>', '+'];
let siblingGroup;
let lastGroup;
const groups = [];
const selectorList = [...selectors];
const length = selectorList.length - 1;
this.specificity = 0;
this.dynamic = false;

for (let i = length; i >= 0; i--) {
const sel = selectorList[i];
selectors.reverse().forEach((sel) => {
if (supportedCombinator.indexOf(sel.combinator) === -1) {
console.error(`Unsupported combinator "${sel.combinator}".`);
throw new Error(`Unsupported combinator "${sel.combinator}".`);
}

if (sel.combinator === undefined || sel.combinator === ' ') {
groups.push(lastGroup = [(siblingGroup = [])]);
groups.push(lastGroup = [siblingGroup = []]);
}
if (sel.combinator === '>') {
lastGroup.push((siblingGroup = []));
}

this.specificity += sel.specificity;

if (sel.dynamic) {
this.dynamic = true;
lastGroup.push(siblingGroup = []);
}

siblingGroup.push(sel);
}

this.groups = groups.map(g => new ChildGroup(g.map(sg => new SiblingGroup(sg))));
this.last = selectorList[length];
});
this.groups = groups.map(g => new Selector.ChildGroup(g.map(sg => new Selector.SiblingGroup(sg))));
this.last = selectors[0];
this.specificity = selectors.reduce((sum, sel) => sel.specificity + sum, 0);
this.dynamic = selectors.some(sel => sel.dynamic);
}

toString() {
return this.selectors.join('');
}

match(node) {
if (!node) return false;
return this.groups.every((group, i) => {
if (i === 0) {
node = group.match(node);
Expand Down Expand Up @@ -547,7 +532,7 @@ class Selector extends SelectorCore {
return false;
});

// Calculating the right bounds for each selector won't save much
// Calculating the right bounds for each selectors won't save much
if (!mayMatch) {
return false;
}
Expand All @@ -562,12 +547,12 @@ class Selector extends SelectorCore {
continue;
}
const bound = bounds[i];
let node = bound.left;
let leftBound = bound.left;
do {
if (group.mayMatch(node)) {
group.trackChanges(node, map);
if (group.mayMatch(leftBound)) {
group.trackChanges(leftBound, map);
}
} while ((node !== bound.right) && (node = node.parentNode));
} while ((leftBound !== bound.right) && (leftBound = node.parentNode));
}

return mayMatch;
Expand Down