Skip to content

Commit 96c0563

Browse files
hpehlhpehl
committed
Popover - wip
1 parent aa16534 commit 96c0563

31 files changed

Lines changed: 880 additions & 356 deletions

‎src/demo/java/IconDemo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static org.patternfly.layout.PredefinedIcon.exclamationTriangle;
88
import static org.patternfly.layout.PredefinedIcon.filter;
99
import static org.patternfly.layout.Size.lg;
10-
import static org.patternfly.layout.Status.warning;
10+
import static org.patternfly.core.Status.warning;
1111

1212
public class IconDemo {
1313

‎src/main/java/org/patternfly/component/ComponentType.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ public enum ComponentType {
9393

9494
Pagination("pgn", null),
9595

96+
Popover("pvr", null),
97+
9698
Select("sel", null),
9799

98100
Sidebar("sb", null),

‎src/main/java/org/patternfly/component/TemplateComponent.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
import static org.jboss.elemento.Elements.div;
2424
import static org.jboss.elemento.EventType.click;
2525

26+
/**
27+
* The template component is a template for creating new components.
28+
*
29+
* @see <a href=
30+
* "https://www.patternfly.org/components/template/template/html">https://www.patternfly.org/components/template/template/html</a>
31+
*/
2632
public class TemplateComponent extends BaseComponent<HTMLElement, TemplateComponent> {
2733

2834
// ------------------------------------------------------ factory

‎src/main/java/org/patternfly/component/alert/Alert.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.patternfly.core.Expandable;
2828
import org.patternfly.core.Modifiers.Inline;
2929
import org.patternfly.core.Modifiers.Plain;
30+
import org.patternfly.core.Severity;
3031
import org.patternfly.handler.CloseHandler;
3132
import org.patternfly.handler.ToggleHandler;
3233
import org.patternfly.layout.Classes;
@@ -83,7 +84,7 @@ public class Alert extends BaseComponent<HTMLDivElement, Alert> implements Inlin
8384

8485
// ------------------------------------------------------ factory
8586

86-
public static Alert alert(AlertType type, String title) {
87+
public static Alert alert(Severity type, String title) {
8788
return new Alert(type, title);
8889
}
8990

@@ -96,7 +97,7 @@ public static Alert alert(AlertType type, String title) {
9697
int timeout;
9798
Button closeButton;
9899
CloseHandler<Alert> closeHandler;
99-
private final AlertType alertType;
100+
private final Severity severity;
100101
private final String title;
101102
private final HTMLElement iconContainer;
102103
private final HTMLParagraphElement titleElement;
@@ -107,22 +108,22 @@ public static Alert alert(AlertType type, String title) {
107108
private AlertActionGroup actionGroup;
108109
private ToggleHandler<Alert> toggleHandler;
109110

110-
Alert(AlertType alertType, String title) {
111-
super(div().css(component(alert), alertType.status.modifier)
112-
.aria(label, alertType.aria)
111+
Alert(Severity severity, String title) {
112+
super(div().css(component(alert), severity.status.modifier)
113+
.aria(label, severity.aria)
113114
.element(),
114115
ComponentType.Alert);
115-
this.alertType = alertType;
116+
this.severity = severity;
116117
this.title = title;
117118
this.timeout = NO_TIMEOUT;
118119
this.timeoutHandle = 0;
119120

120121
add(iconContainer = div().css(component(alert, icon))
121-
.add(inlineIcon(alertType.iconClass))
122+
.add(inlineIcon(severity.icon))
122123
.element());
123124
add(titleElement = p().css(component(alert, Classes.title))
124125
.add(span().css(screenReader)
125-
.textContent(alertType.aria + ":"))
126+
.textContent(severity.aria + ":"))
126127
.add(title)
127128
.element());
128129
Attachable.register(this, this);
@@ -199,7 +200,7 @@ public Alert closable() {
199200

200201
public Alert closable(CloseHandler<Alert> closeHandler) {
201202
insertAfter(div().css(component(alert, Classes.action))
202-
.add(closeButton = button(times, "Close " + alertType.aria + ": " + title)
203+
.add(closeButton = button(times, "Close " + severity.aria + ": " + title)
203204
.plain()
204205
.on(click, event -> close(event, true)))
205206
.element(), titleElement);
@@ -230,7 +231,7 @@ public Alert expandable(ToggleHandler<Alert> toggleHandler) {
230231
.add(toggleButton = button().plain()
231232
.on(click, e -> toggle())
232233
.aria(expanded, false)
233-
.aria(label, alertType.aria + ": " + title + " details")
234+
.aria(label, severity.aria + ": " + title + " details")
234235
.add(span().css(component(alert, toggle, icon))
235236
.add(inlineIcon(angleRight))))
236237
.element());

‎src/main/java/org/patternfly/component/button/Button.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.patternfly.core.Aria;
2929
import org.patternfly.core.Modifiers.Disabled;
3030
import org.patternfly.core.Modifiers.Inline;
31+
import org.patternfly.core.Modifiers.NoPadding;
3132
import org.patternfly.core.Modifiers.Plain;
3233
import org.patternfly.core.WithProgress;
3334
import org.patternfly.handler.ComponentHandler;
@@ -55,7 +56,6 @@
5556
import static org.patternfly.layout.Classes.display;
5657
import static org.patternfly.layout.Classes.link;
5758
import static org.patternfly.layout.Classes.modifier;
58-
import static org.patternfly.layout.Classes.noPadding;
5959
import static org.patternfly.layout.Classes.plain;
6060
import static org.patternfly.layout.Classes.primary;
6161
import static org.patternfly.layout.Classes.progress;
@@ -76,7 +76,7 @@
7676
*/
7777
public class Button extends BaseComponent<HTMLElement, Button>
7878
implements Disabled<HTMLElement, Button>, Inline<HTMLElement, Button>, Plain<HTMLElement, Button>,
79-
WithProgress<HTMLElement, Button> {
79+
NoPadding<HTMLElement, Button>, WithProgress<HTMLElement, Button> {
8080

8181
// ------------------------------------------------------ factory
8282

@@ -235,10 +235,6 @@ public Button link() {
235235
return css(modifier(link));
236236
}
237237

238-
public Button noPadding() {
239-
return css(modifier(noPadding));
240-
}
241-
242238
public Button control() {
243239
return css(modifier(control));
244240
}

‎src/main/java/org/patternfly/component/icon/Icon.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.patternfly.layout.Classes;
2727
import org.patternfly.layout.PredefinedIcon;
2828
import org.patternfly.layout.Size;
29-
import org.patternfly.layout.Status;
29+
import org.patternfly.core.Status;
3030

3131
import elemental2.dom.HTMLElement;
3232

0 commit comments

Comments
 (0)