x4js 1.4.8 → 1.4.9

package/src/icon.ts

@@ -7,25 +7,29 @@
 *        
 * @file icon.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { Component, CProps } from './component'
 import { Stylesheet } from './styles'
-import { HtmlString } from './tools';
+import { HtmlString, isString } from './tools';
 import { BasicEvent, EvChange, EventMap, EventSource } from './x4_events';
 
 // ============================================================================
@@ -39,7 +43,6 @@ export interface IconProps extends CProps {
 	size?: number;
 }
 
-
 export interface EvLoaded extends BasicEvent {
 	url: string;
 	svg: string;
@@ -53,6 +56,17 @@ interface LoadingEventMap extends EventMap {
 	loaded: EvLoaded;
 }
 
+function trimQuotes( str:string ): string {
+	const l = str.length;
+	if( str[0]=='"' && str[l-1]=='"' ) {
+		str = str.substring( 1, l-1 )
+		str = str.replaceAll( '\\"', "'" );
+		return str;
+	}
+
+	return str;
+}
+
 class Loader extends EventSource<LoadingEventMap> {
 	svgs: Map<string,string>;
 
@@ -75,14 +89,23 @@ class Loader extends EventSource<LoadingEventMap> {
 
 			// then start loading
 			const _load = async ( url ) => {
-				const r = await fetch( url );
-				if( r.ok ) {
-					const svg = await r.text();
+					
+				// shortcut
+				if( url.substring(0,24)=="data:image/svg+xml;utf8,") {
+					const svg = url.substring(24);
 					this.svgs.set( url, svg );
-
-					//console.log( 'signal=', url );
 					this.signal( 'loaded', EvLoaded(url,svg) );
 				}
+				else {
+					const r = await fetch( url );
+					if( r.ok ) {
+						const svg = await r.text();
+						this.svgs.set( url, svg );
+
+						//console.log( 'signal=', url );
+						this.signal( 'loaded', EvLoaded(url,svg) );
+					}
+				}
 			}
 
 			_load( url );			
@@ -101,43 +124,95 @@ export class Icon extends Component<IconProps>
 	private m_icon: string;
 	private m_iconName: IconID;
 
-	constructor( props: IconProps ) {
-		super( props );
-				
-		this._setIcon( props.icon, false );
+	constructor( props: IconProps | string ) {
+
+		if( isString(props) ) {
+			super( { icon: props } );
+		}
+		else {
+			super( props );
+		}
 
-		if( props.size ) {
-			this.setStyleValue( 'fontSize', props.size );
+		this._setIcon( this.m_props.icon, false );
+		if( this.m_props.size ) {
+			this.setStyleValue( 'fontSize', this.m_props.size );
 		}
 	}
 
 	private _setIcon(icon: IconID, remove_old: boolean) {
 
-		const reUrl = /\s*url\s*\(\s*(.+)\s*\)\s*/gi;
-		const reSvg = /\s*svg\s*\(\s*(.+)\s*\)\s*/gi;
-		const reSvg2 = /(.*\.svg)$/gi;
-		const reCls = /\s*cls\s*\(\s*(.+)\s*\)\s*/gi;
-		
 		if( !icon ) {
 			this.m_iconName = '';
 			return;
 		}
 
 		this.removeClass( '@svg' );
-		
-		let name, url;
+
+		//	todo: deprecated
+		let name, url: string;
 		if (typeof (icon) === 'number') {
 			icon = icon.toString(16);
 			name = icon;
 		}
 		else {
+			// var( <var-name> )
+			//	
+			//	in the .css
+			//  --------------------------
+			//	:root {
+			//		--chevron-up: svgpath( "M0 96C0 78.33 14.33 64 32 64H416C433.7 64 448 78.33 448 96C448 113.7 433.7 128 416 128H32C14.33 128 0 113.7 0 96z" );
+			//	}
+			//
+			//	var( "--chevron-up" )
+			const reVar = /\s*var\s*\(\s*(.+)\s*\)\s*/gi;
+			let match_var = reVar.exec( icon );
+			while( match_var ) {
+				const varname = match_var[1].trim( );
+				icon = (Stylesheet.getVar(varname) as string).trim( );
+                if (icon == '' || icon === undefined) {
+					console.error( `icon: unable to find variable named '${varname}'` );
+					return;
+				}
+				else {
+					icon = trimQuotes( icon );
+				}
+
+				match_var = reVar.exec( icon );
+			}
+			
+			//	svg( <svg-filename> )	-> 	svg( "mysvgfile.svg" )	
+			//	<svg-filename>.svg 		->  "mysvgfile.svg"
+
+			const reSvg = /\s*svg\s*\(\s*(.+)\s*\)\s*/gi;
+			const reSvg2 = /(.*\.svg)$/gi;
+			
 			let match_svg = reSvg.exec( icon ) || reSvg2.exec(icon);
 			if( match_svg ) {
 				const url  = match_svg[1].trim( );
 				this._setSVG( url );
 				return;
 			}
+
+			//	svgpath( <svg-path> )
+			//	svgpath( "M0 96C0 78.33 14.33 64 32 64H416C433.7 64 448 78.33 448 96C448 113.7 433.7 128 416 128H32C14.33 128 0 113.7 0 96z" )
+			const reSvg3 = /\s*svgpath\s*\(\s*(.+)\s*\)\s*/gi;
+			let match_pth = reSvg3.exec( icon );
+			if( match_pth ) {
+				const pth  = this._setSVGPath( match_pth[1].trim( ) );
+				return;
+			}
+
+			//	data( <direct> )
+			//	data( "data:image/svg+xml;utf8,<svg...></svg>" )
+
+			const reSvg4 = /^\s*(data\:image\/.+)\s*$/gi;
+			let match_dta = reSvg4.exec( icon );
+			if( match_dta ) {
+				this._setSVG( match_dta[1] );
+				return;
+			}
 			
+			const reCls = /\s*cls\s*\(\s*(.+)\s*\)\s*/gi;
 			let match_cls = reCls.exec( icon );
 			if( match_cls ) {
 				const classes  = match_cls[1].trim( );
@@ -145,12 +220,20 @@ export class Icon extends Component<IconProps>
 				return;
 			}
 			
+			const reUrl = /\s*url\s*\(\s*(.+)\s*\)\s*/gi;
 			let match_url = reUrl.exec( icon );
 			if( match_url ) {
-				url  = match_url[1].trim( );
-				name = url.replace( /[/\\\.\* ]/g, '_' );
+				url  = trimQuotes( match_url[1].trim( ) );
+				if( url.substring(0,5)=='data:' ) {
+					this._setSVG( url );
+					return;
+				}
+				else {
+					name = url.replace( /[/\\\.\* ]/g, '_' );
+				}
 			}
 			else {
+				// todo: deprecated
 				name = icon;
 				icon = Stylesheet.getVar( 'icon-'+icon ) as string;
 
@@ -203,6 +286,7 @@ export class Icon extends Component<IconProps>
 	 * change the icon
 	 * @param icon - new icon
 	 */
+	
 	public set icon( icon: IconID ) {
 		this._setIcon( icon, true );
 	}
@@ -227,6 +311,14 @@ export class Icon extends Component<IconProps>
 		svgLoader.load( url );
 	}
 
+	/**
+	 * todo: try to extract viewbox
+	 */
+
+	private _setSVGPath( pth: string ) {
+		this.addClass( '@svg-icon' );
+		this.setContent( HtmlString.from(`<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="${pth}/></svg>`), false );
+	}
 
 	/**
 	 * 

package/src/image.ts

@@ -7,20 +7,24 @@
 *        
 * @file image.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { Component, CProps, html } from './component'

package/src/index.ts

@@ -1,3 +1,32 @@
+/**
+*  ___   ___ __
+*  \  \_/  /  / _
+*   \     /  /_| |_
+*   /  _  \____   _|  
+*  /__/ \__\   |_|
+*        
+* @file index.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 * from "./application"
 export * from "./base_component"
 export * from "./base64"

package/src/input.ts

@@ -7,20 +7,24 @@
 *        
 * @file input.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { Component, CProps, CEventMap, EvFocus } from './component'

package/src/label.ts

@@ -7,20 +7,24 @@
 *        
 * @file label.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { Component, CProps } from './component'

package/src/layout.ts

@@ -5,23 +5,27 @@
 *   /    \____   _|  
 *  /__/\__\   |_|
 *        
- * @file layout.ts
- * @author Etienne Cochard 
- * @license
- * Copyright (c) 2019-2021 R-libre ingenierie
- *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 3 of the License, or
- *	(at your option) any later version.
- *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
- *
- *	You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>..
- */
+* @file layout.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 { Component, CProps, ComponentContent, Container, ContainerProps, ContainerEventMap } from './component'
 import { } from './x4_events'

package/src/link.ts

@@ -7,20 +7,24 @@
 *        
 * @file link.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { Component, CProps, CEventMap, isHtmlString, HtmlString, html } from './component'

package/src/listview.ts

@@ -7,20 +7,24 @@
 *        
 * @file listview.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { Container, Component, CProps, ContainerEventMap, EvDblClick } from './component'

package/src/md5.ts

@@ -8,19 +8,24 @@
 * @file md5.ts
 * @author Etienne Cochard 
 * @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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/src/menu.ts

@@ -7,20 +7,24 @@
 *        
 * @file menu.ts
 * @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
 *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+* Copyright (c) 2019-2022 R-libre ingenierie
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+* 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.
 *
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+* 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 { CEventMap, Component, CProps } from './component'
@@ -282,8 +286,10 @@ export class MenuItem extends Component<MenuItemProps, MenuItemEventMap> {
 			icon = props.checked ? 'cls(far fa-check)' : 0;	//todo: use stylesheet
 		}
 
+		let popIco = null;
 		if (this.isPopup) {
 			this.addClass('@popup-menu-item');
+			popIco = new Icon( "var( --x4-icon-chevron-right )" );
 		}
 
 		if (!text && !icon) {
@@ -300,7 +306,8 @@ export class MenuItem extends Component<MenuItemProps, MenuItemEventMap> {
 
 		this.setContent([
 			icon < 0 ? null : new Icon({ icon }),
-			new Label({ flex: 1, text })
+			new Label({ flex: 1, text }),
+			popIco
 		]);
 	}