@patternfly/react-core 6.5.0-prerelease.8 → 6.5.0

package/src/demos/examples/Tabs/TabsOpen.tsx

@@ -0,0 +1,186 @@
+import { useState } from 'react';
+import {
+  PageSection,
+  PageBreadcrumb,
+  Breadcrumb,
+  BreadcrumbItem,
+  Tabs,
+  Tab,
+  TabContent,
+  TabContentBody,
+  TabTitleText,
+  Title,
+  DescriptionList,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  DescriptionListDescription,
+  Label,
+  LabelColor,
+  LabelGroup,
+  Flex,
+  FlexItem
+} from '@patternfly/react-core';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-check-circle-fill-icon';
+import RhUiInformationFillIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-information-fill-icon';
+import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
+import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
+
+export const TabsOpen: React.FunctionComponent = () => {
+  const [activeTabKey, setActiveTabKey] = useState(0);
+
+  // Toggle currently active tab
+  const handleTabClick = (_event: React.MouseEvent<HTMLElement>, tabIndex: number | string) => {
+    setActiveTabKey(tabIndex);
+  };
+
+  const tabsBreadcrumb = (
+    <PageBreadcrumb isWidthLimited>
+      <Breadcrumb>
+        <BreadcrumbItem to="#">Overview</BreadcrumbItem>
+        <BreadcrumbItem to="#">Pods</BreadcrumbItem>
+        <BreadcrumbItem to="#" isActive>
+          Pod details{' '}
+        </BreadcrumbItem>
+      </Breadcrumb>
+    </PageBreadcrumb>
+  );
+
+  const tabContent = (
+    <Flex direction={{ default: 'column' }}>
+      <FlexItem spacer={{ default: 'spacerLg' }}>
+        <Title headingLevel="h2" size="lg" className={spacing.mtSm} id="open-tabs-example-tabs-list-details-title">
+          Pod details
+        </Title>
+      </FlexItem>
+      <FlexItem>
+        <DescriptionList columnModifier={{ lg: '2Col' }} aria-labelledby="open-tabs-example-tabs-list-details-title">
+          <DescriptionListGroup>
+            <DescriptionListTerm>Name</DescriptionListTerm>
+            <DescriptionListDescription>3scale-control-fccb6ddb9-phyqv9</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Status</DescriptionListTerm>
+            <DescriptionListDescription>
+              <Flex spacer={{ default: 'spacerLg' }}>
+                <FlexItem>
+                  <RhUiCheckCircleFillIcon />
+                </FlexItem>
+                <FlexItem>Running</FlexItem>
+              </Flex>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Namespace</DescriptionListTerm>
+            <DescriptionListDescription>
+              <Flex spaceItems={{ default: 'spaceItemsSm' }}>
+                <FlexItem>
+                  <Label color={LabelColor.teal}>NS</Label>
+                </FlexItem>
+                <FlexItem>
+                  <a href="#">knative-serving-ingress</a>
+                </FlexItem>
+              </Flex>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Restart policy</DescriptionListTerm>
+            <DescriptionListDescription>Always restart</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Labels</DescriptionListTerm>
+            <DescriptionListDescription>
+              <LabelGroup>
+                <Label>app=3scale-gateway</Label>
+                <Label>pod-template-has=6747686899</Label>
+              </LabelGroup>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Active deadline seconds</DescriptionListTerm>
+            <DescriptionListDescription>Not configured</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Tolerations</DescriptionListTerm>
+            <DescriptionListDescription>stuff</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Pod IP</DescriptionListTerm>
+            <DescriptionListDescription>10.345.2.197</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Annotations</DescriptionListTerm>
+            <DescriptionListDescription>stuff</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Node</DescriptionListTerm>
+            <DescriptionListDescription>
+              <Flex spaceItems={{ default: 'spaceItemsSm' }}>
+                <FlexItem>
+                  <Label color={LabelColor.purple}>N</Label>
+                </FlexItem>
+                <FlexItem>ip-10-0-233-118.us-east-2.computer.external</FlexItem>
+              </Flex>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Created at</DescriptionListTerm>
+            <DescriptionListDescription>
+              <time>Oct 15, 1:51 pm</time>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+        </DescriptionList>
+      </FlexItem>
+    </Flex>
+  );
+
+  return (
+    <DashboardWrapper hasNoBreadcrumb>
+      {tabsBreadcrumb}
+      <PageSection isWidthLimited aria-label="Pod header">
+        <Flex
+          spaceItems={{ default: 'spaceItemsMd' }}
+          alignItems={{ default: 'alignItemsFlexStart' }}
+          flexWrap={{ default: 'noWrap' }}
+        >
+          <FlexItem>
+            <Label color={LabelColor.blue}>N</Label>
+          </FlexItem>
+          <FlexItem>
+            <Title headingLevel="h1" size="2xl">
+              3scale-control-fccb6ddb9-phyqv9
+            </Title>
+          </FlexItem>
+          <FlexItem flex={{ default: 'flexNone' }}>
+            <Label icon={<RhUiInformationFillIcon />}>Running</Label>
+          </FlexItem>
+        </Flex>
+      </PageSection>
+      <PageSection type="tabs" isWidthLimited aria-label="Pod navigation tabs">
+        <Tabs activeKey={activeTabKey} onSelect={handleTabClick} usePageInsets id="open-tabs-example-tabs-list">
+          <Tab eventKey={0} title={<TabTitleText>Details</TabTitleText>} tabContentId={`tabContent${0}`} />
+          <Tab eventKey={1} title={<TabTitleText>YAML</TabTitleText>} tabContentId={`tabContent${1}`} />
+          <Tab eventKey={2} title={<TabTitleText>Environment</TabTitleText>} tabContentId={`tabContent${2}`} />
+          <Tab eventKey={3} title={<TabTitleText>Events</TabTitleText>} tabContentId={`tabContent${3}`} />
+          <Tab eventKey={4} title={<TabTitleText>Terminal</TabTitleText>} tabContentId={`tabContent${4}`} />
+        </Tabs>
+      </PageSection>
+      <PageSection isWidthLimited aria-label="Pod content">
+        <TabContent key={0} eventKey={0} id={`tabContent${0}`} activeKey={activeTabKey} hidden={0 !== activeTabKey}>
+          <TabContentBody>{tabContent}</TabContentBody>
+        </TabContent>
+        <TabContent key={1} eventKey={1} id={`tabContent${1}`} activeKey={activeTabKey} hidden={1 !== activeTabKey}>
+          <TabContentBody>YAML panel</TabContentBody>
+        </TabContent>
+        <TabContent key={2} eventKey={2} id={`tabContent${2}`} activeKey={activeTabKey} hidden={2 !== activeTabKey}>
+          <TabContentBody>Environment panel</TabContentBody>
+        </TabContent>
+        <TabContent key={3} eventKey={3} id={`tabContent${3}`} activeKey={activeTabKey} hidden={3 !== activeTabKey}>
+          <TabContentBody>Events panel</TabContentBody>
+        </TabContent>
+        <TabContent key={4} eventKey={4} id={`tabContent${4}`} activeKey={activeTabKey} hidden={4 !== activeTabKey}>
+          <TabContentBody>Terminal panel</TabContentBody>
+        </TabContent>
+      </PageSection>
+    </DashboardWrapper>
+  );
+};

package/src/demos/examples/Tabs/TabsOpenWithSecondaryTabs.tsx

@@ -0,0 +1,229 @@
+import { useState } from 'react';
+import {
+  PageSection,
+  PageBreadcrumb,
+  Breadcrumb,
+  BreadcrumbItem,
+  Tabs,
+  Tab,
+  TabContent,
+  TabContentBody,
+  TabTitleText,
+  Title,
+  DescriptionList,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  DescriptionListDescription,
+  Label,
+  LabelColor,
+  LabelGroup,
+  Flex,
+  FlexItem
+} from '@patternfly/react-core';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-check-circle-fill-icon';
+import RhUiInformationFillIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-information-fill-icon';
+import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
+import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
+
+export const TabsOpenWithSecondaryTabs: React.FunctionComponent = () => {
+  const [activeTabKey, setActiveTabKey] = useState<number>(0);
+  const [activeTabKeySecondary, setActiveTabKeySecondary] = useState<number>(10);
+
+  // Toggle currently active tab
+  const handleTabClick = (_event: React.MouseEvent<HTMLElement>, tabIndex: number) => {
+    setActiveTabKey(tabIndex);
+  };
+
+  // Toggle currently active secondary tab
+  const handleTabClickSecondary = (_event: React.MouseEvent<HTMLElement>, tabIndex: number) => {
+    setActiveTabKeySecondary(tabIndex);
+  };
+
+  const tabsBreadcrumb = (
+    <PageBreadcrumb isWidthLimited>
+      <Breadcrumb>
+        <BreadcrumbItem to="#">Overview</BreadcrumbItem>
+        <BreadcrumbItem to="#">Pods</BreadcrumbItem>
+        <BreadcrumbItem to="#" isActive>
+          Pod details{' '}
+        </BreadcrumbItem>
+      </Breadcrumb>
+    </PageBreadcrumb>
+  );
+
+  const tabContent = (
+    <Flex direction={{ default: 'column' }}>
+      <FlexItem spacer={{ default: 'spacerLg' }}>
+        <Title headingLevel="h2" size="lg" className={spacing.mtSm} id="open-tabs-example-tabs-list-details-title">
+          Pod details
+        </Title>
+      </FlexItem>
+      <FlexItem>
+        <DescriptionList columnModifier={{ lg: '2Col' }} aria-labelledby="open-tabs-example-tabs-list-details-title">
+          <DescriptionListGroup>
+            <DescriptionListTerm>Name</DescriptionListTerm>
+            <DescriptionListDescription>3scale-control-fccb6ddb9-phyqv9</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Status</DescriptionListTerm>
+            <DescriptionListDescription>
+              <Flex spacer={{ default: 'spacerLg' }}>
+                <FlexItem>
+                  <RhUiCheckCircleFillIcon />
+                </FlexItem>
+                <FlexItem>Running</FlexItem>
+              </Flex>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Namespace</DescriptionListTerm>
+            <DescriptionListDescription>
+              <Flex spaceItems={{ default: 'spaceItemsSm' }}>
+                <FlexItem>
+                  <Label color={LabelColor.teal}>NS</Label>
+                </FlexItem>
+                <FlexItem>
+                  <a href="#">knative-serving-ingress</a>
+                </FlexItem>
+              </Flex>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Restart policy</DescriptionListTerm>
+            <DescriptionListDescription>Always restart</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Labels</DescriptionListTerm>
+            <DescriptionListDescription>
+              <LabelGroup>
+                <Label>app=3scale-gateway</Label>
+                <Label>pod-template-has=6747686899</Label>
+              </LabelGroup>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Active deadline seconds</DescriptionListTerm>
+            <DescriptionListDescription>Not configured</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Tolerations</DescriptionListTerm>
+            <DescriptionListDescription>stuff</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Pod IP</DescriptionListTerm>
+            <DescriptionListDescription>10.345.2.197</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Annotations</DescriptionListTerm>
+            <DescriptionListDescription>stuff</DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Node</DescriptionListTerm>
+            <DescriptionListDescription>
+              <Flex spaceItems={{ default: 'spaceItemsSm' }}>
+                <FlexItem>
+                  <Label color={LabelColor.purple}>N</Label>
+                </FlexItem>
+                <FlexItem>ip-10-0-233-118.us-east-2.computer.external</FlexItem>
+              </Flex>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>Created at</DescriptionListTerm>
+            <DescriptionListDescription>
+              <time>Oct 15, 1:51 pm</time>
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+        </DescriptionList>
+      </FlexItem>
+    </Flex>
+  );
+
+  return (
+    <DashboardWrapper hasNoBreadcrumb>
+      {tabsBreadcrumb}
+      <PageSection isWidthLimited aria-label="Pod header">
+        <Flex
+          spaceItems={{ default: 'spaceItemsMd' }}
+          alignItems={{ default: 'alignItemsFlexStart' }}
+          flexWrap={{ default: 'noWrap' }}
+        >
+          <FlexItem>
+            <Label color={LabelColor.blue}>N</Label>
+          </FlexItem>
+          <FlexItem>
+            <Title headingLevel="h1" size="2xl">
+              3scale-control-fccb6ddb9-phyqv9
+            </Title>
+          </FlexItem>
+          <FlexItem flex={{ default: 'flexNone' }}>
+            <Label icon={<RhUiInformationFillIcon />}>Running</Label>
+          </FlexItem>
+        </Flex>
+      </PageSection>
+      <PageSection type="tabs" isWidthLimited aria-label="Pod navigation tabs">
+        <Tabs activeKey={activeTabKey} onSelect={handleTabClick} usePageInsets id="open-tabs-example-tabs-list">
+          <Tab eventKey={0} title={<TabTitleText>Details</TabTitleText>} tabContentId={`tabContent${0}`} />
+          <Tab eventKey={1} title={<TabTitleText>YAML</TabTitleText>} tabContentId={`tabContent${1}`} />
+          <Tab eventKey={2} title={<TabTitleText>Environment</TabTitleText>} tabContentId={`tabContent${2}`} />
+          <Tab eventKey={3} title={<TabTitleText>Events</TabTitleText>} tabContentId={`tabContent${3}`} />
+          <Tab eventKey={4} title={<TabTitleText>Terminal</TabTitleText>} tabContentId={`tabContent${4}`} />
+        </Tabs>
+      </PageSection>
+      <PageSection isWidthLimited padding={{ default: 'noPadding' }} aria-label="Pod content">
+        <TabContent key={0} eventKey={0} id={`tabContent${0}`} activeKey={activeTabKey} hidden={0 !== activeTabKey}>
+          <TabContentBody>
+            <Tabs
+              isSecondary
+              activeKey={activeTabKeySecondary}
+              onSelect={handleTabClickSecondary}
+              usePageInsets
+              id="open-with-secondary-tabs-example-tabs-list-secondary"
+            >
+              <Tab
+                eventKey={10}
+                title={<TabTitleText>Pod information</TabTitleText>}
+                tabContentId={`tabContent${10}`}
+              />
+              <Tab
+                eventKey={11}
+                title={<TabTitleText>Editable aspects</TabTitleText>}
+                tabContentId={`tabContent${11}`}
+              />
+            </Tabs>
+            <TabContent
+              key={10}
+              eventKey={10}
+              id={`tabContent${10}`}
+              activeKey={activeTabKeySecondary}
+              hidden={10 !== activeTabKeySecondary}
+            >
+              <TabContentBody hasPadding>{tabContent}</TabContentBody>
+            </TabContent>
+            <TabContent
+              key={11}
+              eventKey={11}
+              id={`tabContent${11}`}
+              activeKey={activeTabKeySecondary}
+              hidden={11 !== activeTabKeySecondary}
+            >
+              <TabContentBody>Editable aspects</TabContentBody>
+            </TabContent>
+          </TabContentBody>
+        </TabContent>
+        <TabContent key={1} eventKey={1} id={`tabContent${1}`} activeKey={activeTabKey} hidden={1 !== activeTabKey}>
+          <TabContentBody>YAML panel</TabContentBody>
+        </TabContent>
+        <TabContent key={2} eventKey={2} id={`tabContent${2}`} activeKey={activeTabKey} hidden={2 !== activeTabKey}>
+          <TabContentBody>Environment panel</TabContentBody>
+        </TabContent>
+        <TabContent key={3} eventKey={3} id={`tabContent${3}`} activeKey={activeTabKey} hidden={3 !== activeTabKey}>
+          <TabContentBody>Events panel</TabContentBody>
+        </TabContent>
+        <TabContent key={4} eventKey={4} id={`tabContent${4}`} activeKey={activeTabKey} hidden={4 !== activeTabKey}>
+          <TabContentBody>Terminal panel</TabContentBody>
+        </TabContent>
+      </PageSection>
+    </DashboardWrapper>
+  );
+};

