x4js 2.0.13 → 2.0.14

package/lib/src/components/popup/popup.ts

@@ -15,43 +15,44 @@
  **/
 
 import { Component, ComponentEvent, ComponentEvents, ComponentProps, componentFromDOM, makeUniqueComponentId } from "../../core/component"
+
 import { CSizer } from '../sizers/sizer';
-import { Rect, Point, class_ns } from '../../core/core_tools.js';
+import { Rect, Point, class_ns, asap } from '../../core/core_tools.js';
+import { Box } from '../boxes/boxes'
 
 import "./popup.module.scss"
 
-
 export interface PopupEvents extends ComponentEvents {
 	closed: ComponentEvent;
 	opened: ComponentEvent;
 }
 
 export interface PopupProps extends ComponentProps {
-	modal?: boolean;
 	autoClose?: boolean | string;
 	sizable?: boolean;
 	movable?: boolean;
 }
 
-
-let modal_mask: Component;
-let modal_count = 0;
-
-let modal_stack: Popup[] = [];
 let autoclose_list: Popup[] = [];
 let popup_list:  Popup[] = [];
 
+let modal_stack: Popup[] = [];
+let modal_mask: Component;
 
 
+function getRoot( ) {
+	return document.body;
+}
+
 /**
  * 
  */
 
 @class_ns( "x4" )
-export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = PopupEvents> extends Component<P,E> {
+export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = PopupEvents> extends Box<P,E> {
 
-	private _isopen = false;
 	private _isshown = false;
+	protected _ismodal = false;
 
 	constructor( props: P ) {
 		super( props );
@@ -59,12 +60,28 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 		if( this.props.sizable ) {
 			this._createSizers( );
 		}
+
+		// wait for element to create it's childs
+		asap( ( ) => {
+			if( this.props.movable===true || (this.props.sizable && this.props.movable===undefined) ) {
+				const movers = this.queryAll( ".caption-element" );
+				movers.forEach( m => new CMover(m,this) );
+
+				if( this.hasClass("popup-caption") ) {
+					new CMover(this,this);
+				}		
+			}
+		} );
 	}
 
+	/**
+	 * 
+	 */
+
 	displayNear( rc: Rect, dst = "top left", src = "top left", offset = {x:0,y:0} ) {
 
 		this.setStyle( { left: "0px", top: "0px" } );	// avoid scrollbar
-		this._show( );									// to compute size
+		this._do_show( );		// to compute size
 		
 		let rm = this.getBoundingRect();
 
@@ -85,7 +102,6 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 			yref = rc.top + rc.height/2;
 		}
 
-		let halign = 'l';
 		if (dst.indexOf('right') >= 0) {
 			xref -= rm.width;
 		}
@@ -93,7 +109,6 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 			xref -= rm.width/2;
 		}
 
-		let valign = 't';
 		if (dst.indexOf('bottom') >= 0) {
 			yref -= rm.height;
 		}
@@ -132,7 +147,7 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 			top: y+"px",
 		})
 
-		this._show( );
+		this._do_show( );	// to compute size
 
 		const rc = this.getBoundingRect( );
 		const width = window.innerWidth - 16;
@@ -145,29 +160,65 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 		if( rc.bottom>height ) {
 			this.setStyleValue( "top", height-rc.height );
 		}
+	}
+
+	isOpen( ) {
+		return this._isshown;
+	}
 
