Button: all args are optional, checks are done in constructor

Author: KierPalin

button.ts

@@ -1,20 +1,19 @@
 namespace user_interface_base {
-
     export class Borders {
         constructor(
             public top: number,
             public bottom: number,
             public left: number,
             public right: number
-        ) {}
+        ) { }
     }
 
     export class ButtonStyle {
         constructor(
             public fill: number,
             public borders: Borders,
             public shadow: boolean
-        ) {}
+        ) { }
     }
 
     export namespace ButtonStyles {
@@ -148,8 +147,8 @@ namespace user_interface_base {
             return !this.icon.invisible
         }
 
-        public hover(hov: boolean) {}
-        public update() {}
+        public hover(hov: boolean) { }
+        public update() { }
 
         isOffScreenX(): boolean {
             return this.icon.isOffScreenX()
@@ -202,13 +201,11 @@ namespace user_interface_base {
         public selected: boolean
         private dynamicBoundaryColorsOn: boolean
         private boundaryColor: number
+        public state: number[]
         public pressable: boolean
 
         public get ariaId(): string {
-            return (
-                this._ariaId ||
-                (typeof this.iconId === "string" ? <string>this.iconId : "")
-            )
+            return this._ariaId
         }
 
         public set ariaId(value: string) {
@@ -221,29 +218,30 @@ namespace user_interface_base {
                 value: this.ariaId,
                 force,
             }
-            accessibility.setLiveContent(msg) 
+            accessibility.setLiveContent(msg)
         }
 
         constructor(opts: {
             parent?: IPlaceable
             style?: ButtonStyle
-            icon: string | Bitmap
+            icon?: string | Bitmap
             ariaId?: string
-            x: number
-            y: number
+            x?: number
+            y?: number
             onClick?: (button: Button) => void,
             dynamicBoundaryColorsOn?: boolean
             boundaryColor?: number,
-            flipIcon?: boolean
+            flipIcon?: boolean,
+            state?: number[]
         }) {
             super(
-                opts.x,
-                opts.y,
+                (opts.x != null) ? opts.x : 0,
+                (opts.y != null) ? opts.y : 0,
                 opts.style || ButtonStyles.Transparent,
                 opts.parent && opts.parent.xfrm
             )
             this.iconId = opts.icon
-            this._ariaId = opts.ariaId
+            this._ariaId = (opts.ariaId != null) ? opts.ariaId : ""
             this.onClick = opts.onClick
             this.buildSprite(this.image_())
 
@@ -267,6 +265,8 @@ namespace user_interface_base {
                 this.dynamicBoundaryColorsOn = true
                 this.boundaryColor = opts.boundaryColor
             }
+
+            this.state = opts.state
         }
 
         public getIcon() {
@@ -283,10 +283,10 @@ namespace user_interface_base {
 
         private image_() {
             return typeof this.iconId == "string"
-                ? getIcon(this.iconId,false)
+                ? getIcon(this.iconId, false)
                 : this.iconId
         }
-        
+
         public setIcon(iconId: string, img?: Bitmap) {
             this.iconId = iconId
             if (img) this.icon.setImage(img)
@@ -310,7 +310,7 @@ namespace user_interface_base {
             super.draw()
 
             if (this.dynamicBoundaryColorsOn) {
-                const boundaryColour = (this.selected && this.pressable) ? 7: this.boundaryColor 
+                const boundaryColour = (this.selected && this.pressable) ? 7 : this.boundaryColor
 
                 for (let dist = 1; dist <= 3; dist++) {
                     Screen.outlineBoundsXfrm(

cursor.ts

@@ -23,7 +23,7 @@ namespace user_interface_base {
     }
 
     export interface CursorState {
-        navigator: INavigator 
+        navigator: INavigator
         pos: Vec2
         ariaId: string
         size: Bounds
@@ -48,7 +48,7 @@ namespace user_interface_base {
             this.cancelHandlerStack = []
             this.moveDest = new Vec2()
             this.setSize()
-            
+
             this.cursorOutlineColour = DEFAULT_CURSOR_OUTLINE_COLOUR
         }
 
@@ -70,7 +70,7 @@ namespace user_interface_base {
         public snapTo(x: number, y: number, ariaId: string, sizeHint: Bounds) {
             this.setSize(
                 sizeHint ||
-                    new Bounds({ left: 0, top: 0, width: 16, height: 16 })
+                new Bounds({ left: 0, top: 0, width: 16, height: 16 })
             )
             this.moveDest.x = this.xfrm.localPos.x = x
             this.moveDest.y = this.xfrm.localPos.y = y