Merge branch 'master' into doubleTap-location

dtopuzov · web-flow · commit bf02f7a332ab · 2020-03-10T18:23:49.000+02:00
diff --git a/nativescript-core/css/css-tree-parser.d.ts b/nativescript-core/css/css-tree-parser.d.ts
@@ -0,0 +1 @@
+export declare function cssTreeParse(css: any, source: any): any;
diff --git a/nativescript-core/ui/core/view/view.android.ts b/nativescript-core/ui/core/view/view.android.ts
@@ -1116,7 +1116,7 @@ function createNativePercentLengthProperty(options: NativePercentLengthPropertyO
                 setPercent = options.setPercent || percentNotSupported;
                 options = null;
             }
-            if (length == "auto") { // tslint:disable-line
+            if (length == "auto" || !length) { // tslint:disable-line
                 setPixels(this.nativeViewProtected, auto);
             } else if (typeof length === "number") {
                 setPixels(this.nativeViewProtected, layout.round(layout.toDevicePixels(length)));
diff --git a/nativescript-core/ui/styling/style-scope.ts b/nativescript-core/ui/styling/style-scope.ts
@@ -110,6 +110,19 @@ class CSSSource {
         this.parse();
     }
 
+    public static fromDetect(cssOrAst: any, keyframes: KeyframesMap, fileName?: string): CSSSource {
+        if (typeof cssOrAst === "string") {
+            // raw-loader
+            return CSSSource.fromSource(cssOrAst, keyframes, fileName);
+        } else if (typeof cssOrAst === "object" && cssOrAst.type === "stylesheet" && cssOrAst.stylesheet && cssOrAst.stylesheet.rules) {
+            // css-loader
+            return CSSSource.fromAST(cssOrAst, keyframes, fileName);
+        } else {
+            // css2json-loader
+            return CSSSource.fromSource(cssOrAst.toString(), keyframes, fileName);
+        }
+    }
+
     public static fromURI(uri: string, keyframes: KeyframesMap): CSSSource {
         // webpack modules require all file paths to be relative to /app folder
         const appRelativeUri = CSSSource.pathRelativeToApp(uri);
@@ -119,16 +132,7 @@ class CSSSource {
         try {
             const cssOrAst = global.loadModule(resolvedModuleName, true);
             if (cssOrAst) {
-                if (typeof cssOrAst === "string") {
-                    // raw-loader
-                    return CSSSource.fromSource(cssOrAst, keyframes, resolvedModuleName);
-                } else if (typeof cssOrAst === "object" && cssOrAst.type === "stylesheet" && cssOrAst.stylesheet && cssOrAst.stylesheet.rules) {
-                    // css-loader
-                    return CSSSource.fromAST(cssOrAst, keyframes, resolvedModuleName);
-                } else {
-                    // css2json-loader
-                    return CSSSource.fromSource(cssOrAst.toString(), keyframes, resolvedModuleName);
-                }
+                return CSSSource.fromDetect(cssOrAst, keyframes, resolvedModuleName);
             }
         } catch (e) {
             traceWrite(`Could not load CSS from ${uri}: ${e}`, traceCategories.Error, traceMessageType.error);
@@ -325,7 +329,7 @@ export function removeTaggedAdditionalCSS(tag: String | Number): Boolean {
 }
 
 export function addTaggedAdditionalCSS(cssText: string, tag?: string | Number): Boolean {
-    const parsed: RuleSet[] = CSSSource.fromSource(cssText, applicationKeyframes, undefined).selectors;
+    const parsed: RuleSet[] = CSSSource.fromDetect(cssText, applicationKeyframes, undefined).selectors;
     let changed = false;
     if (parsed && parsed.length) {
         changed = true;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export declare function cssTreeParse(css: any, source: any): any;`
Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ function createNativePercentLengthProperty(options: NativePercentLengthPropertyO`
`1116`	`1116`	`setPercent = options.setPercent \|\| percentNotSupported;`
`1117`	`1117`	`options = null;`
`1118`	`1118`	`}`
`1119`		`- if (length == "auto") { // tslint:disable-line`
	`1119`	`+ if (length == "auto" \|\| !length) { // tslint:disable-line`
`1120`	`1120`	`setPixels(this.nativeViewProtected, auto);`
`1121`	`1121`	`} else if (typeof length === "number") {`
`1122`	`1122`	`setPixels(this.nativeViewProtected, layout.round(layout.toDevicePixels(length)));`