From 2a5f3a2000be910082ccae9f5cf28c91315fa6f1 Mon Sep 17 00:00:00 2001
From: Jumper Chen <jumperchen@gmail.com>
Date: Thu, 7 Nov 2024 17:28:29 +0800
Subject: [PATCH] ZK-5839: ZK-5839 Follow up on ZK-5696: missing nested shadow
 element after fix

---
 zkdoc/release-note                            |  1 +
 zktest/src/main/webapp/test2/B101-ZK-5839.zul | 35 +++++++++++++++++++
 .../src/main/webapp/test2/config.properties   |  1 +
 .../zktest/zats/test2/B101_ZK_5839Test.java   | 33 +++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 zktest/src/main/webapp/test2/B101-ZK-5839.zul
 create mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B101_ZK_5839Test.java

diff --git a/zkdoc/release-note b/zkdoc/release-note
index b4277a77be..590d6f282d 100644
--- a/zkdoc/release-note
+++ b/zkdoc/release-note
@@ -48,6 +48,7 @@ ZK 10.1.0
   ZK-5833: ZK-423 regression on Android
   ZK-4960: Listbox doesn't keep scrollbar position when applying hflex="min" on a listheader in mobile
   ZK-4961: Unable to scroll in grid and listbox when using non-native scrollbar on mobile
+  ZK-5839: ZK-5839 Follow up on ZK-5696: missing nested shadow element after fix
 
 * Upgrade Notes
   + Remove Htmls.encodeJavaScript(), Strings.encodeJavaScript(), Strings.escape() with Strings.ESCAPE_JAVASCRIPT, and replace them with OWASP Java Encoder APIs instead.
diff --git a/zktest/src/main/webapp/test2/B101-ZK-5839.zul b/zktest/src/main/webapp/test2/B101-ZK-5839.zul
new file mode 100644
index 0000000000..56f3f3d004
--- /dev/null
+++ b/zktest/src/main/webapp/test2/B101-ZK-5839.zul
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+B101-ZK-5839.zul
+
+	Purpose:
+
+	Description:
+
+	History:
+		2024/11/7, Created by jumperchen
+
+Copyright (C) 2024 Potix Corporation. All Rights Reserved.
+
+-->
+<zk>
+	<zscript><![CDATA[
+        int counter = 0;
+        ListModelList items = new ListModelList();
+    ]]></zscript>
+	<div apply="org.zkoss.bind.BindComposer">
+		<forEach items="@init(items)">
+			<div>
+				<if test="@init(true)">
+					AAA
+					<if test="@init(true)">
+						BBB
+					</if>
+					CCC
+				</if>
+			</div>
+		</forEach>
+	</div>
+	<button onClick="items.add(++counter)" label="add"/>
+</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 970aa59a9a..68838a7f93 100644
--- a/zktest/src/main/webapp/test2/config.properties
+++ b/zktest/src/main/webapp/test2/config.properties
@@ -3154,6 +3154,7 @@ B90-ZK-4431.zul=A,E,Multislider
 ##zats##B101-ZK-5802.zul=A,E,JavaScript,Private,Function,Export,Override
 ##zats##B101-ZK-5810.zul=A,E,XEL,ZUL,ClientMVVM
 ##zats##B101-ZK-5777.zul=A,E,SendRedirect,Encoding
+##zats##B101-ZK-5839.zul=A,E,Shadow,ForEach,Model,MVVM,Diff-merge
 
 ##
 # Features - 3.0.x version
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B101_ZK_5839Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B101_ZK_5839Test.java
new file mode 100644
index 0000000000..438e57b73f
--- /dev/null
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B101_ZK_5839Test.java
@@ -0,0 +1,33 @@
+/* B101_ZK_5839Test.java
+
+	Purpose:
+
+	Description:
+
+	History:
+		5:21 PM 2024/11/7, Created by jumperchen
+
+Copyright (C) 2024 Potix Corporation. All Rights Reserved.
+*/
+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;
+
+/**
+ * @author jumperchen
+ */
+public class B101_ZK_5839Test extends WebDriverTestCase {
+	@Test
+	public void test() {
+		connect();
+		for (int i = 0; i < 5; i++) {
+			click(jq(".z-button"));
+			waitResponse();
+			assertEquals("AAABBBCCC", jq(".z-div .z-div:eq("+i+")").text().replaceAll("[^A-Z]", ""));
+		}
+	}
+}