Skip to content

Commit 8f783ea

Browse files
vegegokuvegegoku
committed
fix #841 hide() will not work on element with a dui css display class
1 parent 41d6d71 commit 8f783ea

File tree

3 files changed

+130
-26
lines changed

3 files changed

+130
-26
lines changed

‎domino-ui-shared/src/main/java/org/dominokit/domino/ui/style/AggregatedCss.java

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright © 2019 Dominokit
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.dominokit.domino.ui.style;
17+
18+
class AggregatedCss {
19+
20+
static CssClass dui_block = () -> "dui-block";
21+
static CssClass dui_block_full = () -> "dui-block-full";
22+
static CssClass dui_inline_block = () -> "dui-inline-block";
23+
static CssClass dui_inline = () -> "dui-inline";
24+
static CssClass dui_flex = () -> "dui-flex";
25+
static CssClass dui_inline_flex = () -> "dui-inline-flex";
26+
static CssClass dui_table = () -> "dui-table";
27+
static CssClass dui_inline_table = () -> "dui-inline-table";
28+
static CssClass dui_table_caption = () -> "dui-table-caption";
29+
static CssClass dui_table_cell = () -> "dui-table-cell";
30+
static CssClass dui_table_column = () -> "dui-table-column";
31+
static CssClass dui_table_column_group = () -> "dui-table-column-group";
32+
static CssClass dui_table_footer_group = () -> "dui-table-footer-group";
33+
static CssClass dui_table_header_group = () -> "dui-table-header-group";
34+
static CssClass dui_table_row_group = () -> "dui-table-row-group";
35+
static CssClass dui_table_row = () -> "dui-table-row";
36+
static CssClass dui_flow_root = () -> "dui-flow-root";
37+
static CssClass dui_grid = () -> "dui-grid";
38+
static CssClass dui_inline_grid = () -> "dui-inline-grid";
39+
static CssClass dui_contents = () -> "dui-contents";
40+
static CssClass dui_list_item = () -> "dui-list-item";
41+
static CompositeCssClass dui_display =
42+
CompositeCssClass.of(
43+
dui_block,
44+
dui_block_full,
45+
dui_inline_block,
46+
dui_inline,
47+
dui_flex,
48+
dui_inline_flex,
49+
dui_table,
50+
dui_inline_table,
51+
dui_table_caption,
52+
dui_table_cell,
53+
dui_table_column,
54+
dui_table_column_group,
55+
dui_table_footer_group,
56+
dui_table_header_group,
57+
dui_table_row_group,
58+
dui_table_row,
59+
dui_flow_root,
60+
dui_grid,
61+
dui_inline_grid,
62+
dui_contents,
63+
dui_list_item);
64+
}

‎domino-ui-shared/src/main/java/org/dominokit/domino/ui/style/DisplayCss.java

