refactor(*): remove icon support (for now)

BREAKING CHANGE: `Control.icon` no longer exists.

Author: niklashigi

src/core/and.spec.ts

@@ -7,13 +7,11 @@ describe('The `and()` operator function', () => {
 
   const controlA: Control<boolean> = {
     label: '[A]',
-    icons: ['a'],
     query: () => false,
   }
 
   const controlB: Control<boolean> = {
     label: '[B]',
-    icons: ['b'],
     query: () => true,
   }
 
@@ -23,10 +21,6 @@ describe('The `and()` operator function', () => {
     expect(control.label).to.equal('[A] + [B]')
   })
 
-  it('correctly combines icons', () => {
-    expect(control.icons).to.deep.equal(['a', 'plus', 'b'])
-  })
-
   it('makes the combined query work as expected', () => {
     expect(control.query()).to.equal(false)
   })

src/core/and.ts

@@ -5,7 +5,6 @@ export function and(...controls: Array<Control<boolean>>): Control<boolean> {
 
   return {
     label: controls.map(control => control.label).join(' + '),
-    icons: [].concat(...controls.map(control => control.icons)).join('?plus?').split('?'),
     query: () => {
       for (const control of controls) {
         /* istanbul ignore else */

src/core/control.ts

@@ -2,8 +2,6 @@ export interface Control<QueryType> {
 
   label: string
 
-  icons: string[]
-
   fromGamepad?: boolean
 
   query(): QueryType

src/core/or.spec.ts

@@ -8,7 +8,6 @@ describe('the `or()` operator function', () => {
 
   const controlUndefined: Control<number> = {
     label: '',
-    icons: [],
     query: () => undefined,
   }
 
@@ -20,13 +19,11 @@ describe('the `or()` operator function', () => {
 
     const controlTrue: Control<boolean> = {
       label: '',
-      icons: [],
       query: () => true,
     }
 
     const controlFalse: Control<boolean> = {
       label: '',
-      icons: [],
       query: () => false,
     }
 
@@ -48,13 +45,11 @@ describe('the `or()` operator function', () => {
 
     const controlThree: Control<number> = {
       label: '',
-      icons: [],
       query: () => 3,
     }
 
     const controlFour: Control<number> = {
       label: '',
-      icons: [],
       query: () => 4,
     }
 
@@ -73,14 +68,12 @@ describe('the `or()` operator function', () => {
 
     const controlGamepad: Control<number> = {
       label: 'gamepad',
-      icons: ['gamepad'],
       query: null,
       fromGamepad: true,
     }
 
     const controlNonGamepad: Control<number> = {
       label: 'non-gamepad',
-      icons: ['non-gamepad'],
       query: null,
     }
 
@@ -92,10 +85,6 @@ describe('the `or()` operator function', () => {
         expect(or(controlGamepad, controlNonGamepad).label).to.equal('non-gamepad')
       })
 
-      it('return the icons of the first non-gamepad control', () => {
-        expect(or(controlGamepad, controlNonGamepad).icons[0]).to.equal('non-gamepad')
-      })
-
     })
 
     describe('is `true`', () => {
@@ -106,28 +95,19 @@ describe('the `or()` operator function', () => {
         expect(or(controlGamepad, controlNonGamepad).label).to.equal('gamepad')
       })
 
-      it('return the icons of the first gamepad control', () => {
-        expect(or(controlGamepad, controlNonGamepad).icons[0]).to.equal('gamepad')
-      })
-
     })
 
     describe('is `true` or `false` and no gamepad control is passed in', () => {
 
       const controlFirst: Control<number> = {
         label: 'first',
-        icons: ['first'],
         query: null,
       }
 
       it('return the label of the first control', () => {
         expect(or(controlFirst, controlNonGamepad).label).to.equal('first')
       })
 
-      it('return the icons of the first control', () => {
-        expect(or(controlFirst, controlNonGamepad).label).to.equal('first')
-      })
-
     })
 
   })

src/core/or.ts

@@ -2,22 +2,16 @@ import { store } from '../index'
 import { Vector2 } from '../utils/math'
 import { Control } from './control'
 
-const findPreferred = (controls: Array<Control<any>>, thing: string): any =>
-  (controls.filter(control => control.fromGamepad).length === 0 ?
-    controls[0]
-    : store.preferGamepad ?
-      controls.filter(control => control.fromGamepad === true)[0]
-      : controls.filter(control => control.fromGamepad !== true)[0])[thing]
-
 export function or(...controls: Array<Control<any>>): Control<any> {
   if (controls.length < 2) throw new Error('Less than two controls specified!')
 
   return {
     get label() {
-      return findPreferred(controls, 'label')
-    },
-    get icons() {
-      return findPreferred(controls, 'icons')
+      return (controls.filter(control => control.fromGamepad).length === 0 ?
+          controls[0]
+          : store.preferGamepad ?
+            controls.filter(control => control.fromGamepad === true)[0]
+            : controls.filter(control => control.fromGamepad !== true)[0]).label
     },
     query: () => {
       let sampleQueryValue

src/inputs/gamepad.ts

@@ -49,7 +49,6 @@ export class Gamepad {
   public button(button: number, trigger = false): Control<boolean> {
     return {
       label: `(${button})`,
-      icons: ['gamepad-button-' + button],
       fromGamepad: true,
       query: trigger ? () => {
         /* istanbul ignore else */

src/inputs/keyboard.spec.ts

@@ -36,10 +36,6 @@ describe('The `Keyboard` class', () => {
       expect(keyboard.key('G').label).to.equal('G')
     })
 
-    it('returns the correct icon', () => {
-      expect(keyboard.key('G').icons[0]).to.equal('keyboard-key-g')
-    })
-
     describe('when queried', () => {
 
       it('returns `true` when the key is pressed', () => {
@@ -88,12 +84,6 @@ describe('The `Keyboard` class', () => {
       expect(keyboard.directionalKeys(['z', 'g', 'h', 'j']).label).to.equal('[ZGHJ]')
     })
 
-    it('returns the correct icon', () => {
-      expect(keyboard.directionalKeys('wasd').icons[0]).to.equal('keyboard-directional-keys-wasd')
-      expect(keyboard.directionalKeys('arrows').icons[0]).to.equal('keyboard-directional-keys-arrows')
-      expect(keyboard.directionalKeys(['z', 'g', 'h', 'j']).icons[0]).to.equal('keyboard-directional-keys-zghj')
-    })
-
     it("throws an error when the passed in arrow key template doesn't exist", () => {
       expect(() => keyboard.directionalKeys('wsad').query()).to.throw(Error, 'Arrow key template "wsad" not found!')
     })

src/inputs/keyboard.ts

@@ -42,7 +42,6 @@ export class Keyboard {
     key = key.toLowerCase()
     return {
       label: key.toUpperCase(),
-      icons: ['keyboard-key-' + key],
       query: () => {
         if (trigger) {
           if (this.queuedKeys.has(key)) {
@@ -73,7 +72,6 @@ export class Keyboard {
     const defaultLabel = `[${name.toUpperCase()}]`
     return {
       label: label || defaultLabel,
-      icons: ['keyboard-directional-keys-' + name],
       query: () => {
         const vector = new Vector2()
         if (this.key(keys[0]).query()) vector.y -= 1

src/inputs/mouse.spec.ts

@@ -74,12 +74,6 @@ describe('The `Mouse` class', () => {
       expect(mouse.button('right').label).to.equal('[RMB]')
     })
 
-    it('returns the correct icon for all three buttons', () => {
-      expect(mouse.button('left').icons[0]).to.equal('left-mouse-button')
-      expect(mouse.button('middle').icons[0]).to.equal('middle-mouse-button')
-      expect(mouse.button('right').icons[0]).to.equal('right-mouse-button')
-    })
-
     it('when queried returns `true` the mouse button is pressed', () => {
       canvas.listeners.mousedown({ button: 0 })
       expect(mouse.button('left').query()).to.equal(true)
@@ -116,10 +110,6 @@ describe('The `Mouse` class', () => {
       expect(mouse.pointer().label).to.equal('Cursor')
     })
 
-    it('returns the correct icon', () => {
-      expect(mouse.pointer().icons[0]).to.equal('mouse-pointer')
-    })
-
     describe('when queried', () => {
 
       it('returns a (0, 0) vector if no movement occurred', () => {
@@ -151,10 +141,6 @@ describe('The `Mouse` class', () => {
       expect(mouse.wheel().label).to.equal('Mouse wheel')
     })
 
-    it('returns the correct icon', () => {
-      expect(mouse.wheel().icons[0]).to.equal('mouse-wheel')
-    })
-
     describe('when queried', () => {
 
       it('returns `0` if no scrolling occurred', () => {

src/inputs/mouse.ts

@@ -68,7 +68,6 @@ export class Mouse {
     button = this.parseButton(button)
     return {
       label: ['[LMB]', '[MMB]', '[RMB]'][button],
-      icons: [['left-mouse-button', 'middle-mouse-button', 'right-mouse-button'][button]],
       query: () => {
         button = this.parseButton(button)
         if (trigger) {
@@ -87,7 +86,6 @@ export class Mouse {
   public pointer(): Control<Vector2> {
     return {
       label: 'Cursor',
-      icons: ['mouse-pointer'],
       query: () => {
         const movement = this.pointerMovement
         this.pointerMovement = new Vector2(0, 0)
@@ -99,7 +97,6 @@ export class Mouse {
   public wheel() {
     return {
       label: 'Mouse wheel',
-      icons: ['mouse-wheel'],
       query: () => {
         const distance = this.scrollDistance
         this.scrollDistance = 0