From b51aa9894ecd4ac00c56bb938ad74956e40645ef Mon Sep 17 00:00:00 2001
From: James Chu <marchuqq@gmail.com>
Date: Thu, 28 Sep 2023 17:49:06 +0800
Subject: [PATCH] refix for B50-3025674.zul (to TS issue)

---
 zul/src/main/resources/web/js/zul/mesh/ColumnMenuWidget.ts | 4 +++-
 zul/src/main/resources/web/js/zul/mesh/HeaderWidget.ts     | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/zul/src/main/resources/web/js/zul/mesh/ColumnMenuWidget.ts b/zul/src/main/resources/web/js/zul/mesh/ColumnMenuWidget.ts
index 5ce0556dcb6..05c28358768 100644
--- a/zul/src/main/resources/web/js/zul/mesh/ColumnMenuWidget.ts
+++ b/zul/src/main/resources/web/js/zul/mesh/ColumnMenuWidget.ts
@@ -240,7 +240,9 @@ export abstract class ColumnMenuWidget extends zul.mesh.HeadWidget {
 	override onChildAdded_(child: zul.mesh.HeaderWidget): void {
 		super.onChildAdded_(child);
 		this._syncColMenu();
-		this.getMeshWidget()?._syncEmpty();
+		let mesh = this.getMeshWidget();
+		if (mesh && mesh._syncEmpty)
+			mesh._syncEmpty();
 	}
 
 	/** @internal */
diff --git a/zul/src/main/resources/web/js/zul/mesh/HeaderWidget.ts b/zul/src/main/resources/web/js/zul/mesh/HeaderWidget.ts
index dae207895c7..e7bf448036f 100644
--- a/zul/src/main/resources/web/js/zul/mesh/HeaderWidget.ts
+++ b/zul/src/main/resources/web/js/zul/mesh/HeaderWidget.ts
@@ -333,9 +333,9 @@ export abstract class HeaderWidget extends zul.LabelImageWidget<HTMLTableCellEle
 	 * @internal
 	 */
 	fixFaker_(): void {
-		if (!(this.parent instanceof zul.mesh.Auxhead)) {
-			var n = this.$n_(),
-				index = zk(n).cellIndex(),
+		let n = this.$n();
+		if (!(this.parent instanceof zul.mesh.Auxhead) && n) {
+			let index = zk(n).cellIndex(),
 				owner = this.getMeshWidget()!;
 			for (var faker: HTMLElement | undefined, fs = HeaderWidget._faker, i = fs.length; i--;) {
 				type MethodName = `e${typeof fs[number]}`;