x4js 2.2.68 → 2.2.70

package/package.json

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

package/src/components/gridview/gridview.ts

@@ -989,7 +989,7 @@ export class Gridview<P extends GridviewProps = GridviewProps, E extends Gridvie
 
 		this._viewport = new Viewport({ content: this._body });
 
-		if (!this._has_footer) {
+		if (!this.props.footer) {
 			this.setStyleVariable("--footer-height", "0");
 		}
 

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 );
+		}
 	}
 }
 

package/src/components/textarea/textarea.module.scss

@@ -56,7 +56,7 @@
 		}
 	}
 
-	.x4label:has(.empty) {
+	.x4label#text:has(.empty) {
 		display: none;
 	}
 

package/src/components/textarea/textarea.ts

@@ -49,7 +49,9 @@ export class SimpleTextArea extends Component<TextAreaProps> {
 		super( { ...props, tag: "textarea" } );
 
 		this.setAttribute( "name", props.name );
-		this.setAttribute( "value", props.value+'' );
+		if( props.value ) {
+			this.setAttribute( "value", props.value+'' );
+		}
 
 		if( props.resize!==undefined ) {
 			this.setStyleValue( "resize", props.resize===false ? "none" : props.resize as string );
@@ -112,9 +114,12 @@ export class TextArea extends VBox {
 	constructor( props: TextAreaProps ) {
 		super( props );
 
+
+		const { label, value, resize, readonly, trim, name } = props;
+
 		this.setContent( [
 			new Label( { text: props.label }),
-			this._input = new SimpleTextArea( props )
+			this._input = new SimpleTextArea( { label,value,resize,readonly,trim } )
 		])
 	}
 

package/src/core/core_data.ts

@@ -275,7 +275,7 @@ export class DataModel<T = any> {
 			this.addField( ...fields );
 		}
 	}
-	
+
     /**
      * dynamic DataModel
      */
@@ -1083,7 +1083,7 @@ export class DataStore<T = any> extends EventSource<DataStoreEventMap> {
 			} );
 		}
 
-		return result>=0 ? this.getByIndex(result) : null;
+		return result>=0 ? this.m_records[result] : null;
 	}
 
 	export( ) {