x4js 2.2.51 → 2.2.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x4js",
-  "version": "2.2.51",
+  "version": "2.2.53",
   "type": "module",
   "main": "src/x4.ts",
   "module": "src/x4.ts",

package/src/components/base.scss

@@ -24,6 +24,10 @@
 	@extend %flex;
 }
 
+.x4stretch {
+	align-self: stretch;
+}
+
 .x4fit-h {
 	width: stretch;
 }

package/src/components/combobox/combobox.module.scss

@@ -28,7 +28,7 @@
 	--combobox-btn-color-hover: var( --text-primary );
 
 	--combo-tree-indent: 1em;
-}
+	}
 
 .x4dropdownlist {
 	@extend %shadow-xl;
@@ -36,7 +36,7 @@
 
 	max-height: 250px;
 	max-width: 50vw;
-	
+
 	position: absolute;
 	background-color: var( --dropdown-background );
 	border: 1px solid var( --dropdown-border );
@@ -51,7 +51,7 @@
 
 		.x4item {
 			white-space: nowrap;
-			
+
 			&.level-1 { padding-left: calc(var(--combo-tree-indent) * 1 ); }
 			&.level-2 { padding-left: calc(var(--combo-tree-indent) * 2 ); }
 			&.level-3 { padding-left: calc(var(--combo-tree-indent) * 3 ); }
@@ -60,47 +60,48 @@
 			&.level-6 { padding-left: calc(var(--combo-tree-indent) * 6 ); }
 			&.level-7 { padding-left: calc(var(--combo-tree-indent) * 7 ); }
 			&.level-8 { padding-left: calc(var(--combo-tree-indent) * 8 ); }
+			}
 		}
-	}
-}
-
+		}
+		
 .x4combobox {
 	@extend %hbox;
 	margin: 5px;
 	gap: 6px;
 
 	&> #label {
-		
+
 		&> .x4label {
 			padding: 0 6px 0 0;
 			border-bottom: 1px solid transparent;
-
+	
 			height: 100%;
 			font-weight: 500;
 			gap: 0px;
-					
+		
 			#text:not(.empty) {
 				&::after {
 					content: ":"
-				}
+	}
+			}
 			}
 		}
-	}
 
 	&>#edit {
 		@extend %flex;
 		border-bottom: 1px solid var( --combobox-border );
+
 		&:focus-within {
 			border-bottom-color: var( --combobox-border-focus );
 		}
-		
+
 		.x4input {
 			@extend %flex;
-
-			&[readonly] {
-				cursor: pointer;
-			}
-		}
+			cursor: pointer;
+//			&[readonly] {
+//				cursor: pointer;
+//			}
+	}
 
 		.x4button {
 			margin: 0;
@@ -111,36 +112,39 @@
 
 			#icon {
 				color: var( --combobox-btn-color );
-			}
+		}
 
 			&:hover, &:hover #icon {
 				color: var( --combobox-btn-color-hover );
-			}
+		}
 
 			//&:focus {
 				//background-color: var( --color-30 );
 				//color: var( --color-10 );
 			//}
 		}
-	}
+		}
+
+	&[disabled],
+	&.readonly {
+		--label-color: var( --disabled-color-dark );
+		--input-color: var( --disabled-color-dark );
 
-	&[disabled] {
 		&, * {
 			cursor: not-allowed;
-		}
+	}
 
 		#label .x4label {
-			color: var( --disabled-color-dark );
 			pointer-events: none;
-		}
 	}
-	
+	}
+
 	&[required] {
 		& > #label > .x4label::before {
 			content: "*";
 			font-weight: bold;
 			color: var( --textedit-required );
 			margin-right: 2px;
-		}
 	}
+}
 }

package/src/components/combobox/combobox.ts

@@ -15,7 +15,7 @@
  **/
 
 import { Component, ComponentEvents, ComponentProps, EvClick, EvSelectionChange, makeUniqueComponentId } from '../../core/component';
