Ver código fonte

fix reorder v2

tripeur 4 anos atrás
pai
commit
25498b11e4
3 arquivos alterados com 18 adições e 8 exclusões
  1. 9 4
      lib/Timeline.js
  2. 0 0
      lib/Timeline.js.map
  3. 9 4
      src/Timeline.ts

+ 9 - 4
lib/Timeline.js

@@ -144,10 +144,14 @@ let Timeline = class Timeline extends lit_element_1.LitElement {
                     if (!alreadyChild)
                         r.parent.children = [r, ...r.parent.children];
                 }
-                else if (pos < idx + r.parent.children.length) {
-                    this.rows.splice(pos, 0, r);
-                    if (!alreadyChild)
+                else if (pos <= idx + r.parent.children.length) {
+                    if (alreadyChild) {
+                        this.rows.splice(idx + r.parent.children.indexOf(r) + 1, 0, r);
+                    }
+                    else {
+                        this.rows.splice(pos, 0, r);
                         r.parent.children.splice(pos - idx, 0, r);
+                    }
                 }
                 else {
                     if (alreadyChild) {
@@ -684,7 +688,8 @@ let Timeline = class Timeline extends lit_element_1.LitElement {
                             idx += 1;
                         }
                     }
-                    this.addRessource(src, idx - 1);
+                    console.log(idx);
+                    this.addRessource(src, idx);
                 }
                 const idx = this.rows.findIndex((v) => v.id === srcId);
                 this.addRessources(movedContent.ressources, idx - 1);

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
lib/Timeline.js.map


+ 9 - 4
src/Timeline.ts

@@ -199,9 +199,13 @@ class Timeline extends LitElement {
         if (pos <= idx) {
           this.rows.splice(idx + 1, 0, r);
           if (!alreadyChild) r.parent.children = [r, ...r.parent.children];
-        } else if (pos < idx + r.parent.children.length) {
-          this.rows.splice(pos, 0, r);
-          if (!alreadyChild) r.parent.children.splice(pos - idx, 0, r);
+        } else if (pos <= idx + r.parent.children.length) {
+          if (alreadyChild) {
+            this.rows.splice(idx + r.parent.children.indexOf(r) + 1, 0, r);
+          } else {
+            this.rows.splice(pos, 0, r);
+            r.parent.children.splice(pos - idx, 0, r);
+          }
         } else {
           if (alreadyChild) {
             this.rows.splice(idx + r.parent.children.indexOf(r) + 1, 0, r);
@@ -812,7 +816,8 @@ class Timeline extends LitElement {
               idx += 1;
             }
           }
-          this.addRessource(src, idx - 1);
+          console.log(idx);
+          this.addRessource(src, idx);
         }
         // Add moved children and associated slots
         const idx = this.rows.findIndex((v) => v.id === srcId);

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff