@brandocms/jupiter 4.0.0-beta.1 → 5.0.0-beta.1

package/src/modules/Moonwalk/index.js

@@ -1,7 +1,7 @@
 /**
  * Vendor imports
  */
-import { gsap, CSSPlugin } from 'gsap/all'
+import { animate, stagger } from 'motion'
 import _defaultsDeep from 'lodash.defaultsdeep'
 
 /**
@@ -11,9 +11,28 @@ import * as Events from '../../events'
 import prefersReducedMotion from '../../utils/prefersReducedMotion'
 import imageIsLoaded from '../../utils/imageIsLoaded'
 import imagesAreLoaded from '../../utils/imagesAreLoaded'
+import { set, animateAutoAlpha, delayedCall, convertEasing } from '../../utils/motion-helpers'
 import Dom from '../Dom'
 
-gsap.registerPlugin(CSSPlugin)
+/**
+ * Debug logging
+ */
+const DEBUG = false
+
+function logMoonwalk(category, message, data = {}) {
+  if (DEBUG) {
+    console.log(`[Moonwalk:${category}]`, message, data)
+  }
+}
+
+function logComputedStyle(element, props = ['opacity', 'transform']) {
+  if (DEBUG && element) {
+    const computed = window.getComputedStyle(element)
+    const values = {}
+    props.forEach((prop) => (values[prop] = computed[prop]))
+    console.log('[Moonwalk:ComputedStyle]', element, values)
+  }
+}
 
 /**
  * @typedef {Object} MoonwalkTransition
@@ -39,6 +58,7 @@ gsap.registerPlugin(CSSPlugin)
  * @property {boolean} [repeated=false] - Whether the run should repeat
  * @property {string} [rootMargin] - IntersectionObserver rootMargin
  * @property {Function} [initialize] - Function called during initialization
+ * @property {Function} [onReady] - Function called when APPLICATION_REVEALED fires, before viewport observers start
  */
 
 /**
@@ -344,6 +364,7 @@ export default class Moonwalk {
           el: run,
           threshold: foundRun.threshold || 0,
           initialize: foundRun.initialize,
+          onReady: foundRun.onReady,
           callback: foundRun.callback,
           onExit: foundRun.onExit,
           repeated: foundRun.repeated,
@@ -386,16 +407,15 @@ export default class Moonwalk {
       this.addIndexes(section)
     }
 
-    const timeline = gsap.timeline({
-      autoRemoveChildren: false,
-      smoothChildTiming: false,
-    })
-
     return {
       id: Math.random().toString(36).substring(7),
       el: section,
       name: section.getAttribute('data-moonwalk-section') || null,
-      timeline,
+      animation: {
+        lastDelay: 0,
+        lastDuration: 0,
+        lastStartTime: null,
+      },
       observer: null,
       stage: {
         name: section.getAttribute('data-moonwalk-stage') || null,
@@ -481,14 +501,32 @@ export default class Moonwalk {
         section.children = this.orderChildren(section.el.children)
       }
 
-      const fromTransition = sectionWalk.alphaTween
-        ? {
-            ...sectionWalk.transition.from,
-            opacity: 0,
-          }
-        : sectionWalk.transition.from
-
-      gsap.set(section.children, fromTransition)
+      // Only set initial states for JS animations (transition !== null)
+      if (sectionWalk.transition) {
+        const fromTransition = sectionWalk.alphaTween
+          ? {
+              ...sectionWalk.transition.from,
+              opacity: 0,
+            }
+          : sectionWalk.transition.from
+
+        logMoonwalk('InitialState', 'Setting initial state for named section', {
+          section: section.name,
+          childCount: section.children.length,
+          fromTransition,
+        })
+        set(section.children, fromTransition)
+
+        // Check if styles were actually applied
+        if (section.children.length > 0) {
+          logComputedStyle(section.children[0])
+        }
+      } else {
+        logMoonwalk('InitialState', 'Skipping initial state for CSS-only section', {
+          section: section.name,
+          childCount: section.children.length,
+        })
+      }
     }
 
     if (section.stage.name) {
@@ -500,7 +538,12 @@ export default class Moonwalk {
           section.stage.name
         )
       } else {
-        gsap.set(section.el, stageTween.transition.from)
+        logMoonwalk('InitialState', 'Setting stage initial state', {
+          stage: section.stage.name,
+          from: stageTween.transition.from,
+        })
+        set(section.el, stageTween.transition.from)
+        logComputedStyle(section.el)
       }
     }
 
@@ -530,12 +573,9 @@ export default class Moonwalk {
                 // run stage tween
                 const stageTween = walks[section.stage.name]
 
-                const to = {
-                  ...stageTween.transition.to,
+                animate(entry.target, stageTween.transition.to, {
                   duration: stageTween.duration,
-                }
-
-                section.timeline.to(entry.target, to, 0)
+                })
                 section.stage.firstTween = true
               }
             }
@@ -550,44 +590,75 @@ export default class Moonwalk {
                 )
               }
 
-              if (typeof tween.alphaTween === 'object') {
-                tween.alphaTween.duration = tween.alphaTween.duration
-                  ? tween.alphaTween.duration
-                  : tween.duration
-              } else if (tween.alphaTween === true) {
-                tween.alphaTween = {
-                  duration: tween.duration,
-                  ease: 'sine.in',
+              logMoonwalk('SectionObserver', 'Named section triggered', {
+                sectionName: section.name,
+                childCount: section.children.length,
+                interval: tween.interval,
+                duration: tween.duration,
+                hasAlphaTween: !!tween.alphaTween,
+                isCssOnly: !tween.transition,
+              })
+
+              // Check if this is CSS-only animation (transition: null)
+              if (!tween.transition) {
+                // CSS-only mode - stagger adding the data-moonwalked attribute
+                logMoonwalk('SectionObserver', 'Using CSS-only mode', {
+                  sectionName: section.name,
+                })
+
+                section.children.forEach((child, index) => {
+                  const delay = (tween.startDelay || 0) + index * tween.interval
+                  delayedCall(delay, () => {
+                    child.setAttribute('data-moonwalked', '')
+                  })
+                })
+              } else {
+                // JS animation mode
+                if (typeof tween.alphaTween === 'object') {
+                  tween.alphaTween.duration = tween.alphaTween.duration
+                    ? tween.alphaTween.duration
+                    : tween.duration
+                } else if (tween.alphaTween === true) {
+                  tween.alphaTween = {
+                    duration: tween.duration,
+                    ease: 'easeIn',
+                  }
                 }
-              }
 
-              if (tween.startDelay) {
-                tween.transition.to = {
-                  ...tween.transition.to,
-                  delay: tween.startDelay,
-                }
-              }
+                // Extract ease from to values and convert for Motion.js
+                const { ease: tweenEase, ...toValues } = tween.transition.to
+                const convertedEase = convertEasing(tweenEase || 'easeOut')
 
-              section.timeline.staggerTo(
-                section.children,
-                tween.duration,
-                tween.transition.to,
-                tween.interval,
-                0
-              )
+                const animationOptions = {
+                  duration: tween.duration,
+                  ease: convertedEase,
+                  delay: stagger(tween.interval, {
+                    startDelay: tween.startDelay || 0,
+                  }),
+                }
 
-              if (tween.alphaTween) {
-                section.timeline.staggerTo(
-                  section.children,
-                  tween.alphaTween.duration,
-                  {
-                    opacity: 1,
-                    ease: tween.alphaTween.ease,
-                    delay: tween.startDelay || 0,
-                  },
-                  tween.interval,
-                  0
-                )
+                logMoonwalk('SectionObserver', 'Starting stagger animation', {
+                  sectionName: section.name,
+                  to: toValues,
+                  ease: convertedEase,
+                  options: animationOptions,
+                })
+
+                animate(section.children, toValues, animationOptions)
+
+                if (tween.alphaTween) {
+                  animate(
+                    section.children,
+                    { opacity: 1 },
+                    {
+                      duration: tween.alphaTween.duration,
+                      ease: convertEasing(tween.alphaTween.ease || 'easeIn'),
+                      delay: stagger(tween.interval, {
+                        startDelay: tween.startDelay || 0,
+                      }),
+                    }
+                  )
+                }
               }
             }
 
@@ -629,6 +700,64 @@ export default class Moonwalk {
     })
   }
 
+  /**
+   * Calculate the delay for the next animation in the section.
+   * This replaces GSAP's timeline.recent() logic.
+   *
+   * @param {*} section - The section object
+   * @param {*} duration - Duration of the animation to add
+   * @param {*} overlap - How much the animations should overlap
+   * @returns {number} The delay in seconds
+   */
+  calculateDelay(section, duration, overlap) {
+    if (!section.animation.lastStartTime) {
+      // First animation in section
+      logMoonwalk('DelayCalc', 'First animation in section', { delay: 0 })
+      return 0
+    }
+
+    const now = performance.now()
+    const elapsed = (now - section.animation.lastStartTime) / 1000
+    // overlap is negative when animations should stagger (start before previous ends)
+    // So we ADD overlap (which is negative) to get the correct next start time
+    const idealNextStart =
+      section.animation.lastDelay + section.animation.lastDuration + overlap
+    const actualDelay = Math.max(0, idealNextStart - elapsed)
+
+    logMoonwalk('DelayCalc', 'Calculating delay', {
+      elapsed: elapsed.toFixed(3),
+      lastDelay: section.animation.lastDelay,
+      lastDuration: section.animation.lastDuration,
+      overlap,
+      idealNextStart,
+      actualDelay: actualDelay.toFixed(3),
+    })
+
+    return actualDelay
+  }
+
+  /**
+   * Update the animation state after adding an animation.
+   *
+   * @param {*} section - The section object
+   * @param {*} delay - The delay that was used
+   * @param {*} duration - The duration of the animation
+   */
+  updateAnimationState(section, delay, duration) {
+    const previousState = { ...section.animation }
+
+    section.animation.lastDelay = delay
+    section.animation.lastDuration = duration
+    section.animation.lastStartTime = performance.now()
+
+    logMoonwalk('StateUpdate', 'Updating animation state', {
+      delay,
+      duration,
+      previousState,
+      newState: { ...section.animation },
+    })
+  }
+
   onReady() {
     if (this.opts.initialDelay) {
       setTimeout(() => {
@@ -646,6 +775,14 @@ export default class Moonwalk {
   ready() {
     const { opts } = this
 
+    // Execute onReady callbacks for all runs
+    for (let idx = 0; idx < this.runs.length; idx += 1) {
+      const run = this.runs[idx]
+      if (run && run.onReady) {
+        run.onReady(run.el)
+      }
+    }
+
     for (let idx = 0; idx < this.runs.length; idx += 1) {
       const run = this.runs[idx]
 
@@ -688,7 +825,29 @@ export default class Moonwalk {
       }
 
       section.elements = section.el.querySelectorAll('[data-moonwalk]')
-      section.elements.forEach((box) => section.observer.observe(box))
+
+      // Only set initial states and observe individual elements for unnamed sections
+      // Named sections are observed at the section level via sectionObserver
+      if (!section.name) {
+        // Set initial states for tweenJS elements BEFORE observing
+        section.elements.forEach((element) => {
+          const walkName = element.getAttribute('data-moonwalk')
+          const cfg = !walkName.length
+            ? opts.walks.default
+            : opts.walks[walkName]
+
+          // Only set initial state if this uses tweenJS (has transition property)
+          if (cfg && cfg.transition) {
+            logMoonwalk('InitialState', 'Setting initial state for individual element', {
+              walkName: walkName || 'default',
+              from: cfg.transition.from,
+            })
+            set(element, cfg.transition.from)
+          }
+        })
+
+        section.elements.forEach((box) => section.observer.observe(box))
+      }
     }
   }
 
@@ -830,16 +989,25 @@ export default class Moonwalk {
           if (entry.isIntersecting || entry.intersectionRatio > 0) {
             section.running = true
 
-            if (entry.target.dataset.moonwalkId) {
-              console.debug('-- intersecting', entry.target.dataset.moonwalkId)
-            }
-
             const walkName = entry.target.getAttribute('data-moonwalk')
+            const targetId =
+              entry.target.getAttribute('data-testid') ||
+              walkName ||
+              entry.target.className
+
+            logMoonwalk('Observer', 'Element entered viewport', {
+              target: targetId,
+              walkName,
+              isIntersecting: entry.isIntersecting,
+              intersectionRatio: entry.intersectionRatio,
+            })
             const cfg = !walkName.length
               ? opts.walks.default
               : opts.walks[walkName]
 
-            const { duration, transition, interval, startDelay } = cfg
+            const { duration, transition, startDelay } = cfg
+            // Default interval to 0.15 if not specified (same as default walk)
+            const interval = cfg.interval !== undefined ? cfg.interval : 0.15
 
             let { alphaTween } = cfg
             let overlap = (duration - interval) * -1 // flip it
@@ -856,27 +1024,36 @@ export default class Moonwalk {
             } else if (alphaTween === true) {
               alphaTween = {
                 duration,
-                ease: 'sine.in',
+                ease: 'easeIn',
               }
             }
 
-            const tween = transition ? this.tweenJS : this.tweenCSS
-
             const tweenFn = () => {
-              tween(
-                section,
-                entry.target,
-                duration,
-                interval,
-                transition,
-                overlap,
-                alphaTween
-              )
+              if (transition) {
+                this.tweenJS(
+                  section,
+                  entry.target,
+                  duration,
+                  interval,
+                  transition,
+                  overlap,
+                  alphaTween
+                )
+              } else {
+                this.tweenCSS(
+                  section,
+                  entry.target,
+                  duration,
+                  interval,
+                  transition,
+                  overlap
+                )
+              }
             }
 
             const wrappedTweenFn = () => {
               if (startDelay) {
-                gsap.delayedCall(startDelay, tweenFn)
+                delayedCall(startDelay, tweenFn)
               } else {
                 tweenFn()
               }
@@ -940,56 +1117,90 @@ export default class Moonwalk {
     tweenOverlap,
     alphaTween
   ) {
-    let tweenPosition
-    const startingPoint = tweenDuration - tweenOverlap
+    const targetId =
+      target.getAttribute('data-testid') ||
+      target.getAttribute('data-moonwalk') ||
+      target.className
+
+    logMoonwalk('TweenJS', 'Starting tweenJS', {
+      target: targetId,
+      duration: tweenDuration,
+      overlap: tweenOverlap,
+      hasAlphaTween: !!alphaTween,
+    })
 
     if (Dom.hasAttribute(target, 'data-moonwalked')) {
+      logMoonwalk('TweenJS', 'Already moonwalked, skipping', { target: targetId })
       return
     }
 
-    if (section.timeline.isActive() && section.timeline.recent()) {
-      const currentTime = section.timeline.time()
-      const lastTweenTime = section.timeline.recent().time()
-      const lastTweenEndTime = section.timeline.recent().endTime()
-      if (lastTweenTime > startingPoint) {
-        /* We're late for this tween if it was supposed to be sequential,
-        so insert at current time in timeline instead */
-        tweenPosition = () => section.timeline.time()
-      } else {
-        if (currentTime + tweenOverlap * -1 < lastTweenEndTime) {
-          /* Still time, add as normal overlap at the end */
-          tweenPosition = () => `>${tweenOverlap}`
-        } else {
-          /* Won't make it */
-          tweenPosition = () => section.timeline.time()
-        }
-      }
-    } else {
-      tweenPosition = () => '>'
-    }
+    // Calculate delay using our new helper method
+    const delay = this.calculateDelay(section, tweenDuration, tweenOverlap)
+
+    // Initial state should already be set during ready()
+    // Only log for debugging
+    logMoonwalk('TweenJS', 'Element should already have initial state', {
+      target: targetId,
+      expectedFrom: tweenTransition.from,
+    })
+    logComputedStyle(target, ['opacity', 'transform', 'x', 'y'])
 
-    gsap.set(target, tweenTransition.from)
+    // Extract ease from to values (GSAP format) and convert to Motion easing option
+    const { ease, ...toValues } = tweenTransition.to
+    const easingOption = convertEasing(ease || 'easeOut')
 
-    const toTransition = {
-      ...tweenTransition.to,
+    logMoonwalk('TweenJS', 'Starting animation', {
+      target: targetId,
+      toValues,
       duration: tweenDuration,
-      onComplete: () => target.setAttribute('data-moonwalked', ''),
-    }
+      delay: delay.toFixed(3),
+      ease: easingOption,
+    })
+
+    // Animate to final state
+    const animation = animate(target, toValues, {
+      duration: tweenDuration,
+      delay,
+      ease: easingOption,
+    })
 
-    section.timeline.to(target, toTransition, tweenPosition())
+    // Use .finished promise for completion callback
+    if (animation && animation.finished) {
+      animation.finished
+        .then(() => {
+          logMoonwalk('TweenJS', 'Animation completed', { target: targetId })
+          target.setAttribute('data-moonwalked', '')
+        })
+        .catch((err) => {
+          // Animation cancelled or failed, still mark as walked
+          logMoonwalk('TweenJS', 'Animation failed/cancelled', {
+            target: targetId,
+            error: err,
+          })
+          target.setAttribute('data-moonwalked', '')
+        })
+    } else {
+      // No animation object returned, mark immediately
+      logMoonwalk('TweenJS', 'No animation object returned', { target: targetId })
+      target.setAttribute('data-moonwalked', '')
+    }
 
+    // Optional separate alpha animation
     if (alphaTween) {
-      section.timeline.to(
-        target,
-        {
-          duration: alphaTween.duration,
-          opacity: 1,
-          ease: alphaTween.ease,
-          delay: alphaTween.delay ? alphaTween.delay : 0,
-        },
-        '<'
-      )
+      logMoonwalk('TweenJS', 'Adding alpha tween', {
+        target: targetId,
+        duration: alphaTween.duration,
+        delay: (delay + (alphaTween.delay || 0)).toFixed(3),
+      })
+      animate(target, { opacity: 1 }, {
+        duration: alphaTween.duration,
+        ease: convertEasing(alphaTween.ease || 'easeIn'),
+        delay: delay + (alphaTween.delay || 0),
+      })
     }
+
+    // Update animation state for next element
+    this.updateAnimationState(section, delay, tweenDuration)
   }
 
   /**
@@ -1009,47 +1220,35 @@ export default class Moonwalk {
     tweenTransition,
     tweenOverlap
   ) {
-    let tweenPosition
-    const startingPoint = tweenDuration - tweenOverlap * -1
-
     if (Dom.hasAttribute(target, 'data-moonwalked')) {
       return
     }
 
-    if (section.timeline.isActive() && section.timeline.recent()) {
-      const currentTime = section.timeline.time()
-      const lastTweenTime = section.timeline.recent().time()
-      const lastTweenEndTime = section.timeline.recent().endTime()
-      if (lastTweenTime > startingPoint) {
-        /* We're late for this tween if it was supposed to be sequential,
-        so insert at current time in timeline instead */
-        tweenPosition = () => section.timeline.time()
-      } else {
-        if (currentTime + tweenOverlap * -1 < lastTweenEndTime) {
-          /* Still time, add as normal overlap at the end */
-          tweenPosition = () => `>${tweenOverlap}`
-        } else {
-          /* Won't make it */
-          tweenPosition = () => section.timeline.time()
-        }
-      }
-    } else {
-      tweenPosition = () => '>'
-    }
+    // Calculate delay using our helper method for stagger effect
+    const calculatedDelay = this.calculateDelay(
+      section,
+      tweenDuration,
+      tweenOverlap
+    )
 
-    section.timeline
-      .to(
-        target,
-        {
-          css: {
-            className: target.className
-              ? `${target.className} moonwalked`
-              : 'moonwalked',
-          },
-          duration: tweenDuration,
-        },
-        tweenPosition()
-      )
-      .call(() => target.setAttribute('data-moonwalked', ''), null, '>')
+    const targetId = target.getAttribute('data-testid') || target.className
+
+    logMoonwalk('TweenCSS', 'Scheduling CSS animation', {
+      target: targetId,
+      delay: calculatedDelay.toFixed(3),
+      duration: tweenDuration,
+    })
+
+    // Add class after delay to trigger CSS transition
+    delayedCall(calculatedDelay, () => {
+      logMoonwalk('TweenCSS', 'Adding moonwalked attribute', {
+        target: targetId,
+      })
+      target.classList.add('moonwalked')
+      target.setAttribute('data-moonwalked', '')
+    })
+
+    // Update animation state for next element in section
+    this.updateAnimationState(section, calculatedDelay, tweenDuration)
   }
 }