activeadmin_reorderable 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 432b1bf79ccce9af126f1d991c7a00a926a80d2e6aa3544c93650a2860591628
-  data.tar.gz: 71d1daeb82bb9c9631c5e947a98437478b6c347d0e55846c84b5d653dbe02aaf
+  metadata.gz: d5d2078b647c1ba2fff85693c3ddca69049127474e6dc4ea742ebfe13afd0785
+  data.tar.gz: e7029690575b2600dcdba74f6122f8e7b3519ab3dc9c181b2aac6107a585cdaf
 SHA512:
-  metadata.gz: 9969c5d1b405bbc2f00530a08b97c182a35460295f3929befc05a6288756fc908df1a8e2ad9ce9d281667b65d3bd698452248cfe712cce94fb563a0f3ba1b348
-  data.tar.gz: 9778aaf69204141275c167df461034b75c40033c9ab91b92db45d1a00138f573251090d0b40f5a5934e43d6dbe45e5befca8a3c28d05e9b47f7313bdfbe5e89a
+  metadata.gz: 418c67cd8f3057f91a9926ef8b8a0d1f43b13017fff242449e2205d50d0eb1ad398c55b52d1b88eb4955722592cd622288ffc2d5a4fa216222a2cc94494b7747
+  data.tar.gz: 9d49b162efd928e36a61dbdb3e89e67a9dec13926f0674d066bfc5e35efcacfe226dc0c973fa5e330e6759b66fae6aa229e744628f6f11b1c8dbc4c9f9a6ede8

data/app/assets/javascripts/activeadmin_reorderable.js

@@ -1,7 +1,8 @@
-const setupReorderable = ({ table, onUpdate }) => {
+const setupReorderable = ({ table, onDragover, onDragEnd }) => {
   const rows = table.getElementsByTagName('tbody')[0].rows
 
   let dragSrc = null
+  let srcIndex = null
 
   for (var i = 0; i < rows.length; i++) {
     const row = rows[i]
@@ -15,6 +16,7 @@ const setupReorderable = ({ table, onUpdate }) => {
       e.dataTransfer.effectAllowed = "move"
 
       dragSrc = row
+      srcIndex = row.rowIndex
 
       // Apply styling a millisecond later, so the dragging image shows up correctly
       setTimeout(() => { row.classList.add("dragged-row") }, 1)
@@ -34,7 +36,7 @@ const setupReorderable = ({ table, onUpdate }) => {
         } else {
           table.tBodies[0].insertBefore(dragSrc, row)
         }
-        onUpdate(dragSrc)
+        onDragover(dragSrc)
       }
     })
 
@@ -42,7 +44,13 @@ const setupReorderable = ({ table, onUpdate }) => {
       // Disable dragging, so only the handle can start the dragging again
       row.setAttribute("draggable", "false")
       row.classList.remove("dragged-row")
+
+      if (srcIndex != row.rowIndex) {
+        onDragEnd(dragSrc)
+      }
+
       dragSrc = null
+      srcIndex = null
     })
   }
 }
@@ -85,11 +93,8 @@ document.addEventListener("DOMContentLoaded", () => {
   document.querySelectorAll("table.aa-reorderable").forEach((table) => {
     setupReorderable({
       table,
-      onUpdate: (row) => {
+      onDragover: (_row) => {
         const allRows = table.getElementsByTagName('tbody')[0].rows
-        const handle = row.querySelector(".reorder-handle")
-        const url = handle.dataset["reorderUrl"]
-        const rowIndex = Array.prototype.indexOf.call(allRows, row)
 
         for (var i = 0; i < allRows.length; i++) {
           const loopRow = allRows[i]
@@ -97,6 +102,12 @@ document.addEventListener("DOMContentLoaded", () => {
           updateEvenOddClasses(loopRow, index)
           updatePositionText(loopRow, index)
         }
+      },
+      onDragEnd: (row) => {
+        const handle = row.querySelector(".reorder-handle")
+        const url = handle.dataset["reorderUrl"]
+        const allRows = table.getElementsByTagName('tbody')[0].rows
+        const rowIndex = Array.prototype.indexOf.call(allRows, row)
 
         updateBackend(url, rowIndex + 1)
       }

data/config/importmap.rb

@@ -0,0 +1 @@
+pin "activeadmin_reorderable", to: "activeadmin_reorderable.js"

data/lib/activeadmin_reorderable/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminReorderable
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "activeadmin_reorderable",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Drag and drop to reorder your ActiveAdmin tables.",
   "main": "app/assets/javascripts/activeadmin_reorderable.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_reorderable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Derek Kniffin
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -197,6 +197,7 @@ files:
 - README.md
 - app/assets/javascripts/activeadmin_reorderable.js
 - app/assets/stylesheets/activeadmin_reorderable.scss
+- config/importmap.rb
 - lib/active_admin/reorderable/dsl.rb
 - lib/active_admin/reorderable/table_methods.rb
 - lib/active_admin/views/index_as_reorderable_table.rb