+44-25
Original file line numberDiff line numberDiff line change
@@ -53,53 +53,72 @@ public interface DisplayCss {
5353
CssClass dui_opacity_95 = () -> "dui-opacity-95";
5454
/** Constant <code>dui_opacity_100</code> */
5555
CssClass dui_opacity_100 = () -> "dui-opacity-100";
56+
5657
/** Constant <code>dui_block</code> */
57-
CssClass dui_block = () -> "dui-block";
58+
CssClass dui_block = ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-block");
5859
/** Constant <code>dui_block_full</code> */
59-
CssClass dui_block_full = () -> "dui-block-full";
60+
CssClass dui_block_full =
61+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-block-full");
6062
/** Constant <code>dui_inline_block</code> */
61-
CssClass dui_inline_block = () -> "dui-inline-block";
63+
CssClass dui_inline_block =
64+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-inline-block");
6265
/** Constant <code>dui_inline</code> */
63-
CssClass dui_inline = () -> "dui-inline";
66+
CssClass dui_inline =
67+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-inline");
6468
/** Constant <code>dui_flex</code> */
65-
CssClass dui_flex = () -> "dui-flex";
69+
CssClass dui_flex = ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-flex");
6670
/** Constant <code>dui_inline_flex</code> */
67-
CssClass dui_inline_flex = () -> "dui-inline-flex";
68-
/** Constant <code>dui_flex_responsive</code> */
69-
CssClass dui_flex_responsive = () -> "dui-flex-responsive";
70-
/** Constant <code>dui_flex_responsive_reverse</code> */
71-
CssClass dui_flex_responsive_reverse = () -> "dui-flex-responsive-reverse";
71+
CssClass dui_inline_flex =
72+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-inline-flex");
7273

7374
/** Constant <code>dui_table</code> */
74-
CssClass dui_table = () -> "dui-table";
75+
CssClass dui_table = ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table");
7576
/** Constant <code>dui_inline_table</code> */
76-
CssClass dui_inline_table = () -> "dui-inline-table";
77+
CssClass dui_inline_table =
78+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-inline-table");
7779
/** Constant <code>dui_table_caption</code> */
78-
CssClass dui_table_caption = () -> "dui-table-caption";
80+
CssClass dui_table_caption =
81+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-caption");
7982
/** Constant <code>dui_table_cell</code> */
80-
CssClass dui_table_cell = () -> "dui-table-cell";
83+
CssClass dui_table_cell =
84+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-cell");
8185
/** Constant <code>dui_table_column</code> */
82-
CssClass dui_table_column = () -> "dui-table-column";
86+
CssClass dui_table_column =
87+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-column");
8388
/** Constant <code>dui_table_column_group</code> */
84-
CssClass dui_table_column_group = () -> "dui-table-column-group";
89+
CssClass dui_table_column_group =
90+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-column-group");
8591
/** Constant <code>dui_table_footer_group</code> */
86-
CssClass dui_table_footer_group = () -> "dui-table-footer-group";
92+
CssClass dui_table_footer_group =
93+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-footer-group");
8794
/** Constant <code>dui_table_header_group</code> */
88-
CssClass dui_table_header_group = () -> "dui-table-header-group";
95+
CssClass dui_table_header_group =
96+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-header-group");
8997
/** Constant <code>dui_table_row_group</code> */
90-
CssClass dui_table_row_group = () -> "dui-table-row-group";
98+
CssClass dui_table_row_group =
99+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-row-group");
91100
/** Constant <code>dui_table_row</code> */
92-
CssClass dui_table_row = () -> "dui-table-row";
101+
CssClass dui_table_row =
102+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-table-row");
93103
/** Constant <code>dui_flow_root</code> */
94-
CssClass dui_flow_root = () -> "dui-flow-root";
104+
CssClass dui_flow_root =
105+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-flow-root");
95106
/** Constant <code>dui_grid</code> */
96-
CssClass dui_grid = () -> "dui-grid";
107+
CssClass dui_grid = ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-grid");
97108
/** Constant <code>dui_inline_grid</code> */
98-
CssClass dui_inline_grid = () -> "dui-inline-grid";
109+
CssClass dui_inline_grid =
110+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-inline-grid");
99111
/** Constant <code>dui_contents</code> */
100-
CssClass dui_contents = () -> "dui-contents";
112+
CssClass dui_contents =
113+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-contents");
101114
/** Constant <code>dui_list_item</code> */
102-
CssClass dui_list_item = () -> "dui-list-item";
115+
CssClass dui_list_item =
116+
ReplaceCssClass.of(AggregatedCss.dui_display).replaceWith(() -> "dui-list-item");
117+
118+
/** Constant <code>dui_flex_responsive</code> */
119+
CssClass dui_flex_responsive = () -> "dui-flex-responsive";
120+
/** Constant <code>dui_flex_responsive_reverse</code> */
121+
CssClass dui_flex_responsive_reverse = () -> "dui-flex-responsive-reverse";
103122
/** Constant <code>dui_hidden</code> */
104123
CssClass dui_hidden = () -> "dui-hidden";
105124
/** Constant <code>dui_float_right</code> */

‎domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/domino-ui/dui-components/domino-ui-display.css

+22-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,28 @@
149149
display: list-item;
150150
}
151151

152-
.dui.dui-hidden {
152+
.dui.dui-hidden,
153+
.dui.dui-block.dui-hidden,
154+
.dui.dui-block-full.dui-hidden,
155+
.dui.dui-inline-block.dui-hidden,
156+
.dui.dui-inline.dui-hidden,
157+
.dui.dui-flex.dui-hidden,
158+
.dui.dui-inline-flex.dui-hidden,
159+
.dui.dui-table.dui-hidden,
160+
.dui.dui-inline-table.dui-hidden,
161+
.dui.dui-table-caption.dui-hidden,
162+
.dui.dui-table-cell.dui-hidden,
163+
.dui.dui-table-column.dui-hidden,
164+
.dui.dui-table-column-group.dui-hidden,
165+
.dui.dui-table-footer-group.dui-hidden,
166+
.dui.dui-table-header-group.dui-hidden,
167+
.dui.dui-table-row-group.dui-hidden,
168+
.dui.dui-table-row.dui-hidden,
169+
.dui.dui-flow-root.dui-hidden,
170+
.dui.dui-grid.dui-hidden,
171+
.dui.dui-inline-grid.dui-hidden,
172+
.dui.dui-contents.dui-hidden,
173+
.dui.dui-list-item.dui-hidden {
153174
display: none;
154175
}
155176

0 commit comments

Comments
 (0)