javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 11:01:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(css): parse css selectors with escape sequences (#7689)

Browse Source
This commit is contained in:
Igor Randjelovic
2019-08-26 12:59:03 +02:00
committed by Manol Donev
parent 55c9cc9072
commit 552021373e
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/app/ui/styling/style-tests.ts
View File

@ -198,6 +198,29 @@ export function test_class_selector() {
TKUnit.assert(btnWithNoClass.style.color === undefined, "Color should not have a value"); TKUnit.assert(btnWithNoClass.style.color === undefined, "Color should not have a value");
} }
export function test_class_selector_with_escape_characters() {
let page = helper.getClearCurrentPage();
let btnWithClass1: buttonModule.Button;
let btnWithClass2: buttonModule.Button;
page.css = ".test-1 { color: red; } .test-1\\/2 { color: blue }";
//// Will be styled
btnWithClass1 = new buttonModule.Button();
btnWithClass1.className = "test-1";
btnWithClass2 = new buttonModule.Button();
btnWithClass2.className = "test-1/2";
const stack = new stackModule.StackLayout();
page.content = stack;
stack.addChild(btnWithClass1);
stack.addChild(btnWithClass2);
helper.assertViewColor(btnWithClass1, "#FF0000");
helper.assertViewColor(btnWithClass2, "#0000FF");
}
export function test_multiple_class_selector() { export function test_multiple_class_selector() {
let page = helper.getClearCurrentPage(); let page = helper.getClearCurrentPage();
let btnWithClasses: buttonModule.Button; let btnWithClasses: buttonModule.Button;

8
tns-core-modules/css/parser.ts
View File

@ -546,7 +546,7 @@ function parseArgumentsList<T>(text: string, start: number, argument: (value: st
} }
end = arg.end; end = arg.end;
value.push(arg); value.push(arg);
closingBracketOrCommaRegEx.lastIndex = end; closingBracketOrCommaRegEx.lastIndex = end;
const closingBracketOrComma = closingBracketOrCommaRegEx.exec(text); const closingBracketOrComma = closingBracketOrCommaRegEx.exec(text);
if (closingBracketOrComma) { if (closingBracketOrComma) {
@ -734,7 +734,7 @@ export function parseUniversalSelector(text: string, start: number = 0): Parsed<
return { start, end, value: { type: "*" }}; return { start, end, value: { type: "*" }};
} }
const simpleIdentifierSelectorRegEx = /(#|\.|:|\b)([_-\w][_-\w\d]*)/gy; const simpleIdentifierSelectorRegEx = /(#|\.|:|\b)([_-\w][_-\w\d\\/]*)/gy;
export function parseSimpleIdentifierSelector(text: string, start: number = 0): Parsed<TypeSelector | ClassSelector | IdSelector | PseudoClassSelector> { export function parseSimpleIdentifierSelector(text: string, start: number = 0): Parsed<TypeSelector | ClassSelector | IdSelector | PseudoClassSelector> {
simpleIdentifierSelectorRegEx.lastIndex = start; simpleIdentifierSelectorRegEx.lastIndex = start;
const result = simpleIdentifierSelectorRegEx.exec(text); const result = simpleIdentifierSelectorRegEx.exec(text);
@ -743,7 +743,7 @@ export function parseSimpleIdentifierSelector(text: string, start: number = 0):
} }
const end = simpleIdentifierSelectorRegEx.lastIndex; const end = simpleIdentifierSelectorRegEx.lastIndex;
const type = <"#" | "." | ":" | "">result[1]; const type = <"#" | "." | ":" | "">result[1];
const identifier: string = result[2]; const identifier: string = result[2].replace(/\\/g, "");
const value = <TypeSelector | ClassSelector | IdSelector | PseudoClassSelector>{ type, identifier }; const value = <TypeSelector | ClassSelector | IdSelector | PseudoClassSelector>{ type, identifier };
return { start, end, value }; return { start, end, value };
@ -1617,4 +1617,4 @@ export class CSSNativeScript {
return selectors; return selectors;
} }
} }