x4js 2.2.62 → 2.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x4js",
-  "version": "2.2.62",
+  "version": "2.2.63",
   "type": "module",
   "main": "src/x4.ts",
   "module": "src/x4.ts",

package/src/components/keyboard/keyboard.module.scss

@@ -33,7 +33,7 @@
 	padding: 8px;
 
 	#kb {
-		width: 100vw;
+		width: 100%;
 		max-width: 800px;
 		zoom: var( --keyboard-zoom );
 	}

package/src/core/core_tools.ts

@@ -114,10 +114,29 @@ export function unsafeHtml(x: string): UnsafeHtml {
 }
 
 export function unsafe(strings: TemplateStringsArray, ...values: any[]): UnsafeHtml {
+
+    const resolve = ( value: any ) : string | UnsafeHtml => {
+        let v: string;
+        if( !value ) {
+            return "";
+        }
+        
+        if( isArray( value ) ) {
+            return value.map( resolve ).join( '' );
+        }
+
+        if ( value instanceof UnsafeHtml ) {
+            return value.toString();
+        }
+
+        return sanitizeHtml(value);
+    }
+
 	const result = strings.reduce((acc, str, i) => {
-		return acc + str + sanitizeHtml(values[i] ?? '');
+        return acc + str + resolve( values[i] );
 	}, '');
-	return unsafeHtml(result);
+
+	return new UnsafeHtml(result);
 }
 
 /**