@brandocms/jupiter 3.47.0 → 3.48.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@brandocms/jupiter",
-    "version": "3.47.0",
+    "version": "3.48.1",
     "description": "Frontend helpers.",
     "author": "Univers/Twined",
     "license": "UNLICENSED",
@@ -33,19 +33,19 @@
     "dependencies": {
         "@egjs/hammerjs": "^2.0.17",
         "body-scroll-lock": "^4.0.0-beta.0",
-        "gsap": "3.11.0",
+        "gsap": "3.11.3",
         "lodash.defaultsdeep": "^4.6.1"
     },
     "devDependencies": {
-        "@babel/core": "^7.18.13",
-        "@babel/preset-env": "^7.18.10",
-        "babel-jest": "^29.0.1",
-        "eslint": "8.23.0",
+        "@babel/core": "^7.19.6",
+        "@babel/preset-env": "^7.19.4",
+        "babel-jest": "^29.2.1",
+        "eslint": "8.25.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^6.0.1",
-        "jest": "^29.0.1",
-        "jest-environment-jsdom": "^29.0.1"
+        "eslint-plugin-promise": "^6.1.1",
+        "jest": "^29.2.1",
+        "jest-environment-jsdom": "^29.2.1"
     }
 }

package/src/events/index.js

@@ -18,4 +18,5 @@ export const APPLICATION_VISIBLE = 'APPLICATION:VISIBLE'
 export const BREAKPOINT_CHANGE = 'BREAKPOINT:CHANGE'
 
 export const IMAGE_LAZYLOADED = 'IMAGE:LAZYLOADED'
+export const IMAGE_REVEALED = 'IMAGE:REVEALED'
 export const SECTION_LAZYLOADED = 'SECTION:LAZYLOADED'

package/src/index.js

@@ -1,10 +1,4 @@
-import {
-  CSSPlugin,
-  Draggable,
-  ScrollToPlugin,
-  ScrollTrigger,
-  gsap
-} from 'gsap/all'
+import { CSSPlugin, Draggable, ScrollToPlugin, ScrollTrigger, gsap } from 'gsap/all'
 
 import Hammer from '@egjs/hammerjs'
 import _defaultsDeep from 'lodash.defaultsdeep'
@@ -13,8 +7,10 @@ import Application from './modules/Application'
 import Breakpoints from './modules/Breakpoints'
 import Cookies from './modules/Cookies'
 import CoverOverlay from './modules/CoverOverlay'
+import Dataloader from './modules/Dataloader'
 import Dom from './modules/Dom'
 import Dropdown from './modules/Dropdown'
+import EqualHeightElements from './modules/EqualHeightElements'
 import EqualHeightImages from './modules/EqualHeightImages'
 import * as Events from './events'
 import FixedHeader from './modules/FixedHeader'
