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

Jump to bottom

Adding attribute selector with variable concatenation feature #4261

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding attribute selector with variable concatenation feature #4261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions packages/less/src/less/parser/parser.js
View file
Open in desktop
Expand Up @@ -1448,8 +1448,18 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
//
let cif;

if (!(key = entities.variableCurly())) {
key = expect(/^(?:[_A-Za-z0-9-*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/);
let keys;
while((key = entities.variableCurly()) || (key = parserInput.$re(/^(?:[_A-Za-z0-9-*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/))){
if(keys){
keys.push(key);
}else{
keys = [key];
}
key = null
}

if(keys.length == 0){
error('unexpected token');
}

op = parserInput.$re(/^[|~*$^]?=/);
Expand All @@ -1462,7 +1472,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {

expectChar(']');

return new(tree.Attribute)(key, op, val, cif);
return new(tree.Attribute)(keys, op, val, cif);
},

//
Expand Down
11 changes: 9 additions & 2 deletions packages/less/src/less/tree/attribute.js
View file
Open in desktop
Expand Up @@ -11,8 +11,12 @@ Attribute.prototype = Object.assign(new Node(), {
type: 'Attribute',

eval(context) {
let key = [];
for(let i=0;i<this.key.length;++i){
key.push(this.key[i].eval?this.key[i].eval(context):this.key[i]);
}
return new Attribute(
this.key.eval ? this.key.eval(context) : this.key,
key,
this.op,
(this.value && this.value.eval) ? this.value.eval(context) : this.value,
this.cif
Expand All @@ -24,7 +28,10 @@ Attribute.prototype = Object.assign(new Node(), {
},

toCSS(context) {
let value = this.key.toCSS ? this.key.toCSS(context) : this.key;
let value = '';
for(let i=0;i<this.key.length;++i){
value += this.key[i].toCSS ? this.key[i].toCSS(context) : this.key[i];
}

if (this.op) {
value += this.op;
Expand Down
10 changes: 9 additions & 1 deletion packages/less/src/less/visitors/extend-visitor.js
View file
Open in desktop
Expand Up @@ -375,9 +375,17 @@ class ProcessExtendsVisitor {
return elementValue1 === elementValue2;
}
if (elementValue1 instanceof tree.Attribute) {
if (elementValue1.op !== elementValue2.op || elementValue1.key !== elementValue2.key) {
if (elementValue1.op !== elementValue2.op) {
return false;
}
if (elementValue1.key.length !== elementValue2.key.length) {
return false;
}
for(let i=0;i<elementValue1.key.length;++i){
if(elementValue1.key[i] !== elementValue2.key[i]){
return false;
}
}
if (!elementValue1.value || !elementValue2.value) {
if (elementValue1.value || elementValue2.value) {
return false;
Expand Down
5 changes: 5 additions & 0 deletions packages/test-data/css/_main/selectors.css
View file
Open in desktop
Expand Up @@ -143,6 +143,11 @@ p a span {
[p] {
attributes: yes;
}
[p-attr^="val3"],
[p-attr=3],
[p-attr] {
attributes: yes;
}
/**
* https://www.w3.org/TR/selectors-4/#attribute-case
*/
Expand Down
5 changes: 5 additions & 0 deletions packages/test-data/less/_main/selectors.less
View file
Open in desktop
Expand Up @@ -146,6 +146,11 @@ a {
[@{prop}] {
attributes: yes;
}
[@{prop}-attr^="val@{num}"],
[@{prop}-attr=@{num}],
[@{prop}-attr] {
attributes: yes;
}

/**
* https://www.w3.org/TR/selectors-4/#attribute-case
Expand Down