Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add drag deltas to the data state #201

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions projects/ngx-d3timeline/src/lib/drag-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { scaleBandInvert } from './scale-util';
import { State } from './store/state';
import { Orientation } from './orientation';
import { TimelineEvent } from '../public-api';
import { DraggedTimelineEvent } from './dragged-timeline-event';

export function getDropTimelineEvent(state: State) {
export function getDropTimelineEvent(state: State): DraggedTimelineEvent {
const draggingTimelineEvent = getDraggingTimelineEvent(state);

return (
Expand All @@ -15,7 +16,7 @@ export function getDropTimelineEvent(state: State) {
);
}

export function getDraggingTimelineEvent(state: State): TimelineEvent {
export function getDraggingTimelineEvent(state: State): DraggedTimelineEvent {
return state.dragEvent && state.data.find(d => d.id === state.dragEvent.id);
}

Expand Down
24 changes: 24 additions & 0 deletions projects/ngx-d3timeline/src/lib/dragged-timeline-event.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { TimelineEvent } from './timeline-event';

export interface DraggedTimelineEvent extends TimelineEvent {
dx: number;
dy: number;
x: number;
y: number;
}

const initialDraggedTimelineEvent: Omit<
DraggedTimelineEvent,
keyof TimelineEvent
> = {
dx: null,
dy: null,
x: null,
y: null
};

export function initialiseDraggedTimelineEvent(
timelineEvent: TimelineEvent
): DraggedTimelineEvent {
return { ...timelineEvent, ...initialDraggedTimelineEvent };
}
16 changes: 14 additions & 2 deletions projects/ngx-d3timeline/src/lib/store/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ import { EventRectangle } from '../content/event-rectangle';
import { Orientation } from '../orientation';
import { AxisOrientations } from '../axis-orientations';
import { flipOrientation } from '../orientation-utils';
import {
DraggedTimelineEvent,
initialiseDraggedTimelineEvent
} from '../dragged-timeline-event';

export function reducer(state: State, action: Actions): State {
switch (action.type) {
case ActionType.DataChanged: {
return patchStateAndUpdateScales(state, { data: action.payload });
return patchStateAndUpdateScales(state, {
data: initDraggedTimelineEvents(action.payload)
});
}

case ActionType.OrientationChanged: {
Expand Down Expand Up @@ -68,7 +74,7 @@ export function reducer(state: State, action: Actions): State {
}
}

function dropTimelineEventOnDragEnd(state: State): TimelineEvent[] {
function dropTimelineEventOnDragEnd(state: State): DraggedTimelineEvent[] {
const dropEvent = getDropTimelineEvent(state);
return state.data.map(data => (data.id === dropEvent.id ? dropEvent : data));
}
Expand Down Expand Up @@ -109,3 +115,9 @@ function setAxisOrientations(timeOrientation: Orientation): AxisOrientations {
const resourceOrientation = flipOrientation(timeOrientation);
return { time: timeOrientation, resource: resourceOrientation };
}

function initDraggedTimelineEvents(
timelineEvents: TimelineEvent[]
): DraggedTimelineEvent[] {
return timelineEvents.map(initialiseDraggedTimelineEvent);
}
3 changes: 2 additions & 1 deletion projects/ngx-d3timeline/src/lib/store/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { TimeScale, BandScale } from '../scale-types';
import { AxisOrientations } from '../axis-orientations';
import { TimelineDragEvent } from '../content/timeline-drag-event';
import { createSliceSelector } from '../selector/slice-selector';
import { DraggedTimelineEvent } from '../dragged-timeline-event';

export interface State {
view: TimelineView;
axisOrientations: AxisOrientations;
data: TimelineEvent[];
data: DraggedTimelineEvent[];
timeScale: TimeScale;
bandScale: BandScale;
dragEvent: TimelineDragEvent;
Expand Down