aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-05-30 01:53:55 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-05-30 02:21:14 +0800
commit338e8be327731116a4a0308ba353266293013dce (patch)
tree5924a9f8022f0dbc323b5d8fbbe10f7f5f8735a8 /packages/website/ts/components
parentd4a366aeb13d8b3ea2ace86f5566ddf8d94bf9c2 (diff)
downloaddexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.tar
dexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.tar.gz
dexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.tar.bz2
dexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.tar.lz
dexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.tar.xz
dexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.tar.zst
dexon-sol-tools-338e8be327731116a4a0308ba353266293013dce.zip
Add types for react-popper, remove types for react-joyride
Diffstat (limited to 'packages/website/ts/components')
-rw-r--r--packages/website/ts/components/onboarding/onboarding_flow.tsx26
-rw-r--r--packages/website/ts/components/onboarding/portal_onboarding_flow.tsx7
2 files changed, 16 insertions, 17 deletions
diff --git a/packages/website/ts/components/onboarding/onboarding_flow.tsx b/packages/website/ts/components/onboarding/onboarding_flow.tsx
index cd6fe2195..9c416c2e1 100644
--- a/packages/website/ts/components/onboarding/onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/onboarding_flow.tsx
@@ -1,11 +1,17 @@
import * as _ from 'lodash';
import * as React from 'react';
-import Joyride, { CallbackData, Step, StyleOptions } from 'react-joyride';
-import { Popper, PopperChildrenProps } from 'react-popper';
+import { Placement, Popper, PopperChildrenProps } from 'react-popper';
import { OnboardingTooltip } from 'ts/components/onboarding/onboarding_tooltip';
import { zIndex } from 'ts/utils/style';
+export interface Step {
+ target: string;
+ title?: string;
+ content: React.ReactNode;
+ placement?: Placement;
+}
+
export interface OnboardingFlowProps {
steps: Step[];
blacklistedStepIndices: number[];
@@ -15,11 +21,6 @@ export interface OnboardingFlowProps {
setOnboardingStep: (stepIndex: number) => void;
}
-const joyrideStyleOptions: StyleOptions = {
- zIndex: zIndex.overlay,
-};
-
-// Wrapper around Joyride with defaults and styles set
export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
public componentDidMount(): void {
this._setOnboardingStepBasedOnBlacklist(this.props.stepIndex);
@@ -34,7 +35,7 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
return null;
}
return (
- <Popper referenceElement={this._getElementForStep()} placement="right">
+ <Popper referenceElement={this._getElementForStep()} placement={this._getCurrentStep().placement}>
{this._renderPopperChildren.bind(this)}
</Popper>
);
@@ -86,11 +87,10 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
}
private _getElementForStep(): Element {
- const step = this.props.steps[this.props.stepIndex];
- return document.querySelector(step.target);
+ return document.querySelector(this._getCurrentStep().target);
}
- private _renderPopperChildren(props: any): React.ReactNode {
+ private _renderPopperChildren(props: PopperChildrenProps): React.ReactNode {
const { arrowProps } = props;
return (
<div ref={props.ref} style={props.style} data-placement={props.placement}>
@@ -116,6 +116,10 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
);
}
+ private _getCurrentStep(): Step {
+ return this.props.steps[this.props.stepIndex];
+ }
+
private _goToNextStep(): void {
const nextStep = this.props.stepIndex + 1;
if (nextStep < this.props.steps.length) {
diff --git a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
index 99fe5006d..00d278ce0 100644
--- a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
@@ -1,9 +1,8 @@
import * as _ from 'lodash';
import * as React from 'react';
-import { Step } from 'react-joyride';
import { black } from 'material-ui/styles/colors';
-import { OnboardingFlow } from 'ts/components/onboarding/onboarding_flow';
+import { OnboardingFlow, Step } from 'ts/components/onboarding/onboarding_flow';
import { ProviderType } from 'ts/types';
import { utils } from 'ts/utils/utils';
@@ -25,26 +24,22 @@ const steps: Step[] = [
content:
'Before you begin, you need to connect to a wallet. This will be used across all 0x relayers and dApps',
placement: 'right',
- disableBeacon: true,
},
{
target: '.wallet',
content: 'Unlock your metamask extension to begin',
placement: 'right',
- disableBeacon: true,
},
{
target: '.wallet',
content:
'In order to start trading on any 0x relayer in the 0x ecosystem, you need to complete two simple steps',
placement: 'right',
- disableBeacon: true,
},
{
target: '.wallet',
content: 'Before you begin you will need to send some ETH to your metamask wallet',
placement: 'right',
- disableBeacon: true,
},
];