You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2024/08/09 12:10:32 UTC
(myfaces-tobago) 01/02: fix(sheet): wrong number of columns
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit fed6291e79ef01afe6895e411c808a743cb264b4
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Aug 9 11:27:46 2024 +0200
fix(sheet): wrong number of columns
* fix wrong number of columns if using tc:columnPanel
* fix colspan for tc:columnPanel
* always hide behavior container columns
* adjust tests
Issue: TOBAGO-2333
---
.../internal/renderkit/renderer/SheetRenderer.java | 16 ++++++++++------
.../apache/myfaces/tobago/renderkit/css/TobagoClass.java | 1 +
.../src/test/resources/renderer/sheet/sheet-columns.html | 14 +++++++-------
.../src/test/resources/renderer/sheet/sheet-paging.html | 8 ++------
tobago-core/src/test/resources/renderer/sheet/sheet.html | 14 ++++----------
tobago-theme/src/main/scss/_tobago.scss | 4 ++++
6 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
index 3e2d49318e..59dfebfb61 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
@@ -340,7 +340,7 @@ public class SheetRenderer<T extends AbstractUISheet> extends RendererBase<T> {
final ArrayList<Boolean> encodedRendered = new ArrayList<>();
for (final AbstractUIColumnBase column : columns) {
- if (!(column instanceof AbstractUIRow)) {
+ if (!(column instanceof AbstractUIRow) && !(column instanceof AbstractUIColumnPanel)) {
encodedRendered.add(column.isRendered());
}
}
@@ -735,10 +735,14 @@ public class SheetRenderer<T extends AbstractUISheet> extends RendererBase<T> {
}
}
- colSpan++;
+ if (!autoLayout) {
+ writer.startElement(HtmlElements.TD);
+ writer.endElement(HtmlElements.TD);
+ colSpan++;
+ }
+
writer.startElement(HtmlElements.TD);
- writer.startElement(HtmlElements.DIV);
- writer.endElement(HtmlElements.DIV);
+ writer.writeClassAttribute(TobagoClass.BEHAVIOR__CONTAINER);
encodeBehavior(writer, facesContext, row);
writer.endElement(HtmlElements.TD);
@@ -863,7 +867,7 @@ public class SheetRenderer<T extends AbstractUISheet> extends RendererBase<T> {
}
for (int j = 0; j < columns.size(); j++) {
final AbstractUIColumnBase column = columns.get(j);
- if (!column.isRendered() || column instanceof AbstractUIRow) {
+ if (!column.isRendered() || column instanceof AbstractUIRow || column instanceof AbstractUIColumnPanel) {
offset++;
} else {
final Cell cell = grid.getCell(j - offset, i);
@@ -1048,7 +1052,7 @@ public class SheetRenderer<T extends AbstractUISheet> extends RendererBase<T> {
int i = 0;
for (final AbstractUIColumnBase column : columns) {
- if (!(column instanceof AbstractUIRow)) {
+ if (!(column instanceof AbstractUIRow) && !(column instanceof AbstractUIColumnPanel)) {
if (column.isRendered()) {
final Integer width = columnWidths.get(i);
writeCol(writer, width >= 0 ? width : null);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
index 89d5ce9a9f..cf543711f5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
@@ -36,6 +36,7 @@ public enum TobagoClass implements CssItem {
AUTO__SPACING("tobago-auto-spacing"),
BAR("tobago-bar"),
BADGES("tobago-badges"),
+ BEHAVIOR__CONTAINER("tobago-behavior-container"),
BODY("tobago-body"),
BOX__HEADER("tobago-box-header"),
// tbd: can this be removed, when using <tobago-button>?
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html b/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html
index 1d54d9f2c2..36446c86f1 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html
@@ -55,8 +55,8 @@
<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
</td>
<td>
- <div>
- </div>
+ </td>
+ <td class='tobago-behavior-container'>
</td>
</tr>
<tr row-index='1'>
@@ -64,8 +64,8 @@
<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
</td>
<td>
- <div>
- </div>
+ </td>
+ <td class='tobago-behavior-container'>
</td>
</tr>
<tr row-index='2'>
@@ -73,11 +73,11 @@
<tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out>
</td>
<td>
- <div>
- </div>
+ </td>
+ <td class='tobago-behavior-container'>
</td>
</tr>
</tbody>
</table>
</div>
-</tobago-sheet>
\ No newline at end of file
+</tobago-sheet>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html b/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html
index a44fa40f96..b3b08b874e 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html
@@ -32,18 +32,14 @@
<td>
<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
</td>
- <td>
- <div>
- </div>
+ <td class='tobago-behavior-container'>
</td>
</tr>
<tr row-index='1'>
<td>
<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
</td>
- <td>
- <div>
- </div>
+ <td class='tobago-behavior-container'>
</td>
</tr>
</tbody>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet.html b/tobago-core/src/test/resources/renderer/sheet/sheet.html
index 943efe0663..cb6ac57e56 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet.html
@@ -32,30 +32,24 @@
<td>
<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
</td>
- <td>
- <div>
- </div>
+ <td class='tobago-behavior-container'>
</td>
</tr>
<tr row-index='1'>
<td>
<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
</td>
- <td>
- <div>
- </div>
+ <td class='tobago-behavior-container'>
</td>
</tr>
<tr row-index='2'>
<td>
<tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out>
</td>
- <td>
- <div>
- </div>
+ <td class='tobago-behavior-container'>
</td>
</tr>
</tbody>
</table>
</div>
-</tobago-sheet>
\ No newline at end of file
+</tobago-sheet>
diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index 0312dc6c68..f3030f25e8 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -1645,6 +1645,10 @@ tobago-sheet {
td {
overflow: hidden;
+ &.tobago-behavior-container {
+ display: none;
+ }
+
@include treeNodeMarginLeftLevel();
> input.tobago-selected {