fix: remove deprecated keyCode in controls (#59)

Brings three-stdlib up to date with three: mrdoob/three.js#21409
pmndrs · May 11, 2021 · cf15c71 · cf15c71 · vercel · May 11, 2021
1 parent 57382f3
commit cf15c71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/controls/OrbitControls.ts b/src/controls/OrbitControls.ts
@@ -62,7 +62,7 @@ class OrbitControls extends EventDispatcher {
   autoRotate = false
   autoRotateSpeed = 2.0 // 30 seconds per orbit when fps is 60
   // The four arrow keys
-  keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 }
+  keys = { LEFT: 'ArrowLeft', UP: 'ArrowUp', RIGHT: 'ArrowRight', BOTTOM: 'ArrowDown' }
   // Mouse buttons
   mouseButtons = {
     LEFT: MOUSE.ROTATE,
@@ -498,7 +498,7 @@ class OrbitControls extends EventDispatcher {
     function handleKeyDown(event: KeyboardEvent) {
       let needsUpdate = false
 
-      switch (event.keyCode) {
+      switch (event.code) {
         case scope.keys.UP:
           pan(0, scope.keyPanSpeed)
           needsUpdate = true

diff --git a/src/controls/TrackballControls.ts b/src/controls/TrackballControls.ts
@@ -19,7 +19,7 @@ class TrackballControls extends EventDispatcher {
   public minDistance = 0
   public maxDistance = Infinity
 
-  public keys: [number, number, number] = [65 /*A*/, 83 /*S*/, 68 /*D*/]
+  public keys: [string, string, string] = ['KeyA' /*A*/, 'KeyS' /*S*/, 'KeyD' /*D*/]
 
   public mouseButtons = {
     LEFT: MOUSE.ROTATE,
@@ -344,11 +344,11 @@ class TrackballControls extends EventDispatcher {
 
     if (this._keyState !== this.STATE.NONE) {
       return
-    } else if (event.keyCode === this.keys[this.STATE.ROTATE] && !this.noRotate) {
+    } else if (event.code === this.keys[this.STATE.ROTATE] && !this.noRotate) {
       this._keyState = this.STATE.ROTATE
-    } else if (event.keyCode === this.keys[this.STATE.ZOOM] && !this.noZoom) {
+    } else if (event.code === this.keys[this.STATE.ZOOM] && !this.noZoom) {
       this._keyState = this.STATE.ZOOM
-    } else if (event.keyCode === this.keys[this.STATE.PAN] && !this.noPan) {
+    } else if (event.code === this.keys[this.STATE.PAN] && !this.noPan) {
       this._keyState = this.STATE.PAN
     }
   }

diff --git a/src/controls/experimental/CameraControls.ts b/src/controls/experimental/CameraControls.ts
@@ -95,7 +95,7 @@ class CameraControls extends EventDispatcher {
   enableKeys = true
 
   /** The four arrow keys */
-  keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 }
+  keys = { LEFT: 'ArrowLeft', UP: 'ArrowUp', RIGHT: 'ArrowRight', BOTTOM: 'ArrowDown' }
 
   mouseButtons: {
     LEFT: MOUSE
@@ -545,8 +545,7 @@ class CameraControls extends EventDispatcher {
   private handleKeyDown = (event: KeyboardEvent): void => {
     let needsUpdate = false
 
-    // TODO: keyCode deprecated?
-    switch (event.keyCode) {
+    switch (event.code) {
       case this.keys.UP:
         this.pan(0, this.keyPanSpeed)
         needsUpdate = true