more tests

src/state/dimension-marshal/dimension-marshal.js

@@ -117,7 +117,7 @@ export default (callbacks: Callbacks) => {
     );
 
     // Not relevant to the drag
-    if (collection.critical.draggable.type !== descriptor.type) {
+    if (descriptor.type !== collection.critical.draggable.type) {
       return;
     }
 
@@ -143,6 +143,11 @@ export default (callbacks: Callbacks) => {
       return;
     }
 
+    // Not relevant to this drag
+    if (descriptor.type !== collection.critical.droppable.type) {
+      return;
+    }
+
     publisher.addDroppable(id);
   };
 

src/state/dimension-marshal/publisher.js

@@ -43,6 +43,7 @@ type Callbacks = {|
 
 type Args = {|
   getProvided: () => Provided,
+  getEntries: () => Entries,
   callbacks: Callbacks
 |}
 
@@ -53,41 +54,41 @@ const getEmptyMap = (): Map => ({
 
 const timingKey: string = 'Publish collection from DOM';
 
-const advancedUsageWarning = (() => {
-  // noop for production
-  if (process.env.NODE_ENV === 'production') {
-    return () => { };
-  }
+export default ({
+  getProvided,
+  callbacks,
+}: Args): Publisher => {
+  const advancedUsageWarning = (() => {
+    // noop for production
+    if (process.env.NODE_ENV === 'production') {
+      return () => { };
+    }
 
-  let hasAnnounced: boolean = false;
+    let hasAnnounced: boolean = false;
 
-  return () => {
-    if (hasAnnounced) {
-      return;
-    }
+    return () => {
+      if (hasAnnounced) {
+        return;
+      }
 
-    hasAnnounced = true;
+      hasAnnounced = true;
 
-    console.warn(`
-      Advanced usage warning: you are adding or removing a dimension during a drag
-      This an advanced feature used to support dynamic interactions such as lazy loading lists.
+      console.warn(`
+        Advanced usage warning: you are adding or removing a dimension during a drag
+        This an advanced feature used to support dynamic interactions such as lazy loading lists.
 
-      Keep in mind the following restrictions:
+        Keep in mind the following restrictions:
 
-      - Draggable's can only be added to Droppable's that are scroll containers
-      - Adding a Droppable cannot impact the placement of other Droppables
-        (it cannot push a Droppable on the page)
+        - Draggable's can only be added to Droppable's that are scroll containers
+        - Adding a Droppable cannot impact the placement of other Droppables
+          (it cannot push a Droppable on the page)
 
-      (This warning will be stripped in production builds)
-    `.trim()
-    );
-  };
-})();
+        (This warning will be stripped in production builds)
+      `.trim()
+      );
+    };
+  })();
 
-export default ({
-  getProvided,
-  callbacks,
-}: Args): Publisher => {
   let additions: Map = getEmptyMap();
   let removals: Map = getEmptyMap();
   let frameId: ?AnimationFrameID = null;

src/state/dimension-structures.js

@@ -0,0 +1,31 @@
+// @flow
+import type {
+  DroppableId,
+  DraggableId,
+  DroppableDimension,
+  DroppableDimensionMap,
+  DraggableDimension,
+  DraggableDimensionMap,
+} from '../types';
+
+export const toDroppableMap =
+  (droppables: DroppableDimension[]): DroppableDimensionMap =>
+    droppables.reduce((previous, current) => {
+      previous[current.descriptor.id] = current;
+      return previous;
+    }, {});
+
+export const toDraggableMap =
+  (draggables: DraggableDimension[]): DraggableDimensionMap =>
+    draggables.reduce((previous, current) => {
+      previous[current.descriptor.id] = current;
+      return previous;
+    }, {});
+
+export const toDroppableList =
+  (droppables: DroppableDimensionMap): DroppableDimension[] =>
+    Object.keys(droppables).map((id: DroppableId): DroppableDimension => droppables[id]);
+
+export const toDraggableList =
+  (draggables: DraggableDimensionMap): DraggableDimension[] =>
+    Object.keys(draggables).map((id: DraggableId): DraggableDimension => draggables[id]);

src/state/publish/get-dimension-map.js

@@ -17,7 +17,7 @@ import type {
   DraggableDimensionMap,
   DroppableDimensionMap,
 } from '../../types';
-import { toDroppableMap, toDraggableMap } from '../to-map';
+import { toDroppableMap, toDraggableMap } from '../dimension-structures';
 import { patch } from '../position';
 import * as timings from '../../debug/timings';