x4js 2.0.13 → 2.0.14

package/lib/src/components/button/button.module.scss

@@ -36,8 +36,12 @@
 
 	// outline
 	--ol-button-background: var( --background-primary );
-	--ol-button-background-active: #eee;
+	--ol-button-background-active: #ccc;
 	--ol-button-color-active: var( --text-primary );
+	--ol-button-background-hover: #eee;
+	--ol-button-color-hover: var( --text-primary );
+	--ol-button-color-disabled: #ccc;
+
 	--ol-button-color: var( --text-primary );
 	--ol-button-border: var( --border );
 	--ol-button-icon-color: var( --text-primary );
@@ -69,7 +73,9 @@
 	gap: 0.4em;
 		
 	&> #icon {
-		transition: color 0.3s;
+		transition: color 0.3s, fill 0.3s;
+		fill: var( --button-color );
+
 		width: 1em;
 		height: 1em;
 		//color: var( --button-icon-color );
@@ -80,12 +86,12 @@
 	}
 
 	&> #label {
-		@extend .flex;
+		flex-grow: 1;
 
 		padding: 0;
 		color: inherit;
 
-		&:empty {
+		&.empty {
 			display: none;
 		}
 	}
@@ -126,26 +132,38 @@
 
 	#icon {
 		color: var( --ol-button-icon-color );
+		fill: var(--ol-button-icon-color);
 	}
 
 	&:focus{
 		border-color: var( --ol-button-border-focus );
 		color: var( --ol-button-color-focus );
+		fill: var( --ol-button-color-focus );
 		#icon {
 			color: var( --ol-button-color-focus );
+			fill: var( --ol-button-color-focus );
 		}
 	}
 
+	&:hover{
+		background-color: var( --ol-button-background-hover );
+		color: var( --ol-button-color-hover );
+		fill: var( --ol-button-color-hover );
+	}	
+
 	&:active{
 		background-color: var( --ol-button-background-active );
 		color: var( --ol-button-color-active );
+		fill: var( --ol-button-color-active );
+
 		#icon {
 			color: var( --button-icon-color );
+			fill: var( --button-icon-color );
 		}
 	}	
 }
 
