aboutsummaryrefslogtreecommitdiffstats
path: root/packages/react-docs
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-11-14 03:38:20 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-11-14 03:38:20 +0800
commit3a3fe0e69acdc3a7aac16c4a64054d71a0689279 (patch)
tree1a394dd9c9db95ccba548688e62d9266c0774324 /packages/react-docs
parentbaba78f545110c469e3ac1d29d9f3e89586597ca (diff)
parent5c21d3f6af2ffc513b2bbfe92abf99181a32ceca (diff)
downloaddexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.gz
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.bz2
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.lz
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.xz
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.zst
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.zip
Merge branch 'development' into fix/asset-buyer/price-per-token
* development: Publish Updated CHANGELOGS Fix a bug when undefined was been tried to convert to an array feat(instant): add extra asset metadata chore: fix linter error Improve logo spacing fix: lowercase supplied address before comparing with derived addresses (which are not checksummed) Remove unused instance variable update yarn.lock Increase logo size Replace remaining scroll-links with Link component Adjust paddin Fix menuItem background colors depending on the context Remove "Home" menu item, instead make different parts of logo link to different sections of the website Rename tutorial to match verb structure chore: Make `External exports` clickable on sidebar style: reduce border size on version dropdown style: make line-height of sidebar title 26px, make sure still bottom aligned with version picker Update yarn.lock style: remove small gap under topbar
Diffstat (limited to 'packages/react-docs')
-rw-r--r--packages/react-docs/CHANGELOG.json9
-rw-r--r--packages/react-docs/CHANGELOG.md4
-rw-r--r--packages/react-docs/package.json6
-rw-r--r--packages/react-docs/src/components/type.tsx13
-rw-r--r--packages/react-docs/src/docs_info.ts3
5 files changed, 21 insertions, 14 deletions
diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 42de578a6..401070f2a 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1542134075,
+ "version": "1.0.17",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1542028948,
"version": "1.0.16",
"changes": [
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 7f0514ddb..1cbbc7a84 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.17 - _November 13, 2018_
+
+ * Dependencies updated
+
## v1.0.16 - _November 12, 2018_
* Dependencies updated
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index fb1d6d78c..31101becb 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/react-docs",
- "version": "1.0.16",
+ "version": "1.0.17",
"engines": {
"node": ">=6.12"
},
@@ -24,7 +24,7 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.15",
+ "@0x/dev-utils": "^1.0.16",
"@0x/tslint-config": "^1.0.10",
"@types/compare-versions": "^3.0.0",
"@types/styled-components": "^4.0.0",
@@ -34,7 +34,7 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/react-shared": "^1.0.19",
+ "@0x/react-shared": "^1.0.20",
"@0x/types": "^1.2.1",
"@0x/utils": "^2.0.4",
"@types/lodash": "4.14.104",
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 412b99b9d..fa3b658b4 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -1,9 +1,8 @@
-import { colors, constants as sharedConstants, Link, utils as sharedUtils } from '@0x/react-shared';
+import { colors, Link, utils as sharedUtils } from '@0x/react-shared';
import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0x/types';
import { errorUtils } from '@0x/utils';
import * as _ from 'lodash';
import * as React from 'react';
-import { Link as ScrollLink } from 'react-scroll';
import * as ReactTooltip from 'react-tooltip';
import { DocsInfo } from '../docs_info';
@@ -224,13 +223,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
{sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? (
<span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
) : (
- <ScrollLink
- to={typeDefinitionAnchorId}
- offset={0}
- hashSpy={true}
- duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
- containerId={sharedConstants.SCROLL_CONTAINER_ID}
- >
+ <Link to={typeDefinitionAnchorId}>
<span
data-tip={true}
data-for={id}
@@ -252,7 +245,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
/>
</ReactTooltip>
</span>
- </ScrollLink>
+ </Link>
)}
</span>
);
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 54b59ef1f..76f7784ba 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -10,6 +10,7 @@ import {
SectionsMap,
SupportedDocJson,
} from './types';
+import { constants } from './utils/constants';
export class DocsInfo {
public id: string;
@@ -64,7 +65,7 @@ export class DocsInfo {
const docSections = _.keys(this.sections);
_.each(docSections, sectionName => {
const docSection = docAgnosticFormat[sectionName];
- if (_.isUndefined(docSection)) {
+ if (_.isUndefined(docSection) || sectionName === constants.EXTERNAL_EXPORTS_SECTION_NAME) {
return; // no-op
}