fixing flow

atlassian · Jun 21, 2018 · de8fee6 · de8fee6
1 parent 9372d1e
commit de8fee6
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 106 deletions.
diff --git a/src/state/dimension-marshal/publisher.js b/src/state/dimension-marshal/publisher.js
@@ -115,7 +115,7 @@ export default ({
       const draggables: DraggableDimension[] = Object.keys(additions.draggables)
         .map((id: DraggableId): DraggableDimension =>
           // TODO
-          entries.draggables[id].getDimension(windowScroll, { x: 0, y: 0 })
+          entries.draggables[id].getDimension(windowScroll)
         );
 
       const droppables: DroppableDimension[] = Object.keys(additions.droppables)

diff --git a/src/state/droppable-dimension.js b/src/state/droppable-dimension.js
@@ -166,12 +166,12 @@ export const scrollDroppable = (
   return result;
 };
 
-// TODO
-const growSubjectIfNeeded = ({
-  draggables: DraggableDimensionMap,
-  droppable: DroppableDimension,
-  addition: Position,
-}): DroppableDimension => {
-
-};
+// TODO: make this work
+// const growSubjectIfNeeded = ({
+//   draggables: DraggableDimensionMap,
+//   droppable: DroppableDimension,
+//   addition: Position,
+// }): DroppableDimension => {
+
+// };
 
diff --git a/stories/src/dynamic/lazy-loading.jsx b/stories/src/dynamic/lazy-loading.jsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import QuoteList from '../primatives/quote-list';
 import { DragDropContext } from '../../../src/';
-import type { DropResult, DragUpdate, DragStart, DraggableLocation } from '../../../src/types';
+import type { DropResult, DragUpdate, DraggableLocation } from '../../../src/types';
 import type { Quote } from '../types';
 import { quotes as initial, getQuotes } from '../data';
 import reorder from '../reorder';
@@ -13,15 +13,13 @@ type State = {|
 |}
 
 export default class LazyLoading extends React.Component<*, State> {
+  // eslint-disable-next-line react/sort-comp
+  timerId: ?TimeoutID = null;
   state: State = {
     quotes: initial,
     isLoading: false,
   }
 
-  onDragStart = (start: DragStart) => {
-
-  }
-
   onDragUpdate = (update: DragUpdate) => {
     const destination: ?DraggableLocation = update.destination;
     if (!destination) {
@@ -32,9 +30,6 @@ export default class LazyLoading extends React.Component<*, State> {
     const startLoadingFrom: number = lastIndex - 2;
 
     if (destination.index < startLoadingFrom) {
-      console.log('not far enough along');
-      console.log('destination', destination.index);
-      console.log('startLoading from', startLoadingFrom);
       return;
     }
 
@@ -72,7 +67,6 @@ export default class LazyLoading extends React.Component<*, State> {
   }
 
   startLazyLoading = () => {
-    console.log('starting lazy load');
     if (this.state.isLoading) {
       return;
     }
@@ -96,7 +90,6 @@ export default class LazyLoading extends React.Component<*, State> {
   render() {
     return (
       <DragDropContext
-        onDragStart={this.onDragStart}
         onDragUpdate={this.onDragUpdate}
         onDragEnd={this.onDragEnd}
       >

diff --git a/stories/src/primatives/quote-item.jsx b/stories/src/primatives/quote-item.jsx
@@ -1,5 +1,4 @@
 // @flow
-import { getBox } from 'css-box-model';
 import React from 'react';
 import styled from 'styled-components';
 import { borderRadius, colors, grid } from '../constants';
@@ -100,20 +99,14 @@ const Attribution = styled.small`
 // things we should be doing in the selector as we do not know if consumers
 // will be using PureComponent
 export default class QuoteItem extends React.PureComponent<Props> {
-  componentDidMount() {
-    console.log(`mounting center: ${this.props.quote.id}`, getBox(this.ref).borderBox.center);
-  }
   render() {
     const { quote, isDragging, provided } = this.props;
 
     return (
       <Container
         href={quote.author.url}
         isDragging={isDragging}
-        innerRef={(ref) => {
-          this.ref = ref;
-          provided.innerRef(ref);
-        }}
+        innerRef={provided.innerRef}
         {...provided.draggableProps}
         {...provided.dragHandleProps}
       >

diff --git a/test/unit/state/get-displacement.spec.js b/test/unit/state/get-displacement.spec.js
@@ -37,6 +37,7 @@ const inViewport: DraggableDimension = getDraggableDimension({
   descriptor: {
     id: 'in-viewport',
     droppableId: droppable.descriptor.id,
+    type: droppable.descriptor.type,
     index: 0,
   },
   borderBox: {
@@ -51,6 +52,7 @@ const notInViewport: DraggableDimension = getDraggableDimension({
   descriptor: {
     id: 'not-in-viewport',
     droppableId: droppable.descriptor.id,
+    type: droppable.descriptor.type,
     index: 1,
   },
   // outside of viewport but within droppable

diff --git a/test/unit/state/get-drag-impact.spec.js b/test/unit/state/get-drag-impact.spec.js
@@ -406,6 +406,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'visible',
                 droppableId: droppable.descriptor.id,
+                type: droppable.descriptor.type,
                 index: 0,
               },
               borderBox: {
@@ -419,6 +420,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'not-visible-1',
                 droppableId: droppable.descriptor.id,
+                type: droppable.descriptor.type,
                 index: 1,
               },
               borderBox: {
@@ -433,6 +435,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'not-visible-2',
                 droppableId: droppable.descriptor.id,
+                type: droppable.descriptor.type,
                 index: 2,
               },
               borderBox: {
@@ -510,6 +513,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'visible',
                 droppableId: droppable.descriptor.id,
+                type: droppable.descriptor.type,
                 index: 0,
               },
               borderBox: {
@@ -523,6 +527,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'not-visible-1',
                 droppableId: droppable.descriptor.id,
+                type: droppable.descriptor.type,
                 index: 1,
               },
               borderBox: {
@@ -537,6 +542,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'not-visible-2',
                 droppableId: droppable.descriptor.id,
+                type: droppable.descriptor.type,
                 index: 2,
               },
               borderBox: {
@@ -1020,6 +1026,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'inSource1',
                 droppableId: source.descriptor.id,
+                type: source.descriptor.type,
                 index: 0,
               },
               borderBox: {
@@ -1064,6 +1071,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'visible',
                 droppableId: destination.descriptor.id,
+                type: destination.descriptor.type,
                 index: 0,
               },
               borderBox: {
@@ -1077,6 +1085,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'not-visible-1',
                 droppableId: destination.descriptor.id,
+                type: destination.descriptor.type,
                 index: 1,
               },
               borderBox: {
@@ -1158,6 +1167,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'inSource1',
                 droppableId: source.descriptor.id,
+                type: source.descriptor.type,
                 index: 0,
               },
               borderBox: {
@@ -1187,6 +1197,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'visible',
                 droppableId: destination.descriptor.id,
+                type: destination.descriptor.type,
                 index: 0,
               },
               borderBox: {
@@ -1200,6 +1211,7 @@ describe('get drag impact', () => {
               descriptor: {
                 id: 'not-visible-1',
                 droppableId: destination.descriptor.id,
+                type: destination.descriptor.type,
                 index: 1,
               },
               borderBox: {

diff --git a/test/unit/state/get-droppable-over.spec.js b/test/unit/state/get-droppable-over.spec.js
@@ -98,7 +98,8 @@ describe('get droppable over', () => {
     const draggable: DraggableDimension = getDraggableDimension({
       descriptor: {
         id: 'draggable',
-        droppableId: droppable.descriptor.type,
+        droppableId: droppable.descriptor.id,
+        type: droppable.descriptor.type,
         index: 0,
       },
       borderBox: {
@@ -142,7 +143,8 @@ describe('get droppable over', () => {
     const draggable: DraggableDimension = getDraggableDimension({
       descriptor: {
         id: 'draggable',
-        droppableId: droppable.descriptor.type,
+        droppableId: droppable.descriptor.id,
+        type: droppable.descriptor.type,
         index: 0,
       },
       borderBox: {
@@ -183,6 +185,7 @@ describe('get droppable over', () => {
       descriptor: {
         id: 'in-home-1',
         droppableId: home.descriptor.id,
+        type: home.descriptor.type,
         index: 0,
       },
       borderBox: {
@@ -198,6 +201,7 @@ describe('get droppable over', () => {
       descriptor: {
         id: 'in-foreign-1',
         droppableId: 'foreign',
+        type: home.descriptor.type,
         index: 0,
       },
       borderBox: {

diff --git a/test/unit/state/move-to-next-index.spec.js b/test/unit/state/move-to-next-index.spec.js
@@ -482,6 +482,7 @@ describe('move to next index', () => {
                 descriptor: {
                   id: 'inHome1',
                   droppableId: home.descriptor.id,
+                  type: home.descriptor.type,
                   index: 0,
                 },
                 borderBox: {
@@ -496,6 +497,7 @@ describe('move to next index', () => {
                 descriptor: {
                   id: 'inHome2',
                   droppableId: home.descriptor.id,
+                  type: home.descriptor.type,
                   index: 1,
                 },
                 borderBox: {
@@ -510,6 +512,7 @@ describe('move to next index', () => {
                 descriptor: {
                   id: 'inHome3',
                   droppableId: home.descriptor.id,
+                  type: home.descriptor.type,
                   index: 2,
                 },
                 borderBox: {
@@ -524,6 +527,7 @@ describe('move to next index', () => {
                 descriptor: {
                   id: 'inHome4',
                   droppableId: home.descriptor.id,
+                  type: home.descriptor.type,
                   index: 3,
                 },
                 borderBox: {
@@ -538,6 +542,7 @@ describe('move to next index', () => {
                 descriptor: {
                   id: 'inHome5',
                   droppableId: home.descriptor.id,
+                  type: home.descriptor.type,
                   index: 4,
                 },
                 borderBox: {
@@ -552,6 +557,7 @@ describe('move to next index', () => {
                 descriptor: {
                   id: 'inHome5',
                   droppableId: home.descriptor.id,
+                  type: home.descriptor.type,
                   index: 5,
                 },
                 borderBox: {
@@ -1035,6 +1041,7 @@ describe('move to next index', () => {
                   id: 'inside',
                   index: 0,
                   droppableId: droppable.descriptor.id,
+                  type: droppable.descriptor.type,
                 },
                 borderBox: customViewport.frame,
               });
@@ -1043,6 +1050,7 @@ describe('move to next index', () => {
                   id: 'outside',
                   index: 1,
                   droppableId: droppable.descriptor.id,
+                  type: droppable.descriptor.type,
                 },
                 borderBox: {
                   // is bottom left of the viewport
@@ -1122,6 +1130,7 @@ describe('move to next index', () => {
                   id: 'inside',
                   index: 0,
                   droppableId: droppable.descriptor.id,
+                  type: droppable.descriptor.type,
                 },
                 borderBox: {
                   top: 0,
@@ -1135,6 +1144,7 @@ describe('move to next index', () => {
                   id: 'partial',
                   index: 1,
                   droppableId: droppable.descriptor.id,
+                  type: droppable.descriptor.type,
                 },
                 borderBox: {
                   top: customViewport.frame.bottom + 1,
@@ -1227,6 +1237,7 @@ describe('move to next index', () => {
                   id: 'inside',
                   index: 0,
                   droppableId: droppable.descriptor.id,
+                  type: droppable.descriptor.type,
                 },
                 borderBox: {
                   top: 0,
@@ -1241,6 +1252,7 @@ describe('move to next index', () => {
                   id: 'outside',
                   index: 1,
                   droppableId: droppable.descriptor.id,
+                  type: droppable.descriptor.type,
                 },
                 borderBox: {
                   // in the droppable, but outside the frame