chore: use ESNext support for Disposable (#1192)

hackworthltd · May 4, 2024 · 66d3b07 · 66d3b07
2 parents d617124 + c094094
commit 66d3b07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 54 deletions.
diff --git a/src/components/TreeReactFlow/dispose.ts b/src/components/TreeReactFlow/dispose.ts
diff --git a/src/components/TreeReactFlow/layoutTree.ts b/src/components/TreeReactFlow/layoutTree.ts
@@ -35,7 +35,7 @@ export const layoutTree = <
       const [treeTidy0, nodeInfos, edgeInfos] = primerToTidy(primerTree);
       const treeTidy = layout.set_root(treeTidy0);
       layout.layout(true);
-      layout.dispose();
+      layout[Symbol.dispose]();
       const nodeMap = makeNodeMap(
         nodeInfos,
         edgeInfos,

diff --git a/src/components/TreeReactFlow/tidy.ts b/src/components/TreeReactFlow/tidy.ts
@@ -31,7 +31,6 @@ import {
   Tidy as TidyWasm,
   WasmLayoutType as LayoutType,
 } from "@hackworthltd/tidyt-wasm";
-import { Disposable } from "./dispose";
 
 export { LayoutType };
 
@@ -73,7 +72,7 @@ const NULL_ID = () => {
   }
   return nullId;
 };
-export class TidyLayout extends Disposable {
+export class TidyLayout implements Disposable {
   private tidy: TidyWasm;
   private nextId = 1;
   private root: InnerNode | undefined;
@@ -91,7 +90,6 @@ export class TidyLayout extends Disposable {
     parent_child_margin: number,
     peer_margin: number
   ) {
-    super();
     if (type === LayoutType.Basic) {
       this.tidy = TidyWasm.with_basic_layout(parent_child_margin, peer_margin);
     } else if (type === LayoutType.Tidy) {
@@ -101,11 +99,10 @@ export class TidyLayout extends Disposable {
     } else {
       throw new Error("not implemented");
     }
-    this._register({
-      dispose: () => {
-        this.tidy.free();
-      },
-    });
+  }
+
+  [Symbol.dispose]() {
+    this.tidy.free();
   }
 
   changeLayoutType(type: LayoutType) {