refactor(types): simplify types (react-bootstrap#5708)

Author: kyletsang

src/Accordion.tsx

@@ -11,14 +11,14 @@ import AccordionContext from './AccordionContext';
 import AccordionHeader from './AccordionHeader';
 import AccordionItem from './AccordionItem';
 import {
-  BsPrefixPropsWithChildren,
+  BsPrefixProps,
   BsPrefixRefForwardingComponent,
   SelectCallback,
 } from './helpers';
 
 export interface AccordionProps
   extends Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'>,
-    BsPrefixPropsWithChildren {
+    BsPrefixProps {
   activeKey?: string;
   defaultActiveKey?: string;
   onSelect?: SelectCallback;

src/AccordionBody.tsx

@@ -5,13 +5,10 @@ import PropTypes from 'prop-types';
 import { useBootstrapPrefix } from './ThemeProvider';
 import AccordionCollapse from './AccordionCollapse';
 import AccordionItemContext from './AccordionItemContext';
-import {
-  BsPrefixRefForwardingComponent,
-  BsPrefixPropsWithChildren,
-} from './helpers';
+import { BsPrefixRefForwardingComponent, BsPrefixProps } from './helpers';
 
 export interface AccordionBodyProps
-  extends BsPrefixPropsWithChildren,
+  extends BsPrefixProps,
     React.HTMLAttributes<HTMLElement> {}
 
 const propTypes = {

src/AccordionButton.tsx

@@ -4,17 +4,14 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import AccordionContext from './AccordionContext';
 import AccordionItemContext from './AccordionItemContext';
-import {
-  BsPrefixPropsWithChildren,
-  BsPrefixRefForwardingComponent,
-} from './helpers';
+import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
 import { useBootstrapPrefix } from './ThemeProvider';
 
 type EventHandler = React.EventHandler<React.SyntheticEvent>;
 
 export interface AccordionButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    BsPrefixPropsWithChildren {}
+    BsPrefixProps {}
 
 const propTypes = {
   /** Set a custom element for this component */

src/AccordionCollapse.tsx

@@ -6,13 +6,10 @@ import { Transition } from 'react-transition-group';
 import { useBootstrapPrefix } from './ThemeProvider';
 import Collapse, { CollapseProps } from './Collapse';
 import AccordionContext from './AccordionContext';
-import {
-  BsPrefixRefForwardingComponent,
-  BsPrefixAndClassNameOnlyProps,
-} from './helpers';
+import { BsPrefixRefForwardingComponent, BsPrefixOnlyProps } from './helpers';
 
 export interface AccordionCollapseProps
-  extends BsPrefixAndClassNameOnlyProps,
+  extends BsPrefixOnlyProps,
     CollapseProps {
   eventKey: string;
 }

src/AccordionHeader.tsx

@@ -3,13 +3,10 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useBootstrapPrefix } from './ThemeProvider';
 import AccordionButton from './AccordionButton';
-import {
-  BsPrefixRefForwardingComponent,
-  BsPrefixPropsWithChildren,
-} from './helpers';
+import { BsPrefixRefForwardingComponent, BsPrefixProps } from './helpers';
 
 export interface AccordionHeaderProps
-  extends BsPrefixPropsWithChildren,
+  extends BsPrefixProps,
     React.HTMLAttributes<HTMLElement> {}
 
 const propTypes = {

src/AccordionItem.tsx

@@ -6,13 +6,10 @@ import { useBootstrapPrefix } from './ThemeProvider';
 import AccordionItemContext, {
   AccordionItemContextValue,
 } from './AccordionItemContext';
-import {
-  BsPrefixRefForwardingComponent,
-  BsPrefixPropsWithChildren,
-} from './helpers';
+import { BsPrefixRefForwardingComponent, BsPrefixProps } from './helpers';
 
 export interface AccordionItemProps
-  extends BsPrefixPropsWithChildren,
+  extends BsPrefixProps,
     React.HTMLAttributes<HTMLElement> {
   eventKey: string;
 }

src/Button.tsx

@@ -4,17 +4,14 @@ import PropTypes from 'prop-types';
 
 import { useBootstrapPrefix } from './ThemeProvider';
 import SafeAnchor from './SafeAnchor';
-import {
-  BsPrefixPropsWithChildren,
-  BsPrefixRefForwardingComponent,
-} from './helpers';
+import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
 import { ButtonVariant } from './types';
 
 export type ButtonType = 'button' | 'reset' | 'submit' | string;
 
 export interface ButtonProps
   extends React.HTMLAttributes<HTMLElement>,
-    BsPrefixPropsWithChildren {
+    BsPrefixProps {
   active?: boolean;
   variant?: ButtonVariant;
   size?: 'sm' | 'lg';

src/CardImg.tsx

@@ -5,7 +5,9 @@ import PropTypes from 'prop-types';
 import { useBootstrapPrefix } from './ThemeProvider';
 import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
 
-export interface CardImgProps extends BsPrefixProps {
+export interface CardImgProps
+  extends BsPrefixProps,
+    React.ImgHTMLAttributes<HTMLImageElement> {
   variant?: 'top' | 'bottom';
 }
 

src/FormRange.tsx

@@ -2,10 +2,10 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import * as React from 'react';
 import { useBootstrapPrefix } from './ThemeProvider';
-import { BsPrefixAndClassNameOnlyProps } from './helpers';
+import { BsPrefixOnlyProps } from './helpers';
 
 export interface FormRangeProps
-  extends BsPrefixAndClassNameOnlyProps,
+  extends BsPrefixOnlyProps,
     Omit<React.InputHTMLAttributes<HTMLInputElement>, 'type'> {}
 
 const propTypes = {

src/FormSelect.tsx

@@ -2,13 +2,10 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import * as React from 'react';
 import { useBootstrapPrefix } from './ThemeProvider';
-import {
-  BsPrefixAndClassNameOnlyProps,
-  BsPrefixRefForwardingComponent,
-} from './helpers';
+import { BsPrefixOnlyProps, BsPrefixRefForwardingComponent } from './helpers';
 
 export interface FormSelectProps
-  extends BsPrefixAndClassNameOnlyProps,
+  extends BsPrefixOnlyProps,
     React.HTMLAttributes<HTMLSelectElement> {
   htmlSize?: number;
   size?: 'sm' | 'lg';