Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZK-5035: Listbox renders duplicate checkmarks after adding 1st listheader dynamically #3050

Merged
merged 4 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions zkdoc/release-note
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,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
ZK-5453: XSS in chosenbox
ZK-5025: redundant selection highlight on a menupopup

Expand Down
40 changes: 40 additions & 0 deletions zktest/src/main/webapp/test2/B100-ZK-5035.zul
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions zktest/src/main/webapp/test2/config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
##zats##B100-ZK-5453.zul=A,E,Chosenbox,XSS
##zats##B100-ZK-5025.zul=A,E,Menu,Menupopup,Menuitem,focus,hover

Expand Down
Original file line number Diff line number Diff line change
@@ -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()));
}
}
4 changes: 4 additions & 0 deletions zul/src/main/resources/web/js/zul/sel/Listcell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ 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
if (this.parent?.$n('cm'))
this.nextSibling?.rerender();

var chkable = p.isSelectable(),
multi = box.isMultiple();
s += '<span id="' + p.uuid + '-cm" class="' + p.$s('checkable')
Expand Down