x4js 1.5.16 → 1.5.18

package/lib/cjs/app_sockets.js

@@ -0,0 +1,74 @@
+"use strict";
+/**
+*  ___  ___ __
+*  \  \/  /  / _
+*   \    /  /_| |_
+*   /    \____   _|
+*  /__/\__\   |_|
+*
+* @file app_sockets.ts
+* @author Etienne Cochard
+*
+* Copyright (c) 2019-2022 R-libre ingenierie
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+* of the Software, and to permit persons to whom the Software is furnished to do so,
+* subject to the following conditions:
+* The above copyright notice and this permission notice shall be included in all copies
+* or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupWSMessaging = void 0;
+const application_1 = require("./application");
+/**
+ * WEB SOCKETS
+ *
+ * les messages reçus par l'application sont retransmis au websocket.
+ * comme ça, tous les clients connectés sur le serveur recevront une copie du message.
+ * ca permet de mettre a jour les clients dynamiquement
+ *
+ */
+const msg_sent = Symbol('msg_sent');
+function setupWSMessaging(closeCB) {
+    const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+    const sockets = new WebSocket(`${protocol}${window.location.hostname}:${window.location.port}`, 'messaging');
+    const app = application_1.Application.instance();
+    // pour tous les messages recus par l'application
+    //	on transmet aux autres
+    app.on('global', (e) => {
+        if (e[msg_sent]) {
+            return;
+        }
+        sockets.send(JSON.stringify({
+            msg: e.msg,
+            params: e.params,
+        }));
+    });
+    // reception d'un message
+    sockets.onmessage = (e) => {
+        if (e.data != 'ping') {
+            const message = JSON.parse(e.data);
+            message[msg_sent] = true;
+            app.signal('global', message);
+        }
+    };
+    // perte du socket
+    sockets.onclose = (ev) => {
+        console.log('websocket closed:', ev);
+        closeCB();
+    };
+    sockets.onerror = (ev) => {
+        console.log('websocket error:', ev);
+    };
+}
+exports.setupWSMessaging = setupWSMessaging;

package/lib/cjs/index.js

@@ -99,4 +99,5 @@ __exportStar(require("./tooltips"), exports);
 __exportStar(require("./treeview"), exports);
 __exportStar(require("./x4events"), exports);
 __exportStar(require("./x4react"), exports);
+__exportStar(require("./app_sockets"), exports);
 __exportStar(require("./version"), exports);

package/lib/cjs/treeview.js

@@ -297,21 +297,36 @@ class TreeView extends layout_1.VLayout {
         this.select(id, false);
     }
     /**
-     * idem selection = xx but with a notification
-     * @param id
+     * care, component should have been created, to select an item at startup,
+     * use something like
+     * componentCreated( ) {
+     * 	mytree.select( id );
+     * }
      */
