From c520015ba7dac8a1478a5bc8be38eac4c466f48f Mon Sep 17 00:00:00 2001
From: rebecca0201 <rebeccalai@potix.com>
Date: Mon, 11 Sep 2023 17:52:19 +0800
Subject: [PATCH 1/2] ZK-5035: Listbox renders duplicate checkmarks after
 adding 1st listheader dynamically

---
 zkdoc/release-note                            |  1 +
 zktest/src/main/webapp/test2/B100-ZK-5035.zul | 40 +++++++++++++++++++
 .../src/main/webapp/test2/config.properties   |  1 +
 .../zktest/zats/test2/B100_ZK_5035Test.java   | 33 +++++++++++++++
 .../main/resources/web/js/zul/sel/Listcell.ts |  8 ++++
 5 files changed, 83 insertions(+)
 create mode 100644 zktest/src/main/webapp/test2/B100-ZK-5035.zul
 create mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5035Test.java

diff --git a/zkdoc/release-note b/zkdoc/release-note
index ab0d9247560..4b433cbd7d8 100644
--- a/zkdoc/release-note
+++ b/zkdoc/release-note
@@ -64,6 +64,7 @@ ZK 10.0.0
   ZK-5539: $init() will call twice on Keikai component
   ZK-5540: zk.wpd with browser condition won't work with ZK 10
   ZK-5530: users cannot focus on the icons on the Calendar header
+  ZK-5035: Listbox renders duplicate checkmarks after adding 1st listheader dynamically
 
 * Upgrade Notes
   + The Java binary-compatible level is Java 11 since ZK 10.
diff --git a/zktest/src/main/webapp/test2/B100-ZK-5035.zul b/zktest/src/main/webapp/test2/B100-ZK-5035.zul
new file mode 100644
index 00000000000..efd96f189db
--- /dev/null
+++ b/zktest/src/main/webapp/test2/B100-ZK-5035.zul
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+B100-ZK-5035.zul
+
+        Purpose:
+
+        Description:
+
+        History:
+                Thu Sep 07 13:18:53 CST 2023, Created by rebeccalai
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+-->
+<zk>
+    <label multiline="true">
+        1. click the prepend 1st column dynamically button
+        2. only the 1st column has checkmarks (if bug exists then the 2nd column also has checkmarks)
+    </label>
+    <zscript><![CDATA[
+        ListModelList model = new ListModelList(Locale.getAvailableLocales());
+        String[] columnSettings = {"displayName", "country", "language"};
+        ListModelList visibleColumns = new ListModelList();
+        visibleColumns.addAll(Arrays.asList(columnSettings));
+    ]]></zscript>
+    <button label="prepend 1st column dynamically" onClick='visibleColumns.add(0, "displayCountry");'/>
+    <listbox id="lb" apply="org.zkoss.bind.BindComposer" multiple="true" checkmark="true" model="@load(model)" height="400px">
+        <listhead sizable="true" menupopup="auto">
+            <forEach items="@init(visibleColumns)">
+                <listheader label="@init(each)"/>
+            </forEach>
+        </listhead>
+        <template name="model" var="record">
+            <listitem >
+                <forEach items="@init(visibleColumns)">
+                    <listcell label="@init(record[each])"/>
+                </forEach>
+            </listitem>
+        </template>
+    </listbox>
+</zk>
\ No newline at end of file
diff --git a/zktest/src/main/webapp/test2/config.properties b/zktest/src/main/webapp/test2/config.properties
index c9cf694afa0..1bc4dfe6d31 100644
--- a/zktest/src/main/webapp/test2/config.properties
+++ b/zktest/src/main/webapp/test2/config.properties
@@ -3158,6 +3158,7 @@ B90-ZK-4431.zul=A,E,Multislider
 ##zats##B100-ZK-5468-Tabbox.zul=A,E,Model,Tabbox
 ##zats##B100-ZK-5468-Tree.zul=A,E,Model,Tree
 ##zats##B100-ZK-5235.zul=A,E,Menu,Menupopup,focus
