Merge pull request #639 from taye/fix-style-cursor

autoStart: set cursor on both target and <html>
taye · Jun 4, 2018 · 8543104 · 8543104
2 parents ff30f9c + 65ef914
commit 8543104
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/packages/autoStart/base.js b/packages/autoStart/base.js
@@ -59,7 +59,7 @@ function init (scope) {
     const target = interaction.target;
 
     if (target && target.options.styleCursor) {
-      target._doc.documentElement.style.cursor = '';
+      setCursor(interaction.element, '', scope);
     }
   });
 
@@ -97,6 +97,7 @@ function init (scope) {
     // Allow this many interactions to happen simultaneously
     maxInteractions: Infinity,
     withinInteractionLimit,
+    cursorElement: null,
     signals: new Signals(),
   };
 }
@@ -171,7 +172,7 @@ function prepare (interaction, { action, target, element }, scope) {
   action = action || {};
 
   if (interaction.target && interaction.target.options.styleCursor) {
-    interaction.target._doc.documentElement.style.cursor = '';
+    setCursor(interaction.element, '', scope);
   }
 
   interaction.target = target;
@@ -180,7 +181,7 @@ function prepare (interaction, { action, target, element }, scope) {
 
   if (target && target.options.styleCursor) {
     const cursor = action? scope.actions[action.name].getCursor(action) : '';
-    interaction.target._doc.documentElement.style.cursor = cursor;
+    setCursor(interaction.element, cursor, scope);
   }
 
   scope.autoStart.signals.fire('prepared', { interaction: interaction });
@@ -239,6 +240,16 @@ function maxInteractions (newValue, scope) {
   return scope.autoStart.maxInteractions;
 }
 
+function setCursor (element, cursor, scope) {
+  if (scope.autoStart.cursorElement) {
+    scope.autoStart.cursorElement.style.cursor = '';
+  }
+
+  element.ownerDocument.documentElement.style.cursor = cursor;
+  element.style.cursor = cursor;
+  scope.autoStart.cursorElement = cursor ? element : null;
+}
+
 export default {
   init,
   maxInteractions,