yummy-guide-generic-administrate 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b442ee0d24ba8d34271193cdbc8c2da175d5b91b3a2b847706ce5f5c316eff66
-  data.tar.gz: cc6d60ef4a0b80f2561638de33ce7abef3908ba1064c77c2c94e628d47dec970
+  metadata.gz: 2e28359ae136f4efa7cb334c6cb9eb4f3001371d02b8104c68bf8924fa052692
+  data.tar.gz: 7f38757520d5d46d9a7fbd1f095e0659a31d65be38f9cc91baa08f4e7e7a4228
 SHA512:
-  metadata.gz: ad2200cef92ab686ffb9fabee36c87672ff48dc1a507406995057effa3afff4bad625eb7fbaad8011ddf4ffa8eb93b5b95af2455436f131fabbdc18a8ff55873
-  data.tar.gz: 2502a4c2723a4d8fc25ca7d1ba5fd10aff5a2002dbfff58f5c698d042b21e21ebd0597c863463ec1b086934b3450e56088e718d5fddae8a8b1a861bd02bf08c5
+  metadata.gz: 3fcc34c49df48b58a1c81f1d14dc31ea0fc6df8b950a8390a86cace55d3adbbd1067f9326ffb12dd821524230e226d0c9db6771224c02230252adb4b29493977
+  data.tar.gz: 23dfaaf929e5bbd3afa4fa422ffe3a13bb3a45c5f5190a317884359ad56173b514a7052cd569d27e17cd28632bdd229819b343530159a4cf71ba615dc60f4e77

data/app/assets/javascripts/yummy_guide_administrate/sticky_table_headers.js

@@ -3,6 +3,7 @@
   var WRAPPER_SELECTOR = '[data-fixed-header-scroll], .scroll-table, .home-table__wrapper, .table-wrap, .af__table__content';
   var resizeObservers = new WeakMap();
   var observedScrolls = new WeakMap();
+  var observedFixedScrolls = new WeakMap();
   var scrollSyncStates = new WeakMap();
 
   function directCells(row) {
@@ -232,10 +233,61 @@
     if (!scroll || !fixedScroll) return;
 
     var left = typeof scrollLeft === 'number' ? scrollLeft : scroll.scrollLeft;
+    var state = ensureScrollSyncState(scroll);
+    var currentLeft = preciseNumber(fixedScroll.scrollLeft);
 
+    if (Math.abs(currentLeft - left) < 0.5) {
+      state.ignoredFixedScrollLeft = null;
+      return;
+    }
+
+    state.ignoredFixedScrollLeft = preciseNumber(left);
     fixedScroll.scrollLeft = left;
   }
 
+  function syncSourceScroll(scroll, fixedScroll, scrollLeft) {
+    if (!scroll || !fixedScroll) return;
+
+    var left = typeof scrollLeft === 'number' ? scrollLeft : fixedScroll.scrollLeft;
+    var state = ensureScrollSyncState(scroll);
+    var currentLeft = preciseNumber(scroll.scrollLeft);
+
+    if (Math.abs(currentLeft - left) < 0.5) {
+      state.ignoredSourceScrollLeft = null;
+      return;
+    }
+
+    state.ignoredSourceScrollLeft = preciseNumber(left);
+    scroll.scrollLeft = left;
+  }
+
+  function ensureScrollSyncState(scroll) {
+    var state = scrollSyncStates.get(scroll);
+
+    if (state) return state;
+
+    state = {
+      sourceFrame: null,
+      fixedFrame: null,
+      sourceScrollLeft: 0,
+      fixedScrollLeft: 0,
+      ignoredSourceScrollLeft: null,
+      ignoredFixedScrollLeft: null
+    };
+
+    scrollSyncStates.set(scroll, state);
+    return state;
+  }
+
+  function consumeIgnoredScrollLeft(state, key, scrollLeft) {
+    if (!state || state[key] === null || typeof state[key] === 'undefined') return false;
+
+    var ignoredLeft = state[key];
+    state[key] = null;
+
+    return Math.abs(ignoredLeft - preciseNumber(scrollLeft)) < 0.5;
+  }
+
   function fixedHeaderTableClassName(sourceTable) {
     var excludedClasses = {
       'table-with-fixed-header': true,
@@ -508,35 +560,57 @@
     });
   }
 
-  function observeFixedHeaderScroll(scroll) {
+  function observeSourceScroll(scroll) {
     if (observedScrolls.has(scroll)) return;
 
     scroll.addEventListener('scroll', function() {
-      var state = scrollSyncStates.get(scroll) || {};
+      var state = ensureScrollSyncState(scroll);
+      if (consumeIgnoredScrollLeft(state, 'ignoredSourceScrollLeft', scroll.scrollLeft)) return;
+
       state.scrollLeft = scroll.scrollLeft;
+      state.sourceScrollLeft = scroll.scrollLeft;
 
-      if (state.frame) return;
+      if (state.sourceFrame) return;
 
-      state.frame = window.requestAnimationFrame(function() {
+      state.sourceFrame = window.requestAnimationFrame(function() {
         var slot = ensureFixedHeaderSlot(scroll);
-        state.frame = null;
-        syncFixedHeaderScroll(scroll, slot.querySelector('.table-fixed-header__scroll'), state.scrollLeft);
+        state.sourceFrame = null;
+        syncFixedHeaderScroll(scroll, ensureFixedHeaderScrollViewport(slot), state.sourceScrollLeft);
       });
-
-      scrollSyncStates.set(scroll, state);
     }, { passive: true });
 
     observedScrolls.set(scroll, true);
   }
 
+  function observeFixedHeaderViewport(scroll, fixedScroll) {
+    if (!fixedScroll || observedFixedScrolls.get(fixedScroll) === scroll) return;
+
+    fixedScroll.addEventListener('scroll', function() {
+      var state = ensureScrollSyncState(scroll);
+      if (consumeIgnoredScrollLeft(state, 'ignoredFixedScrollLeft', fixedScroll.scrollLeft)) return;
+
+      state.fixedScrollLeft = fixedScroll.scrollLeft;
+
+      if (state.fixedFrame) return;
+
+      state.fixedFrame = window.requestAnimationFrame(function() {
+        state.fixedFrame = null;
+        syncSourceScroll(scroll, fixedScroll, state.fixedScrollLeft);
+      });
+    }, { passive: true });
+
+    observedFixedScrolls.set(fixedScroll, scroll);
+  }
+
   function initializeFixedHeaderForScroll(scroll) {
     var sourceTable = activeSourceTable(scroll);
     if (!sourceTable) return;
 
     var slot = ensureFixedHeaderSlot(scroll);
     buildFixedTableHeader(slot, scroll, sourceTable);
+    observeFixedHeaderViewport(scroll, slot.querySelector('.table-fixed-header__scroll'));
     observeFixedHeader(scroll);
-    observeFixedHeaderScroll(scroll);
+    observeSourceScroll(scroll);
   }
 
   function initializeFixedHeaders(root) {

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummy-guide-generic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - akatsuki-kk