Skip to content

Commit 2b6c99b

Browse files
thatblindgeyeEric Olkowski
thatblindgeye
and
Eric Olkowski
authored
fix(Table): updated logic for expandable class (#11918)
* fix(Table): updated logic for expandable class * Bumped core for latest style updates --------- Co-authored-by: Eric Olkowski <[email protected]>
1 parent 87ddd2d commit 2b6c99b

File tree

9 files changed

+37
-35
lines changed

9 files changed

+37
-35
lines changed

‎packages/react-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"tslib": "^2.8.1"
5555
},
5656
"devDependencies": {
57-
"@patternfly/patternfly": "6.3.0-prerelease.37",
57+
"@patternfly/patternfly": "6.3.0-prerelease.38",
5858
"case-anything": "^3.1.2",
5959
"css": "^3.0.0",
6060
"fs-extra": "^11.3.0"

‎packages/react-docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"test:a11y": "patternfly-a11y --config patternfly-a11y.config"
2424
},
2525
"dependencies": {
26-
"@patternfly/patternfly": "6.3.0-prerelease.37",
26+
"@patternfly/patternfly": "6.3.0-prerelease.38",
2727
"@patternfly/react-charts": "workspace:^",
2828
"@patternfly/react-code-editor": "workspace:^",
2929
"@patternfly/react-core": "workspace:^",

‎packages/react-icons/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@fortawesome/free-brands-svg-icons": "^5.15.4",
3434
"@fortawesome/free-regular-svg-icons": "^5.15.4",
3535
"@fortawesome/free-solid-svg-icons": "^5.15.4",
36-
"@patternfly/patternfly": "6.3.0-prerelease.37",
36+
"@patternfly/patternfly": "6.3.0-prerelease.38",
3737
"fs-extra": "^11.3.0",
3838
"tslib": "^2.8.1"
3939
},

‎packages/react-styles/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"clean": "rimraf dist css"
2020
},
2121
"devDependencies": {
22-
"@patternfly/patternfly": "6.3.0-prerelease.37",
22+
"@patternfly/patternfly": "6.3.0-prerelease.38",
2323
"change-case": "^5.4.4",
2424
"fs-extra": "^11.3.0"
2525
},

