Refactor (packages/ui/src/v2/components/tooltip-v2.tsx): Function with many returns

packages/ui/src/v2/components/tooltip-v2-utils.ts

@@ -0,0 +1,3 @@
+export function shouldDropBlock(expand: boolean, hovered: boolean, inside: boolean) {
+  return !expand && !hovered && !inside
+}

packages/ui/src/v2/components/tooltip-v2.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect, test } from "bun:test"
+import { shouldDropBlock } from "./tooltip-v2-utils"
+describe("shouldDropBlock", () => {
+  test("drops the block when tooltip is not expanded, hovered, or focused", () => {
+    expect(shouldDropBlock(false, false, false)).toBe(true)
+  })
+
+  test("keeps the block while expanded", () => {
+    expect(shouldDropBlock(true, false, false)).toBe(false)
+  })
+
+  test("keeps the block while hovered", () => {
+    expect(shouldDropBlock(false, true, false)).toBe(false)
+  })
+
+  test("keeps the block while focus is inside", () => {
+    expect(shouldDropBlock(false, false, true)).toBe(false)
+  })
+})

packages/ui/src/v2/components/tooltip-v2.tsx

@@ -3,6 +3,7 @@ import { createEffect, Match, onCleanup, splitProps, Switch, type JSX } from "so
 import type { ComponentProps } from "solid-js"
 import { createStore } from "solid-js/store"
 import "./tooltip-v2.css"
+import { shouldDropBlock } from "./tooltip-v2-utils"
 
 export interface TooltipV2Props extends ComponentProps<typeof KobalteTooltip> {
   value: JSX.Element
@@ -13,6 +14,8 @@ export interface TooltipV2Props extends ComponentProps<typeof KobalteTooltip> {
   forceOpen?: boolean
 }
 
+
+
 export function TooltipV2(props: TooltipV2Props) {
   let ref: HTMLDivElement | undefined
   const [state, setState] = createStore({
@@ -40,10 +43,10 @@ export function TooltipV2(props: TooltipV2Props) {
   }
 
   const drop = (expand = state.expand) => {
-    if (expand) return
-    if (ref?.matches(":hover")) return
-    if (inside()) return
-    setState("block", false)
+    const hovered = ref?.matches(":hover") ?? false
+    if (shouldDropBlock(expand, hovered, inside())) {
+      setState("block", false)
+    }
   }
 
   const sync = () => {