Add types for react-popper, remove types for react-joyride

2 files changed, 46 insertions, 88 deletions

diff --git a/packages/typescript-typings/types/react-joyride/index.d.ts b/packages/typescript-typings/types/react-joyride/index.d.ts
deleted file mode 100644
index dacdf47a6..000000000
--- a/packages/typescript-typings/types/react-joyride/index.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Type definitions for react-joyride 2.0.0-11
-// Project: https://github.com/gilbarbara/react-joyride
-
-declare module 'react-joyride' {
-    import * as React from 'react';
-    export interface StyleOptions {
-        arrowColor?: string;
-        backgroundColor?: string;
-        primaryColor?: string;
-        textColor?: string;
-        overlayColor?: string;
-        spotlightShadow?: string;
-        beaconSize?: number;
-        zIndex?: number;
-    }
-
-    export type Placement =
-        | 'top'
-        | 'top-left'
-        | 'top-right'
-        | 'bottom'
-        | 'bottom-left'
-        | 'bottom-right'
-        | 'right'
-        | 'left';
-
-    export interface Step {
-        title?: string;
-        content: React.ReactNode;
-        target: string;
-        placement?: Placement;
-        type?: 'click' | 'hover';
-        isFixed?: boolean;
-        allowClicksThruHole?: boolean;
-        disableBeacon?: boolean;
-        style?: StyleOptions;
-        [prop: string]: any;
-    }
-
-    export interface StyleOptionsProp {
-        options: StyleOptions;
-    }
-
-    interface CallbackMetadata {
-        type:
-            | 'tour:start'
-            | 'step:before'
-            | 'beacon'
-            | 'tooltip'
-            | 'close'
-            | 'step:after'
-            | 'tour:end'
-            | 'tour:status'
-            | 'error:target_not_found'
-            | 'error';
-        step: number;
-    }
-
-    export type CallbackData = CallbackMetadata & State;
-
-    export interface Props {
-        steps?: Step[];
-        beaconComponent?: React.ReactNode;
-        disableOverlayClose?: boolean;
-        continuous?: boolean;
-        run?: boolean;
-        stepIndex?: number;
-        debug?: boolean;
-        styles?: StyleOptionsProp;
-        tooltipComponent: React.ComponentClass<any> | React.StatelessComponent;
-    }
-
-    export interface State {
-        action: 'prev' | 'close' | 'next';
-        controlled: boolean;
-        index: number;
-        lifecycle: string;
-        size: 0;
-        status: string;
-    }
-
-    export default class Joyride extends React.Component<Props, State> {
-        constructor(props: Props);
-
-        static defaultProps: Props;
-    }
-}
diff --git a/packages/typescript-typings/types/react-popper/index.d.ts b/packages/typescript-typings/types/react-popper/index.d.ts
index 4341c4521..d7dbca17f 100644
--- a/packages/typescript-typings/types/react-popper/index.d.ts
+++ b/packages/typescript-typings/types/react-popper/index.d.ts
@@ -1,4 +1,49 @@
 // Type definitions for react-popper 1.0.0-beta.6
 // Project: https://github.com/gilbarbara/react-joyride
 
-declare module 'react-popper';
+declare module 'react-popper' {
+    import * as React from 'react';
+    import * as PopperJS from 'popper.js';
+
+    interface ManagerProps {
+        children: React.ReactNode;
+    }
+    export class Manager extends React.Component<ManagerProps, {}> {}
+
+    type RefHandler = (ref: HTMLElement | null) => void;
+
+    export interface ReferenceChildrenProps {
+        ref: RefHandler;
+    }
+
+    export interface ReferenceProps {
+        children: (props: ReferenceChildrenProps) => React.ReactNode;
+    }
+    export class Reference extends React.Component<ReferenceProps, {}> {}
+
+    export interface PopperArrowProps {
+        ref: RefHandler;
+        style: React.CSSProperties;
+    }
+
+    export type Placement = PopperJS.Placement;
+
+    export interface PopperChildrenProps {
+        arrowProps: PopperArrowProps;
+        outOfBoundaries: boolean | null;
+        placement: PopperJS.Placement;
+        ref: RefHandler;
+        scheduleUpdate: () => void;
+        style: React.CSSProperties;
+    }
+
+    export interface PopperProps {
+        children: (props: PopperChildrenProps) => React.ReactNode;
+        eventsEnabled?: boolean;
+        modifiers?: PopperJS.Modifiers;
+        placement?: PopperJS.Placement;
+        positionFixed?: boolean;
+        referenceElement?: Element;
+    }
+    export class Popper extends React.Component<PopperProps, {}> {}
+}