‎packages/react-table/src/components/Table/Tr.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ const TrBase: React.FunctionComponent<TrProps> = ({
9999
className={css(
100100
styles.tableTr,
101101
className,
102-
isExpandable !== undefined && styles.tableExpandableRow,
102+
// TODO: Revert this back to just isExpandable !== undefined and refine docs around expandable table structure --
103+
// We should note where isExpanded and isExpandable props must be passed in
104+
(isExpandable !== undefined || isExpanded !== undefined) && styles.tableExpandableRow,
103105
isExpanded && styles.modifiers.expanded,
104106
isEditable && inlineStyles.modifiers.inlineEditable,
105107
isClickable && styles.modifiers.clickable,

‎packages/react-table/src/components/Table/__tests__/__snapshots__/RowWrapper.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`RowWrapper renders expanded correctly 1`] = `
2020
<table>
2121
<tbody>
2222
<tr
23-
class="pf-v6-c-table__tr pf-m-expanded"
23+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row pf-m-expanded"
2424
data-ouia-component-id="OUIA-Generated-TableRow-2"
2525
data-ouia-component-type="PF6/TableRow"
2626
data-ouia-safe="true"

‎packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,7 +1602,7 @@ exports[`Table Collapsible nested table 1`] = `
16021602
</td>
16031603
</tr>
16041604
<tr
1605-
class="pf-v6-c-table__tr"
1605+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
16061606
data-ouia-component-id="OUIA-Generated-TableRow-182"
16071607
data-ouia-component-type="PF6/TableRow"
16081608
data-ouia-safe="true"
@@ -1697,7 +1697,7 @@ exports[`Table Collapsible nested table 1`] = `
16971697
</td>
16981698
</tr>
16991699
<tr
1700-
class="pf-v6-c-table__tr"
1700+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
17011701
data-ouia-component-id="OUIA-Generated-TableRow-183"
17021702
data-ouia-component-type="PF6/TableRow"
17031703
data-ouia-safe="true"
@@ -1853,7 +1853,7 @@ exports[`Table Collapsible nested table 1`] = `
18531853
</td>
18541854
</tr>
18551855
<tr
1856-
class="pf-v6-c-table__tr"
1856+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
18571857
data-ouia-component-id="OUIA-Generated-TableRow-185"
18581858
data-ouia-component-type="PF6/TableRow"
18591859
data-ouia-safe="true"
@@ -2360,7 +2360,7 @@ exports[`Table Collapsible table 1`] = `
23602360
</td>
23612361
</tr>
23622362
<tr
2363-
class="pf-v6-c-table__tr pf-m-expanded"
2363+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row pf-m-expanded"
23642364
data-ouia-component-id="OUIA-Generated-TableRow-167"
23652365
data-ouia-component-type="PF6/TableRow"
23662366
data-ouia-safe="true"
@@ -2577,7 +2577,7 @@ exports[`Table Collapsible table 1`] = `
25772577
</td>
25782578
</tr>
25792579
<tr
2580-
class="pf-v6-c-table__tr"
2580+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
25812581
data-ouia-component-id="OUIA-Generated-TableRow-170"
25822582
data-ouia-component-type="PF6/TableRow"
25832583
data-ouia-safe="true"
@@ -2975,7 +2975,7 @@ exports[`Table Compound Expandable table 1`] = `
29752975
</td>
29762976
</tr>
29772977
<tr
2978-
class="pf-v6-c-table__tr pf-m-expanded"
2978+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row pf-m-expanded"
29792979
data-ouia-component-id="OUIA-Generated-TableRow-177"
29802980
data-ouia-component-type="PF6/TableRow"
29812981
data-ouia-safe="true"
@@ -3041,7 +3041,7 @@ exports[`Table Compound Expandable table 1`] = `
30413041
</td>
30423042
</tr>
30433043
<tr
3044-
class="pf-v6-c-table__tr"
3044+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
30453045
data-ouia-component-id="OUIA-Generated-TableRow-179"
30463046
data-ouia-component-type="PF6/TableRow"
30473047
data-ouia-safe="true"
@@ -3183,7 +3183,7 @@ exports[`Table Control text table 1`] = `
31833183
</td>
31843184
</tr>
31853185
<tr
3186-
class="pf-v6-c-table__tr"
3186+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
31873187
data-ouia-component-id="OUIA-Generated-TableRow-212"
31883188
data-ouia-component-type="PF6/TableRow"
31893189
data-ouia-safe="true"
@@ -3234,7 +3234,7 @@ exports[`Table Control text table 1`] = `
32343234
</td>
32353235
</tr>
32363236
<tr
3237-
class="pf-v6-c-table__tr"
3237+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
32383238
data-ouia-component-id="OUIA-Generated-TableRow-213"
32393239
data-ouia-component-type="PF6/TableRow"
32403240
data-ouia-safe="true"
@@ -3341,7 +3341,7 @@ exports[`Table Control text table 1`] = `
33413341
</td>
33423342
</tr>
33433343
<tr
3344-
class="pf-v6-c-table__tr"
3344+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
33453345
data-ouia-component-id="OUIA-Generated-TableRow-215"
33463346
data-ouia-component-type="PF6/TableRow"
33473347
data-ouia-safe="true"
@@ -3742,7 +3742,7 @@ exports[`Table Header width table 1`] = `
37423742
</td>
37433743
</tr>
37443744
<tr
3745-
class="pf-v6-c-table__tr"
3745+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
37463746
data-ouia-component-id="OUIA-Generated-TableRow-222"
37473747
data-ouia-component-type="PF6/TableRow"
37483748
data-ouia-safe="true"
@@ -3793,7 +3793,7 @@ exports[`Table Header width table 1`] = `
37933793
</td>
37943794
</tr>
37953795
<tr
3796-
class="pf-v6-c-table__tr"
3796+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
37973797
data-ouia-component-id="OUIA-Generated-TableRow-223"
37983798
data-ouia-component-type="PF6/TableRow"
37993799
data-ouia-safe="true"
@@ -3900,7 +3900,7 @@ exports[`Table Header width table 1`] = `
39003900
</td>
39013901
</tr>
39023902
<tr
3903-
class="pf-v6-c-table__tr"
3903+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
39043904
data-ouia-component-id="OUIA-Generated-TableRow-225"
39053905
data-ouia-component-type="PF6/TableRow"
39063906
data-ouia-safe="true"
@@ -4359,7 +4359,7 @@ exports[`Table Selectable table 1`] = `
43594359
</td>
43604360
</tr>
43614361
<tr
4362-
class="pf-v6-c-table__tr"
4362+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
43634363
data-ouia-component-id="OUIA-Generated-TableRow-192"
43644364
data-ouia-component-type="PF6/TableRow"
43654365
data-ouia-safe="true"
@@ -4415,7 +4415,7 @@ exports[`Table Selectable table 1`] = `
44154415
</td>
44164416
</tr>
44174417
<tr
4418-
class="pf-v6-c-table__tr"
4418+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
44194419
data-ouia-component-id="OUIA-Generated-TableRow-193"
44204420
data-ouia-component-type="PF6/TableRow"
44214421
data-ouia-safe="true"
@@ -4540,7 +4540,7 @@ exports[`Table Selectable table 1`] = `
45404540
</td>
45414541
</tr>
45424542
<tr
4543-
class="pf-v6-c-table__tr"
4543+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
45444544
data-ouia-component-id="OUIA-Generated-TableRow-195"
45454545
data-ouia-component-type="PF6/TableRow"
45464546
data-ouia-safe="true"
@@ -5048,7 +5048,7 @@ exports[`Table Selectable table with Radio 1`] = `
50485048
</td>
50495049
</tr>
50505050
<tr
5051-
class="pf-v6-c-table__tr"
5051+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
50525052
data-ouia-component-id="OUIA-Generated-TableRow-202"
50535053
data-ouia-component-type="PF6/TableRow"
50545054
data-ouia-safe="true"
@@ -5104,7 +5104,7 @@ exports[`Table Selectable table with Radio 1`] = `
51045104
</td>
51055105
</tr>
51065106
<tr
5107-
class="pf-v6-c-table__tr"
5107+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
51085108
data-ouia-component-id="OUIA-Generated-TableRow-203"
51095109
data-ouia-component-type="PF6/TableRow"
51105110
data-ouia-safe="true"
@@ -5229,7 +5229,7 @@ exports[`Table Selectable table with Radio 1`] = `
52295229
</td>
52305230
</tr>
52315231
<tr
5232-
class="pf-v6-c-table__tr"
5232+
class="pf-v6-c-table__tr pf-v6-c-table__expandable-row"
52335233
data-ouia-component-id="OUIA-Generated-TableRow-205"
52345234
data-ouia-component-type="PF6/TableRow"
52355235
data-ouia-safe="true"

‎packages/react-tokens/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"@adobe/css-tools": "^4.4.2",
33-
"@patternfly/patternfly": "6.3.0-prerelease.37",
33+
"@patternfly/patternfly": "6.3.0-prerelease.38",
3434
"fs-extra": "^11.3.0"
3535
}
3636
}

‎yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3639,10 +3639,10 @@ __metadata:
36393639
languageName: node
36403640
linkType: hard
36413641

3642-
"@patternfly/patternfly@npm:6.3.0-prerelease.37":
3643-
version: 6.3.0-prerelease.37
3644-
resolution: "@patternfly/patternfly@npm:6.3.0-prerelease.37"
3645-
checksum: 10c0/388e6ef0cc77e592ddd9d939fbbb11a34c3a71bdb779a030dd03ee7d3cdea904d8d4b63dd8e5f18347324636e0c9382f3a7657748a8594c105c3a3fe02b6cc7b
3642+
"@patternfly/patternfly@npm:6.3.0-prerelease.38":
3643+
version: 6.3.0-prerelease.38
3644+
resolution: "@patternfly/patternfly@npm:6.3.0-prerelease.38"
3645+
checksum: 10c0/6e0934764bcb22266f82ea93f5aac1664c9d65e481ccc6ca1ef2d7493f6c1e96e907d5b48d73acb688d5524b931d553e74b457891e648d8520d9a3fac95b6541
36463646
languageName: node
36473647
linkType: hard
36483648

@@ -3740,7 +3740,7 @@ __metadata:
37403740
version: 0.0.0-use.local
37413741
resolution: "@patternfly/react-core@workspace:packages/react-core"
37423742
dependencies:
3743-
"@patternfly/patternfly": "npm:6.3.0-prerelease.37"
3743+
"@patternfly/patternfly": "npm:6.3.0-prerelease.38"
37443744
"@patternfly/react-icons": "workspace:^"
37453745
"@patternfly/react-styles": "workspace:^"
37463746
"@patternfly/react-tokens": "workspace:^"
@@ -3761,7 +3761,7 @@ __metadata:
37613761
resolution: "@patternfly/react-docs@workspace:packages/react-docs"
37623762
dependencies:
37633763
"@patternfly/documentation-framework": "npm:^6.5.20"
3764-
"@patternfly/patternfly": "npm:6.3.0-prerelease.37"
3764+
"@patternfly/patternfly": "npm:6.3.0-prerelease.38"
37653765
"@patternfly/patternfly-a11y": "npm:5.1.0"
37663766
"@patternfly/react-charts": "workspace:^"
37673767
"@patternfly/react-code-editor": "workspace:^"
@@ -3801,7 +3801,7 @@ __metadata:
38013801
"@fortawesome/free-brands-svg-icons": "npm:^5.15.4"
38023802
"@fortawesome/free-regular-svg-icons": "npm:^5.15.4"
38033803
"@fortawesome/free-solid-svg-icons": "npm:^5.15.4"
3804-
"@patternfly/patternfly": "npm:6.3.0-prerelease.37"
3804+
"@patternfly/patternfly": "npm:6.3.0-prerelease.38"
38053805
fs-extra: "npm:^11.3.0"
38063806
tslib: "npm:^2.8.1"
38073807
peerDependencies:
@@ -3885,7 +3885,7 @@ __metadata:
38853885
version: 0.0.0-use.local
38863886
resolution: "@patternfly/react-styles@workspace:packages/react-styles"
38873887
dependencies:
3888-
"@patternfly/patternfly": "npm:6.3.0-prerelease.37"
3888+
"@patternfly/patternfly": "npm:6.3.0-prerelease.38"
38893889
change-case: "npm:^5.4.4"
38903890
fs-extra: "npm:^11.3.0"
38913891
languageName: unknown
@@ -3927,7 +3927,7 @@ __metadata:
39273927
resolution: "@patternfly/react-tokens@workspace:packages/react-tokens"
39283928
dependencies:
39293929
"@adobe/css-tools": "npm:^4.4.2"
3930-
"@patternfly/patternfly": "npm:6.3.0-prerelease.37"
3930+
"@patternfly/patternfly": "npm:6.3.0-prerelease.38"
39313931
fs-extra: "npm:^11.3.0"
39323932
languageName: unknown
39333933
linkType: soft

0 commit comments

Comments
 (0)