-		if( this.props.movable ) {
-			const movers = this.queryAll( ".caption-element" );
-			movers.forEach( m => new CMover(m,this) );
+	protected _do_hide( ) {
 
-			if( this.hasClass("popup-caption") ) {
-				new CMover(this,this);
-			}		
+		if( !this._isshown ) {
+			return;
 		}
 
-		this.fire( "opened", {} );
+		this.__hide( );
+		this.__remove( );
+
+		if( this._ismodal ) {
+			modal_stack.pop( );
+			this._hideModalMask( );
+		}
+
+		// remove from popup list
+		const idx = popup_list.indexOf( this );
+		console.assert( idx>=0 );
+		popup_list.splice( idx, 1 );
+
+		// remove from auto close list
+		if( this.props.autoClose ) {
+			const idx = autoclose_list.indexOf( this );
+			if( idx>=0 ) {
+				autoclose_list.splice( idx, 1 );
+				if( autoclose_list.length==0 ) {
+					document.removeEventListener( "pointerdown", this._dismiss );
+				}
+			}
+		}
+
+		this._isshown = false;
+		this.fire( "closed", {} );
 	}
 
-	private _show( ) {
-		
-		if( this.props.modal && !this._isshown ) {
-			this._showModalMask( );
-			modal_stack.push( this );
-			modal_count++;
+	/**
+	 * 
+	 */
+
+	protected _do_show( ) {
+		if( this._isshown  ) {
+			return;
 		}
 
 		this._isshown = true;
-		
+		this.__append( );
+
+		if( this._ismodal ) {
+			modal_stack.push( this );
+			this._showModalMask( );
+		}
+
+		this.__show( );
+				
 		if( this.props.autoClose ) {
 			if( autoclose_list.length==0 ) {
 				document.addEventListener( "pointerdown", this._dismiss );
@@ -178,52 +229,53 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 		}
 
 		popup_list.push( this );
-		document.body.appendChild( this.dom );
+		
+		this.fire( "opened", {} );
+	}
 
-		this.show( );
+	/**
+	 * 
+	 */
+
+	protected __show( ) {
+		super.show( true );
 	}
 
-	override show( show = true ) {
-		this._isopen = show;
-		super.show( show );
+	protected __hide( ) {
+		super.show( false );
 	}
 
-	isOpen( ) {
-		return this._isopen;
+	protected __append( ) {
+		const root = getRoot( );
+		root.appendChild( this.dom );
+	}
+
+	protected __remove( ) {
+		const root = getRoot( );
+		root.removeChild( this.dom );
 	}
 
 	/**
 	 * 
 	 */
 
-	close( ) {
-		document.body.removeChild( this.dom );
-
-		// remove from popup list
-		const idx = popup_list.indexOf( this );
-		console.assert( idx>=0 );
-		popup_list.splice( idx, 1 );
-
-		// remove from auto close list
-		if( this.props.autoClose ) {
-			const idx = autoclose_list.indexOf( this );
-			if( idx>=0 ) {
-				autoclose_list.splice( idx, 1 );
-				if( autoclose_list.length==0 ) {
-					document.removeEventListener( "pointerdown", this._dismiss );
-				}
-			}
+	override show( show = true ) : this {
+		if( show ) {
+			this.displayCenter( );
 		}
-
-		// update mask
-		if( this.props.modal ) {
-			const top = modal_stack.pop( );
-			console.assert( top==this );
-			this._updateModalMask( );
+		else {
+			this._do_hide( );
 		}
 
-		this._isshown = false;
-		this.fire( "closed", {} );
+		return this;
+	}
+
+	/**
+	 * 
+	 */
+
+	close( ) {
+		this._do_hide( );
 	}
 
 	/**
@@ -280,38 +332,6 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 		list.forEach( x => x.close() );
 	}
 
-	/**
-	 * 
-	 */
-
-	private _showModalMask( ) {
-		
-		if( !modal_mask ) {
-			modal_mask = new Component( {
-				cls: "x4modal-mask",
-				domEvents: {
-					click: this._dismiss
-				}
-			});
-		}
-
-		modal_mask.show( true );
-		document.body.insertAdjacentElement( "beforeend", modal_mask.dom );
-	}
-
-	/**
-	 * 
-	 */
-
-	private _updateModalMask( ) {
-		if( --modal_count == 0 ) {
-			modal_mask.show( false );
-		}
-		else {
-			this.dom.insertAdjacentElement( "beforebegin", modal_mask.dom );
-		}
-	}
-
 	/**
 	 * 
 	 */
@@ -328,6 +348,29 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
 			new CSizer( "bottom-right" ),
 		])
 	}
+
+	private _showModalMask( ) {
+		if( !modal_mask ) {
+			modal_mask = new Component( { cls: 'x4modal-mask' } )
+			//document.body.appendChild( modal_mask.dom );
+		}
+
+		const root = getRoot( );
+		root.insertBefore( modal_mask.dom, this.dom );
+	}
+
+	private _hideModalMask( ) {
+		if( modal_mask ) {
+			const root = getRoot( );
+			if( modal_stack.length ) {
+				const top = modal_stack[ modal_stack.length-1 ];
+				root.insertBefore( modal_mask.dom, top.dom );
+			}
+			else {
+				root.removeChild( modal_mask.dom );
+			}
+		}
+	}
 }
 
 
@@ -335,6 +378,7 @@ export class Popup<P extends PopupProps = PopupProps, E extends PopupEvents = Po
  * 
  */
 
+export 
 class CMover {
 	private ref: Component;
 	private delta: Point;

package/lib/src/components/propgrid/folder-closed.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Pro 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc.--><path class="fa-secondary" opacity=".4" d="M32 224l448 0 0 224L32 448l0-224z"/><path class="fa-primary" d="M32 32l192 0 48 64 208 0 32 0 0 32 0 320 0 32-32 0L32 480 0 480l0-32L0 64 0 32l32 0zm240 96l-16 0-9.6-12.8L208 64 32 64l0 128 448 0 0-64-208 0zM32 224l0 224 448 0 0-224L32 224z"/></svg>

package/lib/src/components/propgrid/folder-open.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--!Font Awesome Pro 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc.--><path class="fa-secondary" opacity=".4" d="M32 64l0 280.4L108.2 192 448 192l0-64-176 0-13.3 0-9.4-9.4L194.7 64 32 64zM51.8 448L384 448l44.2 0 96-192-376.4 0-96 192z"/><path class="fa-primary" d="M272 96L208 32 32 32 0 32 0 64 0 448l0 32 32 0 3.8 0L384 480l64 0L560 256l16-32-35.8 0L128 224 32 416 32 64l162.7 0 54.6 54.6 9.4 9.4 13.3 0 176 0 0 64 32 0 0-64 0-32-32 0L272 96zM51.8 448l96-192 376.4 0-96 192L384 448 51.8 448z"/></svg>

package/lib/src/components/propgrid/progrid.module.scss

@@ -0,0 +1,108 @@
+/**
+ * @file progrid.module.scss
+ * @author Etienne Cochard 
+ * @copyright (c) 2025 InCare
+ **/
+
+:root {
+	--propertygrid-background: white;
+}
+
+.x4propertygrid {
+	background: var( --propertygrid-background );
+	border: 1px solid var(--color-primary-a50);
+	overflow-y: auto;
+    flex-basis: 0;
+	
+	.root {
+		display: grid;
+		grid-template-columns: 1fr;
+		grid-template-rows: auto;
+	}
+
+	.group {
+		padding: 6px 4px 4px 4px;
+		min-height: 2em;
+		font-weight: bold;
+		background-color: white;
+		color: var(--color-primary-a50);
+
+		.x4box > .desc {
+			font-style: italic;
+			font-weight: normal;
+			font-size: 90%;
+			color: var( --text-ternary );
+		}
+
+		&:not(:first-child ) {
+			border-top: 1px solid var(--color-primary-a50);
+		}
+
+		&:not( :last-child ) {
+			border-bottom: 1px solid var(--color-primary-a50);
+			box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.2);
+		}
+		
+		display: flex;
+		align-items: center;
+		padding-left: 8px;
+		gap: 8px;
+
+		&>.x4box {
+			flex-grow: 1;
+		}
+
+		&>.x4icon {
+			.fa-secondary,
+			.fa-primary {
+				fill: var( --color-primary-a50 );
+			}
+
+			width: 1em;
+			height: 1em;
+		}
+
+		&>.x4button {
+			background-color: transparent;
+			color: var(--color-primary-a50);
+		}
+	}
+
+	.row {
+		border-bottom: 1px solid var( --border-light );
+		//border-top: none;
+		//border-left: 1px solid var(--color-primary-a50);
+		//border-right: 1px solid var(--color-primary-a50);
+
+		&:has(:focus) {
+			background-color: var(--color-primary-a20);
+		}
+
+		&:hover {
+			background-color: var(--color-primary-a10);
+		}
+		
+		.cell {
+			flex-grow: 1;
+			flex-basis: 10px;
+	    	padding: 4px;
+
+			&>* {
+				width: 100%;
+			}
+
+			input {
+				background: rgba(255,255,255,0.6);
+			}
+		}
+
+		.cell:first-child {
+			border-right: 1px solid var( --border );
+		}
+
+		.hdr {
+			padding: 8px;
+			padding-left: 34px;
+		}
+	}
+}