improve drawing

Im-Beast · Nov 27, 2021 · 6a56518 · 6a56518
1 parent 8c3ed4c
commit 6a56518
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/src/tui.ts b/src/tui.ts
@@ -29,7 +29,6 @@ export interface TuiInstance {
   readonly once: TuiInstance["emitter"]["once"];
   readonly draw: () => void;
   readonly stopDrawing: () => void;
-  readonly restartDrawing: () => void;
   rectangle: () => TuiRectangle;
   children: AnyComponent[];
   components: AnyComponent[];
@@ -79,6 +78,7 @@ export function createTui(
 ): TuiInstance {
   const emitter = createEventEmitter() as TuiInstance["emitter"];
 
+  let timeoutHandle: number | undefined;
   const tui: TuiInstance = {
     id: instanceId++,
     emitter,
@@ -93,10 +93,6 @@ export function createTui(
         styler,
       });
 
-      tui.components = tui.components.sort((b, a) =>
-        b.drawPriority - a.drawPriority
-      );
-
       for (const component of tui.components) {
         component.draw();
       }
@@ -116,12 +112,14 @@ export function createTui(
       render(tui.canvas);
 
       tui.selected.active = false;
+
+      timeoutHandle = setTimeout(
+        tui.draw,
+        getStaticValue(refreshRate) - tui.canvas.deltaTime,
+      );
     },
     stopDrawing() {
-      clearInterval(intervalId);
-    },
-    restartDrawing() {
-      restartInterval();
+      clearTimeout(timeoutHandle);
     },
     rectangle() {
       const { columns: width, rows: height } = getStaticValue(tui.size);
@@ -144,26 +142,6 @@ export function createTui(
     writer,
   };
 
-  let intervalId: number;
-  const restartInterval = () => {
-    if (intervalId) clearInterval(intervalId);
-    const dynamicRR = typeof refreshRate === "function";
-    let lastRR: number;
-    setInterval(
-      dynamicRR
-        ? () => {
-          tui.draw();
-          const rr = refreshRate();
-          if (lastRR && lastRR !== rr) {
-            restartInterval();
-          }
-        }
-        : tui.draw,
-      getStaticValue(refreshRate),
-    );
-  };
-
-  restartInterval();
-
+  tui.draw();
   return tui;
 }
diff --git a/src/tui_component.ts b/src/tui_component.ts
@@ -168,6 +168,10 @@ export function createComponent<
   instance.components.push(component);
   object.children.push(component);
 
+  instance.components = instance.components.sort((b, a) =>
+    b.drawPriority - a.drawPriority
+  );
+
   return component as Extension extends void
     ? TuiComponent<Name, Events, DataTypes>
     : ExtendedTuiComponent<Name, Extension, Events, DataTypes>;