fix: fix type errors

actualbudget · Dec 12, 2023 · e640c6c · e640c6c
1 parent 6e4bcc1
commit e640c6c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/desktop-client/src/components/NotesButton.tsx b/packages/desktop-client/src/components/NotesButton.tsx
@@ -15,7 +15,7 @@ import { remarkBreaks, sequentialNewlinesPlugin } from '../util/markdown';
 import Button from './common/Button';
 import Text from './common/Text';
 import View from './common/View';
-import { Tooltip, TooltipPosition, useTooltip } from './tooltips';
+import { Tooltip, type TooltipPosition, useTooltip } from './tooltips';
 
 const remarkPlugins = [sequentialNewlinesPlugin, remarkGfm, remarkBreaks];
 

diff --git a/packages/desktop-client/src/components/tooltips.tsx b/packages/desktop-client/src/components/tooltips.tsx
@@ -7,14 +7,15 @@ import {
   type ReactNode,
   type MouseEventHandler,
   type MouseEvent,
+  type ContextType,
 } from 'react';
 import ReactDOM from 'react-dom';
 
 import { css } from 'glamor';
 
 import { type CSSProperties, styles, theme } from '../style';
 
-export const IntersectionBoundary = createContext<any>(null);
+export const IntersectionBoundary = createContext<RefObject<HTMLElement>>(null);
 
 export function useTooltip() {
   const [isOpen, setIsOpen] = useState<boolean>(false);
@@ -53,17 +54,23 @@ type TooltipProps = {
   forceLayout?: boolean;
   forceTop?: number;
   ignoreBoundary?: boolean;
-  targetRect?: any;
+  targetRect?: DOMRect;
   offset?: number;
   style?: CSSProperties;
   width?: number;
   children: ReactNode;
   targetHeight?: number;
 };
+type MutableDomRect = {
+  top: number;
+  left: number;
+  width: number;
+  height: number;
+};
 
 export class Tooltip extends Component<TooltipProps> {
   static contextType = IntersectionBoundary;
-  declare context: React.ContextType<typeof IntersectionBoundary>;
+  declare context: ContextType<typeof IntersectionBoundary>;
   position: TooltipPosition;
   contentRef: RefObject<HTMLDivElement>;
   cleanup: () => void;
@@ -164,11 +171,11 @@ export class Tooltip extends Component<TooltipProps> {
 
     if (
       container.parentNode &&
-      container.parentNode.style.overflow === 'auto'
+      (container.parentNode as HTMLElement).style.overflow === 'auto'
     ) {
-      return container.parentNode;
+      return container.parentNode as HTMLElement;
     }
-    return container;
+    return container as HTMLElement;
   }
 
   layout() {
@@ -179,9 +186,10 @@ export class Tooltip extends Component<TooltipProps> {
     }
 
     const box = contentEl.getBoundingClientRect();
-    const anchorEl = this.target.parentNode as any;
+    const anchorEl = this.target.parentNode as HTMLElement;
 
-    let anchorRect = targetRect || anchorEl.getBoundingClientRect();
+    let anchorRect: MutableDomRect =
+      targetRect || anchorEl.getBoundingClientRect();
 
     // Copy it so we can mutate it
     anchorRect = {