Code cleanup

Author: adamgraham

src/components/ContactForm.tsx

@@ -5,20 +5,11 @@ import React from 'react';
 
 export type ContactFormProps = {
   className?: string;
-  onSubmit?: React.FormEventHandler<HTMLFormElement>;
 } & Omit<React.ComponentPropsWithRef<'form'>, 'children'>;
 
-export default React.forwardRef(function ContactForm(
-  { className, onSubmit = () => {}, ...rest }: ContactFormProps,
-  ref: React.ForwardedRef<HTMLFormElement>,
-) {
+export default function ContactForm({ className, ...rest }: ContactFormProps) {
   return (
-    <form
-      className={classNames('contact-form', className)}
-      onSubmit={onSubmit}
-      {...rest}
-      ref={ref}
-    >
+    <form className={classNames('contact-form', className)} {...rest}>
       <input
         aria-label="Name"
         id="contactName"
@@ -45,4 +36,4 @@ export default React.forwardRef(function ContactForm(
       <input aria-label="Send" id="contactSubmit" type="submit" value="Send" />
     </form>
   );
-});
+}

src/components/Overlay.tsx

@@ -9,8 +9,6 @@ import type { ThemeToken, ZIndexToken } from '../types';
 
 export type OverlayProps = {
   animated?: boolean;
-  children?: React.ReactNode;
-  className?: string;
   closeOnScrimClick?: boolean;
   dialogClassName?: string;
   dialogZIndex?: ZIndexToken | number;

src/hooks/useSmoothDamp.ts

@@ -5,12 +5,12 @@ import { smoothdamp } from '../utils';
 
 export function useSmoothDamp(
   defaultValue: number,
-  targetValueRef: React.MutableRefObject<number>,
+  targetValueRef: React.RefObject<number>,
   smoothTime: number,
   maxSpeed: number = Infinity,
 ): number {
-  const animationHandle = useRef<number | undefined>();
-  const previousTimeRef = useRef<number | undefined>();
+  const animationHandle = useRef<number>(undefined);
+  const previousTimeRef = useRef<number>(undefined);
   const currentValueRef = useRef<number>(defaultValue);
   const velocityRef = useRef<number>(0);
   const [value, setValue] = useState(defaultValue);
@@ -21,7 +21,7 @@ export function useSmoothDamp(
         const deltaTime = time - previousTimeRef.current;
         currentValueRef.current = smoothdamp(
           currentValueRef.current,
-          targetValueRef.current,
+          targetValueRef.current || currentValueRef.current,
           velocityRef,
           smoothTime / 1000,
           maxSpeed,

src/utils/math.ts

@@ -30,6 +30,7 @@ export function smoothdamp(
   deltaTime: number,
 ): number {
   smoothTime = Math.max(0.0001, smoothTime);
+  const vel = currentVelocity.current || 0;
   const num = 2 / smoothTime;
   const num2 = num * deltaTime;
   const num3 = 1 / (1 + num2 + 0.48 * num2 * num2 + 0.235 * num2 * num2 * num2);
@@ -38,8 +39,8 @@ export function smoothdamp(
   const num6 = maxSpeed * smoothTime;
   num4 = Math.min(Math.max(num4, -num6), num6);
   target = current - num4;
-  const num7 = (currentVelocity.current + num * num4) * deltaTime;
-  currentVelocity.current = (currentVelocity.current - num * num7) * num3;
+  const num7 = (vel + num * num4) * deltaTime;
+  currentVelocity.current = (vel - num * num7) * num3;
   let num8 = target + (num4 + num7) * num3;
   if (num5 - current > 0 == num8 > num5) {
     num8 = num5;

src/utils/scrolling.ts

@@ -17,7 +17,7 @@ export function getScrollbarWidth(): number {
     : 0;
 }
 
-export function getWheelDirection(e: WheelEvent) {
+export function getWheelDirection(e: WheelEvent): number {
   if ('deltaY' in e) {
     return clamp(e.deltaY, -1, 1) * -1;
   } else if ('wheelDeltaY' in e) {

src/utils/timing.ts

@@ -8,7 +8,7 @@ export function debounce(fn: Function, wait: number): Function {
   };
 }
 
-export function throttle(fn: Function, wait: number = 300) {
+export function throttle(fn: Function, wait: number): Function {
   let inThrottle: boolean,
     lastFn: ReturnType<typeof setTimeout>,
     lastTime: number;