-import { class_ns, IComponentInterface, IFormElement, kbNav, safeText, sanitizeHtml, UnsafeHtml } from '../../core/core_tools';
+import { class_ns, IComponentInterface, IFormElement, kbNav } from '../../core/core_tools';
 import { EventCallback } from '../../core/core_events';
 
 import { Listbox, ListboxID, ListItem } from '../listbox/listbox';
@@ -46,7 +46,7 @@ export class DropdownList extends Popup<DropdownProps,DropdownEvents> {
 
 	private _list: Listbox;
 
-	constructor( props: DropdownProps, content?: ListItem[] ) {
+	constructor( props: DropdownProps ) {
 		super( props );
 
 		this._list = new Listbox( { items: props.items } );
@@ -147,7 +147,7 @@ export class Combobox extends Component<ComboboxProps,ComboboxEvents> {
 				list.select( sel, false );
 			}
 
-			this._input.setValue( safeText(itm.text) );
+			this._input.setValue( itm.text as string );
 			
 			if( !this._prevent_close ) {
 				this._popup.show( false );
@@ -248,7 +248,9 @@ export class Combobox extends Component<ComboboxProps,ComboboxEvents> {
 	}
 
 	setItems( items: ListItem[] ) {
-		this._getList().setItems( items );		
+		const list = this._getList( );
+		list.setItems( items );
+		this.setValue( "" ); 
 	}
 
 	getValue( ) {
@@ -260,7 +262,12 @@ export class Combobox extends Component<ComboboxProps,ComboboxEvents> {
 	}
 
 	selectItem( index: ListboxID ) {
-		this._getList( ).select( index );
+		const list = this._getList( );
+		list.select( index );
+		const el = list.getItem( index );
+		if( el ) {
+			this.setValue( el.text as string );
+		}
 	}
 
 	getSelection( ) {

package/src/components/dialog/dialog.module.scss

@@ -29,6 +29,7 @@
 	background-color: white;
 	border: 1px solid var( --border-dark );
 	max-width: 99vw;
+	outline: none;
 	
 	&> .caption {
 		padding: 8px;
@@ -39,6 +40,7 @@
 			color: var(--color-dialog-caption-text);
 			font-weight: bold;
 			font-size: 120%;
+			pointer-events: none;
 
 			#icon {
 				color: var(--color-dialog-caption-text);

package/src/components/dialog/dialog.ts

@@ -72,11 +72,10 @@ export class Dialog<P extends DialogProps = DialogProps, E extends DialogEvents
 
 		this.appendContent([
 			new HBox({
-				cls: "caption",
+				cls: "caption caption-element",
 				content: [
 					this._title = new Label({
 						id: "title",
-						cls: "caption-element",
 						icon: props.icon,
 						text: props.title
 					}),

package/src/components/input/input.module.scss

@@ -23,6 +23,7 @@
 	--input-placeholder: var( --disabled-background );
 	--input-error: var( --alert-background );
 
+	--input-color-disabled: var( --disabled-color-dark );
 	--input-checkbox-color: var( --accent-background );
 }
 
@@ -68,8 +69,10 @@ input.x4input {
 		font-weight: bold;
 	}
 
-	&:disabled {
+	&:disabled,
+	&[disabled] {
 		background-color: transparent;
+		color: var( --input-color-disabled );
 	}
 
 	&:invalid {

package/src/components/listbox/listbox.module.scss

@@ -126,7 +126,10 @@
 				}
 			}
 
-			.column { background-color: var(--listbox-background); overflow: hidden; }
+			.column {
+				background-color: transparent; 
+				overflow: hidden; 
+			}
 
 			.ref-c1 { width: var( --ref-c1-width); }
 			.ref-c2 { width: var( --ref-c2-width); }

package/src/components/listbox/listbox.ts

@@ -94,16 +94,11 @@ export interface ListboxProps extends Omit<ComponentProps,'content'> {
 @class_ns( "x4" )
 export class Listbox extends Component<ListboxProps,ListboxEvents> {
 
-	private _view: Viewport;
-	//private _selection: ListboxID;
-	//private _selitem: Component;
-	
+private _view: Viewport;
 	private _lastsel: ListboxID;
-	
 	private _multisel: Set<ListboxID>;
 	private _items: ListItem[];
-
-	preventFocus = false;
+	//<?? preventFocus = false;
 
 	constructor( props: ListboxProps ) {
 		super( { ...props } );
@@ -515,7 +510,7 @@ export class Listbox extends Component<ListboxProps,ListboxEvents> {
 			return new SimpleText( { cls: `column ref-c${index+2}`, text: c } )
 		}
 
-		const content = [
+		const content: Component[] = [
 			new Label( { cls: `column ref-c1`, icon: item.iconId, text: item.text } ),
 		];
 
@@ -629,6 +624,11 @@ export class Listbox extends Component<ListboxProps,ListboxEvents> {
 		return Array.from( this._multisel );
 	}
 
+	getFirstSel( ) : ListItem {
+		const [first] = this.getSelection( );
+		return first ? this.getItem( first ) : null;
+	}
+
 	ensureSelectionVisible( ) {
 		const sels = Array.from( this._multisel.values() );
 		if( sels.length) {

package/src/components/popup/popup.ts

@@ -432,7 +432,7 @@ class CMover {
 		this.self = ref ? true : false;
 
 		const mouseDown = ( e: PointerEvent ) => {
-			if( this.self && e.target!=x.dom ) {
+			if( this.self && e.target && (e.target as HTMLElement).tagName!=="DIV" ) {
 				return;
 			}
 

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

@@ -8,15 +8,96 @@
 	--propertygrid-background: white;
     --propertygrid-gadget-background: white;
     --propertygrid-gadget-color: black;
+
+	--propertygrid-odd-background: var(--color-primary-a5);
+	--propertygrid-even-background: transparent;
 }
 
 .x4propertygrid {
 	background: var( --propertygrid-background );
 	border: 1px solid var(--border);
-	overflow-y: auto;
     flex-basis: 0;
 	align-self: stretch;
-	
+
+	& > .body {
+		width: 100%;
+		flex-basis: 0;
+		overflow-y: auto;
+		overflow-x: auto;
+		outline: none;
+		position: relative;
+	}
+
+	&> #footer {
+		border-top: 1px solid var(--border);
+		margin: 0;
+
+		&.x4btngroup {
+			gap: 0px;
+
+			.x4button {
+				background-color: var( --ol-button-background );
+				margin: 0;
+				color: var( --ol-button-color );
+
+				&:disabled {
+					color: var( --ol-button-color-disabled );
+				}
+								
+				.x4icon {
+					height: 1.5em;
+					width: 1.5em;
+
+					.fa-primary, .fa-secondary {
+						fill:  var( --accent-background );
+					}
+				}
+
+				&.icon-danger {
+					.x4icon {
+						.fa-secondary {
+							fill: var( --disabled-color-dark);
+							opacity: 0.7;
+						}
+
+						.fa-primary {
+							fill: var( --alert-background );
+						}
+					}
+				}
+
+				&.icon-success {
+					.x4icon {
+						.fa-primary {
+							fill: var( --success-background );
+						}
+					}
+				}
+
+				&:hover{
+					background-color: var( --ol-button-background-hover );
+					color: var( --ol-button-color-hover );
+				}	
+
+				&:active{
+					background-color: var( --ol-button-background-active );
+					color: var( --ol-button-color-active );
+					#icon {
+						color: var( --button-icon-color );
+					}
+				}	
+
+				&:focus {
+					background-color: var( --ol-button-background-hover );
+				}
+
+				&:disabled {
+					color: var( --disabled-color-dark );
+				}
+			}
+		}
+	}
+
 	.root {
 		display: grid;
 		grid-template-columns: 1fr;
@@ -78,7 +159,10 @@
 		//border-right: 1px solid var(--color-primary-a50);
 
 		&.even {
-			background-color: var(--color-primary-a5);
+			background-color: var(--propertygrid-even-background)
+		}
+		&.odd {
+			background-color: var(--propertygrid-odd-background)
 		}
 
 		&:has(:focus) {

package/src/components/propgrid/propgrid.ts

@@ -22,7 +22,7 @@ import { Input } from "../input/input"
 import { ListboxID, ListItem } from "../listbox/listbox"
 import { Label, SimpleText } from "../label/label"
 import { asap, class_ns, isFunction, isNumber } from '../../core/core_tools';
-import { Icon } from '../components'
+import { Icon, ScrollView } from '../components'
 
 import icons from "../assets/icons"
 
@@ -58,6 +58,7 @@ export interface PropertyGroup {
 
 export interface PropertyProps extends ComponentProps {
 	groups: PropertyGroup[];
+	footer?: Component;
 }
 
 /**
@@ -76,8 +77,18 @@ export class PropertyGrid extends VBox {
 	constructor(props: PropertyProps) {
 		super(props);
 
-		this.root = new Component({ cls: "root" });
-		this.setContent( this.root );
+		if( props.footer ) {
+			props.footer.setAttribute( "id", "footer" );
+		}
+
+		const scroller = new ScrollView( { cls: "body" } );
+		this.root = scroller.getViewport( );
+
+		this.root.addClass( "root" );
+		this.setContent( [
+			scroller,
+			props.footer,
+		] );
 
 		if( props.groups ) {
 			this.setItems( props.groups );
@@ -90,6 +101,11 @@ export class PropertyGrid extends VBox {
 
 	setItems( _grps: PropertyGroup[] ) {
 
+		if( !_grps || _grps.length==0 ) {
+			this.root.clearContent( );
+			return;
+		}
+		
 		this.groups = _grps.filter( x => !!x );
 		//this.groups.sort( (a,b) => {return a.title>b.title ? 1 : 0} );
 
@@ -100,10 +116,8 @@ export class PropertyGrid extends VBox {
 			g.items.forEach( (i,idx) => {
 				if( i ) {
 					const row = this.makePropertyRow(i);
-					if( idx&1 ) {
-						row.addClass( "even" )
-					}
-
+					row.addClass( idx&1 ? "even" : "odd" );
+					
 					items.push( row );
 				}
 			});

package/src/components/tag/tag.module.scss

@@ -1,13 +1,24 @@
-/**
-* @file tag.module.scss
-* @author Etienne Cochard 
-* @copyright (c) 2026 R-libre ingenierie, all rights reserved.
-**/
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file tag.module.scss
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2026 R-libre ingenierie
+ *
+ * Use of this source code is governed by an MIT-style license 
+ * that can be found in the LICENSE file or at https://opensource.org/licenses/MIT.
+ **/
+
 
 :root {
 	--tag-border: var( --border );
 	--tag-border-focus: var( --border-focus );
-	--tag-selection: var( --accent-background );
+	--tag-background: var( --accent-background );
 	--tag-color: black;
 	--tag-icon-color: var( --tag-color );
 }
@@ -15,9 +26,11 @@
 .x4tag {
 	border-radius: 16px;
 	border: 1px solid var( --tag-border );
+	background-color: var( --tag-background );
 	padding: 2px 8px;
 	gap: 4px;
 	font-weight: normal;
+	
 	--label-color: var( --tag-color );
 
 	.x4icon:empty {

package/src/components/tag/tag.ts

@@ -1,8 +1,19 @@
-/**
-* @file tag.ts
-* @author Etienne Cochard 
-* @copyright (c) 2026 R-libre ingenierie, all rights reserved.
-**/
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file tag.ts
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2026 R-libre ingenierie
+ *
+ * Use of this source code is governed by an MIT-style license 
+ * that can be found in the LICENSE file or at https://opensource.org/licenses/MIT.
+ **/
+
 
 import { ComponentProps } from '../../core/component';
 import { class_ns, UnsafeHtml } from '../../core/core_tools';

package/src/components/textedit/textedit.module.scss

@@ -25,7 +25,7 @@
 	--textedit-btn-color: var( --text-secondary );
 	--textedit-btn-color-hover: var( --text-primary );
 
-	--textedit-color-disabled: var( --disabled-background );
+	--textedit-color-disabled: var( --disabled-color-dark );
 }
 
 .x4textedit {
@@ -103,8 +103,8 @@
 		}
 		
 		#label > .x4label #text,
-		#label > .x4label::before,
 		#label::after  {
+			--label-color: var( --textedit-color-disabled );
 			color: var( --textedit-color-disabled );
 		}
 

package/src/components/treeview/treeview.module.scss

@@ -74,10 +74,14 @@
 			
 			// child + subitems
 			.x4ctreeviewitem {
+									
 				&>.label {
+					--label-color: var( --treeitem-color );
+					--label-icon-color: var( --treeitem-color );
+
 					gap: 4px;
 
-					.x4label, .x4icon, .x4label #icon {
+					.x4icon {
 						color: inherit;
 					}
 
@@ -98,11 +102,16 @@
 					&.selected {
 						background-color: var( --treeitem-background-sel );
 						color: var( --treeitem-color-sel );
+
+						--label-color: var( --treeitem-color-sel );
+						--label-icon-color: var( --treeitem-color-sel );
 					}
 
 					&:active{
 						background-color: var( --accent-background-active );
 						color: var( --accent-color-active );
+						--label-color: var( --accent-color-active );
+						--label-icon-color: var( --accent-color-active );
 					}	
 				}
 

package/src/core/component.ts

@@ -109,6 +109,7 @@ export interface ComponentProps {
 	hidden?: boolean,
 	/** Enables flex layout (boolean) or sets flex-grow (number). */
 	flex?: boolean | number;
+	stretch?: boolean;
 	/** Tooltip text. */
 	tooltip?: string;
 	/** Existing DOM element to wrap. */
@@ -202,6 +203,10 @@ export class Component<P extends ComponentProps = ComponentProps, E extends Comp
 					});
 				}
 			}
+
+			if( props.stretch ) {
+				this.addClass( "x4stretch" );
+			}
 			
 			if( props.id!==undefined ) {
 				this.setAttribute( "id", props.id );

package/src/core/core_state.ts

@@ -1,8 +1,19 @@
-/**
-* @file core_state.ts
-* @author Etienne Cochard 
-* @copyright (c) 2025 R-libre ingenierie, all rights reserved.
-**/
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file core_state.ts
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2026 R-libre ingenierie
+ *
+ * Use of this source code is governed by an MIT-style license 
+ * that can be found in the LICENSE file or at https://opensource.org/licenses/MIT.
+ **/
+
 
 import { CoreEvent, EventMap, EventSource } from './core_events.js';
 import { getMemberValue, isPlainObject } from './core_tools.js';

package/src/x4.d.ts

@@ -1,8 +1,18 @@
-/**
-* @file x4.d.ts
-* @author Etienne Cochard 
-* @copyright (c) 2026 R-libre ingenierie, all rights reserved.
-**/
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file x4.d.ts
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2026 R-libre ingenierie
+ *
+ * Use of this source code is governed by an MIT-style license 
+ * that can be found in the LICENSE file or at https://opensource.org/licenses/MIT.
+ **/
 
 declare module "*.svg" {
   	const content: string;

package/src/x4.scss

@@ -15,5 +15,6 @@
  **/
 
 @import "./components/normalize.scss";
+@import "./components/colors.scss";
 @import "./components/themes.scss";
 @import "./components/base.scss";