From afaf38850399ccb739b38f29d2d1e83a585bea09 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Thu, 22 Dec 2022 18:32:51 +0100
Subject: [PATCH] feat(pat-sortable): Support initialization after injection.

---
 src/pat/sortable/index.html       |  3 ++-
 src/pat/sortable/sortable.js      | 17 ++--------------
 src/pat/sortable/sortable.test.js | 33 +++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/pat/sortable/index.html b/src/pat/sortable/index.html
index 2dc0b6fd2..df2f2350f 100644
--- a/src/pat/sortable/index.html
+++ b/src/pat/sortable/index.html
@@ -30,7 +30,8 @@ <h2>Horizontal sorting</h2>
 
         <h2>Vertical sorting with pat-clone</h2>
         <button class="clone-trigger-1">Add item</button>
-        <ul class="pat-sortable pat-clone"
+        <a class="pat-inject" data-pat-inject="source: .clone-template-1; target: #clone-inject-example::after">Add item via injection</a>
+        <ul id="clone-inject-example" class="pat-sortable pat-clone"
           data-pat-clone="template: .clone-template-1; trigger-element: .clone-trigger-1">
         </ul>
         <template class="clone-template-1">
diff --git a/src/pat/sortable/sortable.js b/src/pat/sortable/sortable.js
index 054f4aa09..f202a4b44 100644
--- a/src/pat/sortable/sortable.js
+++ b/src/pat/sortable/sortable.js
@@ -23,31 +23,18 @@ export default Base.extend({
         this.options = parser.parse(this.$el, false);
         this.recordPositions().initScrolling();
         this.$el.on("pat-update", this.onPatternUpdate.bind(this));
+        this.$el.on("patterns-injected", this.recordPositions.bind(this));
     },
 
     onPatternUpdate: function (ev, data) {
         /* Handler which gets called when pat-update is triggered within
          * the .pat-sortable element.
          */
-        if (data?.pattern !== "clone" || data?.action !== "added" || !data?.dom) {
+        if (data?.pattern !== "clone" || data?.action !== "added") {
             // Nothing to do.
             return;
         }
-
         this.recordPositions();
-
-        events.add_event_listener(
-            data.dom,
-            "dragstart",
-            "pat-sortable--dragstart",
-            this.onDragStart.bind(this)
-        );
-        events.add_event_listener(
-            data.dom,
-            "dragend",
-            "pat-sortable--dragend",
-            this.onDragEnd.bind(this)
-        );
     },
 
     recordPositions: function () {
diff --git a/src/pat/sortable/sortable.test.js b/src/pat/sortable/sortable.test.js
index 151e0b4d1..4a1198a21 100644
--- a/src/pat/sortable/sortable.test.js
+++ b/src/pat/sortable/sortable.test.js
@@ -1,4 +1,5 @@
 import events from "../../core/events";
+import utils from "../../core/utils";
 import $ from "jquery";
 import Sortable from "./sortable";
 
@@ -180,4 +181,36 @@ describe("pat-sortable", function () {
 
         expect(cloned.classList.contains(sortable.options.dragClass)).toBe(true);
     });
+
+    it("6 - Initializes sorting behavior on pat-injected elements.", async function () {
+        const Inject = (await import("../inject/inject")).default;
+
+        document.body.innerHTML = `
+            <ul class="pat-sortable">
+            </ul>
+            <a class="pat-inject"
+               data-pat-inject="
+                   source: .inject-template;
+                   target: .pat-sortable::after">Inject</a>
+            <template class="inject-template">
+                <li>item</li>
+            </template>
+        `;
+        const el = document.querySelector(".pat-sortable");
+        const sortable = new Sortable(el);
+        const el_inject = document.querySelector(".pat-inject");
+        Inject.init($(el_inject));
+
+        el_inject.click();
+        await utils.timeout(1);
+
+        const injected = el.querySelector("li");
+        expect(injected).toBeTruthy();
+
+        const drag_handle = injected.querySelector(".sortable-handle");
+        expect(drag_handle).toBeTruthy();
+        drag_handle.dispatchEvent(new Event("dragstart"));
+
+        expect(injected.classList.contains(sortable.options.dragClass)).toBe(true);
+    });
 });