#85: Remove circular dependencies

src/Timeline.tsx

@@ -1,11 +1,13 @@
 import React, { useCallback, Fragment } from 'react'
 
-import { Domain, EventComponentFactory, LaneDisplayMode, TimelineEvent, TimelineLane } from './model'
+import { Domain, EventComponentFactory, LaneDisplayMode, TimelineEvent, TimelineLane, TimelineLayer } from './model'
 
 import { TimelineTheme } from './theme/model'
 import { TimelineThemeProvider } from './theme/TimelineThemeProvider'
 
-import { useEvents, useTimeline, useTimelineAnimation } from './hooks'
+import { useEvents } from './hooks/useEvents'
+import { useTimeline } from './hooks/useTimeline'
+import { useTimelineAnimation } from './hooks/useTimelineAnimation'
 
 import { noOp } from './utils'
 
@@ -16,7 +18,7 @@ import { CollapsedMarks } from './layers/CollapsedMarks'
 import { EventClusters } from './layers/EventClusters'
 import { Axes } from './layers/Axes'
 import { Axis } from './layers/Axis'
-import { defaultOrderedZoomLevels, TimelineLayer, ZoomLevels } from '.'
+import { defaultOrderedZoomLevels, ZoomLevels } from './shared/ZoomScale'
 
 export interface TimelineProps<EID extends string, LID extends string, E extends TimelineEvent<EID, LID>> {
   width: number

src/hooks/useTimeline.ts

@@ -2,8 +2,9 @@ import { useEffect, useState } from 'react'
 
 import { useZoomLevels } from './useZoomLevels'
 
-import { Domain, TimelineEvent, TimelineLane, ZoomLevels } from '..'
 import { ScaleBand, scaleBand, ScaleLinear, scaleLinear } from 'd3-scale'
+import { Domain, TimelineEvent, TimelineLane } from '../model'
+import { ZoomLevels } from '../shared/ZoomScale'
 
 export const calcMaxDomain = <EID extends string, LID extends string, E extends TimelineEvent<EID, LID>>(
   events: ReadonlyArray<E>

src/hooks/useTimelineAnimation.ts

@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react'
-
-import { Domain } from '..'
+import { Domain } from '../model'
 
 type Animation =
   | 'none'

src/hooks/useZoom.ts

@@ -1,6 +1,7 @@
 import { ScaleLinear } from 'd3-scale'
-import { useZoomLevels } from '.'
-import { Domain, getDomainSpan, ZoomLevels, ZoomScale, zoomScaleWidth } from '..'
+import { useZoomLevels } from './useZoomLevels'
+import { getDomainSpan, ZoomLevels, ZoomScale, zoomScaleWidth } from '../shared/ZoomScale'
+import { Domain } from '../model'
 
 interface UseZoomProps {
   domain: Domain

src/layers/interaction/Interaction.tsx

@@ -4,7 +4,7 @@ import { ScaleLinear } from 'd3-scale'
 import { Domain } from '../../model'
 import { MouseAwareSvg, SvgCoordinates } from './MouseAwareSvg'
 import { MouseCursor } from './MouseCursor'
-import { useZoom } from '../../hooks'
+import { useZoom } from '../../hooks/useZoom'
 import { ZoomLevels, getDomainSpan } from '../../shared/ZoomScale'
 import { InteractionHandling } from './InteractionHandling'
 import { useTrimming } from './trimmer/useTrimming'

src/test/Timeline.test.tsx

@@ -7,7 +7,7 @@ import { render, screen } from './test-utils'
 import data from './data.json'
 import { Timeline } from '../Timeline'
 import { THEME } from './testTheme'
-import { calcMaxDomain } from '../hooks'
+import { calcMaxDomain } from '../hooks/useTimeline'
 
 describe('Timeline', () => {
   const events = data.events