Skip to content

Commit

Permalink
yum
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexreardon
alexreardon committed May 3, 2018
1 parent 8617353 commit bed898d
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 71 deletions.
25 changes: 10 additions & 15 deletions src/state/dimension-marshal/collector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ type Collected = {|
droppables: DroppableDimension[],
|}

type CollectionOptions = {|
exclude: {
draggableId: DraggableId,
droppableId: DroppableId,
},
|}

type Args = {|
getToBeCollected: () => ToBeCollected,
getDraggable: (id: DraggableId) => DraggableDimension,
Expand All @@ -24,18 +31,11 @@ type Args = {|
|}

export type Collector = {|
start: (options: ScrollOptions) => void,
start: (excludingCritical: CollectionOptions) => void,
stop: () => void,
collect: () => void,
|}

type CollectionOptions = {|
exclude: {
draggableId: DraggableId,
droppableId: DroppableId,
},
|}

export default ({
publish,
getDraggable,
Expand Down Expand Up @@ -92,18 +92,13 @@ export default ({
});
};

const start = (collection: Collection) => {
const start = (excludingCritical: CollectionOptions) => {
invariant(!isActive, 'Collector has already been started');
isActive = true;

// Start a collection - but there is no need to collect the
// critical dimensions as they have already been collected
run({
exclude: {
draggableId: collection.critical.draggable.descriptor.id,
droppableId: collection.critical.droppable.descriptor.id,
},
});
run(excludingCritical);
};

const collect = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/state/dimension-marshal/dimension-marshal-types.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export type DimensionMarshal = {|
getDimension: GetDraggableDimensionFn
) => void,
updateDraggable: (
previousId: DraggableId,
previous: DraggableDescriptor,
descriptor: DraggableDescriptor,
getDimension: GetDraggableDimensionFn
) => void,
Expand All @@ -76,7 +76,7 @@ export type DimensionMarshal = {|
callbacks: DroppableCallbacks
) => void,
updateDroppable: (
previousId: DroppableId,
previous: DroppableDescriptor,
descriptor: DroppableDescriptor,
callbacks: DroppableCallbacks,
) => void,
Expand Down
149 changes: 95 additions & 54 deletions src/state/dimension-marshal/dimension-marshal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { type Position } from 'css-box-model';
import invariant from 'tiny-invariant';
import createCollector, { type Collector } from './collector';
import * as timings from '../../debug/timings';
import type {
DraggableId,
DroppableId,
Expand All @@ -12,7 +13,6 @@ import type {
State as AppState,
Phase,
LiftRequest,
ScrollOptions,
} from '../../types';
import type {
DimensionMarshal,
Expand Down Expand Up @@ -78,18 +78,16 @@ export default (callbacks: Callbacks) => {
const collector: Collector = createCollector({
publish: callbacks.bulkPublish,
getDraggable: (id: DraggableId): DraggableDimension => {
invariant(collection);
const entry: ?DraggableEntry = entries.draggables[id];
invariant(entry);
invariant(collection && entry);

return entry.getDimension();
},
getDroppable: (id: DroppableId): DroppableDimension => {
invariant(collection);
const entry: ?DroppableEntry = entries.droppables[id];
invariant(entry);
invariant(collection && entry);

return entry.callbacks.getDimension(collection.scrollOptions);
return entry.callbacks.getDimensionAndWatchScroll(collection.scrollOptions);
},
getToBeCollected,
});
Expand Down Expand Up @@ -132,6 +130,43 @@ export default (callbacks: Callbacks) => {
collector.collect();
};

const updateDraggable = (
previous: DraggableDescriptor,
descriptor: DraggableDescriptor,
getDimension: GetDraggableDimensionFn,
) => {
invariant(entries.draggables[previous.id], 'Cannot update draggable registration as no previous registration was found');

if (collection) {
invariant(descriptor.id === previous.id, 'Cannot update a Draggables id during a drag');
invariant(descriptor.droppableId === previous.droppableId, 'Cannot update a Draggables droppable during a drag');
}

delete entries.draggables[previous.id];

registerDraggable(descriptor, getDimension);
};

const unregisterDraggable = (descriptor: DraggableDescriptor) => {
const entry: ?DraggableEntry = entries.draggables[descriptor.id];
invariant(entry, `Cannot unregister Draggable with id ${descriptor.id} as it is not registered`);

// Entry has already been overwritten.
// This can happen when a new Draggable with the same draggableId
// is mounted before the old Draggable has been removed.
if (entry.descriptor !== descriptor) {
return;
}

delete entries.draggables[descriptor.id];

if (!collection) {
return;
}

console.warn('TODO: batch unpublish draggable');
};

const registerDroppable = (
descriptor: DroppableDescriptor,
droppableCallbacks: DroppableCallbacks,
Expand Down Expand Up @@ -161,85 +196,81 @@ export default (callbacks: Callbacks) => {
collector.collect();
};

const updateDroppableIsEnabled = (id: DroppableId, isEnabled: boolean) => {
// no need to update the application state if a collection is not occurring
if (!collection) {
return;
const updateDroppable = (
previous: DroppableDescriptor,
descriptor: DroppableDescriptor,
droppableCallbacks: DroppableCallbacks,
) => {
invariant(entries.droppables[previous.id], 'Cannot update droppable registration as no previous registration was found');

if (collection) {
invariant(descriptor.id === previous.id, 'Cannot update a Droppables id during a drag');
invariant(descriptor.type === previous.type, 'Cannot update a Droppables type during a drag');
}

invariant(entries.droppables[id], `Cannot update the scroll on Droppable ${id} as it is not registered`);
delete entries.droppables[previous.id];

// At this point a non primary droppable dimension might not yet be published
// but may have its enabled state changed. For now we still publish this change
// and let the reducer exit early if it cannot find the dimension in the state.
callbacks.updateDroppableIsEnabled(id, isEnabled);
registerDroppable(descriptor, droppableCallbacks);
};

const updateDroppableScroll = (id: DroppableId, newScroll: Position) => {
invariant(entries.droppables[id], `Cannot update the scroll on Droppable ${id} as it is not registered`);
const unregisterDroppable = (descriptor: DroppableDescriptor) => {
const entry: ?DroppableEntry = entries.droppables[descriptor.id];

// no need to update the application state if a collection is not occurring
if (!collecting) {
invariant(entry, `Cannot unregister Droppable with id ${descriptor.id} as as it is not registered`);

// entry has already been overwritten
// in which can we will not remove it
if (entry.descriptor !== descriptor) {
return;
}
callbacks.updateDroppableScroll(id, newScroll);
};

const scrollDroppable = (id: DroppableId, change: Position) => {
const entry: ?DroppableEntry = entries.droppables[id];
// Not checking if this will leave orphan draggables as react
// unmounts parents before it unmounts children:
// https://twitter.com/alexandereardon/status/941514612624703488

invariant(entry, 'Cannot scroll Droppable if not in entries');
delete entries.droppables[descriptor.id];

if (!collection) {
return;
}

entry.callbacks.scroll(change);
console.warn('TODO: publish droppable unpublish');
};

const unregisterDraggable = (descriptor: DraggableDescriptor) => {
const entry: ?DraggableEntry = entries.draggables[descriptor.id];

invariant(entry, `Cannot unregister Draggable with id ${descriptor.id} as it is not registered`);

// Entry has already been overwritten.
// This can happen when a new Draggable with the same draggableId
// is mounted before the old Draggable has been removed.
if (entry.descriptor !== descriptor) {
return;
}

delete entries.draggables[descriptor.id];

const updateDroppableIsEnabled = (id: DroppableId, isEnabled: boolean) => {
// no need to update the application state if a collection is not occurring
if (!collection) {
return;
}

console.warn('TODO: batch unpublish draggable');
};
invariant(entries.droppables[id], `Cannot update the scroll on Droppable ${id} as it is not registered`);

const unregisterDroppable = (descriptor: DroppableDescriptor) => {
const entry: ?DroppableEntry = entries.droppables[descriptor.id];
// At this point a non primary droppable dimension might not yet be published
// but may have its enabled state changed. For now we still publish this change
// and let the reducer exit early if it cannot find the dimension in the state.
callbacks.updateDroppableIsEnabled(id, isEnabled);
};

invariant(entry, `Cannot unregister Droppable with id ${descriptor.id} as as it is not registered`);
const updateDroppableScroll = (id: DroppableId, newScroll: Position) => {
invariant(entries.droppables[id], `Cannot update the scroll on Droppable ${id} as it is not registered`);

// entry has already been overwritten
// in which can we will not remove it
if (entry.descriptor !== descriptor) {
// no need to update the application state if a collection is not occurring
if (!collection) {
return;
}
callbacks.updateDroppableScroll(id, newScroll);
};

// Not checking if this will leave orphan draggables as react
// unmounts parents before it unmounts children:
// https://twitter.com/alexandereardon/status/941514612624703488
const scrollDroppable = (id: DroppableId, change: Position) => {
const entry: ?DroppableEntry = entries.droppables[id];

delete entries.droppables[descriptor.id];
invariant(entry, 'Cannot scroll Droppable if not in entries');

if (!collection) {
return;
}

console.warn('TODO: publish droppable unpublish');
entry.callbacks.scroll(change);
};

const collectCriticalDimensions = (request: ?LiftRequest) => {
Expand Down Expand Up @@ -269,10 +300,13 @@ export default (callbacks: Callbacks) => {
};

// Get the minimum dimensions to start a drag
const home: DroppableDimension = homeEntry.callbacks.getDimension();
timings.start('initial collection and publish');
const home: DroppableDimension =
homeEntry.callbacks.getDimensionAndWatchScroll(request.scrollOptions);
const draggable: DraggableDimension = draggableEntry.getDimension();
callbacks.publishDroppable(home);
callbacks.publishDraggable(draggable);
timings.finish('initial collection and publish');
};

const stopCollecting = () => {
Expand Down Expand Up @@ -308,7 +342,12 @@ export default (callbacks: Callbacks) => {
'Recorded scroll options does not match app state'
);

collector.start(collection);
collector.start({
exclude: {
draggableId: collection.critical.draggable.id,
droppableId: collection.critical.droppable.id,
},
});
return;
}

Expand All @@ -319,8 +358,10 @@ export default (callbacks: Callbacks) => {

const marshal: DimensionMarshal = {
registerDraggable,
updateDraggable,
unregisterDraggable,
registerDroppable,
updateDroppable,
unregisterDroppable,
updateDroppableIsEnabled,
scrollDroppable,
Expand Down

0 comments on commit bed898d

Please sign in to comment.