x4js 1.4.27 → 1.4.30

package/lib/icon.js

@@ -76,7 +76,8 @@ class Loader extends x4events_1.EventSource {
                     if (r.ok) {
                         const svg = await r.text();
                         // check response, must be svg
-                        if (!svg.startsWith("<svg")) {
+                        //TODO: find better
+                        if (!svg.startsWith("<svg") && !svg.startsWith('<?xml')) {
                             console.error("svg loading error: ", svg);
                             this.signal('loaded', EvLoaded(url, ""));
                         }
@@ -180,13 +181,10 @@ class Icon extends component_1.Component {
             let match_url = reUrl.exec(icon);
             if (match_url) {
                 url = trimQuotes(match_url[1].trim());
-                if (url.substring(0, 5) == 'data:') {
-                    this._setSVG(url);
-                    return;
-                }
-                else {
-                    name = url.replace(/[/\\\.\* ]/g, '_');
-                }
+                // this value is escaped				
+                url = url.replaceAll("\\", "");
+                this._setSVG(url);
+                return;
             }
             else {
                 // todo: deprecated

package/lib/tools.js

@@ -300,10 +300,9 @@ exports.escapeHtml = escapeHtml;
  * console.log( removeHtmlTags('<h1>sss</h1>') );
  */
 function removeHtmlTags(unsafe, nl_br = false) {
-    if (!unsafe || unsafe.length == 0) {
-        return unsafe;
+    if (unsafe === undefined || unsafe === null || !isString(unsafe) || unsafe.length == 0) {
+        return "";
     }
-    debugger;
     let ret_val = '';
     for (let i = 0; i < unsafe.length; i++) {
         const ch = unsafe.codePointAt(i);

package/lib/treeview.js

@@ -378,15 +378,14 @@ class TreeView extends layout_1.VLayout {
                         return;
                     }
                 }
-                this.m_selection = { id: nd.id, el: null };
-                this.update();
+                this.selection = nd.id;
+                this.emit('click', (0, x4events_1.EvClick)(nd));
                 this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, nd));
                 return;
             }
             dom = dom.parentElement;
         }
-        this.m_selection = null;
-        this.update();
+        this.selection = null;
         this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, null));
     }
     /**

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.27",
+	"version": "1.4.30",
 	"description": "X4js core files",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",

package/src/treeview.ts

@@ -520,20 +520,19 @@ export class TreeView extends VLayout<TreeViewProps, TreeViewEventMap> {
 						return;
 					}
 				}
-			
-				this.m_selection = { id: nd.id, el: null };
-				this.update( );
 
+				this.selection = nd.id;
+				
+				this.emit('click', EvClick(nd) );
 				this.emit('contextMenu', EvContextMenu(ev, nd));
+				
 				return;
 			}
 
 			dom = dom.parentElement;
 		}
 
-		this.m_selection = null;
-		this.update( );
-
+		this.selection = null;
 		this.emit('contextMenu', EvContextMenu(ev, null));
 	}
 

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 {