x4js 1.6.0 → 1.6.1

package/lib/src/application.ts

@@ -160,7 +160,7 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 		return this.m_user_data;
 	}
 
-	public get history( ) {
+	public get history( ): null {
 		//if( !this.m_history ) {
 		//	this.m_history = new NavigationHistory( );
 		//}
@@ -247,7 +247,7 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 				const tch = ev.touches[0];
 				let fake: any = {type: "dblclick" };
 				for( const n in tch ) {
-					fake[n] = tch[n];
+					fake[n] = (tch as any)[n];
 				}
 
 				// ignore -> private: dirty x2

package/lib/src/calendar.ts

@@ -170,7 +170,7 @@ export class Calendar extends VLayout<CalendarProps, CalendarEventMap>
 					cls += ' out';
 				}
 
-				const mkItem = ( dte ) => {
+				const mkItem = ( dte: Date ) => {
 					return new HLayout({
 						cls,
 						flex: 1,

package/lib/src/canvas.ts

@@ -30,6 +30,11 @@
 import { Component, CProps, CEventMap, html } from './component'
 import { BasicEvent, EventCallback } from './x4events'
 
+interface IPoint {
+	x: number;
+	y: number;
+}
+
 interface EvPaint extends BasicEvent {
 	ctx: CanvasPainter;
 }
@@ -108,14 +113,14 @@ function smoothLine( this: CanvasRenderingContext2D, points: any[], path: Canvas
 		return;
 	}
 
-	function midPointBtw(p1, p2) {
+	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, sx, sy, cp1x, cp1y, ex, ey) {
+	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
@@ -212,7 +217,7 @@ function smoothLineEx(this: CanvasRenderingContext2D, _points: any[], tension: n
 		parse(pts, cache, 4);
 	}
 
-	function parse(pts, cache, l) {
+	function parse(pts: number[], cache: Float32Array, l: number) {
 
 		for (var i = 2, t; i < l; i += 2) {
 

package/lib/src/cardview.ts

@@ -85,7 +85,7 @@ export class CardView<P extends CardViewProps = CardViewProps, E extends CardVie
 	/** @ignore */
 	render() {
 
-		let pages = [];
+		let pages: any[] = [];
 		this.m_cards.forEach((p) => {
 			if (p.page) {
 				pages.push(p.page);
@@ -171,7 +171,7 @@ export class CardView<P extends CardViewProps = CardViewProps, E extends CardVie
 	 * 
 	 */
 
-	private _initTabs(pages): any {
+	private _initTabs(pages: ICardViewItem[] ): any {
 
 		if (!pages) {
 			return;
@@ -185,10 +185,11 @@ export class CardView<P extends CardViewProps = CardViewProps, E extends CardVie
 				return;
 			}
 
-			let card: ICardItemEx = { ...p };
-
-			card.selector = this._prepareSelector(p);
-			card.active = false;
+			let card: ICardItemEx = { 
+				...p,
+				selector: this._prepareSelector(p),
+				active: false
+			}
 
 			this.m_cards.push(card);
 
@@ -196,7 +197,7 @@ export class CardView<P extends CardViewProps = CardViewProps, E extends CardVie
 				active = p.name;
 			}
 
-			if (p.active) {
+			if (card.active) {
 				active = p.name;
 			}
 		});

package/lib/src/color.ts

@@ -30,7 +30,7 @@
 import { Stylesheet } from './styles'
 
 
-const colorValues = {
+const colorValues: any = {
 	'lightsalmon': 0xFFFFA07A,
 	'lightseagreen': 0xFF20B2AA,
 	'lightskyblue': 0xFF87CEFA,
@@ -180,7 +180,7 @@ const colorValues = {
 export class Color
 {
 	private m_value:number;
-	private static custom: Color[] = []
+	private static custom: Record<string,Color> = {};
 
 	/**
 	 * @example
@@ -451,7 +451,7 @@ export class Color
 			r = g = b = l; // achromatic
 		}
 		else{
-			function hue2rgb(p, q, t){
+			function hue2rgb(p: number, q: number, t: number){
 				if(t < 0) t += 1.0;
 				if(t > 1) t -= 1.0;
 				if(t < 1/6) return p + (q - p) * 6 * t;

package/lib/src/colorpicker.ts

@@ -123,11 +123,11 @@ export class ColorPicker extends Container<ColorPickerProps, ColorPickerEventMap
 
 			this.addClass("pal-mode");
 
-			let selector = null;
-			let cur = null;
+			let selector: VLayout = null;
+			let cur: Component = null;
 
-			let main_sel = [];
-			let sub_sel = [];
+			let main_sel: Component[] = [];
+			let sub_sel: Component[] = [];
 
 			const ccolor = this.m_baseColor.value();
 
@@ -158,7 +158,7 @@ export class ColorPicker extends Container<ColorPickerProps, ColorPickerEventMap
 				main_sel.push(el);
 			});
 
-			function fillSubs( colors ) {
+			function fillSubs( colors: Variation[] ) {
 				sub_sel = [];
 				colors.forEach(mc => {
 					let clr = new Color(mc.hex);
@@ -550,7 +550,7 @@ export class ColorPickerBox extends Dialog<ColorPickerBoxProps, ColorPickerBoxEv
 		});
 	}
 
-	private _makeCustoms(cc) {
+	private _makeCustoms(cc: Color[] ) {
 
 		let custom = null;
 
@@ -735,7 +735,17 @@ export class ColorPickerEditor extends HLayout<ColorPickerEditorProps, ColorPick
 
 // :: Material colors scheme ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-const materialColors = [
+interface Variation {
+	weight: number;
+	hex: number;
+}
+
+interface Variations {
+	color: string;
+	variations: Variation[];
+};
+
+const materialColors: Variations[] = [
 	{
 		color: "Red",
 		variations: [

package/lib/src/combobox.ts

@@ -87,10 +87,10 @@ export interface ComboBoxProps extends CProps<ComboBoxEventMap> {
 }
 
 abstract class InputLike extends Component {
-	abstract setValue( text: string );
+	abstract setValue( text: string ): void;
 	abstract getValue( ): string;
-	abstract showError( text: string );
-	abstract clearError( );
+	abstract showError( text: string ): void;
+	abstract clearError( ): void;
 }
 
 
@@ -131,7 +131,7 @@ export class ComboBox extends HLayout<ComboBoxProps,ComboBoxEventMap> {
 		this.m_lockchg = false;
 	}
 
-	_onKey(e) {
+	_onKey(e: KeyboardEvent ) {
         if (this.m_popvis) {
             if (e.key == "ArrowUp" || e.key == "ArrowDown") {
 				this.m_lockpop = true;
@@ -379,12 +379,12 @@ export class ComboBox extends HLayout<ComboBoxProps,ComboBoxEventMap> {
 	 * 
 	 */
 
-	private _setInput( item, fireEv = false ) {
+	private _setInput( item: ListViewItem, fireEv = false ) {
 
 		if( item ) {
 			if( this.m_ui_input ) {
 				if( this.m_ui_input instanceof Input ) {
-					this.m_ui_input.value = item.text;
+					this.m_ui_input.value = item.text as string;
 					// fires a change event
 					if( fireEv ) {
 						this.m_ui_input.dom.dispatchEvent( new Event('input') );

package/lib/src/component.ts

@@ -54,6 +54,10 @@ export interface ICaptureInfo {
 	iframes: NodeListOf<HTMLIFrameElement>;
 }
 
+type CSSPropertyName = {
+	-readonly [K in keyof CSSStyleDeclaration & string]: CSSStyleDeclaration[K];
+};
+
 /** @ignore classname prefix for system classes */
 const _x4_ns_prefix = 'x-';
 
@@ -66,7 +70,7 @@ const _x4_el_store = Symbol();
 const _x4_el_sym = Symbol();
 
 /** @ignore properties without 'px' unit */
-export const _x4_unitless = {
+export const _x4_unitless: Record<string,1> = {
 	animationIterationCount: 1, borderImageOutset: 1, borderImageSlice: 1, borderImageWidth: 1, boxFlex: 1, boxFlexGroup: 1,
 	boxOrdinalGroup: 1, columnCount: 1, flex: 1, flexGrow: 1, flexPositive: 1, flexShrink: 1, flexNegative: 1, flexOrder: 1,
 	gridRow: 1, gridColumn: 1, fontWeight: 1, lineClamp: 1, lineHeight: 1, opacity: 1, order: 1, orphans: 1, tabSize: 1, widows: 1,
@@ -114,7 +118,7 @@ interface IMap<T> {
 export interface EvDblClick extends BasicEvent {
 }
 
-export function EvDblClick(context = null) {
+export function EvDblClick(context: any = null) {
 	return BasicEvent<EvDblClick>({ context });
 }
 
@@ -127,7 +131,7 @@ export interface EvFocus extends BasicEvent {
 	readonly focus: boolean;
 }
 
-export function EvFocus( focus = true, context = null) {
+export function EvFocus( focus = true, context: any = null) {
 	return BasicEvent<EvFocus>({ focus, context });
 }
 
@@ -151,7 +155,7 @@ export interface CProps<T extends CEventMap = CEventMap> extends BaseComponentPr
 	cls?: string;			// elements classes (space separated), prefix class name with @ to make it system wide
 	id?: string;			// element id
 	style?: IMap<string | number>;	// element style
-	attrs?: object;			// element attributes
+	attrs?: Record<string,string|number|boolean>;			// element attributes
 
 	dom_events?: IDOMEvents;	// DOM event handlers
 	data?: any;				// element user data (you can store everything you need here)
@@ -191,7 +195,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	private m_dom: HTMLElement;
 	private m_iprops: CInternalProps;
 
-	private static __sb_width;			// scrollbar width
+	private static __sb_width: number;			// scrollbar width
 	private static __comp_guid = 1000;	// component global unique id
 	private static __privateEvents: any = {};
 	private static __sizeObserver: ResizeObserver;	// resize observer
@@ -199,8 +203,8 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	//private static __intersectionObserver: IntersectionObserver;	// visibility observer
 
 	private static __capture: ICaptureInfo = null;
-	private static __capture_mask = null;
-	private static __css = null;
+	private static __capture_mask: HTMLElement = null;
+	private static __css: Stylesheet = null;
 
 	constructor(props: P = null ) {
 		super(props ?? {} as P );
@@ -262,7 +266,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			return;
 		}
 
-		const append = (c) => {
+		const append = (c: ComponentOrString) => {
 
 			if (!this.m_props.content) {
 				this.m_props.content = [];
@@ -409,7 +413,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	 * el.setStyle( {left:100} );
 	 */
 
-	public setStyle(style: object) {
+	public setStyle(style: Record<string,any>) {
 		for (let s in style) {
 			this.setStyleValue(s, style[s]);
 		}
@@ -432,16 +436,16 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	}
 
 	private _setDomStyleValue(name: string, value: string | number) {
-		if (this.m_dom) {
 
+		if (this.m_dom) {
 			if (value === undefined) {
 				value = null;
 			}
-			else if (!_x4_unitless[name] && (isNumber(value) || reNumber.test(value))) {
+			else if (!_x4_unitless[name as string] && (isNumber(value) || reNumber.test(value))) {
 				value = value + 'px';
 			}
 
-			this.m_dom.style[name] = value;
+			(this.m_dom.style as any)[name] = value;
 		}
 	}
 
@@ -464,7 +468,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	 */
 
 	public getStyleValue(name: string) {
-		return this.getComputedStyle()[name];
+		return (this.getComputedStyle() as any)[name];
 	}
 
 	/**
@@ -549,7 +553,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 				return this.m_props.id;
 			}
 
-			return this.m_props.attrs ? this.m_props.attrs[name] : undefined;
+			return this.m_props.attrs ? this.m_props.attrs[name]+'' : undefined;
 		}
 	}
 
@@ -591,7 +595,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			return;
 		}
 
-		let add = (c) => {
+		let add = (c: string) => {
 
 			if (c === undefined || c === null || c === '') {
 				return;
@@ -633,7 +637,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			return;
 		}
 
-		let remove = (c) => {
+		let remove = (c: string) => {
 			if (c === undefined || c === null || c === '') {
 				return;
 			}
@@ -684,7 +688,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 
 	public toggleClass(name: string): void {
 
-		let toggle = (c) => {
+		let toggle = (c: string) => {
 			if (c === undefined && c === null && c === '') {
 				return;
 			}
@@ -796,7 +800,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 		// prepare iprops
 		if (props.dom_events) {
 			for (let ename in props.dom_events) {
-				this._setDomEvent(ename, props.dom_events[ename]);
+				this._setDomEvent(ename, (props.dom_events as any)[ename]);
 			}
 		}
 
@@ -813,7 +817,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			this.m_dom = x4document.createElement( (props.tag ?? 'div') as any );
 		}
 
-		this.m_dom[_x4_el_sym] = this;
+		(this.m_dom as any)[_x4_el_sym] = this;
 
 		//let me = Object.getPrototypeOf(this);
 		//console.log( 'create', this.m_iprops.uid, me.constructor.name );
@@ -835,7 +839,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			for (let a in att) {
 				const attr = att[a];
 				if( attr!==false && attr!==undefined ) {
-					this._setDomAttribute(a, att[a]);
+					this._setDomAttribute(a, ''+att[a] );
 				}
 			}
 		}
@@ -932,7 +936,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 				for (let i = 0, n = mutation.addedNodes.length; i < n; i++) {
 
 					let add = mutation.addedNodes[i] as HTMLElement;
-					let el = add[_x4_el_sym] as Component;
+					let el = (add as any)[_x4_el_sym] as Component;
 
 					if (el) {
 						el.enumChilds((c: Component) => {
@@ -959,8 +963,8 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 		let _dom = this.m_dom;
 
 		// free attached resources
-		delete _dom[_x4_el_sym];
-		delete _dom[_x4_el_store];
+		delete (_dom as any)[_x4_el_sym];
+		delete (_dom as any)[_x4_el_store];
 
 		//
 		if (with_dom) {
@@ -1155,7 +1159,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 
 		let _dom = this.m_dom;
 		if (_dom) {
-			let store = _dom[_x4_el_store];
+			let store = (_dom as any)[_x4_el_store];
 			if (store) {
 				delete store[type];
 			}
@@ -1171,10 +1175,10 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	private _createEvent(name: string, handler: Function, passive?: boolean) {
 
 		let _dom = this.m_dom;
-		let store = _dom[_x4_el_store];
+		let store = (_dom as any)[_x4_el_store];
 
 		if (!store) {
-			store = _dom[_x4_el_store] = {};
+			store = (_dom as any)[_x4_el_store] = {};
 		}
 
 		if (!store[name]) {
@@ -1186,14 +1190,14 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			store[name].push(handler);
 		}
 
-		if (unbubbleEvents[name] === 1) {
-			_dom['on' + name] = Component._dispatchUnbubbleEvent;
+		if ((unbubbleEvents as any)[name] === 1) {
+			(_dom as any)['on' + name] = Component._dispatchUnbubbleEvent;
 		}
 		else if (!Component.__privateEvents[name]) {
 			Component.__privateEvents[name] = true; // todo count it
 
 			if( passive===undefined ) {
-				if ( passiveEvents[name] ) {
+				if ( (passiveEvents as any)[name] ) {
 					x4document.addEventListener(name as any, Component._dispatchEvent, { passive: false, capture: true });
 				}
 				else {
@@ -1222,7 +1226,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 	private static _dispatchEvent(ev: any) {
 
 		let target = ev.target,
-			noup = unbubbleEvents[ev.type] === 2;
+			noup = (unbubbleEvents as any)[ev.type] === 2;
 
 		while (target) {
 			if (target[_x4_el_store]) {
@@ -1317,7 +1321,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 
 			while (el) {
 				// get component (if any)
-				let cel = el[_x4_el_sym];
+				let cel = (el as any)[_x4_el_sym];
 				if (cel) {
 					cb(cel);
 
@@ -1678,7 +1682,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			const srhCls = isString(classname);
 
 			while (dom) {
-				let el: Component = dom[_x4_el_sym];
+				let el: Component = (dom as any)[_x4_el_sym];
 
 				if( srhCls ) {
 					if( el && el.hasClass(classname) ) {
@@ -1695,7 +1699,7 @@ export class Component<P extends CProps<CEventMap> = CProps<CEventMap>, E extend
 			return null;
 		}
 		else {
-			return dom ? dom[_x4_el_sym] : null;
+			return dom ? (dom as any)[_x4_el_sym] : null;
 		}
 	}
 
@@ -1747,8 +1751,8 @@ let fly_element: Component = null;
 
 export function flyWrap<T extends Component>(dom: HTMLElement | EventTarget): T {
 
-	if (dom[_x4_el_sym]) {
-		return dom[_x4_el_sym];
+	if ((dom as any)[_x4_el_sym]) {
+		return (dom as any)[_x4_el_sym];
 	}
 
 	let f = fly_element;
@@ -1801,7 +1805,7 @@ export class Space extends Component {
 		let style = null;
 
 		while (dom) {
-			let el: Component = dom[_x4_el_sym];
+			let el: Component = (dom as any)[_x4_el_sym];
 			if (el.hasClass('@hlayout')) {
 				style = { width: this.m_size };
 				break;
@@ -1833,7 +1837,7 @@ export interface EvSize extends BasicEvent {
 	readonly mode: SizeMode;
 }
 
-export function EvSize(size: Size, mode: SizeMode = null, context = null ): EvSize {
+export function EvSize(size: Size, mode: SizeMode = null, context: any = null ): EvSize {
 	return BasicEvent<EvSize>({ size, mode, context });
 }
 
@@ -1927,7 +1931,7 @@ export class Separator extends Component<SeparatorProps, SeparatorEventMap> {
 
 	private _pointerMoved(ev: UIEvent) {
 
-		let __move = (ex, ey) => {
+		let __move = (ex: number, ey: number) => {
 
 			if (this.m_props.orientation == 'horizontal') {
 
@@ -2121,7 +2125,7 @@ export class SizerOverlay extends Component<SizerOverlayProps, SizerOverlayEvent
 	}
 
 	private _handle_mouse(ev: UIEvent) {
-		let __move = (ex, ey) => {
+		let __move = (ex:number, ey:number) => {
 			if (this._is_horz()) {
 
 				let width;
@@ -2200,7 +2204,7 @@ export interface Shortcut {
 	sequence: string;
 	name: string;
 	immediate: boolean;
-	callback?: (domTarget) => void;
+	callback?: EventHandler<KeyboardEvent>;
 }
 
 interface EvShortcut extends BasicEvent {

package/lib/src/dialog.ts

@@ -498,7 +498,7 @@ export class Dialog<P extends DialogProps = DialogProps, E extends DialogBoxEven
 			return;
 		}
 
-		let __move = (ex, ey) => {
+		let __move = (ex: number, ey: number) => {
 			
 			if( ex>wrc.right ) {
 				ex = wrc.right;

package/lib/src/drag_manager.ts

@@ -55,7 +55,7 @@ class DragManager {
 	
 	notified: Component;
 	
-	timer;
+	timer: any; // pb with name of settimeout return
 
 	/**
 	 * 
@@ -178,14 +178,14 @@ class DragManager {
 
 	_check( ) {
 
-		const leaving = ( x ) => {
+		const leaving = ( x: Component ) => {
 			x.removeClass('drop-over');
 
 			const cb = x.getData( x_drag_cb );
 			cb( 'leave', this.dragSource );
 		}
 
-		const entering = ( x ) => {
+		const entering = ( x: Component ) => {
 			x.addClass('drop-over');
 			const cb = x.getData( x_drag_cb );
 			cb( 'enter', this.dragSource );

package/lib/src/fileupload.ts

@@ -105,14 +105,14 @@ export class ImageUpload extends FileUpload {
 		return this.m_path;
 	}
 
-	private _set_value(v) {
+	private _set_value(v: any) {
 		debugger;
 	}
 
-	private _handleChange(e) {
+	private _handleChange(e: any) {
 
 		let self = this;
-		function createThumbnail(file) {
+		function createThumbnail(file: Blob) {
 
 			let reader = new FileReader();
 			reader.addEventListener('load', (e) => {

package/lib/src/form.ts

@@ -324,7 +324,7 @@ export class Form<T extends FormProps = FormProps, E extends FormEventMap = Form
 
 	public getValues(): any {
 		let elements = this._getElements();
-		let result = {};
+		let result: Record<string,any> = {};
 
 		for (let e = 0; e < elements.length; e++) {
 

package/lib/src/svgcomponent.ts

@@ -50,10 +50,10 @@ function num( x: number ): number {
 	return Math.round( x * 1000 ) / 1000;
 }
 
-function clean( a, ...b ) {
+function clean( a: any, ...b: any ) {
 
 	// just round number values to 3 digits
-	b = b.map( v => {
+	b = b.map( ( v: any ) => {
 		if( typeof v === 'number' && isFinite(v) ) {
 			return num(v);
 		}
@@ -79,10 +79,15 @@ export abstract class SVGItem {
 		this.m_style = new Map( );
 	}
 
+	setTag( t: string ) {
+		this.m_tag = t;
+	}
+
 	/**
 	 * render the item
 	 * @returns 
 	 */
+
 	render( ) : string {
 		return `<${this.m_tag} ${this.renderAttrs()} ${this.renderStyle()}>${this.renderContent( )}</${this.m_tag}>`;
 	}
@@ -421,7 +426,7 @@ export class SVGGradient extends SVGItem {
 
 	override renderContent(): string {
 
-		const result = [];
+		const result: string[] = [];
 		this.m_stops.forEach( s => {
 			result.push( `<stop offset="${s.offset}%" stop-color="${s.color}"></stop>`);
 		});
@@ -449,13 +454,13 @@ export class SVGGroup extends SVGItem {
 		return path;
 	}
 
-	text( x, y, txt ) {
+	text( x: number, y: number, txt: string ) {
 		const text = new SVGText( x, y, txt );
 		this.m_items.push( text );
 		return text;
 	}
 
-	ellipse( x, y, r1, r2 = r1 ) {
+	ellipse( x: number, y: number, r1: number, r2 = r1 ): SVGShape {
 		const shape = new SVGShape( 'ellipse' );
 		shape.attr( 'cx', num(x)+'' );
 		shape.attr( 'cy', num(y)+'' );
@@ -465,7 +470,7 @@ export class SVGGroup extends SVGItem {
 		return shape;
 	}
 
-	rect( x, y, w, h ) {
+	rect( x: number, y: number, w: number, h: number ): SVGShape {
 		const shape = new SVGShape( 'rect' );
 		shape.attr( 'x', num(x)+'' );
 		shape.attr( 'y', num(y)+'' );
@@ -545,7 +550,7 @@ export class SVGPathBuilder extends SVGGroup
     
     render() {
 
-		let result = [];
+		let result: string[] = [];
         this.m_items.forEach(i => {
             result.push(i.render());
         });

package/lib/src/version.ts

@@ -27,4 +27,4 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
 
-export const x4js_version = "1.6.0";
+export const x4js_version = "1.6.1";