Skip to content

Commit 5a91d13

Browse files
kmcfaulkmcfaul
authored
feat(misc): remove isFullHeight from page toolbar and dropdown (#10867)
1 parent 1cadcaf commit 5a91d13

16 files changed

+32
-48
lines changed

‎packages/react-core/src/demos/DashboardHeader.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export const DashboardHeader: React.FC<DashboardHeaderProps> = ({ notificationBa
9999
</MastheadBrand>
100100
</MastheadMain>
101101
<MastheadContent>
102-
<Toolbar id="toolbar" isFullHeight isStatic>
102+
<Toolbar id="toolbar" isStatic>
103103
<ToolbarContent>
104104
<ToolbarGroup
105105
variant="action-group-plain"
@@ -182,8 +182,7 @@ export const DashboardHeader: React.FC<DashboardHeaderProps> = ({ notificationBa
182182
ref={toggleRef}
183183
isExpanded={isDropdownOpen}
184184
onClick={onDropdownToggle}
185-
icon={<Avatar src={imgAvatar} alt="" />}
186-
isFullHeight
185+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
187186
>
188187
Ned Username
189188
</MenuToggle>

‎packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerBasic.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
174174
</>
175175
);
176176
const headerToolbar = (
177-
<Toolbar isFullHeight>
177+
<Toolbar>
178178
<ToolbarContent>
179179
<ToolbarGroup align={{ default: 'alignEnd' }}>
180180
<ToolbarGroup variant="action-group-plain">
@@ -242,8 +242,7 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
242242
ref={toggleRef}
243243
isExpanded={isDropdownOpen}
244244
onClick={onDropdownToggle}
245-
icon={<Avatar src={imgAvatar} alt="" />}
246-
isFullHeight
245+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
247246
>
248247
John Smith
249248
</MenuToggle>

‎packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerGrouped.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export const NotificationDrawerGrouped: React.FunctionComponent = () => {
224224
</>
225225
);
226226
const headerToolbar = (
227-
<Toolbar isFullHeight>
227+
<Toolbar>
228228
<ToolbarContent>
229229
<ToolbarGroup align={{ default: 'alignEnd' }}>
230230
<ToolbarGroup variant="action-group-plain">
@@ -292,8 +292,7 @@ export const NotificationDrawerGrouped: React.FunctionComponent = () => {
292292
ref={toggleRef}
293293
isExpanded={isDropdownOpen}
294294
onClick={onDropdownToggle}
295-
icon={<Avatar src={imgAvatar} alt="" />}
296-
isFullHeight
295+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
297296
>
298297
John Smith
299298
</MenuToggle>

‎packages/react-core/src/demos/RTL/examples/PaginatedTable.jsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ export const PaginatedTableAction = () => {
338338
</MastheadBrand>
339339
</MastheadMain>
340340
<MastheadContent>
341-
<Toolbar id="toolbar" isFullHeight isStatic>
341+
<Toolbar id="toolbar" isStatic>
342342
<ToolbarContent>
343343
<ToolbarGroup
344344
variant="action-group-plain"
@@ -419,8 +419,7 @@ export const PaginatedTableAction = () => {
419419
ref={toggleRef}
420420
isExpanded={isDropdownOpen}
421421
onClick={onDropdownToggle}
422-
icon={<Avatar src={imgAvatar} alt="" />}
423-
isFullHeight
422+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
424423
>
425424
{translation.username}
426425
</MenuToggle>

‎packages/react-core/src/demos/RTL/examples/PaginatedTable.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
362362
</MastheadBrand>
363363
</MastheadMain>
364364
<MastheadContent>
365-
<Toolbar id="toolbar" isFullHeight isStatic>
365+
<Toolbar id="toolbar" isStatic>
366366
<ToolbarContent>
367367
<ToolbarGroup
368368
variant="action-group-plain"
@@ -443,8 +443,7 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
443443
ref={toggleRef}
444444
isExpanded={isDropdownOpen}
445445
onClick={onDropdownToggle}
446-
icon={<Avatar src={imgAvatar} alt="" />}
447-
isFullHeight
446+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
448447
>
449448
{translation.username}
450449
</MenuToggle>

‎packages/react-core/src/demos/examples/Masthead/MastheadWithHorizontalNav.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export const MastheadWithHorizontalNav: React.FunctionComponent = () => {
179179
);
180180

181181
const headerToolbar = (
182-
<Toolbar id="toolbar" isFullHeight>
182+
<Toolbar id="toolbar">
183183
<ToolbarContent>
184184
<PageHorizontalNav />
185185
<ToolbarGroup
@@ -255,9 +255,8 @@ export const MastheadWithHorizontalNav: React.FunctionComponent = () => {
255255
<MenuToggle
256256
ref={toggleRef}
257257
onClick={onDropdownToggle}
258-
isFullHeight
259258
isExpanded={isDropdownOpen}
260-
icon={<Avatar src={imgAvatar} alt="" />}
259+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
261260
>
262261
Ned Username
263262
</MenuToggle>

‎packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
378378
];
379379

380380
const headerToolbar = (
381-
<Toolbar id="toolbar" isFullHeight isStatic>
381+
<Toolbar id="toolbar" isStatic>
382382
<ToolbarContent>
383383
<ToolbarGroup
384384
variant="action-group-plain"
@@ -456,9 +456,8 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
456456
<MenuToggle
457457
ref={toggleRef}
458458
onClick={onDropdownToggle}
459-
isFullHeight
460459
isExpanded={isDropdownOpen}
461-
icon={<Avatar src={imgAvatar} alt="" />}
460+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
462461
>
463462
Ned Username
464463
</MenuToggle>

‎packages/react-core/src/demos/examples/Nav/NavFlyout.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const NavFlyout: React.FunctionComponent = () => {
126126
);
127127

128128
const headerToolbar = (
129-
<Toolbar id="toolbar" isFullHeight isStatic>
129+
<Toolbar id="toolbar" isStatic>
130130
<ToolbarContent>
131131
<ToolbarGroup
132132
variant="action-group-plain"
@@ -202,8 +202,7 @@ export const NavFlyout: React.FunctionComponent = () => {
202202
ref={toggleRef}
203203
isExpanded={isDropdownOpen}
204204
onClick={onDropdownToggle}
205-
icon={<Avatar src={imgAvatar} alt="" />}
206-
isFullHeight
205+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
207206
>
208207
Ned Username
209208
</MenuToggle>

‎packages/react-core/src/demos/examples/Nav/NavHorizontal.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const NavHorizontal: React.FunctionComponent = () => {
103103
);
104104

105105
const headerToolbar = (
106-
<Toolbar id="toolbar" isFullHeight isStatic>
106+
<Toolbar id="toolbar" isStatic>
107107
<ToolbarContent>
108108
<ToolbarItem isOverflowContainer>{PageNav}</ToolbarItem>
109109
<ToolbarGroup
@@ -180,8 +180,7 @@ export const NavHorizontal: React.FunctionComponent = () => {
180180
ref={toggleRef}
181181
isExpanded={isDropdownOpen}
182182
onClick={onDropdownToggle}
183-
icon={<Avatar src={imgAvatar} alt="" />}
184-
isFullHeight
183+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
185184
>
186185
Ned Username
187186
</MenuToggle>

‎packages/react-core/src/demos/examples/Nav/NavHorizontalWithSubnav.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const NavHorizontalWithSubnav: React.FunctionComponent = () => {
152152
);
153153

154154
const headerToolbar = (
155-
<Toolbar id="toolbar" isFullHeight isStatic>
155+
<Toolbar id="toolbar" isStatic>
156156
<ToolbarContent>
157157
<ToolbarItem isOverflowContainer>{PageNav}</ToolbarItem>
158158
<ToolbarGroup
@@ -229,8 +229,7 @@ export const NavHorizontalWithSubnav: React.FunctionComponent = () => {
229229
ref={toggleRef}
230230
isExpanded={isDropdownOpen}
231231
onClick={onDropdownToggle}
232-
icon={<Avatar src={imgAvatar} alt="" />}
233-
isFullHeight
232+
icon={<Avatar src={imgAvatar} alt="" size="sm" />}
234233
>
235234
Ned Username
236235
</MenuToggle>

0 commit comments

Comments
 (0)