@brandocms/jupiter 3.51.1 → 3.53.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@brandocms/jupiter",
-    "version": "3.51.1",
+    "version": "3.53.0",
     "description": "Frontend helpers.",
     "author": "Univers/Twined",
     "license": "UNLICENSED",

package/src/modules/Moonwalk/index.js

@@ -42,6 +42,11 @@ const DEFAULT_OPTIONS = {
    */
   clearNestedSections: true,
 
+  /**
+   * Clear out all nested [data-moonwalk]s
+   */
+  clearNestedWalks: true,
+
   /**
    * If page is linked with an anchor, remove moonwalk for the page
    */
@@ -103,19 +108,24 @@ export default class Moonwalk {
   }
 
   initialize(container = document.body) {
-    if (this.opts.clearMoonwalkOnAnchors) {
-      if (window.location.hash) {
-        this.removeAllWalks()
-        return
-      }
-    }
-
     if (this.opts.clearNestedSections) {
       container
         .querySelectorAll('[data-moonwalk-section] [data-moonwalk-section]')
         .forEach(ms => ms.removeAttribute('data-moonwalk-section'))
     }
 
+    if (this.opts.clearNestedWalks) {
+      container
+        .querySelectorAll('[data-moonwalk] [data-moonwalk]')
+        .forEach(ms => ms.removeAttribute('data-moonwalk'))
+    }
+
+    if (this.opts.clearMoonwalkOnAnchors) {
+      if (window.location.hash) {
+        this.walkToThisPoint(window.location.hash)
+      }
+    }
+
     this.addClass()
     this.sections = this.initializeSections(container)
     this.runs = this.initializeRuns(container)
@@ -140,16 +150,43 @@ export default class Moonwalk {
     document.documentElement.classList.add('moonwalk')
   }
 
+  /**
+   * Matching moonwalk elements before the element matching the hash should be set to visible
+   * by setting the `data-moonwalked` attribute on `data-moonwalk` elements and
+   * `data-moonwalk-section-ready` on `data-moonwalk-section` elements.
+   */
+  walkToThisPoint(hash) {
+    // Find the target element using the hash
+    const targetElement = document.querySelector(hash)
+    if (!targetElement) return // Exit if the element is not found
+
+    // Get all elements with the 'data-moonwalk' attribute
+    const moonwalkElements = document.querySelectorAll('[data-moonwalk]')
+    moonwalkElements.forEach(el => {
+      const position = el.compareDocumentPosition(targetElement)
+      // Check if 'el' comes before 'targetElement' or is the same element
+      if (position & Node.DOCUMENT_POSITION_FOLLOWING || el === targetElement) {
+        el.setAttribute('data-moonwalked', '')
+        el.classList.add('moonwalked')
+      }
+    })
+
+    // Get all elements with the 'data-moonwalk-section' attribute
+    const moonwalkSectionElements = document.querySelectorAll('[data-moonwalk-section]')
+    moonwalkSectionElements.forEach(el => {
+      const position = el.compareDocumentPosition(targetElement)
+      // Check if 'el' comes before 'targetElement' or is the same element
+      if (position & Node.DOCUMENT_POSITION_FOLLOWING || el === targetElement) {
+        el.setAttribute('data-moonwalk-section-ready', '')
+      }
+    })
+  }
+
   /**
    * Remove all moonwalks. Useful for clients who prefer reduced motion
    */
-  removeAllWalks(container = document.body) {
-    const keys = [
-      'data-moonwalk',
-      'data-moonwalk-run',
-      'data-moonwalk-section',
-      'data-moonwalk-children'
-    ]
+  removeAllWalks(container = document.body, beforeEl = nil) {
+    const keys = ['data-moonwalk', 'data-moonwalk-section', 'data-moonwalk-children']
     keys.forEach(key => {
       const elems = container.querySelectorAll(`[${key}]`)
       Array.from(elems).forEach(el => el.removeAttribute(key))
@@ -158,12 +195,7 @@ export default class Moonwalk {
   }
 
   removeFor(container = document.body, selector) {
-    const keys = [
-      'data-moonwalk',
-      'data-moonwalk-run',
-      'data-moonwalk-section',
-      'data-moonwalk-children'
-    ]
+    const keys = ['data-moonwalk', 'data-moonwalk-section', 'data-moonwalk-children']
     keys.forEach(key => {
       const elems = container.querySelectorAll(`${selector}[${key}]`)
       Array.from(elems).forEach(el => el.removeAttribute(key))