mouse

Author: sainthkh

packages/driver/src/cy/mouse.ts

@@ -42,7 +42,7 @@ const getMouseCoords = (state) => {
   return state('mouseCoords')
 }
 
-const create = (state, keyboard, focused, Cypress) => {
+export const create = (state, keyboard, focused, Cypress) => {
   const isFirefox = Cypress.browser.family === 'firefox'
 
   const sendPointerEvent = (el, evtOptions, evtName, bubbles = false, cancelable = false) => {
@@ -707,6 +707,8 @@ const create = (state, keyboard, focused, Cypress) => {
   return mouse
 }
 
+export interface Mouse extends ReturnType<typeof create> {}
+
 const { stopPropagation } = window.MouseEvent.prototype
 
 const sendEvent = (evtName, el, evtOptions, bubbles = false, cancelable = false, Constructor, composed = false) => {
@@ -758,7 +760,3 @@ const toCoordsEventOptions = (x, y, win) => {
     layerY: x + scrollY,
   }
 }
-
-export default {
-  create,
-}

packages/driver/src/cypress.ts

@@ -21,7 +21,7 @@ import $errUtils from './cypress/error_utils'
 import $Log from './cypress/log'
 import $LocalStorage from './cypress/local_storage'
 import $Mocha from './cypress/mocha'
-import $Mouse from './cy/mouse'
+import { create as createMouse } from './cy/mouse'
 import $Runner from './cypress/runner'
 import $Screenshot from './cypress/screenshot'
 import $SelectorPlayground from './cypress/selector_playground'
@@ -661,7 +661,10 @@ $Cypress.prototype.LocalStorage = $LocalStorage
 $Cypress.prototype.Mocha = $Mocha
 $Cypress.prototype.resolveWindowReference = resolvers.resolveWindowReference
 $Cypress.prototype.resolveLocationReference = resolvers.resolveLocationReference
-$Cypress.prototype.Mouse = $Mouse
+$Cypress.prototype.Mouse = {
+  create: createMouse,
+}
+
 $Cypress.prototype.Runner = $Runner
 $Cypress.prototype.Server = $Server
 $Cypress.prototype.Screenshot = $Screenshot

packages/driver/src/cypress/cy.ts

@@ -13,7 +13,7 @@ import { create as createAliases, IAliases } from '../cy/aliases'
 import * as $Events from './events'
 import { create as createEnsures, IEnsures } from '../cy/ensures'
 import { create as createFocused, IFocused } from '../cy/focused'
-import $Mouse from '../cy/mouse'
+import { create as createMouse, Mouse } from '../cy/mouse'
 import { Keyboard } from '../cy/keyboard'
 import { create as createLocation, ILocation } from '../cy/location'
 import { create as createAssertions, IAssertions } from '../cy/assertions'
@@ -124,6 +124,7 @@ class $Cy implements ITimeouts, IStability, IAssertions, IRetries, IJQuery, ILoc
   config: any
   devices: {
     keyboard: Keyboard
+    mouse: Mouse
   }
 
   timeout: ITimeouts['timeout']
@@ -141,7 +142,10 @@ class $Cy implements ITimeouts, IStability, IAssertions, IRetries, IJQuery, ILoc
 
   getRemoteLocation: ILocation['getRemoteLocation']
 
-  // focused, keyboard, mouse
+  fireBlur: IFocused['fireBlur']
+  fireFocus: IFocused['fireFocus']
+  needsFocus: IFocused['needsFocus']
+  getFocused: IFocused['getFocused']
 
   pauseTimers: ITimer['pauseTimers']
 
@@ -178,11 +182,6 @@ class $Cy implements ITimeouts, IStability, IAssertions, IRetries, IJQuery, ILoc
   detachDom: ISnapshots['detachDom']
   getStyles: ISnapshots['getStyles']
 
-  fireBlur: IFocused['fireBlur']
-  fireFocus: IFocused['fireFocus']
-  needsFocus: IFocused['needsFocus']
-  getFocused: IFocused['getFocused']
-
   // Private methods
   resetTimer: ReturnType<typeof createTimer>['reset']
 
@@ -205,10 +204,6 @@ class $Cy implements ITimeouts, IStability, IAssertions, IRetries, IJQuery, ILoc
     this.config = config
     initVideoRecorder(Cypress)
 
-    this.devices = {
-      keyboard: new Keyboard(state),
-    }
-
     // bind methods
     this.$$ = this.$$.bind(this)
 
@@ -245,7 +240,23 @@ class $Cy implements ITimeouts, IStability, IAssertions, IRetries, IJQuery, ILoc
 
     this.getRemoteLocation = location.getRemoteLocation
 
-    // focused, keyboard, mouse
+    const focused = createFocused(state)
+
+    this.fireBlur = focused.fireBlur
+    this.fireFocus = focused.fireFocus
+    this.needsFocus = focused.needsFocus
+    this.getFocused = focused.getFocused
+
+    this.documentHasFocus = focused.documentHasFocus
+    this.interceptFocus = focused.interceptFocus
+    this.interceptBlur = focused.interceptBlur
+
+    const keyboard = new Keyboard(state)
+
+    this.devices = {
+      keyboard,
+      mouse: createMouse(state, keyboard, focused, Cypress),
+    }
 
     const timer = createTimer(Cypress)
 
@@ -300,20 +311,6 @@ class $Cy implements ITimeouts, IStability, IAssertions, IRetries, IJQuery, ILoc
 
     this.onCssModified = snapshots.onCssModified
     this.onBeforeWindowLoad = snapshots.onBeforeWindowLoad
-
-    const focused = createFocused(state)
-
-    this.fireBlur = focused.fireBlur
-    this.fireFocus = focused.fireFocus
-    this.needsFocus = focused.needsFocus
-    this.getFocused = focused.getFocused
-
-    this.documentHasFocus = focused.documentHasFocus
-    this.interceptFocus = focused.interceptFocus
-    this.interceptBlur = focused.interceptBlur
-
-    // temporary -> should be removed
-    this.focused = focused
   }
 
   $$ (selector, context) {
@@ -401,8 +398,6 @@ export default {
       })
     }
 
-    const mouse = $Mouse.create(state, cy.devices.keyboard, cy.focused, Cypress)
-
     const testConfigOverride = new TestConfigOverride()
 
     const isStopped = () => {
@@ -726,11 +721,6 @@ export default {
 
       isStopped,
 
-      devices: {
-        mouse,
-        keyboard: cy.devices.keyboard,
-      },
-
       initialize ($autIframe) {
         setRemoteIframeProps($autIframe, state)