From b43a52426a6c4feffacfe2d02f4c8caeba8b8715 Mon Sep 17 00:00:00 2001
From: Nicole Thoen <nthoen@redhat.com>
Date: Mon, 23 Jan 2023 12:05:56 -0500
Subject: [PATCH] fix(Chip): spread fewer props (#8584)

* fix(Chip): spread fewer props

* fix snapshots
---
 .../react-core/src/components/Chip/Chip.tsx   | 42 ++++++++++++++++---
 .../__snapshots__/Chip.test.tsx.snap          |  8 ----
 .../__snapshots__/ChipGroup.test.tsx.snap     |  4 --
 .../__snapshots__/Select.test.tsx.snap        |  2 -
 .../__snapshots__/Toolbar.test.tsx.snap       |  2 -
 5 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/packages/react-core/src/components/Chip/Chip.tsx b/packages/react-core/src/components/Chip/Chip.tsx
index ae95d143358..2a3e041ca85 100644
--- a/packages/react-core/src/components/Chip/Chip.tsx
+++ b/packages/react-core/src/components/Chip/Chip.tsx
@@ -83,17 +83,34 @@ export class Chip extends React.Component<ChipProps, ChipState> {
   });
 
   renderOverflowChip = () => {
-    const { children, className, onClick, ouiaId, ...props } = this.props;
-    const Component = this.props.component as any;
+    const {
+      children,
+      className,
+      onClick,
+      ouiaId,
+      textMaxWidth,
+      style,
+      component,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      tooltipPosition,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      isOverflowChip,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      closeBtnAriaLabel,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      isReadOnly,
+      ...props
+    } = this.props;
+    const Component = component as any;
     return (
       <Component
         onClick={onClick}
-        {...(this.props.textMaxWidth && {
+        {...(textMaxWidth && {
           style: this.setChipStyle(),
-          ...this.props.style
+          ...style
         })}
         className={css(styles.chip, styles.modifiers.overflow, className)}
-        {...(this.props.component === 'button' ? { type: 'button' } : {})}
+        {...(component === 'button' ? { type: 'button' } : {})}
         {...getOUIAProps('OverflowChip', ouiaId !== undefined ? ouiaId : this.state.ouiaStateId)}
         {...props}
       >
@@ -103,7 +120,20 @@ export class Chip extends React.Component<ChipProps, ChipState> {
   };
 
   renderInnerChip(id: string) {
-    const { children, className, onClick, closeBtnAriaLabel, isReadOnly, component, ouiaId, ...props } = this.props;
+    const {
+      children,
+      className,
+      onClick,
+      closeBtnAriaLabel,
+      isReadOnly,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      isOverflowChip,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      tooltipPosition,
+      component,
+      ouiaId,
+      ...props
+    } = this.props;
     const Component = component as any;
     return (
       <Component
diff --git a/packages/react-core/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap b/packages/react-core/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
index bd90c6b3076..1888b52add0 100644
--- a/packages/react-core/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
+++ b/packages/react-core/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
@@ -8,7 +8,6 @@ exports[`Chip closable 1`] = `
     data-ouia-component-type="PF4/Chip"
     data-ouia-safe="true"
     id="chip_one"
-    tooltipposition="top"
   >
     <span
       class="pf-c-chip__text"
@@ -53,7 +52,6 @@ exports[`Chip closable with tooltip 1`] = `
     data-ouia-component-type="PF4/Chip"
     data-ouia-safe="true"
     id="chip_one"
-    tooltipposition="top"
   >
     <span
       class="pf-c-chip__text"
@@ -99,7 +97,6 @@ exports[`Chip custom max-width text 1`] = `
     data-ouia-safe="true"
     style="--pf-c-chip__text--MaxWidth: 100px;"
     textmaxwidth="100px"
-    tooltipposition="top"
   >
     <span
       class="pf-c-chip__text"
@@ -140,12 +137,9 @@ exports[`Chip overflow 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-chip pf-m-overflow my-chp-cls"
-    closebtnarialabel="close"
-    component="div"
     data-ouia-component-id="OUIA-Generated-Chip-1"
     data-ouia-component-type="PF4/OverflowChip"
     data-ouia-safe="true"
-    tooltipposition="top"
   >
     <span
       class="pf-c-chip__text"
@@ -163,7 +157,6 @@ exports[`Chip readonly 1`] = `
     data-ouia-component-id="OUIA-Generated-Chip-4"
     data-ouia-component-type="PF4/Chip"
     data-ouia-safe="true"
-    tooltipposition="top"
   >
     <span
       class="pf-c-chip__text"
@@ -183,7 +176,6 @@ exports[`Chip with role='gridcell' 1`] = `
     data-ouia-component-type="PF4/Chip"
     data-ouia-safe="true"
     role="gridcell"
-    tooltipposition="top"
   >
     <span
       class="pf-c-chip__text"
diff --git a/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/ChipGroup.test.tsx.snap b/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/ChipGroup.test.tsx.snap
index 4db703a7a31..6cbf8fe1ed6 100644
--- a/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/ChipGroup.test.tsx.snap
+++ b/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/ChipGroup.test.tsx.snap
@@ -25,7 +25,6 @@ exports[`ChipGroup chip group default 1`] = `
             data-ouia-component-id="OUIA-Generated-Chip-1"
             data-ouia-component-type="PF4/Chip"
             data-ouia-safe="true"
-            tooltipposition="top"
           >
             <span
               class="pf-c-chip__text"
@@ -97,7 +96,6 @@ exports[`ChipGroup chip group with category 1`] = `
             data-ouia-component-id="OUIA-Generated-Chip-2"
             data-ouia-component-type="PF4/Chip"
             data-ouia-safe="true"
-            tooltipposition="top"
           >
             <span
               class="pf-c-chip__text"
@@ -169,7 +167,6 @@ exports[`ChipGroup chip group with category and tooltip 1`] = `
             data-ouia-component-id="OUIA-Generated-Chip-9"
             data-ouia-component-type="PF4/Chip"
             data-ouia-safe="true"
-            tooltipposition="top"
           >
             <span
               class="pf-c-chip__text"
@@ -241,7 +238,6 @@ exports[`ChipGroup chip group with closable category 1`] = `
             data-ouia-component-id="OUIA-Generated-Chip-3"
             data-ouia-component-type="PF4/Chip"
             data-ouia-safe="true"
-            tooltipposition="top"
           >
             <span
               class="pf-c-chip__text"
diff --git a/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap b/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
index 15c459c39af..3bbfb29c2c1 100644
--- a/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
+++ b/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
@@ -1859,7 +1859,6 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                   data-ouia-component-id="OUIA-Generated-Chip-1"
                   data-ouia-component-type="PF4/Chip"
                   data-ouia-safe="true"
-                  tooltipposition="top"
                 >
                   <span
                     class="pf-c-chip__text"
@@ -1902,7 +1901,6 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                   data-ouia-component-id="OUIA-Generated-Chip-2"
                   data-ouia-component-type="PF4/Chip"
                   data-ouia-safe="true"
-                  tooltipposition="top"
                 >
                   <span
                     class="pf-c-chip__text"
diff --git a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
index 775e47ee477..da1d33c254b 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
+++ b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
@@ -297,7 +297,6 @@ exports[`Toolbar should render with custom chip content 1`] = `
                     data-ouia-component-id="OUIA-Generated-Chip-1"
                     data-ouia-component-type="PF4/Chip"
                     data-ouia-safe="true"
-                    tooltipposition="top"
                   >
                     <span
                       class="pf-c-chip__text"
@@ -340,7 +339,6 @@ exports[`Toolbar should render with custom chip content 1`] = `
                     data-ouia-component-id="OUIA-Generated-Chip-2"
                     data-ouia-component-type="PF4/Chip"
                     data-ouia-safe="true"
-                    tooltipposition="top"
                   >
                     <span
                       class="pf-c-chip__text"