Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(selectors): optimize old->new conversion for css (#4672)

Browse source
This commit is contained in:
Dmitry Gozman 2020-12-10 15:03:02 -08:00 committed by GitHub
parent e97ab7e42f
commit b9c959768c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/server/common/selectorParser.ts
View file

@ -63,21 +63,30 @@ export function parseSelector(selector: string, customNames: Set<string>): Parse
wrapInLight = true; wrapInLight = true;
name = name.substring(0, name.indexOf(':')); name = name.substring(0, name.indexOf(':'));
} }
let simple: CSSSimpleSelector;
if (name === 'css') { if (name === 'css') {
const parsed = parseCSS(part.body, customNames); const parsed = parseCSS(part.body, customNames);
parsed.names.forEach(name => names.add(name)); parsed.names.forEach(name => names.add(name));
simple = callWith('is', parsed.selector); if (wrapInLight || parsed.selector.length > 1) {
let simple = callWith('is', parsed.selector);
if (wrapInLight)
simple = callWith('light', [simpleToComplex(simple)]);
result.simples.push({ selector: simple, combinator: '' });
} else {
result.simples.push(...parsed.selector[0].simples);
}
} else if (name === 'text') { } else if (name === 'text') {
simple = textSelectorToSimple(part.body); let simple = textSelectorToSimple(part.body);
if (result.simples.length) if (result.simples.length)
result.simples[result.simples.length - 1].combinator = '>='; result.simples[result.simples.length - 1].combinator = '>=';
if (wrapInLight)
simple = callWith('light', [simpleToComplex(simple)]);
result.simples.push({ selector: simple, combinator: '' });
} else { } else {
simple = callWith(name, [part.body]); let simple = callWith(name, [part.body]);
if (wrapInLight)
simple = callWith('light', [simpleToComplex(simple)]);
result.simples.push({ selector: simple, combinator: '' });
} }
if (wrapInLight)
simple = callWith('light', [simpleToComplex(simple)]);
result.simples.push({ selector: simple, combinator: '' });
} }
return result; return result;
}; };

14
test/selectors-css.spec.ts
View file

@ -146,6 +146,20 @@ it('should keep dom order with comma separated list', async ({page}) => {
expect(await page.$$eval(`css=section >> *css=div,span >> css=y`, els => els.map(e => e.nodeName).join(','))).toBe('SPAN,DIV'); expect(await page.$$eval(`css=section >> *css=div,span >> css=y`, els => els.map(e => e.nodeName).join(','))).toBe('SPAN,DIV');
}); });
it('should work with comma separated list in various positions', async ({page}) => {
await page.setContent(`<section><span><div><x></x><y></y></div></span></section>`);
expect(await page.$$eval(`css=span,div >> css=x,y`, els => els.map(e => e.nodeName).join(','))).toBe('X,Y');
expect(await page.$$eval(`css=span,div >> css=x`, els => els.map(e => e.nodeName).join(','))).toBe('X');
expect(await page.$$eval(`css=div >> css=x,y`, els => els.map(e => e.nodeName).join(','))).toBe('X,Y');
expect(await page.$$eval(`css=div >> css=x`, els => els.map(e => e.nodeName).join(','))).toBe('X');
expect(await page.$$eval(`css=section >> css=div >> css=x`, els => els.map(e => e.nodeName).join(','))).toBe('X');
expect(await page.$$eval(`css=section >> css=span >> css=div >> css=y`, els => els.map(e => e.nodeName).join(','))).toBe('Y');
expect(await page.$$eval(`css=section >> css=div >> css=x,y`, els => els.map(e => e.nodeName).join(','))).toBe('X,Y');
expect(await page.$$eval(`css=section >> css=div,span >> css=x,y`, els => els.map(e => e.nodeName).join(','))).toBe('X,Y');
expect(await page.$$eval(`css=section >> css=span >> css=x,y`, els => els.map(e => e.nodeName).join(','))).toBe('X,Y');
});
it('should work with comma inside text', async ({page}) => { it('should work with comma inside text', async ({page}) => {
await page.setContent(`<span></span><div attr="hello,world!"></div>`); await page.setContent(`<span></span><div attr="hello,world!"></div>`);
expect(await page.$eval(`css=div[attr="hello,world!"]`, e => e.outerHTML)).toBe('<div attr="hello,world!"></div>'); expect(await page.$eval(`css=div[attr="hello,world!"]`, e => e.outerHTML)).toBe('<div attr="hello,world!"></div>');