package/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx

@@ -14,7 +14,7 @@ import {
   LabelGroup
 } from '@patternfly/react-core';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
-import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
+import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
 
 export const AttributeValueFiltering: React.FunctionComponent = () => {
   const [inputValue, setInputValue] = useState('');
@@ -40,8 +40,8 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
   const [menuItems, setMenuItems] = useState<React.ReactElement<any>[]>([]);
 
   /** refs used to detect when clicks occur inside vs outside of the textInputGroup and menu popper */
-  const menuRef = useRef<HTMLDivElement>(undefined);
-  const textInputGroupRef = useRef<HTMLDivElement>(undefined);
+  const menuRef = useRef<HTMLDivElement>(null);
+  const textInputGroupRef = useRef<HTMLDivElement>(null);
 
   /** callback for updating the inputValue state in this component so that the input can be controlled */
   const handleInputChange = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
@@ -107,7 +107,7 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
     const divider = <Divider key="divider" />;
 
     setMenuItems([headingItem, divider, ...filteredMenuItems]);
-  }, [inputValue]);
+  }, [inputValue, menuItemsText, selectedKey]);
 
   /** add selected key/value pair as a chip in the chip group */
   const selectValue = (selectedValue: string) => {
@@ -117,22 +117,30 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
 
   /** update the input to show the selected key and the menu to show the values associated with that specific key */
   const selectKey = (selectedText: string) => {
+    const values = data[selectedText];
+
+    if (!values) {
+      return;
+    }
+
     setInputValue(`${selectedText}: `);
     setSelectedKey(selectedText);
-    setMenuItemsText(data[selectedText]);
+    setMenuItemsText(values);
   };
 
   const handleEnter = () => {
-    /** do nothing if the menu contains no real results */
-    if (menuItems.length === 1) {
+    /** bail if heading + divider + first option are not all present */
+    const firstResult = menuItems[2]?.props?.children;
+
+    if (!firstResult) {
       return;
     }
 
     /** perform the appropriate action based on key selection state */
     if (selectedKey.length) {
-      selectValue(menuItems[2].props.children);
+      selectValue(firstResult);
     } else {
-      selectKey(menuItems[2].props.children);
+      selectKey(firstResult);
     }
   };
 
@@ -144,7 +152,7 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
   };
 
   /** allow the user to select a key by simply typing it and entering a colon, exact (case sensitive) matches only */
-  const handleColon = () => {
+  const handleColon = (event: React.KeyboardEvent) => {
     if (!selectedKey.length && keyNames.includes(inputValue)) {
       selectKey(inputValue);
       event.preventDefault();
@@ -172,7 +180,7 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
         handleBackspace();
         break;
       case ':':
-        handleColon();
+        handleColon(event);
         break;
       case 'ArrowUp':
       case 'ArrowDown':
@@ -182,24 +190,24 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
   };
 
   /** perform the proper key or value selection when a menu item is selected */
-  const onSelect = (event: React.MouseEvent<Element, MouseEvent>, _itemId: string | number) => {
-    const selectedText = (event.target as HTMLElement).innerText;
+  const onSelect = (event: React.MouseEvent<Element, MouseEvent> | undefined, _itemId: string | number) => {
+    const selectedText = (event?.target as HTMLElement | undefined)?.innerText.trim() || '';
 
     if (selectedKey.length) {
       selectValue(selectedText);
     } else {
       selectKey(selectedText);
     }
-    event.stopPropagation();
-    textInputGroupRef.current.querySelector('input').focus();
+    event?.stopPropagation();
+    textInputGroupRef.current?.querySelector('input')?.focus();
   };
 
   /** close the menu when a click occurs outside of the menu or text input group */
-  const handleClick = (event: MouseEvent) => {
+  const handleClick = (event: MouseEvent | undefined) => {
     if (
       menuRef.current &&
-      !menuRef.current.contains(event.target as HTMLElement) &&
-      !textInputGroupRef.current.contains(event.target as HTMLElement)
+      !menuRef.current.contains(event?.target as HTMLElement) &&
+      !textInputGroupRef.current?.contains(event?.target as HTMLElement)
     ) {
       setMenuIsOpen(false);
     }
@@ -239,7 +247,7 @@ export const AttributeValueFiltering: React.FunctionComponent = () => {
                 variant="plain"
                 onClick={clearChipsAndInput}
                 aria-label="Clear button and input"
-                icon={<TimesIcon />}
+                icon={<RhMicronsCloseIcon />}
               />
             )}
           </TextInputGroupUtilities>

package/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx

@@ -14,7 +14,7 @@ import {
   LabelGroup
 } from '@patternfly/react-core';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
-import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
+import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
 
 export const AutoCompleteSearch: React.FunctionComponent = () => {
   const [inputValue, setInputValue] = useState('');
@@ -233,7 +233,7 @@ export const AutoCompleteSearch: React.FunctionComponent = () => {
                 variant="plain"
                 onClick={clearChipsAndInput}
                 aria-label="Clear button for chips and input"
-                icon={<TimesIcon />}
+                icon={<RhMicronsCloseIcon />}
               />
             )}
           </TextInputGroupUtilities>

package/src/deprecated/components/Chip/Chip.tsx

@@ -1,7 +1,8 @@
 import { Component, Fragment } from 'react';
 import { TooltipPosition } from '../../../components/Tooltip';
 import { Label, LabelProps } from '../../../components/Label';
-import { getOUIAProps, OUIAProps, getDefaultOUIAId } from '../../../helpers';
+import { getOUIAProps, OUIAProps } from '../../../helpers';
+import { SSRSafeIds } from '../../../helpers/SSRSafeIds/SSRSafeIds';
 
 export interface ChipProps extends LabelProps, OUIAProps {
   /** Badge to add to the chip. The badge will be rendered after the chip text. */
@@ -77,26 +78,30 @@ class Chip extends Component<ChipProps> {
     } = this.props;
 
     return (
-      <Label
-        variant="outline"
-        className={className}
-        textMaxWidth={textMaxWidth}
-        tooltipPosition={tooltipPosition}
-        {...(!isReadOnly &&
-          !isOverflowChip && {
-            onClose: onClick,
-            closeBtnAriaLabel: closeBtnAriaLabel ? closeBtnAriaLabel : `Close ${children}`
-          })}
-        {...(isOverflowChip && { onClick, variant: 'overflow' })}
-        {...getOUIAProps(
-          isOverflowChip ? 'OverflowChip' : Chip.displayName,
-          ouiaId !== undefined ? ouiaId : getDefaultOUIAId(Chip.displayName)
+      <SSRSafeIds prefix="pf-" ouiaComponentType={Chip.displayName}>
+        {(_, generatedOuiaId) => (
+          <Label
+            variant="outline"
+            className={className}
+            textMaxWidth={textMaxWidth}
+            tooltipPosition={tooltipPosition}
+            {...(!isReadOnly &&
+              !isOverflowChip && {
+                onClose: onClick,
+                closeBtnAriaLabel: closeBtnAriaLabel ? closeBtnAriaLabel : `Close ${children}`
+              })}
+            {...(isOverflowChip && { onClick, variant: 'overflow' })}
+            {...getOUIAProps(
+              isOverflowChip ? 'OverflowChip' : Chip.displayName,
+              ouiaId !== undefined ? ouiaId : generatedOuiaId
+            )}
+            {...props}
+          >
+            {children}
+            {badge && <Fragment> {badge}</Fragment>}
+          </Label>
         )}
-        {...props}
-      >
-        {children}
-        {badge && <Fragment> {badge}</Fragment>}
-      </Label>
+      </SSRSafeIds>
     );
   }
 }

package/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap

@@ -25,7 +25,7 @@ exports[`Matches snapshot 1`] = `
       <button
         aria-label="Close Chip text"
         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
-        data-ouia-component-id="OUIA-Generated-Button-plain-17"
+        data-ouia-component-id="OUIA-Generated-Button-plain-:r2e:"
         data-ouia-component-type="PF6/Button"
         data-ouia-safe="true"
         type="button"
@@ -39,11 +39,11 @@ exports[`Matches snapshot 1`] = `
             fill="currentColor"
             height="1em"
             role="img"
-            viewBox="0 0 352 512"
+            viewBox="0 0 20 20"
             width="1em"
           >
             <path
-              d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
+              d="M17.8 16.2 11.59 10l6.21-6.21c.42-.46.39-1.17-.07-1.59-.43-.4-1.09-.4-1.52 0l-6.2 6.2-6.22-6.19c-.44-.44-1.15-.44-1.59 0-.44.44-.44 1.15 0 1.59l6.2 6.21-6.2 6.2c-.42.46-.39 1.17.07 1.59.43.4 1.09.4 1.52 0L10 11.59l6.2 6.2c.44.44 1.15.44 1.59 0 .44-.45.44-1.16 0-1.6Z"
             />
           </svg>
         </span>