rails_onboarding 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e42f9771d8f9d357ebbf763900651576721b726c548e6f837853d6590ff2da5
-  data.tar.gz: 5892846e24f4c86ab43217016e5713c8a80958e72aa861cdeed555d659e83179
+  metadata.gz: 532f89d681d2a2bf5cdf575a99b26742497707b65c1109525f51307d09bc50c6
+  data.tar.gz: 6f5e6c0c374b350ac09ac25c36846ad93eee2c2e10d31a531629f65cb19062f7
 SHA512:
-  metadata.gz: ed6b1a9c9a64766bca536370562c962e04dfafb0478283834e335e7a80e0e1e11e5bd7619e468597af0c2fe24d1fa84a2c2bfd2eaf52b57a546a209053bca307
-  data.tar.gz: 7dd60ecfec9f08115c6b25a40ed91c7c54790ca79e539085929891cb900895767bc4e17e2b64cfa50117132464dd655c709ae7bdc83fd05f1319142ca826acc7
+  metadata.gz: 68277199c94e5109304653b498934f8971779b6fe58696133b992b365753527545b06982f013e75faa2fd34e4cb7f71f4730937c2c599da30efdbd0a218d7f7e
+  data.tar.gz: f2b95e0a399d1981f5f01783231179ea62d7398e8145f0aed809e0621f158c8949e1152c8305f9c5f05daf328350eddf4a293885f954dfa99400c5bf8dac491f

data/app/assets/javascripts/rails_onboarding/tour_controller.js

@@ -216,8 +216,7 @@ export default class extends Controller {
             this.executeCallback(step.beforeShow, step)
         }
 
-        // Find target element
-        const targetElement = step.selector ? document.querySelector(step.selector) : null
+        const targetElement = this.resolveTarget(step)
 
         this.currentTargetElement = targetElement
         this.applyScrim(step, targetElement)
@@ -244,6 +243,37 @@ export default class extends Controller {
         this.dispatch('step-shown', { detail: { step, index } })
     }
 
+    /**
+     * Find the element a step should point at.
+     *
+     * `selector` may be a list, which is how a step survives a responsive layout:
+     * the same idea is often two elements, one of them display:none at the current
+     * breakpoint - a row of tabs on a wide screen and a select on a narrow one. The
+     * first candidate that is actually rendered wins.
+     *
+     * An element with no layout box is treated as absent rather than used anyway.
+     * getBoundingClientRect() on a display:none element is all zeroes, so the
+     * spotlight became a small square in the top-left corner and the popup was
+     * placed against the origin - pointing confidently at nothing, on top of
+     * whatever happened to be there.
+     */
+    resolveTarget(step) {
+        const selectors = Array.isArray(step.selector) ? step.selector : [step.selector]
+
+        for (const selector of selectors) {
+            if (!selector) continue
+
+            const element = document.querySelector(selector)
+            if (element && this.hasLayoutBox(element)) return element
+        }
+
+        return null
+    }
+
+    hasLayoutBox(element) {
+        return element.getClientRects().length > 0
+    }
+
     /**
      * Hide current step
      */
@@ -592,26 +622,26 @@ export default class extends Controller {
 
         const popupRect = this.popup.getBoundingClientRect()
         const margin = 20
-        let top, left
-
-        if (targetElement) {
-            const targetRect = targetElement.getBoundingClientRect()
-            const position = this.calculateBestPosition(step, targetRect, popupRect, margin)
+        const targetRect = targetElement ? targetElement.getBoundingClientRect() : null
 
-            top = position.top
-            left = position.left
-        } else {
-            // Center on screen if no target
-            top = (window.innerHeight - popupRect.height) / 2
-            left = (window.innerWidth - popupRect.width) / 2
-        }
+        const coords = targetRect
+            ? this.calculateBestPosition(step, targetRect, popupRect, margin)
+            : {
+                top: (window.innerHeight - popupRect.height) / 2,
+                left: (window.innerWidth - popupRect.width) / 2
+            }
 
-        // Ensure popup stays in viewport
-        top = Math.max(margin, Math.min(top, window.innerHeight - popupRect.height - margin))
-        left = Math.max(margin, Math.min(left, window.innerWidth - popupRect.width - margin))
+        // The clamp keeps the popup reachable, which matters more than anything else -
+        // its own buttons are the only way forward. calculateBestPosition is what keeps
+        // it off the highlight; this is the last word on staying on screen.
+        this.popup.style.top =
+            `${this.clamp(coords.top, margin, window.innerHeight - popupRect.height - margin)}px`
+        this.popup.style.left =
+            `${this.clamp(coords.left, margin, window.innerWidth - popupRect.width - margin)}px`
+    }
 
-        this.popup.style.top = `${top}px`
-        this.popup.style.left = `${left}px`
+    clamp(value, min, max) {
+        return Math.max(min, Math.min(value, max))
     }
 
     /**
@@ -641,22 +671,40 @@ export default class extends Controller {
             }
         }
 
-        // If position is auto, find best fit
-        if (step.position === 'auto') {
-            const preferences = ['bottom', 'top', 'right', 'left']
+        // 'center' is a host saying "do not point at anything", so it is taken at its
+        // word. Every other position is a *preference*: it used to be handed back
+        // without being checked, and positionPopup then clamped it into the viewport -
+        // which on a phone slides the popup straight over the element it is describing.
+        // A tour that hides what it is explaining is worse than one placed on the wrong
+        // side, so the asked-for side is tried first and the others are tried after it.
+        if (step.position === 'center') return positions.center
 
-            for (const pos of preferences) {
-                const coords = positions[pos]
-                if (this.isPositionValid(coords, popupRect, margin)) {
-                    return coords
-                }
-            }
+        const fallbacks = ['bottom', 'top', 'right', 'left']
+        const order = positions[step.position] && step.position !== 'auto'
+            ? [step.position, ...fallbacks.filter((pos) => pos !== step.position)]
+            : fallbacks
 
-            // Fallback to center
-            return positions.center
+        for (const pos of order) {
+            if (this.isPositionValid(positions[pos], popupRect, margin)) return positions[pos]
         }
 
-        return positions[step.position] || positions.bottom
+        return this.positionBesideTarget(targetRect, popupRect, margin)
+    }
+
+    /**
+     * Nothing fits cleanly on any side, which on a small viewport is the ordinary
+     * case rather than the exceptional one. Put the popup in whichever band - above
+     * the target or below it - has more room. Centring instead, which is what this
+     * used to do, lands on the target more often than not.
+     */
+    positionBesideTarget(targetRect, popupRect, margin) {
+        const roomAbove = targetRect.top - margin
+        const roomBelow = window.innerHeight - targetRect.bottom - margin
+        const left = targetRect.left + (targetRect.width - popupRect.width) / 2
+
+        return roomBelow >= roomAbove
+            ? { top: targetRect.bottom + margin, left }
+            : { top: targetRect.top - popupRect.height - margin, left }
     }
 
     /**

data/lib/rails_onboarding/version.rb

@@ -1,3 +1,3 @@
 module RailsOnboarding
-  VERSION = "0.8.11"
+  VERSION = "0.8.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_onboarding
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - David Lewis
@@ -282,7 +282,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/bunnahabhain/rails_onboarding
-  source_code_uri: https://github.com/bunnahabhain/rails_onboarding/tree/v0.8.11
+  source_code_uri: https://github.com/bunnahabhain/rails_onboarding/tree/v0.8.12
   changelog_uri: https://github.com/bunnahabhain/rails_onboarding/blob/master/docs/CHANGELOG.md
 rdoc_options: []
 require_paths: