fix: Various types

src/Button.tsx

@@ -10,14 +10,16 @@ import {
 } from './helpers';
 import { ButtonVariant } from './types';
 
+export type ButtonType = 'button' | 'reset' | 'submit' | string;
+
 export interface ButtonProps
   extends React.HTMLAttributes<HTMLElement>,
     BsPrefixPropsWithChildren {
   active?: boolean;
   block?: boolean;
   variant?: ButtonVariant;
   size?: 'sm' | 'lg';
-  type?: 'button' | 'reset' | 'submit' | string;
+  type?: ButtonType;
   href?: string;
   disabled?: boolean;
   target?: any;

src/DropdownButton.tsx

@@ -7,8 +7,8 @@ import DropdownMenu from './DropdownMenu';
 
 export interface DropdownButtonProps
   extends DropdownProps,
+    Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'title'>,
     React.PropsWithChildren<PropsFromToggle> {
-  id?: string;
   title: React.ReactNode;
   menuRole?: string;
   renderMenuOnMount?: boolean;

src/DropdownItem.tsx

@@ -28,7 +28,7 @@ type DropdownItem = BsPrefixRefForwardingComponent<
 >;
 
 const propTypes = {
-  /** @default 'dropdown' */
+  /** @default 'dropdown-item' */
   bsPrefix: PropTypes.string,
 
   /**

src/Figure.tsx

@@ -1,9 +1,9 @@
 import createWithBsPrefix from './createWithBsPrefix';
-
+import { BsPrefixRefForwardingComponent } from './helpers';
 import FigureImage from './FigureImage';
 import FigureCaption from './FigureCaption';
 
-type Figure = React.ComponentType & {
+type Figure = BsPrefixRefForwardingComponent<'figure'> & {
   Image: typeof FigureImage;
   Caption: typeof FigureCaption;
 };

src/ModalDialog.tsx

@@ -6,7 +6,9 @@ import { useBootstrapPrefix } from './ThemeProvider';
 
 import { BsPrefixPropsWithChildren } from './helpers';
 
-export interface ModalDialogProps extends BsPrefixPropsWithChildren {
+export interface ModalDialogProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    BsPrefixPropsWithChildren {
   size?: 'sm' | 'lg' | 'xl';
   centered?: boolean;
   scrollable?: boolean;

src/Overlay.tsx

@@ -12,15 +12,17 @@ import { TransitionType } from './helpers';
 
 export type Placement = import('react-overlays/usePopper').Placement;
 
+export type ArrowProps = {
+  ref: React.RefCallback<HTMLElement>;
+  style: React.CSSProperties;
+};
+
 export interface OverlayInjectedProps {
   ref: React.RefCallback<HTMLElement>;
   style: React.CSSProperties;
   'aria-labelledby'?: string;
 
-  arrowProps: {
-    ref: React.RefCallback<HTMLElement>;
-    style: React.CSSProperties;
-  };
+  arrowProps: ArrowProps;
 
   show: boolean;
   placement: Placement;

src/PageItem.tsx

@@ -9,8 +9,9 @@ import {
 
 import SafeAnchor from './SafeAnchor';
 
-export interface PageItemProps extends BsPrefixPropsWithChildren {
-  style?: any;
+export interface PageItemProps
+  extends React.HTMLAttributes<HTMLElement>,
+    BsPrefixPropsWithChildren {
   disabled?: boolean;
   active?: boolean;
   activeLabel?: string;

src/Popover.tsx

@@ -5,7 +5,7 @@ import isRequiredForA11y from 'prop-types-extra/lib/isRequiredForA11y';
 import { useBootstrapPrefix } from './ThemeProvider';
 import PopoverTitle from './PopoverTitle';
 import PopoverContent from './PopoverContent';
-import { Placement } from './Overlay';
+import { ArrowProps, Placement } from './Overlay';
 import {
   BsPrefixPropsWithChildren,
   BsPrefixRefForwardingComponent,
@@ -17,7 +17,7 @@ export interface PopoverProps
   id: string;
   placement?: Placement;
   title?: string;
-  arrowProps?: { ref: any; style: object };
+  arrowProps?: ArrowProps;
   content?: boolean;
   popper?: any;
   show?: boolean;

src/ProgressBar.tsx

@@ -7,8 +7,9 @@ import { useBootstrapPrefix } from './ThemeProvider';
 import { map } from './ElementChildren';
 import { BsPrefixPropsWithChildren } from './helpers';
 
-export interface ProgressBarProps extends BsPrefixPropsWithChildren {
-  style?: any;
+export interface ProgressBarProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    BsPrefixPropsWithChildren {
   min?: number;
   now?: number;
   max?: number;

src/SafeAnchor.tsx

@@ -4,10 +4,10 @@ import PropTypes from 'prop-types';
 import createChainedFunction from './createChainedFunction';
 import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
 
-export interface SafeAnchorProps extends BsPrefixProps {
+export interface SafeAnchorProps
+  extends React.HTMLAttributes<HTMLElement>,
+    BsPrefixProps {
   href?: string;
-  onClick?: React.MouseEventHandler<this>;
-  onKeyDown?: React.KeyboardEventHandler<this>;
   disabled?: boolean;
   role?: string;
   tabIndex?: number;

src/Spinner.tsx

@@ -6,7 +6,9 @@ import { useBootstrapPrefix } from './ThemeProvider';
 import { BsPrefixPropsWithChildren } from './helpers';
 import { Variant } from './types';
 
-export interface SpinnerProps extends BsPrefixPropsWithChildren {
+export interface SpinnerProps
+  extends React.HTMLAttributes<HTMLElement>,
+    BsPrefixPropsWithChildren {
   animation: 'border' | 'grow';
   role?: string;
   size?: 'sm';

src/SplitButton.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import Button from './Button';
+import Button, { ButtonType } from './Button';
 import ButtonGroup from './ButtonGroup';
 import Dropdown from './Dropdown';
 import { PropsFromToggle } from './DropdownToggle';
@@ -21,7 +21,7 @@ export interface SplitButtonProps
   target?: string;
   title: React.ReactNode;
   toggleLabel?: string;
-  type?: any;
+  type?: ButtonType;
 }
 
 type SplitButton = BsPrefixRefForwardingComponent<'div', SplitButtonProps>;

src/ToggleButton.tsx

@@ -9,7 +9,8 @@ import {
 } from './helpers';
 
 export interface ToggleButtonProps
-  extends React.PropsWithChildren<BsPrefixAndClassNameOnlyProps> {
+  extends ButtonProps,
+    React.PropsWithChildren<BsPrefixAndClassNameOnlyProps> {
   type?: 'checkbox' | 'radio';
   name?: string;
   checked?: boolean;
@@ -19,7 +20,7 @@ export interface ToggleButtonProps
   inputRef?: React.LegacyRef<'input'>;
 }
 
-type ToggleButton = BsPrefixComponentClass<'button', ButtonProps>;
+type ToggleButton = BsPrefixComponentClass<'button', ToggleButtonProps>;
 
 const noop = () => undefined;
 

src/Tooltip.tsx

@@ -4,17 +4,18 @@ import PropTypes from 'prop-types';
 import isRequiredForA11y from 'prop-types-extra/lib/isRequiredForA11y';
 import { useBootstrapPrefix } from './ThemeProvider';
 
-import { Placement } from './Overlay';
+import { ArrowProps, Placement } from './Overlay';
 import {
   BsPrefixPropsWithChildren,
   BsPrefixRefForwardingComponent,
 } from './helpers';
 
-export interface TooltipProps extends BsPrefixPropsWithChildren {
-  style?: any;
+export interface TooltipProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    BsPrefixPropsWithChildren {
   id: string;
   placement?: Placement;
-  arrowProps?: { ref: any; style: object };
+  arrowProps?: ArrowProps;
   show?: boolean;
   popper?: any;
 }