fix: improve typings * 2

cube-js · Nov 22, 2024 · b0f3118 · b0f3118
1 parent 1d4dcfa
commit b0f3118
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/src/components/actions/Action/Action.tsx b/src/components/actions/Action/Action.tsx
@@ -12,11 +12,13 @@ import {
   TEXT_STYLES,
   TextStyleProps,
   tasty,
+  TagName,
 } from '../../../tasty';
 import { useAction } from '../use-action';
 
-export interface CubeActionProps
-  extends Omit<AllBaseProps, 'htmlType'>,
+export interface CubeActionProps<
+  T extends TagName = 'a' | 'button' | 'span' | 'div',
+> extends Omit<AllBaseProps<T>, 'htmlType'>,
     BaseStyleProps,
     ContainerStyleProps,
     TextStyleProps,

diff --git a/src/components/actions/Button/Button.stories.tsx b/src/components/actions/Button/Button.stories.tsx
@@ -41,7 +41,6 @@ const Template: StoryFn<CubeButtonProps> = ({
   icon,
   rightIcon,
   label,
-  onClick,
   ...props
 }) => (
   <Space

diff --git a/src/components/actions/use-action.ts b/src/components/actions/use-action.ts
@@ -1,4 +1,4 @@
-import { MouseEventHandler, useContext } from 'react';
+import { useContext } from 'react';
 import { useFocusableRef } from '@react-spectrum/utils';
 import { useHover, useButton, AriaButtonProps } from 'react-aria';
 import { FocusableRef, PressEvent } from '@react-types/shared';
@@ -13,15 +13,13 @@ import { useEvent } from '../../_internal';
 const LINK_PRESS_EVENT = 'Link Press';
 const BUTTON_PRESS_EVENT = 'Button Press';
 
-export interface CubeUseActionProps<T extends TagName = TagName>
-  extends AllBaseProps<T>,
+export interface CubeUseActionProps<
+  T extends TagName = 'a' | 'button' | 'span' | 'div',
+> extends AllBaseProps<T>,
     Omit<AriaButtonProps, 'type'> {
   to?: string;
   label?: string;
   htmlType?: 'button' | 'submit' | 'reset' | undefined;
-  onClick?: MouseEventHandler;
-  onMouseEnter?: MouseEventHandler;
-  onMouseLeave?: MouseEventHandler;
 }
 
 const FILTER_OPTIONS = { propNames: new Set(['onMouseEnter', 'onMouseLeave']) };

diff --git a/src/components/form/Label.tsx b/src/components/form/Label.tsx
@@ -1,5 +1,5 @@
 import { useDOMRef } from '@react-spectrum/utils';
-import { forwardRef, MouseEventHandler } from 'react';
+import { forwardRef } from 'react';
 
 import { useProviderProps } from '../../provider';
 import {
@@ -85,7 +85,6 @@ export interface CubeLabelProps extends BaseProps, ContainerStyleProps {
   htmlFor?: string;
   for?: string;
   validationState?: ValidationState;
-  onClick?: MouseEventHandler;
 }
 
 function Label(props: CubeLabelProps, ref) {
@@ -103,7 +102,6 @@ function Label(props: CubeLabelProps, ref) {
     isDisabled,
     validationState,
     for: labelFor,
-    onClick,
     ...otherProps
   } = props;
 
@@ -139,7 +137,6 @@ function Label(props: CubeLabelProps, ref) {
         invalid: validationState === 'invalid',
         valid: validationState === 'valid',
       }}
-      onClick={onClick}
     >
       {typeof children !== 'string' ? (
         children

diff --git a/src/tasty/types.ts b/src/tasty/types.ts
@@ -91,17 +91,22 @@ export interface AllBaseProps<K extends TagName = TagName>
     Omit<
       AllHTMLAttributes<HTMLElementTagNameMap[K]>,
       | 'style'
-      | 'size'
       | 'disabled'
       | 'hidden'
       | 'css'
-      | 'color'
-      | 'height'
-      | 'width'
       | 'content'
       | 'translate'
       | 'as'
       | 'form'
+      | 'bgcolor'
+      | 'background'
+      | 'align'
+      | 'border'
+      | 'color'
+      | 'height'
+      | 'size'
+      | 'width'
+      | 'prefix'
     > {}
 
 export type BaseStyleProps = Pick<Styles, (typeof BASE_STYLES)[number]>;