@@ -46,9 +42,11 @@ export {
   Breakpoints,
   Cookies,
   CoverOverlay,
+  Dataloader,
   Dom,
   Draggable,
   Dropdown,
+  EqualHeightElements,
   EqualHeightImages,
   Events,
   FixedHeader,

package/src/modules/Application/index.js

@@ -31,6 +31,10 @@ window.onpageshow = event => {
     const $nav = Dom.find('header[data-nav]')
     gsap.set($nav, { clearProps: 'opacity' })
 
+    // check that main is visible
+    const $main = Dom.find('main')
+    gsap.set($main, { clearProps: 'opacity' })
+
     // check that footer is visible
     const $footer = Dom.find('footer')
     gsap.set($footer, { clearProps: 'opacity' })
@@ -44,7 +48,12 @@ const DEFAULT_OPTIONS = {
   },
 
   focusableSelectors: [
-    'a', 'input', 'select', 'button', 'textarea', 'iframe' // , 'video'?
+    'a',
+    'input',
+    'select',
+    'button',
+    'textarea',
+    'iframe' // , 'video'?
   ],
 
   bindScroll: true,
@@ -54,7 +63,7 @@ const DEFAULT_OPTIONS = {
   disableWebpSafari: true,
 
   faderOpts: {
-    fadeIn: (callback = () => { }) => {
+    fadeIn: (callback = () => {}) => {
       const fader = document.querySelector('#fader')
       gsap.to(fader, {
         opacity: 0,
@@ -62,6 +71,9 @@ const DEFAULT_OPTIONS = {
         delay: 0,
         duration: 0.65,
         onComplete: () => {
+          if (window.bfTO) {
+            clearTimeout(window.bfTO)
+          }
           gsap.set(fader, { display: 'none' })
           document.body.classList.remove('unloaded')
           callback()
@@ -71,7 +83,7 @@ const DEFAULT_OPTIONS = {
   }
 }
 export default class Application {
-  constructor (opts = {}) {
+  constructor(opts = {}) {
     this.debugType = 1
     this.debugOverlay = null
     this.userAgent = navigator.userAgent
@@ -159,7 +171,7 @@ export default class Application {
   /**
    * Main init. Called from client application on DOMReady.
    */
-  initialize () {
+  initialize() {
     this._emitBeforeInitializedEvent()
     this.setSection()
     this.executeCallbacks(Events.APPLICATION_PRELUDIUM)
@@ -170,10 +182,10 @@ export default class Application {
   }
 
   /**
-  * Application is initialized and ready.
-  * Fade in, then execute callbacks
-  */
-  ready () {
+   * Application is initialized and ready.
+   * Fade in, then execute callbacks
+   */
+  ready() {
     this.fontLoader.loadFonts(this.opts.fonts).then(() => {
       this._emitReadyEvent()
       this.executeCallbacks(Events.APPLICATION_READY)
@@ -181,7 +193,7 @@ export default class Application {
     })
   }
 
-  getZoom () {
+  getZoom() {
     switch (this.browser) {
       case 'chrome':
         this._lastDevicePixelRatio = Math.round(window.devicePixelRatio * 100)
@@ -202,23 +214,25 @@ export default class Application {
     }
   }
 
-  zoomCalculateChrome (dimsChanged) {
+  zoomCalculateChrome(dimsChanged) {
     // only calc new zoom if width/height changed
     if (dimsChanged) {
       const currentDevicePixelRatio = Math.round(window.devicePixelRatio * 100)
       const delta = (currentDevicePixelRatio - this._lastDevicePixelRatio) / 100
       this.size.zoom += delta
-      if (this.size.zoom === 0) { this.size.zoom = 1 }
+      if (this.size.zoom === 0) {
+        this.size.zoom = 1
+      }
       this._lastDevicePixelRatio = currentDevicePixelRatio
-    } 
+    }
   }
 
-  zoomCalculateSafari () {
+  zoomCalculateSafari() {
     // safari does not call resize when switching dpi/monitors
     this.size.zoom = this._zoomSVG.currentScale
   }
 
-  updateZoom (dimsChanged = false, dprDelta = 0) {
+  updateZoom(dimsChanged = false, dprDelta = 0) {
     switch (this.browser) {
       case 'chrome':
         this.zoomCalculateChrome(dimsChanged)
@@ -232,7 +246,9 @@ export default class Application {
         if ([1, -1].indexOf(dprDelta) === -1) {
           if (dimsChanged) {
             this.size.zoom = 1 + (zoom.calculate(this.browser) - this._initialZoom)
-            if (this.size.zoom === 0) { this.size.zoom = 1 }
+            if (this.size.zoom === 0) {
+              this.size.zoom = 1
+            }
           }
         } else {
           this._initialZoom = Math.min(Math.max(this._initialZoom - dprDelta, 1), 2)
@@ -245,14 +261,14 @@ export default class Application {
   /**
    * Fade in application, as declared in the `faderOpts`
    */
-  fadeIn () {
+  fadeIn() {
     this.opts.faderOpts.fadeIn(this._emitRevealedEvent.bind(this))
   }
 
   /**
    * Register callbacks by `type`
    */
-  registerCallback (type, callback) {
+  registerCallback(type, callback) {
     if (!Object.prototype.hasOwnProperty.call(this.callbacks, type)) {
       this.callbacks[type] = []
     }
@@ -262,7 +278,7 @@ export default class Application {
   /**
    * Execute callbacks by `type`
    */
-  executeCallbacks (type) {
+  executeCallbacks(type) {
     if (!Object.prototype.hasOwnProperty.call(this.callbacks, type)) {
       return
     }
@@ -272,16 +288,19 @@ export default class Application {
   /**
    * Set section
    */
-  setSection () {
+  setSection() {
     this.section = document.body.getAttribute('data-script')
   }
 
   /**
    * Check if document is scrolled
    */
-  isScrolled () {
-    return (window.pageYOffset
-      || document.documentElement.scrollTop) - (document.documentElement.clientTop || 0) > 0
+  isScrolled() {
+    return (
+      (window.pageYOffset || document.documentElement.scrollTop) -
+        (document.documentElement.clientTop || 0) >
+      0
+    )
   }
 
   /**
@@ -289,7 +308,7 @@ export default class Application {
    * `extraPaddedElements` can be a list of elements that also need padding, such as the header!
    * @param {*} extraPaddedElements
    */
-  scrollLock (extraPaddedElements = []) {
+  scrollLock(extraPaddedElements = []) {
     if (this.SCROLL_LOCKED) {
       return
     }
@@ -303,7 +322,7 @@ export default class Application {
     document.addEventListener('touchmove', this.scrollVoid, false)
   }
 
-  scrollRelease () {
+  scrollRelease() {
     if (!this.SCROLL_LOCKED) {
       return
     }
@@ -322,7 +341,7 @@ export default class Application {
    * @param {*} time
    * @param {*} emitEvents
    */
-  scrollTo (target, time = 0.8, emitEvents = true) {
+  scrollTo(target, time = 0.8, emitEvents = true, ease = 'sine.inOut') {
     let scrollToData
     const forcedScrollEventStart = new window.CustomEvent(Events.APPLICATION_FORCED_SCROLL_START)
     if (emitEvents) {
@@ -344,29 +363,29 @@ export default class Application {
           window.dispatchEvent(forcedScrollEventEnd)
         }
       },
-      ease: 'sine.inOut'
+      ease
     })
   }
 
-  hardScrollToTop () {
+  hardScrollToTop() {
     window.scrollTo(0, 0)
   }
 
-  hardScrollTo (target) {
+  hardScrollTo(target) {
     const element = Dom.find(target)
     if (element) {
       element.scrollIntoView()
     }
   }
 
-  scrollVoid (e) {
+  scrollVoid(e) {
     e.preventDefault()
   }
 
   /**
    * Get current scrollbar width — if there is none, there is none
    */
-  getCurrentScrollBarWidth () {
+  getCurrentScrollBarWidth() {
     return window.innerWidth - document.documentElement.clientWidth
   }
 
@@ -374,7 +393,7 @@ export default class Application {
    * Get scrollbar width by FORCE. No matter if there is
    * currently a scrollbar or not
    */
-  getScrollBarWidth () {
+  getScrollBarWidth() {
     if (!this.SCROLLBAR_WIDTH) {
       // Creating invisible container
       const outer = document.createElement('div')
@@ -388,7 +407,7 @@ export default class Application {
       outer.appendChild(inner)
 
       // Calculating difference between container's full width and the child width
-      this.SCROLLBAR_WIDTH = (outer.offsetWidth - inner.offsetWidth)
+      this.SCROLLBAR_WIDTH = outer.offsetWidth - inner.offsetWidth
 
       // Removing temporary elements from the DOM
       outer.parentNode.removeChild(outer)
@@ -398,7 +417,7 @@ export default class Application {
   /**
    * Ugly hacks
    */
-  hacks () {
+  hacks() {
     if (this.opts.disableWebpSafari) {
       if (this.browser === 'safari') {
         console.debug('==> disable webp')
@@ -410,11 +429,11 @@ export default class Application {
     }
   }
 
-  getIOSCurrentInnerHeight () {
+  getIOSCurrentInnerHeight() {
     return window.innerHeight
   }
 
-  getIOSInnerHeightMax () {
+  getIOSInnerHeightMax() {
     if (!navigator.userAgent.match(/iphone|ipod|ipad/i)) {
       return window.innerHeight
     }
@@ -451,21 +470,21 @@ export default class Application {
   /**
    * Event emitters
    */
-  _emitBeforeInitializedEvent () {
+  _emitBeforeInitializedEvent() {
     window.dispatchEvent(this.beforeInitializedEvent)
   }
 
-  _emitInitializedEvent () {
+  _emitInitializedEvent() {
     window.dispatchEvent(this.initializedEvent)
     this.INITIALIZED = true
   }
 
-  _emitReadyEvent () {
+  _emitReadyEvent() {
     window.dispatchEvent(this.readyEvent)
     document.body.dataset.appReady = true
   }
 
-  _emitRevealedEvent () {
+  _emitRevealedEvent() {
     if (!document.body.hasAttribute('data-app-revealed')) {
       document.body.dataset.appRevealed = true
       window.dispatchEvent(this.revealedEvent)
@@ -473,27 +492,29 @@ export default class Application {
     }
   }
 
-  _getBaseVW () {
+  _getBaseVW() {
     const fontBasePx = Dom.getCSSVar('--font-base-px')
     const fontBase = parseFloat(fontBasePx, 10)
     const innerWidth = window.innerWidth
-    return `${fontBase / innerWidth * 100}vw`
+    return `${(fontBase / innerWidth) * 100}vw`
   }
 
-  setDims () {
+  setDims() {
     const root = document.querySelector(':root')
 
     this.size.initialInnerHeight = window.innerHeight
     this.size.initialOuterHeight = window.outerHeight
     this.size.initialInnerWidth = window.innerWidth
     this.size.initialOuterWidth = window.outerWidth
-    
+    this.size.scrollHeight = document.body.scrollHeight
+
     root.style.setProperty('--vp-initial-inner-h', `${this.size.initialInnerHeight}px`)
     root.style.setProperty('--vp-initial-outer-h', `${this.size.initialOuterHeight}px`)
     root.style.setProperty('--vp-initial-inner-w', `${this.size.initialInnerWidth}px`)
     root.style.setProperty('--vp-initial-outer-w', `${this.size.initialOuterWidth}px`)
     root.style.setProperty('--ec-zoom', `${this.size.zoom}`)
-    
+    root.style.setProperty('--scroll-h', `${this.size.scrollHeight}px`)
+
     this.setvh100Max()
     this.setvh100()
     this.setFontBaseVw()
@@ -506,13 +527,13 @@ export default class Application {
     this.position.left = window.pageXOffset
   }
 
-  setFontBaseVw () {
+  setFontBaseVw() {
     const root = document.querySelector(':root')
     this.size.baseVW = this._getBaseVW()
     root.style.setProperty('--font-base-vw', `${this.size.baseVW}`)
   }
 
-  setZoom () {
+  setZoom() {
     const root = document.querySelector(':root')
     root.style.setProperty('--ec-zoom', `${this.size.zoom}`)
   }
@@ -520,13 +541,13 @@ export default class Application {
   /**
    * Inner height of mobiles may change when showing hiding bottom bar.
    */
-  setvh100 () {
+  setvh100() {
     const root = document.querySelector(':root')
     root.style.setProperty('--vp-100vh', `${window.innerHeight}px`)
     root.style.setProperty('--vp-1vh', `${window.innerHeight * 0.01}px`)
   }
 
-  setvw100 () {
+  setvw100() {
     const root = document.querySelector(':root')
     root.style.setProperty('--vp-100vw', `${window.innerWidth}px`)
     root.style.setProperty('--vp-1vw', `${window.innerWidth * 0.01}px`)
@@ -535,43 +556,53 @@ export default class Application {
   /**
    * Get the max 100vh for iOS
    */
-  setvh100Max () {
+  setvh100Max() {
     const root = document.querySelector(':root')
     const vh100 = this.featureTests.results.ios
-      ? this.getIOSInnerHeightMax() : this.size.initialInnerHeight
+      ? this.getIOSInnerHeightMax()
+      : this.size.initialInnerHeight
     root.style.setProperty('--vp-100vh-max', `${vh100}px`)
     this.size.vh100max = vh100
   }
 
-  onBreakpointChanged () {
+  setScrollHeight() {
+    const root = document.querySelector(':root')
+    root.style.setProperty('--scroll-h', `${document.body.scrollHeight}px`)
+  }
+
+  onBreakpointChanged() {
     this.size.container = Dom.getCSSVar('--container-padding')
   }
 
   /**
    * RAF'ed resize event
    */
-  onResize (e) {
-    const widthChanged = (this.size.width !== window.innerWidth)
-    const heightChanged = (this.size.height !== window.innerHeight)
+  onResize(e) {
+    const widthChanged = this.size.width !== window.innerWidth
+    const heightChanged = this.size.height !== window.innerHeight
     const dimsChanged = widthChanged || heightChanged
     const dprDelta = this.size.devicePixelRatio - window.devicePixelRatio
-    
+
     this.size.width = window.innerWidth
     this.size.height = window.innerHeight
+    this.size.scrollHeight = document.body.scrollHeight
     this.size.devicePixelRatio = window.devicePixelRatio
 
     this.updateZoom(dimsChanged, dprDelta)
     this.setvh100()
+    this.setScrollHeight()
     this.setFontBaseVw()
 
-    const evt = new CustomEvent(Events.APPLICATION_RESIZE, { detail: { widthChanged, heightChanged } })
+    const evt = new CustomEvent(Events.APPLICATION_RESIZE, {
+      detail: { widthChanged, heightChanged }
+    })
     window.dispatchEvent(evt)
   }
 
   /**
-  * RAF'ed scroll event
-  */
-  onScroll (e) {
+   * RAF'ed scroll event
+   */
+  onScroll(e) {
     if (this.SCROLL_LOCKED) {
       e.preventDefault()
       return
@@ -584,7 +615,7 @@ export default class Application {
     window.dispatchEvent(evt)
   }
 
-  onVisibilityChange (e) {
+  onVisibilityChange(e) {
     let evt = new CustomEvent(Events.APPLICATION_VISIBILITY_CHANGE, e)
     window.dispatchEvent(evt)
 
@@ -597,7 +628,7 @@ export default class Application {
     }
   }
 
-  pollForElement (selector, time = 500, callback = () => { }) {
+  pollForElement(selector, time = 500, callback = () => {}) {
     const el = document.querySelector(selector)
     if (el !== null) {
       callback(el)
@@ -608,7 +639,7 @@ export default class Application {
     }
   }
 
-  pollForVar (variable, time = 500, callback = () => { }) {
+  pollForVar(variable, time = 500, callback = () => {}) {
     if (variable !== null) {
       callback(variable)
     } else {
@@ -618,7 +649,7 @@ export default class Application {
     }
   }
 
-  setupDebug () {
+  setupDebug() {
     this.setupGridoverlay()
     this.debugOverlay = document.querySelector('.dbg-breakpoints')
     if (!this.debugOverlay) {
@@ -631,10 +662,10 @@ export default class Application {
     userAgent.innerHTML = `<b>&rarr; ${this.userAgent}</b> >> <span>KOPIER</span>`
 
     const span = userAgent.querySelector('span')
-    const windowWidth = window.innerWidth || document.documentElement.clientWidth
-      || document.body.clientWidth
-    const windowHeight = window.innerHeight || document.documentElement.clientHeight
-      || document.body.clientHeight
+    const windowWidth =
+      window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
+    const windowHeight =
+      window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
 
     span.addEventListener('click', () => {
       const copyText = userAgent.querySelector('b')
@@ -658,7 +689,7 @@ ${JSON.stringify(this.featureTests.results, undefined, 2)}
     })
   }
 
-  toggleDebug () {
+  toggleDebug() {
     const tl = gsap.timeline()
     const breakpoint = this.debugOverlay.querySelector('.breakpoint')
     const userAgent = this.debugOverlay.querySelector('.user-agent')
@@ -674,21 +705,27 @@ ${JSON.stringify(this.featureTests.results, undefined, 2)}
         // hide all except branding
         tl.to([breakpoint, userAgent], { duration: 0.3, autoAlpha: 0 })
           .to([breakpoint, userAgent], { duration: 0.7, width: 0 })
-          .call(() => { gsap.set([breakpoint, userAgent], { display: 'none' }) })
+          .call(() => {
+            gsap.set([breakpoint, userAgent], { display: 'none' })
+          })
         break
 
       case 1:
         //
         gsap.set(breakpoint, { width: 'auto', display: 'block' })
-        tl.from(breakpoint, { duration: 0.7, width: 0 })
-          .to(breakpoint, { duration: 0.3, autoAlpha: 1 })
+        tl.from(breakpoint, { duration: 0.7, width: 0 }).to(breakpoint, {
+          duration: 0.3,
+          autoAlpha: 1
+        })
         break
 
       case 2:
         //
         gsap.set(userAgent, { width: 'auto', display: 'block' })
-        tl.from(userAgent, { duration: 0.7, width: 0 })
-          .to(userAgent, { duration: 0.3, autoAlpha: 1 })
+        tl.from(userAgent, { duration: 0.7, width: 0 }).to(userAgent, {
+          duration: 0.3,
+          autoAlpha: 1
+        })
         break
 
       default:
@@ -699,7 +736,7 @@ ${JSON.stringify(this.featureTests.results, undefined, 2)}
   /**
    * CTRL-G to show grid overlay
    */
-  setupGridoverlay () {
+  setupGridoverlay() {
     const gridKeyPressed = e => {
       if (e.keyCode === 71 && e.ctrlKey) {
         const guides = Dom.find('.dbg-grid')
@@ -739,7 +776,7 @@ ${JSON.stringify(this.featureTests.results, undefined, 2)}
    * Add in extra selectors that are focusable
    * @param {array} extraSelectors
    */
-  addFocusableSelectors (extraSelectors) {
+  addFocusableSelectors(extraSelectors) {
     if (extraSelectors.length) {
       this.focusableSelectors = this.focusableSelectors.concat(extraSelectors)
     }
@@ -749,7 +786,7 @@ ${JSON.stringify(this.featureTests.results, undefined, 2)}
    * Set focusable selectors. Replaces default array.
    * @param {array} selectors
    */
-  setFocusableSelectors (selectors) {
+  setFocusableSelectors(selectors) {
     if (selectors.length) {
       this.focusableSelectors = selectors
     }
@@ -758,7 +795,7 @@ ${JSON.stringify(this.featureTests.results, undefined, 2)}
   /**
    * Returns focusable selectors as a comma separated list
    */
-  getFocusableSelectors () {
+  getFocusableSelectors() {
     return this.focusableSelectors.join(',')
   }
 }