Fix column width issue, add parse number in string

dist/Models/Containers/Column.js

@@ -10,7 +10,21 @@ export class ColumnModel extends ScopeModel {
         this.style = StringUtils.normalize(json.style);
         this.height = StringUtils.normalize(json.height);
         this.verticalContentAlignment = StringUtils.normalize(json.verticalContentAlignment, 'top');
-        this.width = StringUtils.normalize(json.width);
+        if (typeof json.width === 'number') {
+            this.width = json.width < 0 ? 0 : json.width;
+        }
+        else if (typeof json.width === 'string') {
+            let columnWidth = parseInt(json.width, 10);
+            if (isNaN(columnWidth)) {
+                let jsonLowerCase = json.width.toLowerCase();
+                if (jsonLowerCase === 'auto' || jsonLowerCase === 'stretch') {
+                    this.width = jsonLowerCase;
+                }
+            }
+            else {
+                this.width = columnWidth < 0 ? 0 : columnWidth;
+            }
+        }
         if (json.backgroundImage) {
             this.backgroundImage = new BackgroundImageModel(json.backgroundImage, this, this.context);
             this.context.fit = 'background';

dist/Utils/StringUtils.js

@@ -16,14 +16,12 @@ export class StringUtils {
         return valueString;
     }
     static normalize(value, defaultValue) {
-        if (value) {
-            if (typeof value === 'number') {
-                return value < 0 ? 0 : value;
-            }
-            if (typeof value === 'string') {
-                return value.toLocaleLowerCase();
-            }
+        if (value === null || value === undefined) {
+            return defaultValue;
         }
-        return defaultValue;
+        if (typeof value === 'string') {
+            return value.toLowerCase();
+        }
+        return value;
     }
 }

examples/AdaptiveCards/Models/Containers/Column.js

@@ -10,7 +10,21 @@ export class ColumnModel extends ScopeModel {
         this.style = StringUtils.normalize(json.style);
         this.height = StringUtils.normalize(json.height);
         this.verticalContentAlignment = StringUtils.normalize(json.verticalContentAlignment, 'top');
-        this.width = StringUtils.normalize(json.width);
+        if (typeof json.width === 'number') {
+            this.width = json.width < 0 ? 0 : json.width;
+        }
+        else if (typeof json.width === 'string') {
+            let columnWidth = parseInt(json.width, 10);
+            if (isNaN(columnWidth)) {
+                let jsonLowerCase = json.width.toLowerCase();
+                if (jsonLowerCase === 'auto' || jsonLowerCase === 'stretch') {
+                    this.width = jsonLowerCase;
+                }
+            }
+            else {
+                this.width = columnWidth < 0 ? 0 : columnWidth;
+            }
+        }
         if (json.backgroundImage) {
             this.backgroundImage = new BackgroundImageModel(json.backgroundImage, this, this.context);
             this.context.fit = 'background';

examples/AdaptiveCards/Utils/StringUtils.js

@@ -16,14 +16,12 @@ export class StringUtils {
         return valueString;
     }
     static normalize(value, defaultValue) {
-        if (value) {
-            if (typeof value === 'number') {
-                return value < 0 ? 0 : value;
-            }
-            if (typeof value === 'string') {
-                return value.toLocaleLowerCase();
-            }
+        if (value === null || value === undefined) {
+            return defaultValue;
         }
-        return defaultValue;
+        if (typeof value === 'string') {
+            return value.toLowerCase();
+        }
+        return value;
     }
 }

src/Models/Containers/Column.ts

@@ -21,7 +21,20 @@ export class ColumnModel extends ScopeModel {
         this.style = StringUtils.normalize(json.style);
         this.height = StringUtils.normalize(json.height);
         this.verticalContentAlignment = StringUtils.normalize(json.verticalContentAlignment, 'top');
-        this.width = StringUtils.normalize(json.width);
+
+        if (typeof json.width === 'number') {
+            this.width = json.width < 0 ? 0 : json.width;
+        } else if (typeof json.width === 'string') {
+            let columnWidth = parseInt(json.width, 10);	
+            if (isNaN(columnWidth)) {	
+                let jsonLowerCase = json.width.toLowerCase();
+                if (jsonLowerCase === 'auto' || jsonLowerCase === 'stretch') {	
+                    this.width = jsonLowerCase;	
+                }	
+            } else {
+                this.width = columnWidth < 0 ? 0 : columnWidth;
+            }
+        }
 
         if (json.backgroundImage) {
             this.backgroundImage = new BackgroundImageModel(json.backgroundImage, this, this.context);

src/Utils/StringUtils.ts

@@ -16,14 +16,12 @@ export class StringUtils {
     }
 
     public static normalize(value: any, defaultValue?: any): any {
-        if (value) {
-            if (typeof value === 'number') {
-                return value < 0 ? 0 : value;
-            }
-            if (typeof value === 'string') {
-                return value.toLocaleLowerCase();
-            }
+        if (value === null || value === undefined) {
+            return defaultValue;
         }
-        return defaultValue;
+        if (typeof value === 'string') {
+            return value.toLowerCase();
+        }
+        return value;
     }
 }

tool/src/assets/AdaptiveCards/Models/Containers/Column.js

@@ -10,7 +10,21 @@ export class ColumnModel extends ScopeModel {
         this.style = StringUtils.normalize(json.style);
         this.height = StringUtils.normalize(json.height);
         this.verticalContentAlignment = StringUtils.normalize(json.verticalContentAlignment, 'top');
-        this.width = StringUtils.normalize(json.width);
+        if (typeof json.width === 'number') {
+            this.width = json.width < 0 ? 0 : json.width;
+        }
+        else if (typeof json.width === 'string') {
+            let columnWidth = parseInt(json.width, 10);
+            if (isNaN(columnWidth)) {
+                let jsonLowerCase = json.width.toLowerCase();
+                if (jsonLowerCase === 'auto' || jsonLowerCase === 'stretch') {
+                    this.width = jsonLowerCase;
+                }
+            }
+            else {
+                this.width = columnWidth < 0 ? 0 : columnWidth;
+            }
+        }
         if (json.backgroundImage) {
             this.backgroundImage = new BackgroundImageModel(json.backgroundImage, this, this.context);
             this.context.fit = 'background';

tool/src/assets/AdaptiveCards/Utils/StringUtils.js

@@ -16,14 +16,12 @@ export class StringUtils {
         return valueString;
     }
     static normalize(value, defaultValue) {
-        if (value) {
-            if (typeof value === 'number') {
-                return value < 0 ? 0 : value;
-            }
-            if (typeof value === 'string') {
-                return value.toLocaleLowerCase();
-            }
+        if (value === null || value === undefined) {
+            return defaultValue;
         }
-        return defaultValue;
+        if (typeof value === 'string') {
+            return value.toLowerCase();
+        }
+        return value;
     }
 }