@patternfly/react-core 6.6.1-prerelease.4 → 6.6.2

package/src/demos/examples/PrimaryDetail/PrimaryDetailFullPage.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -23,10 +23,8 @@ import {
   DrawerHead,
   DrawerPanelBody,
   DrawerPanelContent,
-  DrawerSection,
   Flex,
   FlexItem,
-  Icon,
   InputGroup,
   InputGroupItem,
   PageSection,
@@ -43,12 +41,12 @@ import {
 import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
 import RhUiCodeIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-code-icon';
 import RhUiBranchFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-branch-fill-icon';
-import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
+import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
 import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
-import RhMicronsSearchIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-search-icon';
-import RhUiCloseCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-close-circle-fill-icon';
-import RhUiFilterFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-filter-fill-icon';
+import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
+import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
+import TimesCircleIcon from '@patternfly/react-icons/dist/esm/icons/times-circle-icon';
 
 interface SelectOptionType extends Omit<SelectOptionProps, 'children'> {
   label: string;
@@ -101,8 +99,8 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
     setSelectedDataListItemId('');
   };
 
-  const ToolbarItems = (
-    <ToolbarToggleGroup toggleIcon={<RhUiFilterFillIcon />} breakpoint="xl" alignItems="center">
+  const toggleGroupItems = (
+    <Flex alignItems={{ default: 'alignItemsCenter' }}>
       <ToolbarItem>
         <InputGroup>
           <InputGroupItem isFill>
@@ -116,15 +114,11 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
             />
           </InputGroupItem>
           <InputGroupItem>
-            <Button
-              variant={ButtonVariant.control}
-              aria-label="search button for search input"
-              icon={<RhMicronsSearchIcon />}
-            />
+            <Button variant={ButtonVariant.control} aria-label="search button for search input" icon={<SearchIcon />} />
           </InputGroupItem>
         </InputGroup>
       </ToolbarItem>
-      <ToolbarGroup variant="filter-group" alignItems="center">
+      <ToolbarGroup variant="filter-group">
         <ToolbarItem>
           <Select
             aria-label="Status select"
@@ -174,6 +168,12 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
           </Select>
         </ToolbarItem>
       </ToolbarGroup>
+    </Flex>
+  );
+
+  const ToolbarItems = (
+    <ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
+      {toggleGroupItems}
     </ToolbarToggleGroup>
   );
 
@@ -208,224 +208,211 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
   );
 
   const drawerContent = (
-    <DataList
-      aria-label="data list"
-      selectedDataListItemId={selectedDataListItemId}
-      onSelectDataListItem={onSelectDataListItem}
-    >
-      <DataListItem id="full-page-item1">
-        <DataListItemRow>
-          <DataListItemCells
-            dataListCells={[
-              <DataListCell key="primary-content">
-                <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
-                  <FlexItem>
-                    <p>patternfly</p>
-                    <small>
-                      Working repo for PatternFly 5 <a>https://pf5.patternfly.org/</a>
-                    </small>
-                  </FlexItem>
-                  <Flex spaceItems={{ default: 'spaceItemsMd' }}>
+    <Fragment>
+      <Toolbar id="full-page-data-toolbar">
+        <ToolbarContent>{ToolbarItems}</ToolbarContent>
+      </Toolbar>
+      <DataList
+        aria-label="data list"
+        selectedDataListItemId={selectedDataListItemId}
+        onSelectDataListItem={onSelectDataListItem}
+      >
+        <DataListItem id="full-page-item1">
+          <DataListItemRow>
+            <DataListItemCells
+              dataListCells={[
+                <DataListCell key="primary-content">
+                  <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
                     <FlexItem>
-                      <RhUiBranchFillIcon /> 10
+                      <p>patternfly</p>
+                      <small>
+                        Working repo for PatternFly 5 <a>https://pf5.patternfly.org/</a>
+                      </small>
                     </FlexItem>
-                    <FlexItem>
-                      <RhUiCodeIcon /> 4
-                    </FlexItem>
-                    <FlexItem>
-                      <RhUiCubesIcon /> 5
-                    </FlexItem>
-                    <FlexItem>Updated 2 days ago</FlexItem>
+                    <Flex spaceItems={{ default: 'spaceItemsMd' }}>
+                      <FlexItem>
+                        <RhUiBranchFillIcon /> 10
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiCodeIcon /> 4
+                      </FlexItem>
+                      <FlexItem>
+                        <CubeIcon /> 5
+                      </FlexItem>
+                      <FlexItem>Updated 2 days ago</FlexItem>
+                    </Flex>
                   </Flex>
-                </Flex>
-              </DataListCell>,
-              <DataListAction
-                key="actions"
-                aria-labelledby="full-page-item1 full-page-action1"
-                id="full-page-action1"
-                aria-label="Actions"
-              >
-                <Stack>
-                  <StackItem>
-                    <Button variant={ButtonVariant.secondary}>Secondary</Button>
-                  </StackItem>
-                  <StackItem>
-                    <Button variant={ButtonVariant.link}>Link Button</Button>
-                  </StackItem>
-                </Stack>
-              </DataListAction>
-            ]}
-          />
-        </DataListItemRow>
-      </DataListItem>
-      <DataListItem id="full-page-item2">
-        <DataListItemRow>
-          <DataListItemCells
-            dataListCells={[
-              <DataListCell key="primary-content">
-                <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
-                  <FlexItem>
-                    <p>patternfly-elements</p>
-                    <small>PatternFly elements</small>
-                  </FlexItem>
-                  <Flex spaceItems={{ default: 'spaceItemsMd' }}>
-                    <FlexItem>
-                      <RhUiBranchFillIcon /> 10
-                    </FlexItem>
-                    <FlexItem>
-                      <RhUiCodeIcon /> 4
-                    </FlexItem>
-                    <FlexItem>
-                      <RhUiCubesIcon /> 5
-                    </FlexItem>
-                    <FlexItem>
-                      <Icon status="success">
-                        <RhUiCheckCircleFillIcon />
-                      </Icon>
-                      7
-                    </FlexItem>
-                    <FlexItem>
-                      <Icon status="warning">
-                        <RhUiWarningFillIcon />
-                      </Icon>
-                      5
-                    </FlexItem>
+                </DataListCell>,
+                <DataListAction
+                  key="actions"
+                  aria-labelledby="full-page-item1 full-page-action1"
+                  id="full-page-action1"
+                  aria-label="Actions"
+                >
+                  <Stack>
+                    <StackItem>
+                      <Button variant={ButtonVariant.secondary}>Secondary</Button>
+                    </StackItem>
+                    <StackItem>
+                      <Button variant={ButtonVariant.link}>Link Button</Button>
+                    </StackItem>
+                  </Stack>
+                </DataListAction>
+              ]}
+            />
+          </DataListItemRow>
+        </DataListItem>
+        <DataListItem id="full-page-item2">
+          <DataListItemRow>
+            <DataListItemCells
+              dataListCells={[
+                <DataListCell key="primary-content">
+                  <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
                     <FlexItem>
-                      <Icon status="danger">
-                        <RhUiCloseCircleFillIcon />
-                      </Icon>
-                      5
+                      <p>patternfly-elements</p>
+                      <small>PatternFly elements</small>
                     </FlexItem>
-                    <FlexItem>Updated 2 days ago</FlexItem>
+                    <Flex spaceItems={{ default: 'spaceItemsMd' }}>
+                      <FlexItem>
+                        <RhUiBranchFillIcon /> 10
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiCodeIcon /> 4
+                      </FlexItem>
+                      <FlexItem>
+                        <CubeIcon /> 5
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiCheckCircleFillIcon /> 7
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiWarningFillIcon /> 5
+                      </FlexItem>
+                      <FlexItem>
+                        <TimesCircleIcon /> 5
+                      </FlexItem>
+                      <FlexItem>Updated 2 days ago</FlexItem>
+                    </Flex>
                   </Flex>
-                </Flex>
-              </DataListCell>,
-              <DataListAction
-                key="actions"
-                aria-labelledby="full-page-item2 full-page-action2"
-                id="full-page-action2"
-                aria-label="Actions"
-              >
-                <Stack>
-                  <StackItem>
-                    <Button variant={ButtonVariant.secondary}>Secondary</Button>
-                  </StackItem>
-                  <StackItem>
-                    <Button variant={ButtonVariant.link}>Link Button</Button>
-                  </StackItem>
-                </Stack>
-              </DataListAction>
-            ]}
-          />
-        </DataListItemRow>
-      </DataListItem>
-      <DataListItem id="full-page-item3">
-        <DataListItemRow>
-          <DataListItemCells
-            dataListCells={[
-              <DataListCell key="primary-content">
-                <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
-                  <FlexItem>
-                    <p>patternfly</p>
-                    <small>
-                      Working repo for PatternFly 5 <a>https://pf5.patternfly.org/</a>
-                    </small>
-                  </FlexItem>
-                  <Flex spaceItems={{ default: 'spaceItemsMd' }}>
-                    <FlexItem>
-                      <RhUiBranchFillIcon /> 10
-                    </FlexItem>
-                    <FlexItem>
-                      <RhUiCodeIcon /> 4
-                    </FlexItem>
+                </DataListCell>,
+                <DataListAction
+                  key="actions"
+                  aria-labelledby="full-page-item2 full-page-action2"
+                  id="full-page-action2"
+                  aria-label="Actions"
+                >
+                  <Stack>
+                    <StackItem>
+                      <Button variant={ButtonVariant.secondary}>Secondary</Button>
+                    </StackItem>
+                    <StackItem>
+                      <Button variant={ButtonVariant.link}>Link Button</Button>
+                    </StackItem>
+                  </Stack>
+                </DataListAction>
+              ]}
+            />
+          </DataListItemRow>
+        </DataListItem>
+        <DataListItem id="full-page-item3">
+          <DataListItemRow>
+            <DataListItemCells
+              dataListCells={[
+                <DataListCell key="primary-content">
+                  <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
                     <FlexItem>
-                      <RhUiCubesIcon /> 5
+                      <p>patternfly</p>
+                      <small>
+                        Working repo for PatternFly 5 <a>https://pf5.patternfly.org/</a>
+                      </small>
                     </FlexItem>
-                    <FlexItem>Updated 2 days ago</FlexItem>
+                    <Flex spaceItems={{ default: 'spaceItemsMd' }}>
+                      <FlexItem>
+                        <RhUiBranchFillIcon /> 10
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiCodeIcon /> 4
+                      </FlexItem>
+                      <FlexItem>
+                        <CubeIcon /> 5
+                      </FlexItem>
+                      <FlexItem>Updated 2 days ago</FlexItem>
+                    </Flex>
                   </Flex>
-                </Flex>
-              </DataListCell>,
-              <DataListAction
-                key="actions"
-                aria-labelledby="full-page-item3 full-page-action3"
-                id="full-page-action3"
-                aria-label="Actions"
-              >
-                <Stack>
-                  <StackItem>
-                    <Button variant={ButtonVariant.secondary}>Secondary</Button>
-                  </StackItem>
-                  <StackItem>
-                    <Button variant={ButtonVariant.link}>Link Button</Button>
-                  </StackItem>
-                </Stack>
-              </DataListAction>
-            ]}
-          />
-        </DataListItemRow>
-      </DataListItem>
-      <DataListItem id="full-page-item4">
-        <DataListItemRow>
-          <DataListItemCells
-            dataListCells={[
-              <DataListCell key="primary-content">
-                <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
-                  <FlexItem>
-                    <p>patternfly-elements</p>
-                    <small>PatternFly elements</small>
-                  </FlexItem>
-                  <Flex spaceItems={{ default: 'spaceItemsMd' }}>
-                    <FlexItem>
-                      <RhUiBranchFillIcon /> 10
-                    </FlexItem>
-                    <FlexItem>
-                      <RhUiCodeIcon /> 4
-                    </FlexItem>
-                    <FlexItem>
-                      <RhUiCubesIcon /> 5
-                    </FlexItem>
-                    <FlexItem>
-                      <Icon status="success">
-                        <RhUiCheckCircleFillIcon />
-                      </Icon>
-                      7
-                    </FlexItem>
-                    <FlexItem>
-                      <Icon status="warning">
-                        <RhUiWarningFillIcon />
-                      </Icon>
-                      5
-                    </FlexItem>
+                </DataListCell>,
+                <DataListAction
+                  key="actions"
+                  aria-labelledby="full-page-item3 full-page-action3"
+                  id="full-page-action3"
+                  aria-label="Actions"
+                >
+                  <Stack>
+                    <StackItem>
+                      <Button variant={ButtonVariant.secondary}>Secondary</Button>
+                    </StackItem>
+                    <StackItem>
+                      <Button variant={ButtonVariant.link}>Link Button</Button>
+                    </StackItem>
+                  </Stack>
+                </DataListAction>
+              ]}
+            />
+          </DataListItemRow>
+        </DataListItem>
+        <DataListItem id="full-page-item4">
+          <DataListItemRow>
+            <DataListItemCells
+              dataListCells={[
+                <DataListCell key="primary-content">
+                  <Flex spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }}>
                     <FlexItem>
-                      <Icon status="danger">
-                        <RhUiCloseCircleFillIcon />
-                      </Icon>
-                      5
+                      <p>patternfly-elements</p>
+                      <small>PatternFly elements</small>
                     </FlexItem>
-                    <FlexItem>Updated 2 days ago</FlexItem>
+                    <Flex spaceItems={{ default: 'spaceItemsMd' }}>
+                      <FlexItem>
+                        <RhUiBranchFillIcon /> 10
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiCodeIcon /> 4
+                      </FlexItem>
+                      <FlexItem>
+                        <CubeIcon /> 5
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiCheckCircleFillIcon /> 7
+                      </FlexItem>
+                      <FlexItem>
+                        <RhUiWarningFillIcon /> 5
+                      </FlexItem>
+                      <FlexItem>
+                        <TimesCircleIcon /> 5
+                      </FlexItem>
+                      <FlexItem>Updated 2 days ago</FlexItem>
+                    </Flex>
                   </Flex>
-                </Flex>
-              </DataListCell>,
-              <DataListAction
-                key="actions"
-                aria-labelledby="full-page-item4 full-page-action4"
-                id="full-page-action4"
-                aria-label="Actions"
-              >
-                <Stack>
-                  <StackItem>
-                    <Button variant={ButtonVariant.secondary}>Secondary</Button>
-                  </StackItem>
-                  <StackItem>
-                    <Button variant={ButtonVariant.link}>Link Button</Button>
-                  </StackItem>
-                </Stack>
-              </DataListAction>
-            ]}
-          />
-        </DataListItemRow>
-      </DataListItem>
-    </DataList>
+                </DataListCell>,
+                <DataListAction
+                  key="actions"
+                  aria-labelledby="full-page-item4 full-page-action4"
+                  id="full-page-action4"
+                  aria-label="Actions"
+                >
+                  <Stack>
+                    <StackItem>
+                      <Button variant={ButtonVariant.secondary}>Secondary</Button>
+                    </StackItem>
+                    <StackItem>
+                      <Button variant={ButtonVariant.link}>Link Button</Button>
+                    </StackItem>
+                  </Stack>
+                </DataListAction>
+              ]}
+            />
+          </DataListItemRow>
+        </DataListItem>
+      </DataList>
+    </Fragment>
   );
 
   return (
@@ -439,18 +426,9 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
           </p>
         </Content>
       </PageSection>
+      <Divider component="div" />
       <PageSection padding={{ default: 'noPadding' }} aria-label="Card with drawer content">
         <Drawer isExpanded={isDrawerExpanded}>
-          <DrawerSection>
-            <Toolbar
-              id="full-page-data-toolbar"
-              inset={{ default: 'insetLg' }}
-              style={{ paddingBlockStart: 'var(--pf-t--global--spacer--md)' }}
-            >
-              <ToolbarContent alignItems="center">{ToolbarItems}</ToolbarContent>
-            </Toolbar>
-            <Divider component="div" />
-          </DrawerSection>
           <DrawerContent panelContent={panelContent}>
             <DrawerContentBody>{drawerContent}</DrawerContentBody>
           </DrawerContent>