Merge pull request #1951 from adevinta/fix-chip-ts

fix(chip): update TS related things for forthcoming @react/types update

packages/components/chip/src/Chip.tsx

@@ -1,14 +1,12 @@
-import React, { ButtonHTMLAttributes, forwardRef, PropsWithChildren, Ref } from 'react'
+import React, { ComponentPropsWithoutRef, forwardRef } from 'react'
 
 import { chipStyles, type ChipStylesProps } from './Chip.styles'
 import { ChipContext } from './useChipContext'
 import { useChipElement } from './useChipElement'
 
-export interface ChipProps
-  extends PropsWithChildren<
-      Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'type' | 'onClick' | 'disabled'>
-    >,
-    Omit<ChipStylesProps, 'hasClearButton'> {
+type ChipPrimitiveProps = Omit<ComponentPropsWithoutRef<'button'>, 'onClick' | 'disabled' | 'type'>
+
+export interface ChipProps extends ChipPrimitiveProps, Omit<ChipStylesProps, 'hasClearButton'> {
   /**
    * Configures a toggleButton aria-pressed initial value
    */
@@ -32,10 +30,6 @@ export interface ChipProps
    * Clear chip handler
    */
   onClear?: (event?: React.MouseEvent<HTMLButtonElement>) => void
-  /**
-   * Pass react ref from the outside
-   */
-  ref?: Ref<HTMLButtonElement | HTMLDivElement>
 }
 
 export const Chip = forwardRef<HTMLButtonElement | HTMLDivElement, ChipProps>(

packages/components/chip/src/index.ts

@@ -1,6 +1,6 @@
-import { FC } from 'react'
+import { ComponentProps, FC } from 'react'
 
-import { Chip as Root, type ChipProps } from './Chip'
+import { Chip as Root } from './Chip'
 import { ChipClearButton } from './ChipClearButton'
 import { ChipContent } from './ChipContent'
 import { ChipLeadingIcon } from './ChipLeadingIcon'
@@ -11,6 +11,8 @@ export { type ChipContentProps } from './ChipContent'
 export { type ChipLeadingIconProps } from './ChipLeadingIcon'
 export { type ChipTrailingIconProps } from './ChipTrailingIcon'
 
+type ChipProps = ComponentProps<typeof Root>
+
 export const Chip: FC<ChipProps> & {
   Content: typeof ChipContent
   LeadingIcon: typeof ChipLeadingIcon