Merge pull request #5 from nberlette/refactor/components

refactor(components): use generic type params more consistently

Author: nberlette

mod.ts

@@ -12,4 +12,4 @@ export * from "./src/signals/mod.ts";
 export * from "./src/layout/mod.ts";
 export * from "./src/canvas/mod.ts";
 export * from "./src/utils/mod.ts";
-export * from "./src/input_reader/mod.ts";
+export * from "./src/input/mod.ts";

src/canvas/text.ts

@@ -141,19 +141,19 @@ export class TextObject extends Renderable<"text"> {
     });
   }
 
-  draw(): void {
+  override draw(): void {
     this.#updateEffect.resume();
     this.rectangle.subscribe(this.#rectangleSubscription);
     super.draw();
   }
 
-  erase(): void {
+  override erase(): void {
     this.#updateEffect.pause();
     this.rectangle.unsubscribe(this.#rectangleSubscription);
     super.erase();
   }
 
-  updateMovement(): void {
+  override updateMovement(): void {
     const { objectsUnder, previousRectangle } = this;
     const rectangle = this.rectangle.peek();
 
@@ -204,7 +204,7 @@ export class TextObject extends Renderable<"text"> {
     }
   }
 
-  rerender(): void {
+  override rerender(): void {
     const { canvas, valueChars, omitCells, rerenderCells } = this;
 
     const { frameBuffer, rerenderQueue } = canvas;

src/component.ts

@@ -8,7 +8,7 @@ import type { Rectangle } from "./types.ts";
 import { SortedArray } from "./utils/sorted_array.ts";
 import type { Renderable } from "./canvas/renderable.ts";
 import type { View } from "./view.ts";
-import type { InputEventRecord } from "./input_reader/mod.ts";
+import type { InputEventRecord } from "./input/mod.ts";
 import { Computed, Signal, type SignalOfObject } from "./signals/mod.ts";
 import { signalify } from "./signals/signalify.ts";
 

src/components/frame.ts

@@ -64,14 +64,12 @@ export interface FrameOptions extends ComponentOptions {
  * });
  * ```
  */
-export class Frame extends Component {
-  declare drawnObjects: {
-    top: TextObject;
-    bottom: TextObject;
-    left: BoxObject;
-    right: BoxObject;
-  };
-
+export class Frame extends Component<{
+  top: TextObject;
+  bottom: TextObject;
+  left: BoxObject;
+  right: BoxObject;
+}> {
   charMap: Signal<FrameUnicodeCharactersType>;
 
   constructor(options: FrameOptions) {

src/components/input.ts

@@ -91,12 +91,11 @@ export interface InputOptions extends Omit<ComponentOptions, "rectangle"> {
  * });
  * ```
  */
-export class Input extends Box {
-  declare drawnObjects: {
-    box: BoxObject;
-    text: TextObject;
-    cursor: TextObject;
-  };
+export class Input extends Box<{
+  box: BoxObject;
+  text: TextObject;
+  cursor: TextObject;
+}> {
   declare theme: InputTheme;
 
   text: Signal<string>;

src/components/label.ts

@@ -86,9 +86,7 @@ export interface LabelOptions extends Omit<ComponentOptions, "rectangle"> {
  * })
  * ```
  */
-export class Label extends Component {
-  declare drawnObjects: { texts: TextObject[] };
-
+export class Label extends Component<{ texts: TextObject[] }> {
   #valueLines: Signal<string[]>;
 
   text: Signal<string>;

src/components/slider.ts

@@ -58,8 +58,7 @@ export interface SliderOptions extends ComponentOptions {
  * });
  * ```
  */
-export class Slider extends Box {
-  declare drawnObjects: { box: BoxObject; thumb: BoxObject };
+export class Slider extends Box<{ box: BoxObject; thumb: BoxObject }> {
   declare theme: SliderTheme;
 
   min: Signal<number>;

src/components/table.ts

@@ -100,20 +100,19 @@ export interface TableOptions extends Omit<ComponentOptions, "rectangle"> {
  *
  * ```
  */
-export class Table extends Component {
+export class Table extends Component<{
+  frame: [
+    top: TextObject,
+    bottom: TextObject,
+    spacer: TextObject,
+    left: BoxObject,
+    right: BoxObject,
+  ];
+
+  header: TextObject;
+  data: TextObject[];
+}> {
   declare theme: TableTheme;
-  declare drawnObjects: {
-    frame: [
-      top: TextObject,
-      bottom: TextObject,
-      spacer: TextObject,
-      left: BoxObject,
-      right: BoxObject,
-    ];
-
-    header: TextObject;
-    data: TextObject[];
-  };
 
   data: Signal<string[][]>;
   headers: Signal<TableHeader<true>[]>;

src/components/text.ts

@@ -57,9 +57,7 @@ export interface TextOptions extends Omit<ComponentOptions, "rectangle"> {
  * })
  * ```
  */
-export class Text extends Component {
-  declare drawnObjects: { text: TextObject };
-
+export class Text extends Component<{ text: TextObject }> {
   text: Signal<string>;
   overwriteRectangle: Signal<boolean>;
   multiCodePointSupport: Signal<boolean>;

src/components/textbox.ts

@@ -9,7 +9,7 @@ import type { DeepPartial } from "../types.ts";
 import { cropToWidth, insertAt } from "../utils/strings.ts";
 import { clamp } from "../utils/numbers.ts";
 import { Computed, Effect, Signal, signalify } from "../signals/mod.ts";
-import type { KeyPressEvent } from "../input_reader/types.ts";
+import type { KeyPressEvent } from "../input/types.ts";
 
 export interface CursorPosition {
   x: number;