+##zats##B100-ZK-5035.zul=A,E,Listbox,Column,AddChild,Checkmark
 
 ##
 # Features - 3.0.x version
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5035Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5035Test.java
new file mode 100644
index 00000000000..dd37da239bd
--- /dev/null
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5035Test.java
@@ -0,0 +1,33 @@
+/* B100_ZK_5035Test.java
+
+		Purpose:
+
+		Description:
+
+		History:
+				Fri Sep 08 17:14:11 CST 2023, Created by rebeccalai
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+*/
+package org.zkoss.zktest.zats.test2;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Test;
+
+import org.zkoss.test.webdriver.WebDriverTestCase;
+
+public class B100_ZK_5035Test extends WebDriverTestCase {
+	@Test
+	public void test() {
+		connect();
+		waitResponse();
+		int checkableBefore = jq(".z-listitem-checkable").length();
+		click(jq("@button"));
+		waitResponse();
+		int checkableAfter = jq(".z-listitem-checkable").length();
+		assertEquals(checkableBefore, checkableAfter);
+		jq(".z-listitem-checkable").forEach(item -> assertFalse(item.parent().parent().prev().exists()));
+	}
+}
diff --git a/zul/src/main/resources/web/js/zul/sel/Listcell.ts b/zul/src/main/resources/web/js/zul/sel/Listcell.ts
index b6dbaea328f..f3981366015 100644
--- a/zul/src/main/resources/web/js/zul/sel/Listcell.ts
+++ b/zul/src/main/resources/web/js/zul/sel/Listcell.ts
@@ -170,6 +170,14 @@ export class Listcell extends zul.LabelImageWidget<HTMLTableCellElement> {
 			//B70-ZK-2053:make sure checkmark won't display on multiple listgroup
 			if (box.isCheckmark() && !_isListgroupfoot(p)
 				&& (!isGrp || (box.groupSelect && box.isMultiple()))) {
+				// ZK-5035: Remove the old checkmark to prevent duplicate checkmarks
+				const oldCm = this.parent?.$n('cm');
+				if (oldCm) {
+					oldCm.remove();
+					const nextSiblingCave = jq(this.nextSibling?.$n('cave'));
+					nextSiblingCave.html(nextSiblingCave.html().replace(/^&nbsp;/, ''));
+				}
+
 				var chkable = p.isSelectable(),
 					multi = box.isMultiple();
 				s += '<span id="' + p.uuid + '-cm" class="' + p.$s('checkable')

From d68532b306ca18027c39e11495026bd2c6a97c0d Mon Sep 17 00:00:00 2001
From: rebecca0201 <rebeccalai@potix.com>
Date: Thu, 14 Sep 2023 16:39:58 +0800
Subject: [PATCH 2/2] Make changes in response to PR feedback

---
 zul/src/main/resources/web/js/zul/sel/Listcell.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/zul/src/main/resources/web/js/zul/sel/Listcell.ts b/zul/src/main/resources/web/js/zul/sel/Listcell.ts
index f3981366015..9d7fc6331eb 100644
--- a/zul/src/main/resources/web/js/zul/sel/Listcell.ts
+++ b/zul/src/main/resources/web/js/zul/sel/Listcell.ts
@@ -171,12 +171,8 @@ export class Listcell extends zul.LabelImageWidget<HTMLTableCellElement> {
 			if (box.isCheckmark() && !_isListgroupfoot(p)
 				&& (!isGrp || (box.groupSelect && box.isMultiple()))) {
 				// ZK-5035: Remove the old checkmark to prevent duplicate checkmarks
-				const oldCm = this.parent?.$n('cm');
-				if (oldCm) {
-					oldCm.remove();
-					const nextSiblingCave = jq(this.nextSibling?.$n('cave'));
-					nextSiblingCave.html(nextSiblingCave.html().replace(/^&nbsp;/, ''));
-				}
+				if (this.parent?.$n('cm'))
+					this.nextSibling?.rerender();
 
 				var chkable = p.isSelectable(),
 					multi = box.isMultiple();