x4js 2.2.69 → 2.2.70

package/package.json

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

package/src/components/menu/menu.module.scss

@@ -17,7 +17,7 @@
 @use "../shared.scss";
 
 :root {
-	--menu-background: var( --background-ternary );
+	--menu-background: white;
 	--menu-border: var( --border-hover );
 
 	--menuitem-color: var( --text-ternary );;

package/src/components/menu/menu.ts

@@ -172,22 +172,35 @@ export class Menu extends Popup {
 
 		this.addClass( "x4vbox" );
 
-		const children = props.items?.map( itm => {
-			if( itm==="-" ) {
-				return new CMenuSep( );
-			}
-			else if( isString(itm) ) {
-				return new CMenuItem( { text: itm, click: null, cls: 'title' } );
-			}
-			else if( itm instanceof Component ) {
-				return itm;
+		if( props.items ) {
+			let children = props.items.filter( x=> !!x);
+
+			// trim separators
+			while( children.at(0)=='-' ) {
+				children.shift( );
 			}
-			else {
-				return new CMenuItem( itm );
+
+			while( children.at(-1)=='-' ) {
+				children.pop( );
 			}
-		});
 
-		this.setContent( children );
+			const items = children.map( itm => {
+					if( itm==="-" ) {
+						return new CMenuSep( );
+					}
+					else if( isString(itm) ) {
+						return new CMenuItem( { text: itm, click: null, cls: 'title' } );
+					}
+					else if( itm instanceof Component ) {
+						return itm;
+					}
+					else {
+						return new CMenuItem( itm );
+					}
+				});
+
+			this.setContent( items );
+		}
 	}
 }