-.x4button.danger {
+.x4button.danger:not([disabled]) {
 	background-color: var( --alert-background );
 	color: var( --alert-color );
 

package/lib/src/components/button/button.ts

@@ -38,6 +38,8 @@ interface ButtonEvents extends ComponentEvents {
 export interface ButtonProps extends ComponentProps {
 	label?: string;
 	icon?: string;
+	tabindex?: boolean | number;
+	autorepeat?: number | boolean;
 	click?: EventCallback<EvClick>;
 }
 
@@ -47,6 +49,9 @@ export interface ButtonProps extends ComponentProps {
 
 @class_ns( "x4" )
 export class Button extends Component<ButtonProps,ButtonEvents> {
+
+	#text: Component;
+
 	/**
      * Creates an instance of Button.
      * 
@@ -59,12 +64,27 @@ export class Button extends Component<ButtonProps,ButtonEvents> {
 		super( { ...props, tag: 'button', content: null } );
 
 		this.mapPropEvents( props, 'click' );
-		this.addDOMEvent('click', (e) => this._on_click(e));
+
+		if( props.autorepeat ) {
+			this.addDOMEvent('pointerdown', (e) => this._on_mouse(e) );
+			this.addDOMEvent('pointerup', (e) => this._on_mouse(e) );
+		}
+		else {
+			this.addDOMEvent('click', (e) => this._on_click(e));
+		}
+
+		this.addDOMEvent('keydown', (e) => this._on_keydown(e) );
 
 		this.setContent( [
 			new Icon( { id: "icon", iconId: this.props.icon } ),
-			new Component( { id: "label", content: this.props.label } ),
+			this.#text = new Component( { id: "label" } ),
 		] );
+
+		this.setText( props.label );
+
+		if( props.tabindex!==false ) {
+			this.setAttribute( 'tabindex', props.tabindex );
+		}
 	}
 
 	/**
@@ -89,6 +109,52 @@ export class Button extends Component<ButtonProps,ButtonEvents> {
 		ev.stopPropagation();
 	}
 
+	protected _on_mouse( e: PointerEvent ) {
+
+		let count = 0;
+
+		if( e.type=='pointerdown' ) {
+			this.dom.setPointerCapture( e.pointerId );
+
+			const rt = this.props.autorepeat===true ? 200 : this.props.autorepeat as number;
+
+			this.setTimeout( 'repeat', 500, ( ) => {
+				count++;
+
+				this.fire('click', {} );
+				this.setInterval( 'repeat', rt, ( ) => {
+					this.fire('click', {} );
+				})
+			} );
+		}
+		else {
+			this.clearTimeout( 'repeat' );
+
+			if( !count ) {
+				this.fire('click', {} );
+			}
+		}
+	}
+
+	/**
+	 * simulate a click
+	 */
+
+	click( ) {
+		(this.dom as HTMLButtonElement).click( );
+	}
+
+	/**
+	 * called on key down
+	 */
+
+	protected _on_keydown( e: KeyboardEvent ) {
+		if( e.key=='Enter' ) {
+			this.click( );
+			e.preventDefault( );
+		}
+	}
+
 	/**
      * Sets the text content of the button's label.
      * 
@@ -99,9 +165,10 @@ export class Button extends Component<ButtonProps,ButtonEvents> {
      */
 
 	public setText( text: string | UnsafeHtml ) {
-		this.query( "#label" ).setContent( text );
+		this.#text.setContent( text );
+		this.#text.setClass( "empty", !text );
 	}
-
+	
 	/**
      * Sets the icon of the button.
      * 
@@ -113,5 +180,6 @@ export class Button extends Component<ButtonProps,ButtonEvents> {
 	public setIcon( icon: string ) {
 		this.query<Icon>( "#icon" ).setIcon( icon );
 	}
+
 }
 

package/lib/src/components/canvas/canvas.module.scss

@@ -0,0 +1,25 @@
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file canvas.module.scss
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2025 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.
+ **/
+
+ .x4canvas {
+	overflow: hidden;
+
+	&> canvas {
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+ }

package/lib/src/components/canvas/canvas.ts

@@ -0,0 +1,189 @@
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file canvas.ts
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2025 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 { class_ns } from '@core/core_tools.js';
+import { Component, ComponentEvent, ComponentEvents, ComponentProps } from '../../core/component';
+import { EventCallback } from "../../core/core_events"
+import { CanvasEx, createPainter } from './canvas_ex.js';
+
+import './canvas.module.scss'
+
+export interface EvPaint extends ComponentEvent {
+	ctx: CanvasEx;
+}
+
+interface CanvasEventMap extends ComponentEvents {
+	paint: EvPaint;
+}
+
+interface CanvasProps extends ComponentProps {
+	paint: EventCallback<EvPaint>
+	clear?: boolean;
+}
+
+
+
+// ============================================================================
+// [CANVAS]
+// ============================================================================
+
+/**
+ * Standard Canvas
+ */
+
+@class_ns( "x4" )
+export class Canvas extends Component<CanvasProps, CanvasEventMap> {
+
+	private m_iwidth: number = -1;
+	private m_iheight: number = -1;
+	private m_scale = 1.0;
+	private m_canvas: Component;
+
+	constructor(props: CanvasProps) {
+		super(props);
+
+		this.mapPropEvents( props, 'paint' );
+		this.addDOMEvent('resized', () => { this._paint(); })
+		
+		this.m_iwidth = -1;
+		this.m_iheight = -1;
+		this.m_canvas = new Component({
+			tag: 'canvas'
+		});
+
+		this.setContent( this.m_canvas );
+	}
+
+	/**
+	 * scale the whole canvas
+	 */
+
+	scale(scale: number) {
+		this.m_scale = scale;
+		this.m_iwidth = -1;	// force recalc
+		this.redraw();
+	}
+
+	/**
+	 * return the internal canvas
+	 */
+	get canvas(): Component {
+		return this.m_canvas;
+	}
+
+	getContext( ) {
+		return (this.m_canvas.dom as HTMLCanvasElement).getContext('2d') as CanvasEx;
+	}
+
+	/**
+	 * redraw the canvas (force a paint)
+	 */
+
+	private $update_rep = 0;
+	public redraw(wait?: number) {
+
+		if (wait !== undefined) {
+			if( ++this.$update_rep>=20 ) {
+				this.clearTimeout( 'update' );
+				this._paint( );
+			}
+			else {
+				this.setTimeout( 'update', wait, () => this._paint() );
+			}
+		}
+		else {
+			this.clearTimeout( 'update' );
+			this._paint();
+		}
+	}
+
+	/**
+	 * 
+	 */
+
+	private _paint() {
+		this.$update_rep = 0;
+
+		let dom = this.dom;
+		if (!this.isVisible() ) {
+			return;
+		}
+
+		//const canvas = this.m_canvas.dom as HTMLCanvasElement;
+		const w = dom.clientWidth;
+		const h = dom.clientHeight;
+
+		const ctx = this.getContext();
+		if (w != this.m_iwidth || h != this.m_iheight) {
+			// adjustment for HDPI
+			let devicePixelRatio = window.devicePixelRatio || 1;
+			let backingStoreRatio = (<any>ctx).webkitBackingStorePixelRatio ||
+				(<any>ctx).mozBackingStorePixelRatio ||
+				(<any>ctx).msBackingStorePixelRatio ||
+				(<any>ctx).oBackingStorePixelRatio ||
+				(<any>ctx).backingStorePixelRatio || 1;
+
+			let canvas = this.canvas;
+
+			if ( this.m_scale != 1.0 ) { //devicePixelRatio !== backingStoreRatio || this.m_scale != 1.0) {
+				let ratio = 1;	//devicePixelRatio / backingStoreRatio,
+				const rw = w * ratio;
+				const rh = h * ratio;
+
+				canvas.setAttribute('width', '' + rw);
+				canvas.setAttribute('height', '' + rh);
+				canvas.setStyleValue('width', w);
+				canvas.setStyleValue('height', h);
+
+				ratio *= this.m_scale;
+				ctx.scale(ratio, ratio);
+			}
+			else {
+				canvas.setAttribute('width', '' + w);
+				canvas.setAttribute('height', '' + h);
+				canvas.setStyleValue('width', w);
+				canvas.setStyleValue('height', h);
+				ctx.scale(1, 1);
+			}
+
+			this.m_iwidth = w;
+			this.m_iheight = h;
+		}
+
+		if (w && h) {
+			let cc = createPainter(ctx, w, h);
+			if (this.props.clear) {
+				
+				cc.clearRect(0,0,w/this.m_scale,h/this.m_scale);
+			}
+
+			cc.save();
+			cc.translate(-0.5, -0.5);
+			this.paint(cc);
+			cc.restore();
+		}
+	}
+
+	protected paint(ctx: CanvasEx ) {
+		try {
+			this.fire('paint', { ctx } );
+		}
+		catch (x) {
+			console.assert(false, x);
+		}
+	}
+}
+

package/lib/src/components/canvas/canvas_ex.ts

@@ -0,0 +1,269 @@
+/** 
+ *  ___  ___ __
+ *  \  \/  /  / _
+ *   \    /  /_| |_
+ *   /    \____   _|  
+ *  /__/\__\   |_|.2
+ * 
+ * @file canvas_ex.ts
+ * @author Etienne Cochard 
+ * 
+ * @copyright (c) 2025 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.
+ **/
+
+
+export interface CanvasEx extends CanvasRenderingContext2D {
+	width: number;
+	height: number;
+
+	smoothLine(points: any[], path: CanvasPath, move: boolean): void;
+	smoothLineEx(_points: any[], tension: number, numOfSeg: number, path: CanvasPath, move?: boolean, close?: boolean): void;
+	line(x1: number, y1: number, x2: number, y2: number, color: string, lineWidth: number): void;
+	roundRect(x: number, y: number, width: number, height: number, radius: number): void;
+	calcTextSize(text: string, rounded: boolean): { width: number, height: number };
+	setFontSize(fs: number): void;
+	circle(x: number, y: number, radius: number): void;
+}
+
+export function createPainter(c2d: CanvasRenderingContext2D, w: number, h: number): CanvasEx {
+
+	let cp = c2d as CanvasEx;
+
+	cp.width = w;
+	cp.height = h;
+
+	cp.smoothLine = smoothLine;
+	cp.smoothLineEx = smoothLineEx;
+	cp.line = line;
+	cp.roundRect = roundRect;
+	cp.calcTextSize = calcTextSize;
+	cp.setFontSize = setFontSize;
+	cp.circle = circle;
+
+	return cp;
+}
+
+function smoothLine( this: CanvasRenderingContext2D, points: any[], path: CanvasPath = null, move = true) {
+	if (points.length < 2) {
+		return;
+	}
+
+	if (!path) {
+		path = this;
+	}
+
+	if (points.length == 2) {
+		if (move !== false) {
+			path.moveTo(points[0].x, points[0].y);
+		}
+		else {
+			path.lineTo(points[0].x, points[0].y);
+		}
+
+		path.lineTo(points[1].x, points[1].y);
+		return;
+	}
+
+	function midPointBtw(p1: IPoint, p2: IPoint ) {
+		return {
+			x: p1.x + (p2.x - p1.x) / 2,
+			y: p1.y + (p2.y - p1.y) / 2
+		};
+	}
+
+	function getQuadraticXY(t: number, sx: number, sy: number, cp1x: number, cp1y: number, ex: number, ey: number) : IPoint {
+		return {
+			x: (1 - t) * (1 - t) * sx + 2 * (1 - t) * t * cp1x + t * t * ex,
+			y: (1 - t) * (1 - t) * sy + 2 * (1 - t) * t * cp1y + t * t * ey
+		};
+	}
+
+	let p1 = points[0],
+		p2 = points[1],
+		p3 = p1;
+
+	path.moveTo(p1.x, p1.y);
+
+	for (let i = 1, len = points.length; i < len; i++) {
+		// we pick the point between pi+1 & pi+2 as the
+		// end point and p1 as our control point
+		let midPoint = midPointBtw(p1, p2);
+		//this.quadraticCurveTo(p1.x, p1.y, midPoint.x, midPoint.y);
+		for (let i = 0; i < 8; i++) {
+			let { x, y } = getQuadraticXY(i / 8, p3.x, p3.y, p1.x, p1.y, midPoint.x, midPoint.y);
+			path.lineTo(x, y);
+		}
+
+		p1 = points[i];
+		p2 = points[i + 1];
+		p3 = midPoint;
+	}
+
+	// Draw last line as a straight line while
+	// we wait for the next point to be able to calculate
+	// the bezier control point
+
+	path.lineTo(p1.x, p1.y);
+}
+
+function smoothLineEx(this: CanvasRenderingContext2D, _points: any[], tension: number = 0.5, numOfSeg: number = 10, path: CanvasPath = null, move = true, close = false) {
+
+	let points = [];
+
+	//pts = points.slice(0);
+	for (let p = 0, pc = _points.length; p < pc; p++) {
+		points.push(_points[p].x);
+		points.push(_points[p].y);
+	}
+
+	let pts,
+		i = 1,
+		l = points.length,
+		rPos = 0,
+		rLen = (l - 2) * numOfSeg + 2 + (close ? 2 * numOfSeg : 0),
+		res = new Float32Array(rLen),
+		cache = new Float32Array((numOfSeg + 2) * 4),
+		cachePtr = 4;
+
+	pts = points.slice(0);
+
+	if (close) {
+		pts.unshift(points[l - 1]);				// insert end point as first point
+		pts.unshift(points[l - 2]);
+		pts.push(points[0], points[1]); 		// first point as last point
+	}
+	else {
+		pts.unshift(points[1]);					// copy 1. point and insert at beginning
+		pts.unshift(points[0]);
+		pts.push(points[l - 2], points[l - 1]);	// duplicate end-points
+	}
+
+	// cache inner-loop calculations as they are based on t alone
+	cache[0] = 1;								// 1,0,0,0
+
+	for (; i < numOfSeg; i++) {
+
+		var st = i / numOfSeg,
+			st2 = st * st,
+			st3 = st2 * st,
+			st23 = st3 * 2,
+			st32 = st2 * 3;
+
+		cache[cachePtr++] = st23 - st32 + 1;	// c1
+		cache[cachePtr++] = st32 - st23;		// c2
+		cache[cachePtr++] = st3 - 2 * st2 + st;	// c3
+		cache[cachePtr++] = st3 - st2;			// c4
+	}
+
+	cache[cachePtr] = 1;						// 0,1,0,0
+
+	// calc. points
+	parse(pts, cache, l);
+
+	if (close) {
+		//l = points.length;
+		pts = [];
+		pts.push(points[l - 4], points[l - 3], points[l - 2], points[l - 1]); // second last and last
+		pts.push(points[0], points[1], points[2], points[3]); // first and second
+		parse(pts, cache, 4);
+	}
+
+	function parse(pts: number[], cache: Float32Array, l: number) {
+
+		for (var i = 2, t; i < l; i += 2) {
+
+			var pt1 = pts[i],
+				pt2 = pts[i + 1],
+				pt3 = pts[i + 2],
+				pt4 = pts[i + 3],
+
+				t1x = (pt3 - pts[i - 2]) * tension,
+				t1y = (pt4 - pts[i - 1]) * tension,
+				t2x = (pts[i + 4] - pt1) * tension,
+				t2y = (pts[i + 5] - pt2) * tension;
+
+			for (t = 0; t < numOfSeg; t++) {
+
+				var c = t << 2, //t * 4;
+
+					c1 = cache[c],
+					c2 = cache[c + 1],
+					c3 = cache[c + 2],
+					c4 = cache[c + 3];
+
+				res[rPos++] = c1 * pt1 + c2 * pt3 + c3 * t1x + c4 * t2x;
+				res[rPos++] = c1 * pt2 + c2 * pt4 + c3 * t1y + c4 * t2y;
+			}
+		}
+	}
+
+	// add last point
+	l = close ? 0 : points.length - 2;
+	res[rPos++] = points[l];
+	res[rPos] = points[l + 1];
+
+	if (!path) {
+		path = this;
+	}
+
+	// add lines to path
+	for (let i = 0, l = res.length; i < l; i += 2) {
+		if (i == 0 && move !== false) {
+			path.moveTo(res[i], res[i + 1]);
+		}
+		else {
+			path.lineTo(res[i], res[i + 1]);
+		}
+	}
+}
+
+function line(this: CanvasRenderingContext2D, x1: number, y1: number, x2: number, y2: number, color: string, lineWidth: number = 1) {
+	this.save();
+	this.beginPath();
+	this.moveTo(x1, y1);
+	this.lineTo(x2, y2);
+	this.lineWidth = lineWidth;
+	this.strokeStyle = color;
+	this.stroke();
+	this.restore();
+}
+
+function roundRect(this: CanvasRenderingContext2D, x: number, y: number, width: number, height: number, radius: number) {
+	//this.beginPath( );
+	this.moveTo(x + radius, y);
+	this.lineTo(x + width - radius, y);
+	this.quadraticCurveTo(x + width, y, x + width, y + radius);
+	this.lineTo(x + width, y + height - radius);
+	this.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+	this.lineTo(x + radius, y + height);
+	this.quadraticCurveTo(x, y + height, x, y + height - radius);
+	this.lineTo(x, y + radius);
+	this.quadraticCurveTo(x, y, x + radius, y);
+	this.closePath();
+}
+
+function calcTextSize( this: CanvasRenderingContext2D, text: string, rounded = false): { width: number, height: number } {
+
+	let fh = this.measureText(text);
+	let lh = fh.fontBoundingBoxAscent + fh.fontBoundingBoxDescent;
+
+	if (rounded) {
+		return { width: Math.round(fh.width), height: Math.round(lh) };
+	}
+	else {
+		return { width: fh.width, height: lh };
+	}
+}
+
+function setFontSize( this: CanvasRenderingContext2D, fs: number) {
+	let fsize = Math.round(fs) + 'px';
+	this.font = this.font.replace(/\d+px/, fsize);
+}
+
+function circle( this: CanvasRenderingContext2D, x: number, y: number, radius: number) {
+	this.moveTo(x + radius, y);
+	this.arc(x, y, radius, 0, Math.PI * 2);
+}