@graphprotocol/gds-react 0.2.3 → 0.2.4

package/src/components/Menu.parts.tsx

@@ -43,16 +43,16 @@ const MenuTriggerContext = createContext<boolean>(false)
 type MenuItemType = 'plain' | 'checkbox' | 'radio'
 
 declare namespace GroupProps {
-  interface BaseProps {
+  interface CommonProps {
     label?: ReactNode | undefined
   }
-  interface NonRadioProps extends BaseProps {
+  interface NonRadioProps extends CommonProps {
     type?: Exclude<MenuItemType, 'radio'> | undefined
     value?: undefined
     defaultValue?: undefined
     onChange?: undefined
   }
-  interface RadioProps<T extends OptionValue> extends BaseProps {
+  interface RadioProps<T extends OptionValue> extends CommonProps {
     type: 'radio'
     value?: T | undefined
     defaultValue?: T | undefined
@@ -60,11 +60,9 @@ declare namespace GroupProps {
   }
 }
 
-declare namespace MenuProps {
-  interface BaseProps
-    extends
-      Omit<ComponentProps<'div'>, 'defaultValue' | 'onChange'>,
-      GDSComponentProps<typeof MenuMeta> {
+export declare namespace MenuProps {
+  interface HTMLProps extends Omit<ComponentProps<'div'>, 'defaultValue' | 'onChange'> {}
+  interface OwnProps {
     /**
      * Element that opens the menu when clicked or hovered (depending on `triggerMode`), or a
      * function that returns such an element. If not provided, the menu is rendered inline rather
@@ -90,8 +88,9 @@ declare namespace MenuProps {
     header?: ReactNode | undefined
     footer?: ReactNode | undefined
   }
-  interface NonRadioProps extends BaseProps, GroupProps.NonRadioProps {}
-  interface RadioProps<T extends OptionValue> extends BaseProps, GroupProps.RadioProps<T> {}
+  interface CommonProps extends HTMLProps, OwnProps, GDSComponentProps<typeof MenuMeta> {}
+  interface NonRadioProps extends CommonProps, GroupProps.NonRadioProps {}
+  interface RadioProps<T extends OptionValue> extends CommonProps, GroupProps.RadioProps<T> {}
 }
 
 export type MenuProps<T extends OptionValue = OptionValue> =
@@ -517,10 +516,10 @@ const MenuGroupContext = createContext<
   | null
 >(null)
 
-declare namespace MenuGroupProps {
-  interface BaseProps extends Omit<ComponentProps<'div'>, 'defaultValue' | 'onChange'> {}
-  interface NonRadioProps extends BaseProps, GroupProps.NonRadioProps {}
-  interface RadioProps<T extends OptionValue> extends BaseProps, GroupProps.RadioProps<T> {}
+export declare namespace MenuGroupProps {
+  interface HTMLProps extends Omit<ComponentProps<'div'>, 'defaultValue' | 'onChange'> {}
+  interface NonRadioProps extends HTMLProps, GroupProps.NonRadioProps {}
+  interface RadioProps<T extends OptionValue> extends HTMLProps, GroupProps.RadioProps<T> {}
 }
 
 export type MenuGroupProps<T extends OptionValue = OptionValue> =
@@ -576,15 +575,17 @@ export function MenuGroup<T extends OptionValue>({
 MenuGroup.displayName = 'Menu.Group'
 
 export declare namespace MenuItemProps {
-  interface BaseProps
-    extends
-      Omit<ComponentProps<'div'>, 'defaultChecked' | 'defaultValue' | 'onChange'>,
-      GDSComponentProps<typeof MenuItemMeta> {
+  interface HTMLProps extends Omit<
+    ComponentProps<'div'>,
+    'defaultChecked' | 'defaultValue' | 'onChange'
+  > {}
+  interface OwnProps {
     addonBefore?: AddonValue | undefined
     addonAfter?: AddonValue | undefined
     disabled?: boolean | undefined
   }
-  interface PlainProps extends BaseProps {
+  interface CommonProps extends HTMLProps, OwnProps, GDSComponentProps<typeof MenuItemMeta> {}
+  interface PlainProps extends CommonProps {
     type?: 'plain' | undefined
     variant?: 'default' | 'danger' | undefined
     loading?: boolean | undefined
@@ -595,7 +596,7 @@ export declare namespace MenuItemProps {
     onChange?: undefined
     value?: undefined
   }
-  interface CheckboxProps extends BaseProps {
+  interface CheckboxProps extends CommonProps {
     type?: 'checkbox' | undefined
     checked?: boolean | 'indeterminate' | undefined
     defaultChecked?: boolean | 'indeterminate' | undefined
@@ -606,7 +607,7 @@ export declare namespace MenuItemProps {
     target?: undefined
     value?: undefined
   }
-  interface RadioProps<T extends OptionValue = OptionValue> extends BaseProps {
+  interface RadioProps<T extends OptionValue = OptionValue> extends CommonProps {
     type?: 'radio' | undefined
     value?: T | undefined
     variant?: undefined

package/src/components/Pane.parts.tsx

@@ -640,12 +640,12 @@ type PaneToggleButtonState = {
   open: boolean
 }
 
-interface PaneToggleButtonBaseProps extends ComponentProps<'button'> {
+interface PaneToggleButtonCommonProps extends ComponentProps<'button'> {
   /** Name of the pane to toggle. */
   name: string
 }
 
-interface PaneToggleButtonWithRenderProps extends PaneToggleButtonBaseProps {
+interface PaneToggleButtonWithRenderProps extends PaneToggleButtonCommonProps {
   /** Element or render function for the toggle button. */
   render: RenderProp<PaneToggleButtonState>
   variant?: never
@@ -658,7 +658,7 @@ interface PaneToggleButtonWithRenderProps extends PaneToggleButtonBaseProps {
 
 interface PaneToggleButtonWithoutRenderProps
   extends
-    PaneToggleButtonBaseProps,
+    PaneToggleButtonCommonProps,
     Pick<
       ToggleButtonProps,
       'variant' | 'size' | 'hideLabel' | 'tooltip' | 'addonBefore' | 'addonAfter'

package/src/components/base/ButtonOrLink.parts.tsx

@@ -60,7 +60,7 @@ export declare namespace InternalButtonOrLinkProps {
   interface DisableableProps {
     disabled?: boolean | 'focusable' | undefined
   }
-  interface BaseProps {
+  interface CommonProps {
     /**
      * Whether to render the element inline instead of block-level. For buttons, renders a `span`
      * that behaves like an accessible button. For links, this prop has no effect as anchor elements
@@ -77,7 +77,7 @@ export declare namespace InternalButtonOrLinkProps {
   }
   interface ButtonProps
     extends
-      BaseProps,
+      CommonProps,
       DisableableProps,
       Omit<ComponentProps<'button'>, 'defaultValue' | 'disabled'> {
     href?: undefined
@@ -91,7 +91,7 @@ export declare namespace InternalButtonOrLinkProps {
     defaultChecked?: boolean | undefined
   }
   interface LinkProps
-    extends BaseProps, DisableableProps, Omit<ComponentProps<'a'>, 'defaultValue'> {
+    extends CommonProps, DisableableProps, Omit<ComponentProps<'a'>, 'defaultValue'> {
     href: string
     type?: undefined
     checked?: undefined
@@ -199,7 +199,7 @@ export const ButtonOrLinkRoot = (passedProps: InternalButtonOrLinkProps) => {
     render: passedRender,
     className: passedClassName,
     children,
-    ...nonBaseProps
+    ...specificProps
   } = props
   const manuallyDisabledEventProps = {
     onClick: undefined,
@@ -243,7 +243,7 @@ export const ButtonOrLinkRoot = (passedProps: InternalButtonOrLinkProps) => {
       href: _href,
       target: _target,
       ...remainingProps
-    } = nonBaseProps
+    } = specificProps
 
     if (defaultChecked !== undefined) {
       // oxlint-disable-next-line no-console
@@ -306,7 +306,7 @@ export const ButtonOrLinkRoot = (passedProps: InternalButtonOrLinkProps) => {
     checked: _checked,
     defaultChecked: _defaultChecked,
     ...remainingProps
-  } = nonBaseProps
+  } = specificProps
 
   let linkProps: ComponentProps<'a'> = {
     role: disabled || role !== 'link' ? role : undefined,

package/src/components/base/MaybeButtonOrLink.tsx

@@ -42,7 +42,7 @@ export declare namespace MaybeButtonOrLinkProps {
     render?: RenderFn<MaybeButtonOrLinkRenderState> | undefined
   }
   export type OtherElementProps =
-    OmitInternalButtonOrLinkProps<InternalButtonOrLinkProps.BaseProps> &
+    OmitInternalButtonOrLinkProps<InternalButtonOrLinkProps.CommonProps> &
       ComponentProps<'span'> & {
         onClick?: InternalButtonOrLinkProps.ButtonProps['onClick'] // Not technically correct, but prevents the event from being `any` when `as` is not specified
         as?: ElementType | undefined
@@ -63,7 +63,7 @@ export type MaybeButtonOrLinkProps =
 
 type InternalMaybeButtonOrLinkProps = MaybeButtonOrLinkProps &
   InternalButtonOrLinkProps.DisableableProps &
-  Omit<InternalButtonOrLinkProps.BaseProps, 'render'>
+  Omit<InternalButtonOrLinkProps.CommonProps, 'render'>
 
 /**
  * Renders a `ButtonOrLink` if one of `href` or `onClick` is passed along with no `as`. Otherwise,