x4js 1.4.29 → 1.4.32

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/treeview.js

@@ -379,6 +379,7 @@ class TreeView extends layout_1.VLayout {
                     }
                 }
                 this.selection = nd.id;
+                this.emit('click', (0, x4events_1.EvClick)(nd));
                 this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, nd));
                 return;
             }

package/lib/x4.css

@@ -31,7 +31,9 @@
   --x4-font-size: 13px;
   --x4-base-color: #266888;
   --x4-selection-color: #2458B3;
+  --x4-selection-text: white;
   --x4-hover-color: rgba(36, 88, 179, 0.9);
+  --x4-hover-text: white;
   --x4-mask-color: rgba(36, 88, 179, 0.6);
   --x4-focus-color: #2458B3;
   --x4-error-color: #b92a09;
@@ -758,11 +760,11 @@ textarea::selection {
 }
 .x-list-view .x-list-item:hover {
   background-color: var(--x4-hover-color);
-  color: white;
+  color: var(--x4-hover-text);
 }
 .x-list-view .x-list-item.x-selected {
   background-color: var(--x4-selection-color);
-  color: white;
+  color: var(--x4-selection-text);
 }
 .x-list-view .x-list-item:focus {
   outline: none;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x4js",
-	"version": "1.4.29",
+	"version": "1.4.32",
 	"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/src/treeview.ts

@@ -520,8 +520,10 @@ export class TreeView extends VLayout<TreeViewProps, TreeViewEventMap> {
 						return;
 					}
 				}
-			
+
 				this.selection = nd.id;
+				
+				this.emit('click', EvClick(nd) );
 				this.emit('contextMenu', EvContextMenu(ev, nd));
 				
 				return;

package/src/x4.less

@@ -36,7 +36,11 @@
 	--x4-base-color: #266888;
 	
 	--x4-selection-color: #2458B3;
+	--x4-selection-text: white;
+
 	--x4-hover-color: fadeout( #2458B3, 10% );
+	--x4-hover-text: white;
+
 	--x4-mask-color: fadeout( #2458B3, 40% );
 	--x4-focus-color: #2458B3;
 	--x4-error-color: #b92a09;
@@ -947,12 +951,12 @@ textarea {
 		
 		&:hover {
 			background-color: var( --x4-hover-color );
-			color: white;
+			color: var( --x4-hover-text );
 		}
 		
 		&.x-selected {
 			background-color: var( --x4-selection-color );
-			color: white;
+			color: var( --x4-selection-text );
 		}
 	
 		&:focus {

package/tsconfig.json

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