x4js 1.4.30 → 1.4.33

package/lib/component.js

@@ -1664,6 +1664,11 @@ class Container extends Component {
                 seq = seq.replace(/CTRL/i, '');
                 reseq += 'ctrl+';
             }
+            let cmd = seq.match(/CMD/i);
+            if (cmd) {
+                seq = seq.replace(/CMD/i, '');
+                reseq += 'cmd+';
+            }
             let alt = seq.match(/ALT/i);
             if (alt) {
                 seq = seq.replace(/ALT/i, '');
@@ -1698,6 +1703,9 @@ class Container extends Component {
         if (e.ctrlKey) {
             seq += 'ctrl+';
         }
+        if (e.metaKey) {
+            seq += 'cmd+';
+        }
         if (e.altKey) {
             seq += 'alt+';
         }

package/lib/drawtext.d.ts

@@ -43,5 +43,6 @@ export interface DrawTextStyle {
     rotation?: number;
 }
 export declare function drawText(ctx: CanvasRenderingContext2D, input_Text: string, rc: Rect, drawStyle: DrawTextStyle): {
+    width: number;
     height: number;
 };

package/lib/drawtext.js

@@ -200,7 +200,8 @@ function drawText(ctx, input_Text, rc, drawStyle) {
             break;
     }
     //print all lines of text
-    let idx = 1, yy = 0;
+    //let idx = 1, yy = 0;
+    let maxw = 0;
     textarray.some(line => {
         //console.log( idx++, yy );
         line.space = spaceW;
@@ -208,6 +209,7 @@ function drawText(ctx, input_Text, rc, drawStyle) {
             _justify(line, col_width, spaceW);
         }
         let x = col_left;
+        let cw = 0;
         if (align == 1) {
             x += col_width - line.width;
         }
@@ -234,9 +236,13 @@ function drawText(ctx, input_Text, rc, drawStyle) {
             ctx.stroke( );*/
             ctx.fillText(w.text, x, y);
             x += w.width + line.space;
+            cw += w.width + line.space;
         });
         y += lineHeight;
-        yy += lineHeight;
+        //yy += lineHeight;
+        if (maxw < cw) {
+            maxw = cw;
+        }
         if (y > (rc.bottom + lineHeight)) {
             y = col_top;
             col_left += col_width + gap;
@@ -248,7 +254,7 @@ function drawText(ctx, input_Text, rc, drawStyle) {
     ctx.restore();
     //console.timeEnd( 'drawtext' );
     // todo autogrow + multi-columns
-    return { height: (textarray.length + 0.3) * lineHeight };
+    return { width: maxw, height: (textarray.length + 0.3) * lineHeight };
 }
 exports.drawText = drawText;
 // Calculate Height of the font

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x4js",
-	"version": "1.4.30",
+	"version": "1.4.33",
 	"description": "X4js core files",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",

package/src/component.ts

@@ -2251,6 +2251,12 @@ export class Container<P extends ContainerProps = ContainerProps, E extends Cont
 				reseq += 'ctrl+';
 			}
 
+			let cmd = seq.match(/CMD/i);
+			if (cmd) {
+				seq = seq.replace(/CMD/i, '');
+				reseq += 'cmd+';
+			}
+
 			let alt = seq.match(/ALT/i);
 			if (alt) {
 				seq = seq.replace(/ALT/i, '');
@@ -2295,6 +2301,10 @@ export class Container<P extends ContainerProps = ContainerProps, E extends Cont
 			seq += 'ctrl+';
 		}
 
+		if (e.metaKey) {
+			seq += 'cmd+';
+		}
+
 		if (e.altKey) {
 			seq += 'alt+';
 		}

package/src/drawtext.ts

@@ -261,7 +261,9 @@ export function drawText(ctx: CanvasRenderingContext2D, input_Text: string, rc:
 	}
 
 	//print all lines of text
-	let idx = 1, yy = 0;
+	//let idx = 1, yy = 0;
+
+	let maxw = 0;
 	textarray.some( line => {
 
 		//console.log( idx++, yy );
@@ -272,6 +274,8 @@ export function drawText(ctx: CanvasRenderingContext2D, input_Text: string, rc:
 		}
 
 		let x = col_left;
+		let cw = 0;
+
 		if (align == 1) { 
 			x += col_width - line.width; 
 		}
@@ -302,10 +306,15 @@ export function drawText(ctx: CanvasRenderingContext2D, input_Text: string, rc:
 
 			ctx.fillText(w.text, x, y);
 			x += w.width + line.space;
+			cw += w.width + line.space;
 		});
 
 		y += lineHeight;
-		yy += lineHeight;
+		//yy += lineHeight;
+
+		if( maxw<cw ) {
+			maxw = cw;
+		}
 
 		if (y > (rc.bottom+lineHeight) ) {
 			y = col_top;
@@ -321,7 +330,7 @@ export function drawText(ctx: CanvasRenderingContext2D, input_Text: string, rc:
 	//console.timeEnd( 'drawtext' );
 
 	// todo autogrow + multi-columns
-	return { height: (textarray.length+0.3) * lineHeight };
+	return { width: maxw, height: (textarray.length+0.3) * lineHeight };
 }
 
 // Calculate Height of the font

package/tsconfig.json

@@ -9,8 +9,8 @@
 		"module": "commonjs",
 		"strict": true//false,
   	},
-	"include": [
-		"./src/*",
+	"files": [
+		"./src/index.ts",
 	],
 	"typedocOptions": {
         "entryPoints": ["src/index.ts"],