-    select(id, notify = false) {
-        if (id === null || id === undefined) {
-            this._selectItem(null, null);
+    select(id, notify = true) {
+        var _a;
+        if ((_a = this.m_selection) === null || _a === void 0 ? void 0 : _a.el) {
+            this.m_selection.el.removeClass('selected');
         }
-        else {
-            if (isFunction(this.m_props.items)) {
-                this.m_defer_sel = id;
+        this.m_selection = null;
+        if (id !== undefined) {
+            const { node: sel } = this._getNode(id);
+            if (sel) {
+                this.m_selection = {
+                    id: id,
+                    el: sel
+                };
+                sel.addClass('selected');
+                sel.scrollIntoView();
+                if (notify) {
+                    let nd = sel.getData('node');
+                    this.emit('selectionchange', (0, x4events_1.EvSelectionChange)(nd));
+                }
             }
-            else {
-                let item = this.m_props.items.find((item) => item.id == id);
-                let citem = this._findItemWithId(item.id);
-                this._selectItem(item, citem, notify);
+        }
+        else {
+            if (notify) {
+                this.emit('selectionchange', (0, x4events_1.EvSelectionChange)(null));
             }
         }
     }

package/lib/cjs/version.js

@@ -29,4 +29,4 @@
 **/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x4js_version = void 0;
-exports.x4js_version = "1.5.16";
+exports.x4js_version = "1.5.18";

package/lib/esm/app_sockets.js

@@ -0,0 +1,70 @@
+/**
+*  ___  ___ __
+*  \  \/  /  / _
+*   \    /  /_| |_
+*   /    \____   _|
+*  /__/\__\   |_|
+*
+* @file app_sockets.ts
+* @author Etienne Cochard
+*
+* Copyright (c) 2019-2022 R-libre ingenierie
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+* of the Software, and to permit persons to whom the Software is furnished to do so,
+* subject to the following conditions:
+* The above copyright notice and this permission notice shall be included in all copies
+* or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**/
+import { Application } from "./application";
+/**
+ * WEB SOCKETS
+ *
+ * les messages reçus par l'application sont retransmis au websocket.
+ * comme ça, tous les clients connectés sur le serveur recevront une copie du message.
+ * ca permet de mettre a jour les clients dynamiquement
+ *
+ */
+const msg_sent = Symbol('msg_sent');
+export function setupWSMessaging(closeCB) {
+    const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+    const sockets = new WebSocket(`${protocol}${window.location.hostname}:${window.location.port}`, 'messaging');
+    const app = Application.instance();
+    // pour tous les messages recus par l'application
+    //	on transmet aux autres
+    app.on('global', (e) => {
+        if (e[msg_sent]) {
+            return;
+        }
+        sockets.send(JSON.stringify({
+            msg: e.msg,
+            params: e.params,
+        }));
+    });
+    // reception d'un message
+    sockets.onmessage = (e) => {
+        if (e.data != 'ping') {
+            const message = JSON.parse(e.data);
+            message[msg_sent] = true;
+            app.signal('global', message);
+        }
+    };
+    // perte du socket
+    sockets.onclose = (ev) => {
+        console.log('websocket closed:', ev);
+        closeCB();
+    };
+    sockets.onerror = (ev) => {
+        console.log('websocket error:', ev);
+    };
+}

package/lib/esm/index.mjs

@@ -83,4 +83,5 @@ export * from "./tooltips";
 export * from "./treeview";
 export * from "./x4events";
 export * from "./x4react";
+export * from "./app_sockets";
 export * from "./version";

package/lib/esm/treeview.js

@@ -293,21 +293,35 @@ export class TreeView extends VLayout {
         this.select(id, false);
     }
     /**
-     * idem selection = xx but with a notification
-     * @param id
+     * care, component should have been created, to select an item at startup,
+     * use something like
+     * componentCreated( ) {
+     * 	mytree.select( id );
+     * }
      */
-    select(id, notify = false) {
-        if (id === null || id === undefined) {
-            this._selectItem(null, null);
+    select(id, notify = true) {
+        if (this.m_selection?.el) {
+            this.m_selection.el.removeClass('selected');
         }
-        else {
-            if (isFunction(this.m_props.items)) {
-                this.m_defer_sel = id;
+        this.m_selection = null;
+        if (id !== undefined) {
+            const { node: sel } = this._getNode(id);
+            if (sel) {
+                this.m_selection = {
+                    id: id,
+                    el: sel
+                };
+                sel.addClass('selected');
+                sel.scrollIntoView();
+                if (notify) {
+                    let nd = sel.getData('node');
+                    this.emit('selectionchange', EvSelectionChange(nd));
+                }
             }
-            else {
-                let item = this.m_props.items.find((item) => item.id == id);
-                let citem = this._findItemWithId(item.id);
-                this._selectItem(item, citem, notify);
+        }
+        else {
+            if (notify) {
+                this.emit('selectionchange', EvSelectionChange(null));
             }
         }
     }

package/lib/esm/version.js

@@ -26,4 +26,4 @@
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
-export const x4js_version = "1.5.16";
+export const x4js_version = "1.5.18";

package/lib/{src/version.ts → types/app_sockets.d.ts}

@@ -1,30 +1,29 @@
-/**
-*  ___   ___ __
-*  \  \_/  /  / _
-*   \     /  /_| |_
-*   /  _  \____   _|  
-*  /__/ \__\   |_|
-*        
-* @file version.ts
-* @author Etienne Cochard 
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy 
-* of this software and associated documentation files (the "Software"), to deal 
-* in the Software without restriction, including without limitation the rights 
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-* of the Software, and to permit persons to whom the Software is furnished to do so, 
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies
-* or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**/
-
-export const x4js_version = "1.5.16";
+/**
+*  ___  ___ __
+*  \  \/  /  / _
+*   \    /  /_| |_
+*   /    \____   _|
+*  /__/\__\   |_|
+*
+* @file app_sockets.ts
+* @author Etienne Cochard
+*
+* Copyright (c) 2019-2022 R-libre ingenierie
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+* of the Software, and to permit persons to whom the Software is furnished to do so,
+* subject to the following conditions:
+* The above copyright notice and this permission notice shall be included in all copies
+* or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**/
+export declare function setupWSMessaging(closeCB: () => void): void;

package/lib/types/index.d.ts

@@ -80,4 +80,5 @@ export * from "./tooltips";
 export * from "./treeview";
 export * from "./x4events";
 export * from "./x4react";
+export * from "./app_sockets";
 export * from "./version";

package/lib/types/treeview.d.ts

@@ -106,8 +106,11 @@ export declare class TreeView extends VLayout<TreeViewProps, TreeViewEventMap> {
     ensureVisible(id: any): void;
     set selection(id: any);
     /**
-     * idem selection = xx but with a notification
-     * @param id
+     * care, component should have been created, to select an item at startup,
+     * use something like
+     * componentCreated( ) {
+     * 	mytree.select( id );
+     * }
      */
     select(id: any, notify?: boolean): void;
     private _getNode;

package/lib/types/version.d.ts

@@ -26,4 +26,4 @@
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
-export declare const x4js_version = "1.5.16";
+export declare const x4js_version = "1.5.18";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x4js",
-	"version": "1.5.16",
+	"version": "1.5.18",
 	"description": "X4js core files",
 	"main": "lib/cjs/index.js",
 	"types": "lib/types/index.d.ts",
@@ -42,8 +42,5 @@
 				"default": "./lib/cjs/index.js"
 			}
 		}
-	},
-	"dependencies": {
-		"typescript": "^4.9.3"
 	}
 }

package/lib/src/MIT-license.md

@@ -1,14 +0,0 @@
-# MIT LICENSE #
-
-**Copyright (c) 2019-2022 R-libre ingenierie**
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

package/lib/src/action.ts

@@ -1,88 +0,0 @@
-/**
-*  ___  ___ __
-*  \  \/  /  / _
-*   \    /  /_| |_
-*   /    \____   _|  
-*  /__/\__\   |_|
-*        
-* @file action.ts
-* @author Etienne Cochard 
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy 
-* of this software and associated documentation files (the "Software"), to deal 
-* in the Software without restriction, including without limitation the rights 
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-* of the Software, and to permit persons to whom the Software is furnished to do so, 
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies
-* or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**/
-
-import { BasicEvent, EvChange } from './x4events'
-import { BaseComponent, BaseComponentEventMap, BaseComponentProps } from './base_component'
-import { IconID } from "./icon"
-import { EventHandler } from './component';
-
-//TODO: implement all
-
-
-export interface EvAction extends BasicEvent {
-}
-
-export function EvAction( source: Action ) {
-	return BasicEvent<EvAction>({source});
-}
-
-interface ActionEventMap extends BaseComponentEventMap {
-	run: EvAction;
-	change: EvChange;
-}
-
-interface ActionProps extends BaseComponentProps<ActionEventMap> {
-	id?: any;
-	text?: string;
-	icon?: IconID;
-	disabled?: boolean;
-	hidden?: boolean;
-	checked?: boolean;
-
-	run: EventHandler<EvAction>;
-	change?: EventHandler<EvChange>;
-}
-
-export class Action extends BaseComponent<ActionProps,ActionEventMap> {
-
-	constructor( props: ActionProps ) {
-		super( props );
-
-		this.mapPropEvents( props, "run" );
-	}
-
-	get props( ) {
-		return this.m_props;
-	}
-
-	set text( t: string ) {
-		this.m_props.text = t;
-		this.emit( "change", EvChange(this) );
-	}
-
-	set icon( i: IconID ) {
-		this.m_props.icon = i;
-		this.emit( "change", EvChange(this) );
-	}
-
-	fire( ) {
-		this.emit( "run", EvAction(this) );
-	}
-}
-