chore(*): refactor types into one file

Author: garthenweb

lib/ObserveBoundingClientRect.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 const raf = require('raf');
 
 import { shallowEqualRect } from './utils';
+import { IRect } from './types';
 
 interface IProps {
   /**
@@ -29,15 +30,6 @@ interface IProps {
   onUpdate?: (rect: IRect) => void;
 }
 
-export interface IRect {
-  top: number;
-  right: number;
-  bottom: number;
-  left: number;
-  height: number;
-  width: number;
-}
-
 interface IState extends IRect {
   isInitialized: boolean;
 }

lib/ObserveViewport.tsx

@@ -5,6 +5,7 @@ const memoize =
 const raf = require('raf');
 
 import { shallowEqualScroll, shallowEqualDimensions } from './utils';
+import { IScroll, IDimensions } from './types';
 
 import {
   Consumer,
@@ -15,24 +16,10 @@ import {
   SCROLL_DIR_DOWN,
   SCROLL_DIR_RIGHT,
   SCROLL_DIR_LEFT,
-  IDimensions,
 } from './ViewportProvider';
 
 interface IState extends IContextScroll, IDimensions {}
 
-export interface IScroll {
-  x: number;
-  y: number;
-  xTurn: number;
-  yTurn: number;
-  xDTurn: number;
-  yDTurn: number;
-  isScrollingUp: boolean;
-  isScrollingDown: boolean;
-  isScrollingLeft: boolean;
-  isScrollingRight: boolean;
-}
-
 export interface IChildProps {
   scroll: IScroll | null;
   dimensions: IDimensions | null;

lib/ViewportProvider.tsx

@@ -2,6 +2,8 @@ import * as React from 'react';
 const throttle = require('lodash.throttle');
 const debounce = require('lodash.debounce');
 
+import { IDimensions } from './types';
+
 export const SCROLL_DIR_DOWN = Symbol('SCROLL_DIR_DOWN');
 export const SCROLL_DIR_UP = Symbol('SCROLL_DIR_UP');
 export const SCROLL_DIR_LEFT = Symbol('SCROLL_DIR_LEFT');
@@ -18,11 +20,6 @@ export interface IScroll {
   yDTurn: number;
 }
 
-export interface IDimensions {
-  width: number;
-  height: number;
-}
-
 const ViewportContext = React.createContext({
   scroll: {},
   dimensions: {},

lib/index.ts

@@ -1,4 +1,4 @@
-export { default as ViewportProvider, IDimensions } from './ViewportProvider';
+export { default as ViewportProvider } from './ViewportProvider';
 export {
   /**
    * @deprecated use connectViewport instead
@@ -8,6 +8,6 @@ export {
 } from './ConnectViewport';
 export {
   default as ObserveBoundingClientRect,
-  IRect,
 } from './ObserveBoundingClientRect';
-export { default as ObserveViewport, IScroll } from './ObserveViewport';
+export { default as ObserveViewport } from './ObserveViewport';
+export { IRect, IScroll, IDimensions } from './types';

lib/types.ts

@@ -0,0 +1,26 @@
+export interface IDimensions {
+  width: number;
+  height: number;
+}
+
+export interface IScroll {
+  x: number;
+  y: number;
+  xTurn: number;
+  yTurn: number;
+  xDTurn: number;
+  yDTurn: number;
+  isScrollingUp: boolean;
+  isScrollingDown: boolean;
+  isScrollingLeft: boolean;
+  isScrollingRight: boolean;
+}
+
+export interface IRect {
+  top: number;
+  right: number;
+  bottom: number;
+  left: number;
+  height: number;
+  width: number;
+}