Merge pull request #180 from keldoc/master

smnbbrv · web-flow · commit 5765eda6726a · 2020-01-28T13:47:24.000+01:00
Replace default index with draggable indexes
diff --git a/projects/ngx-sortablejs/src/lib/sortablejs-options.ts b/projects/ngx-sortablejs/src/lib/sortablejs-options.ts
@@ -1,50 +1,3 @@
-export interface SortablejsOptions {
-  group?: string | {
-    name?: string;
-    pull?: boolean | 'clone' | Function;
-    put?: boolean | string[] | Function;
-    revertClone?: boolean;
-  };
-  sort?: boolean;
-  delay?: number;
-  touchStartThreshold?: number;
-  disabled?: boolean;
-  store?: {
-    get: (sortable: any) => any[];
-    set: (sortable: any) => any;
-  };
-  animation?: number;
-  handle?: string;
-  filter?: any;
-  draggable?: string;
-  ghostClass?: string;
-  chosenClass?: string;
-  dataIdAttr?: string;
-  swapThreshold?: number;
-  invertSwap?: boolean;
-  invertedSwapThreshold?: number;
-  direction?: string;
-  forceFallback?: boolean;
-  fallbackClass?: string;
-  fallbackOnBody?: boolean;
-  scroll?: boolean | HTMLElement;
-  scrollSensitivity?: number;
-  scrollSpeed?: number;
-  preventOnFilter?: boolean;
-  dragClass?: string;
-  fallbackTolerance?: number;
-  setData?: (dataTransfer: any, draggedElement: any) => any;
-  onStart?: (event: any) => any;
-  onEnd?: (event: any) => any;
-  onAdd?: (event: any) => any;
-  onAddOriginal?: (event: any) => any;
-  onUpdate?: (event: any) => any;
-  onSort?: (event: any) => any;
-  onRemove?: (event: any) => any;
-  onFilter?: (event: any) => any;
-  onMove?: (event: any) => boolean;
-  scrollFn?: (offsetX: any, offsetY: any, originalEvent: any) => any;
-  onChoose?: (event: any) => any;
-  onUnchoose?: (event: any) => any;
-  onClone?: (event: any) => any;
-}
+import { Options } from 'sortablejs';
+
+export type SortablejsOptions = Options;
diff --git a/projects/ngx-sortablejs/src/lib/sortablejs.directive.ts b/projects/ngx-sortablejs/src/lib/sortablejs.directive.ts
@@ -6,6 +6,20 @@ import { SortablejsBindings } from './sortablejs-bindings';
 import { SortablejsOptions } from './sortablejs-options';
 import { SortablejsService } from './sortablejs.service';
 
+const getIndexesFromEvent = (event: SortableEvent) => {
+  if (event.hasOwnProperty('newDraggableIndex') && event.hasOwnProperty('oldDraggableIndex')) {
+      return {
+        new: event.newDraggableIndex,
+        old: event.oldDraggableIndex,
+      };
+  } else {
+    return {
+      new: event.newIndex,
+      old: event.oldIndex,
+    };
+  }
+};
+
 @Directive({
   selector: '[sortablejs]',
 })
@@ -154,13 +168,21 @@ export class SortablejsDirective implements OnInit, OnChanges, OnDestroy {
       },
       onUpdate: (event: SortableEvent) => {
         const bindings = this.getBindings();
+        const indexes = getIndexesFromEvent(event);
 
-        bindings.injectIntoEvery(event.newIndex, bindings.extractFromEvery(event.oldIndex));
+        bindings.injectIntoEvery(indexes.new, bindings.extractFromEvery(indexes.old));
         this.proxyEvent('onUpdate', event);
       },
     };
   }
 
 }
 
-interface SortableEvent { oldIndex: number; newIndex: number; item: HTMLElement; clone: HTMLElement; }
+interface SortableEvent {
+  oldIndex: number;
+  newIndex: number;
+  oldDraggableIndex?: number;
+  newDraggableIndex?: number;
+  item: HTMLElement;
+  clone: HTMLElement;
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -9,6 +9,7 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
     "importHelpers": true,
     "target": "es2015",
     "typeRoots": [
