From e8c7a8d8d826a1db948c34435fd6e74535e6a119 Mon Sep 17 00:00:00 2001
From: James Chu <marchuqq@gmail.com>
Date: Tue, 16 Jan 2024 17:16:00 +0800
Subject: [PATCH] ZK-5480: Cascader doesn't display selected item if set before
 render after ZK-5414

---
 zkdoc/release-note                               |  1 +
 zktest/src/main/webapp/test2/B100-ZK-5480.zul    | 14 ++++++++++++++
 zktest/src/main/webapp/test2/config.properties   |  1 +
 .../zktest/zats/test2/B100_ZK_5480Test.java      | 16 ++++++++++++++++
 4 files changed, 32 insertions(+)
 create mode 100644 zktest/src/main/webapp/test2/B100-ZK-5480.zul
 create mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5480Test.java

diff --git a/zkdoc/release-note b/zkdoc/release-note
index 6142224983..bce9f88b87 100644
--- a/zkdoc/release-note
+++ b/zkdoc/release-note
@@ -31,6 +31,7 @@ ZK 10.0.0
   ZK-5593: inputWidget bind_ accesses input dom node may not exist
   ZK-5605: client-bind fails for zk.$extends created widget classes, without ClientBindComposer declared
   ZK-5603: Client-mvvm boolean false handling is different from server-side
+  ZK-5480: Cascader doesn't display selected item if set before render after ZK-5414
 
 * Upgrade Notes
   + Upgrade commons-fileupload to commons-fileupload2-javax 2.0.0-M1 and commons-io to 2.13.0 to support jakarta-friendly uploads
diff --git a/zktest/src/main/webapp/test2/B100-ZK-5480.zul b/zktest/src/main/webapp/test2/B100-ZK-5480.zul
new file mode 100644
index 0000000000..54f6848559
--- /dev/null
+++ b/zktest/src/main/webapp/test2/B100-ZK-5480.zul
@@ -0,0 +1,14 @@
+<zk xmlns:h="native">
+	<h:h1>Basic</h:h1>
+	<zscript><![CDATA[
+	DefaultTreeModel treeModel = new DefaultTreeModel(new DefaultTreeNode("ROOT",
+		Arrays.asList(new DefaultTreeNode[]{
+			new DefaultTreeNode("USA", Arrays.asList(new TreeNode[]{new DefaultTreeNode("New York"),new DefaultTreeNode("Los Angelas")})),
+			new DefaultTreeNode("Japan", Arrays.asList(new TreeNode[]{new DefaultTreeNode("Tokyo"),new DefaultTreeNode("Kyoto")})),
+			new DefaultTreeNode("New Zealand", Arrays.asList(new TreeNode[]{new DefaultTreeNode("Auckland"),new DefaultTreeNode("Queenstown")}))
+		})
+	));
+	treeModel.addToSelection(treeModel.getChild(new int[]{1, 1}));
+    ]]></zscript>
+	<cascader id="cas" width="300px" model="${treeModel}"/>
+</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 0329111979..b40bc299ff 100644
--- a/zktest/src/main/webapp/test2/config.properties
+++ b/zktest/src/main/webapp/test2/config.properties
@@ -3117,6 +3117,7 @@ B90-ZK-4431.zul=A,E,Multislider
 ##zats##B100-ZK-5529.zul=A,E,Tree,focus
 ##zats##B100-ZK-5593.zul=A,E,Listbox,InputWidget,JSError
 ##zats##B100-ZK-5605.zul=A,E,clientbind,widget
+##zats##B100-ZK-5480.zul=A,E,cascader,selection,label
 
 ##
 # Features - 3.0.x version
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5480Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5480Test.java
new file mode 100644
index 0000000000..3733f1c90c
--- /dev/null
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B100_ZK_5480Test.java
@@ -0,0 +1,16 @@
+package org.zkoss.zktest.zats.test2;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import org.zkoss.test.webdriver.WebDriverTestCase;
+
+public class B100_ZK_5480Test extends WebDriverTestCase {
+	@Test
+	public void test() {
+		connect();
+		waitResponse();
+		assertEquals("Japan/Kyoto", jq(".z-cascader-label").text());
+	}
+}