fix: expand hint props to be anything off of base props

gooftroop · Sep 20, 2021 · c9d4dd2 · c9d4dd2
1 parent 2283e4b
commit c9d4dd2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/hint/DefaultHint.tsx b/src/hint/DefaultHint.tsx
@@ -1,7 +1,9 @@
-import { memo } from 'react';
+import { HTMLProps, memo } from 'react';
 import type { HintProps } from 'src/types';
 
-export const DefaultHint = memo((props: HintProps<HTMLDivElement>): JSX.Element => {
+export type PropTypes = HintProps & HTMLProps<HTMLDivElement>;
+
+export const DefaultHint = memo((props: PropTypes): JSX.Element => {
     const {
         isMouseDetected,
         isTouchDetected,

diff --git a/src/types.ts b/src/types.ts
@@ -83,11 +83,12 @@ export interface LensProps extends HTMLProps<HTMLDivElement> {
     position: Point;
 }
 
-export interface HintProps<T extends HTMLElement = any> extends Partial<Omit<HTMLProps<T>, 'ref'>> {
+export interface HintProps {
     isMouseDetected?: boolean;
     isTouchDetected?: boolean;
     hintTextMouse: string;
     hintTextTouch: string;
+    style?: CSSProperties | null;
 }
 
 export type PortalProps = Omit<Partial<Options>, 'modifiers' | 'placement'> & {
@@ -127,6 +128,7 @@ export interface CursorPositionProps extends HTMLProps<HTMLDivElement> {
     tapDurationInMs?: number;
     tapMoveThreshold?: number;
 }
+
 export interface ReactImageMagnifyProps extends Omit<
 CursorPositionProps,
 'activationInteractionMouse' | 'activationInteractionTouch' | 'children'
@@ -135,8 +137,8 @@ CursorPositionProps,
     activationInteractionMouse?: Interactions['click'] | Interactions['hover'];
     activationInteractionTouch?: Interactions['press'] | Interactions['tap'] | Interactions['touch'];
     fadeDurationInMs?: number;
-    hintComponent?: ComponentType<HintProps>;
-    hintProps?: HintProps;
+    hintComponent?: ComponentType<HintProps & any>;
+    hintProps?: HintProps & any;
     hoverDelayInMs?: number;
     hoverOffDelayInMs?: number;
     imageComponent?: ComponentType<HTMLProps<HTMLImageElement>>;