From a12b64faed9b970d44560d41afc86653c6789b1c Mon Sep 17 00:00:00 2001
From: Ryan Gossiaux <ryan.gossiaux@gmail.com>
Date: Mon, 13 Dec 2021 18:31:08 -0800
Subject: [PATCH] Fix a few more misc issues (TS errors, dupe files)

---
 src/lib/components/menu/MenuItems.svelte |  2 +-
 src/lib/hooks/use-tree-walker.ts         |  2 +-
 src/lib/utils/tree-walker.ts             | 35 ------------------------
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 src/lib/utils/tree-walker.ts

diff --git a/src/lib/components/menu/MenuItems.svelte b/src/lib/components/menu/MenuItems.svelte
index 6dda98f..0ae0855 100644
--- a/src/lib/components/menu/MenuItems.svelte
+++ b/src/lib/components/menu/MenuItems.svelte
@@ -3,7 +3,7 @@
   import { useId } from "$lib/hooks/use-id";
   import { Keys } from "$lib/utils/keyboard";
   import { Focus } from "$lib/utils/calculate-active-index";
-  import { treeWalker } from "$lib/utils/tree-walker";
+  import { treeWalker } from "$lib/hooks/use-tree-walker";
   import { State } from "$lib/internal/open-closed";
   import { getContext, tick } from "svelte";
   import type { Writable } from "svelte/store";
diff --git a/src/lib/hooks/use-tree-walker.ts b/src/lib/hooks/use-tree-walker.ts
index 02dc77c..2b43a89 100644
--- a/src/lib/hooks/use-tree-walker.ts
+++ b/src/lib/hooks/use-tree-walker.ts
@@ -23,11 +23,11 @@ export function treeWalker({
   let acceptNode = Object.assign((node: HTMLElement) => accept(node), {
     acceptNode: accept,
   });
-  // @ts-ignore-error Typescript bug thinks this can only have 3 args
   let walker = document.createTreeWalker(
     root,
     NodeFilter.SHOW_ELEMENT,
     acceptNode,
+    // @ts-ignore-error Typescript bug thinks this can only have 3 args
     false
   );
 
diff --git a/src/lib/utils/tree-walker.ts b/src/lib/utils/tree-walker.ts
deleted file mode 100644
index 02dc77c..0000000
--- a/src/lib/utils/tree-walker.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-type AcceptNode = (
-  node: HTMLElement
-) =>
-  | typeof NodeFilter.FILTER_ACCEPT
-  | typeof NodeFilter.FILTER_SKIP
-  | typeof NodeFilter.FILTER_REJECT;
-
-export function treeWalker({
-  container,
-  accept,
-  walk,
-  enabled,
-}: {
-  container: HTMLElement | null;
-  accept: AcceptNode;
-  walk(node: HTMLElement): void;
-  enabled?: boolean;
-}) {
-  let root = container;
-  if (!root) return;
-  if (enabled !== undefined && !enabled) return;
-
-  let acceptNode = Object.assign((node: HTMLElement) => accept(node), {
-    acceptNode: accept,
-  });
-  // @ts-ignore-error Typescript bug thinks this can only have 3 args
-  let walker = document.createTreeWalker(
-    root,
-    NodeFilter.SHOW_ELEMENT,
-    acceptNode,
-    false
-  );
-
-  while (walker.nextNode()) walk(walker.currentNode as HTMLElement);
-}