reducing size (#402)

* remove guts of Component

* fix compile errors

* a few more errors

* remove destroy logic

* more mods

Author: ramseyball

button.ts

@@ -67,15 +67,13 @@ namespace microcode {
         return borderTop(style) + borderBottom(style)
     }
 
-    export class Button extends Component implements ISizable, IPlaceable {
+    export class Button implements IComponent, ISizable, IPlaceable {
         private xfrm_: Affine
         private icon: Sprite
-        //private text: TextSprite;
         private style: ButtonStyle
         private iconId: string | Image
         private _ariaId: string
         public onClick?: (button: Button) => void
-        private bounds_: Bounds
 
         //% blockCombine block="xfrm" callInDebugger
         public get xfrm() {
@@ -112,7 +110,12 @@ namespace microcode {
 
         public get bounds() {
             // Returns bounds in local space
-            return this.bounds_
+            // This isn't quite right, but it's close enough for now
+            return Bounds.GrowXY(
+                            this.icon.bounds,
+                            borderLeft(this.style),
+                            borderTop(this.style)
+                        )
         }
 
         public get rootXfrm(): Affine {
@@ -132,7 +135,6 @@ namespace microcode {
             y: number
             onClick?: (button: Button) => void
         }) {
-            super("button")
             this.xfrm_ = new Affine()
             this.xfrm.parent = opts.parent && opts.parent.xfrm
             this.style = opts.style || ButtonStyles.Transparent
@@ -144,16 +146,6 @@ namespace microcode {
             this.buildSprite()
         }
 
-        destroy() {
-            if (this.icon) {
-                this.icon.destroy()
-            }
-            //if (this.text) { this.text.destroy(); }
-            this.icon = undefined
-            //this.text = undefined;
-            super.destroy()
-        }
-
         public getIcon() {
             return this.iconId
         }
@@ -171,10 +163,6 @@ namespace microcode {
         }
 
         private buildSprite() {
-            if (this.icon) {
-                this.icon.destroy()
-            }
-            //if (this.text) { this.text.destroy(); }
             this.icon = new Sprite({
                 parent: this,
                 img:
@@ -183,15 +171,6 @@ namespace microcode {
                         : this.iconId,
             })
             this.icon.xfrm.parent = this.xfrm
-            //this.icon.xfrm.localPos.x = borderLeft(this.style);
-            //this.icon.xfrm.localPos.y = borderTop(this.style);
-
-            // This isn't quite right, but it's close enough for now
-            this.bounds_ = Bounds.GrowXY(
-                this.icon.bounds,
-                borderLeft(this.style),
-                borderTop(this.style)
-            )
         }
 
         public occlusions(bounds: Bounds) {
@@ -224,46 +203,18 @@ namespace microcode {
             }
         }
 
-        hover(hov: boolean) {
-            /*
-            if (hov && this.text) { return; }
-            if (!hov && !this.text) { return; }
-            if (!this.label) { return; }
-            if (!this.visible()) { return; }
-            if (hov) {
-                this.text = textsprite.create(this.label, 1, 15);
-                this.text.setBorder(1, 15);
-                this.text.x = this.x;
-                this.text.y = this.y - this.height;
-                this.text.z = this.icon.z;
-            } else {
-                this.text.destroy();
-                this.text = undefined;
-            }
-            */
-        }
+        hover(hov: boolean) { }
 
-        /* override */ update() {
-            /*
-            if (this.text) {
-                this.text.x = this.x;
-                this.text.y = this.y - this.height;
-            }
-            */
-        }
+        update() { }
 
         isOffScreenX(): boolean {
             return this.icon.isOffScreenX()
         }
 
-        /* override */ draw() {
+        draw() {
             control.enablePerfCounter()
             this.drawStyle()
             this.drawIcon()
-            //const iconbounds = Bounds.Translate(this.icon.bounds, this.icon.xfrm.worldPos);
-            //iconbounds.drawRect(5);
-            //const mybounds = Bounds.Translate(this.bounds, this.xfrm.worldPos);
-            //mybounds.drawRect(14)
         }
 
         private drawIcon() {

component.ts

@@ -1,54 +1,8 @@
 namespace microcode {
-    let id_sequence = 0
 
-    export type ComponentHandler = (comp: Component) => void
-
-    export interface IKindable {
-        kind: string
-    }
-
-    export abstract class Component implements IKindable {
-        private id_: number
-        private data_: any
-        private _destroyHandlers: ComponentHandler[]
-        private _destroyed = false
-
-        //% blockCombine block="id" callInDebugger
-        get id() {
-            return this.id_
-        }
-        get data(): any {
-            if (!this.data_) {
-                this.data_ = {}
-            }
-            return this.data_
-        }
-        get destroyed(): boolean {
-            return this._destroyed
-        }
-
-        constructor(public kind: string) {
-            this.id_ = id_sequence++
-        }
-
-        onDestroy(handler: ComponentHandler) {
-            this._destroyHandlers = this._destroyHandlers || []
-            this._destroyHandlers.push(handler)
-        }
-
-        /* virtual */ destroy() {
-            if (this._destroyed) console.warn(`double destroy on ${this.id}`)
-            this._destroyed = true
-            const handlers = this._destroyHandlers || []
-            this._destroyHandlers = undefined
-            for (const handler of handlers) {
-                handler(this)
-            }
-            this.data_ = undefined
-        }
-
-        /* abstract */ update() {}
-        /* abstract */ draw() {}
+    export interface IComponent {
+        update: () => void
+        draw: () => void
     }
 
     export interface IPlaceable {
@@ -60,14 +14,13 @@ namespace microcode {
         height: number
     }
 
-    export class Placeable extends Component implements IPlaceable {
+    export class Placeable implements IPlaceable {
         private xfrm_: Affine
         //% blockCombine block="xfrm" callInDebugger
         public get xfrm() {
             return this.xfrm_
         }
         constructor(parent?: IPlaceable) {
-            super("placeable")
             this.xfrm_ = new Affine()
             this.xfrm_.parent = parent && parent.xfrm
         }

cursor.ts

@@ -16,7 +16,7 @@ namespace microcode {
         size: Bounds
     }
 
-    export class Cursor extends Component implements IPlaceable {
+    export class Cursor implements IComponent, IPlaceable {
         xfrm: Affine
         navigator: INavigator
         cancelHandlerStack: CursorCancelHandler[]
@@ -29,7 +29,6 @@ namespace microcode {
         visible = true
 
         constructor() {
-            super("cursor")
             this.xfrm = new Affine()
             this.cancelHandlerStack = []
             this.moveDest = new Vec2()
@@ -105,14 +104,7 @@ namespace microcode {
             return false
         }
 
-        /* override */ destroy() {
-            this.navigator = undefined
-            super.destroy()
-        }
-
-        /* override */ update() {
-            super.update()
-
+        update() {
             const currTimeMs = control.millis()
             const elapsedTimeMs = currTimeMs - this.moveStartMs
 
@@ -130,7 +122,7 @@ namespace microcode {
             this.cycle = currTimeMs % 1000 < 500 ? 1 : 0
         }
 
-        /* override */ draw() {
+        draw() {
             control.enablePerfCounter()
             if (!this.visible) return