FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix drawer body components · patternfly-java/patternfly-java@bfb545b · GitHub

/ patternfly-java Public

Commit bfb545b

Browse files
hpehl
committed
Fix drawer body components
1 parent 56bb107 commit bfb545b

8 files changed

Lines changed: 40 additions & 138 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Fixed
10+
11+
- Fix drawer body components
12+
913
## [0.4.4] - 2026-01-08
1014

1115
### Added

components/src/main/java/org/patternfly/component/drawer/DrawerContentBody.java renamed to components/src/main/java/org/patternfly/component/drawer/DrawerBody.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package org.patternfly.component.drawer;
1717

1818
import org.jboss.elemento.ElementTextMethods;
19+
import org.patternfly.style.Modifiers.NoPadding;
1920
import org.patternfly.style.Modifiers.Padding;
20-
2121
import elemental2.dom.HTMLDivElement;
2222

2323
import static org.jboss.elemento.Elements.div;
@@ -28,28 +28,29 @@
2828
/**
2929
* Subcomponent for elements in a {@link DrawerContent}.
3030
*/
31-
public class DrawerContentBody extends DrawerSubComponent<HTMLDivElement, DrawerContentBody> implements
32-
ElementTextMethods<HTMLDivElement, DrawerContentBody>,
33-
Padding<HTMLDivElement, DrawerContentBody> {
31+
public class DrawerBody extends DrawerSubComponent<HTMLDivElement, DrawerBody> implements
32+
ElementTextMethods<HTMLDivElement, DrawerBody>,
33+
Padding<HTMLDivElement, DrawerBody>,
34+
NoPadding<HTMLDivElement, DrawerBody> {
3435

3536
// ------------------------------------------------------ factory
3637

37-
public static DrawerContentBody drawerContentBody() {
38-
return new DrawerContentBody();
38+
public static DrawerBody drawerBody() {
39+
return new DrawerBody();
3940
}
4041

4142
// ------------------------------------------------------ instance
4243

43-
public static final String SUB_COMPONENT_NAME = "dcb";
44+
public static final String SUB_COMPONENT_NAME = "db";
4445

45-
DrawerContentBody() {
46+
DrawerBody() {
4647
super(SUB_COMPONENT_NAME, div().css(component(drawer, body)).element());
4748
}
4849

4950
// ------------------------------------------------------ builder
5051

5152
@Override
52-
public DrawerContentBody that() {
53+
public DrawerBody that() {
5354
return this;
5455
}
5556
}

‎components/src/main/java/org/patternfly/component/drawer/DrawerContent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static DrawerContent drawerContent() {
4444

4545
// ------------------------------------------------------ add
4646

47-
public DrawerContent addBody(DrawerContentBody body) {
47+
public DrawerContent addBody(DrawerBody body) {
4848
return add(body);
4949
}
5050

‎components/src/main/java/org/patternfly/component/drawer/DrawerPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public DrawerPanel addHead(DrawerPanelHead head) {
197197
return add(head);
198198
}
199199

200-
public DrawerPanel addBody(DrawerPanelBody body) {
200+
public DrawerPanel addBody(DrawerBody body) {
201201
return add(body);
202202
}
203203

‎components/src/main/java/org/patternfly/component/drawer/DrawerPanelBody.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎components/src/main/java/org/patternfly/component/drawer/DrawerPanelHead.java‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,10 @@
1515
*/
1616
package org.patternfly.component.drawer;
1717

18-
import org.jboss.elemento.Attachable;
19-
import org.jboss.elemento.ElementContainerDelegate;
2018
import org.patternfly.style.Modifiers.NoPadding;
21-
22-
import elemental2.dom.Element;
2319
import elemental2.dom.HTMLDivElement;
24-
import elemental2.dom.HTMLElement;
25-
import elemental2.dom.MutationRecord;
2620

2721
import static org.jboss.elemento.Elements.div;
28-
import static org.patternfly.component.drawer.DrawerPanelBody.drawerPanelBody;
2922
import static org.patternfly.style.Classes.component;
3023
import static org.patternfly.style.Classes.drawer;
3124
import static org.patternfly.style.Classes.head;
@@ -34,8 +27,6 @@
3427
* Subcomponent for the header inside a {@link DrawerPanel}.
3528
*/
3629
public class DrawerPanelHead extends DrawerSubComponent<HTMLDivElement, DrawerPanelHead> implements
37-
Attachable,
38-
ElementContainerDelegate<HTMLDivElement, DrawerPanelHead>,
3930
NoPadding<HTMLDivElement, DrawerPanelHead> {
4031

4132
// ------------------------------------------------------ factory
@@ -47,29 +38,9 @@ public static DrawerPanelHead drawerPanelHead() {
4738
// ------------------------------------------------------ instance
4839

4940
public static final String SUB_COMPONENT_NAME = "dph";
50-
private final HTMLElement headContainer;
51-
private boolean adjustTabIndex;
5241

5342
DrawerPanelHead() {
54-
super(SUB_COMPONENT_NAME, drawerPanelBody().element());
55-
element().appendChild(headContainer = div().css(component(drawer, head)).element());
56-
Attachable.register(this, this);
57-
}
58-
59-
@Override
60-
public void attach(MutationRecord mutationRecord) {
61-
if (adjustTabIndex) {
62-
Drawer drawer = lookupComponent();
63-
if (headContainer.firstElementChild instanceof HTMLElement) {
64-
HTMLElement firstElement = ((HTMLElement) headContainer.firstElementChild);
65-
drawer.onToggle((event, drw, expanded) -> firstElement.tabIndex = expanded ? 0 : -1);
66-
}
67-
}
68-
}
69-
70-
@Override
71-
public Element containerDelegate() {
72-
return headContainer;
43+
super(SUB_COMPONENT_NAME, div().css(component(drawer, head)).element());
7344
}
7445

7546
// ------------------------------------------------------ add
@@ -80,15 +51,6 @@ public DrawerPanelHead addCloseButton(DrawerCloseButton closeButton) {
8051

8152
// ------------------------------------------------------ builder
8253

83-
/**
84-
* By default, the tab index of the first HTML element is set to 0 if the drawer is expanded and to -1 if the drawer is
85-
* collapsed. Use this method to turn this feature off.
86-
*/
87-
public DrawerPanelHead noAutoTabIndex() {
88-
this.adjustTabIndex = false;
89-
return this;
90-
}
91-
9254
@Override
9355
public DrawerPanelHead that() {
9456
return this;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL