diff options
author | F. Eugene Aumson <feuGeneA@users.noreply.github.com> | 2018-09-26 04:34:44 +0800 |
---|---|---|
committer | F. Eugene Aumson <feuGeneA@users.noreply.github.com> | 2018-09-26 04:34:44 +0800 |
commit | d3edb9721c21a00c40f03d5c270f19c0d9954754 (patch) | |
tree | fed69dbc80245c77af28ccc5f7c170ac8e726c7c /packages/react-docs | |
parent | de9f5d350f008f1eeb6e42a3dcf611262f6210b4 (diff) | |
parent | b40861747b73bb9a0826853751b7caa5cbf085ae (diff) | |
download | dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.tar dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.tar.gz dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.tar.bz2 dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.tar.lz dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.tar.xz dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.tar.zst dexon-0x-contracts-d3edb9721c21a00c40f03d5c270f19c0d9954754.zip |
Merge remote-tracking branch 'upstream/development' into sol-doc
Diffstat (limited to 'packages/react-docs')
-rw-r--r-- | packages/react-docs/CHANGELOG.json | 9 | ||||
-rw-r--r-- | packages/react-docs/CHANGELOG.md | 4 | ||||
-rw-r--r-- | packages/react-docs/package.json | 10 | ||||
-rw-r--r-- | packages/react-docs/src/components/signature.tsx | 21 | ||||
-rw-r--r-- | packages/react-docs/src/utils/typedoc_utils.ts | 5 |
5 files changed, 35 insertions, 14 deletions
diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index c8a44aa9e..4e3dfed99 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "timestamp": 1537875740, + "version": "1.0.10", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "timestamp": 1537541580, "version": "1.0.9", "changes": [ diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index 595b0cf98..ca96d479d 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.10 - _September 25, 2018_ + + * Dependencies updated + ## v1.0.9 - _September 21, 2018_ * Dependencies updated diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 19be6d04f..d4882c22a 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/react-docs", - "version": "1.0.9", + "version": "1.0.10", "engines": { "node": ">=6.12" }, @@ -23,7 +23,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/dev-utils": "^1.0.8", + "@0xproject/dev-utils": "^1.0.9", "@0xproject/tslint-config": "^1.0.7", "@types/compare-versions": "^3.0.0", "copyfiles": "^2.0.0", @@ -33,9 +33,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/react-shared": "^1.0.10", - "@0xproject/types": "^1.0.1-rc.6", - "@0xproject/utils": "^1.0.9", + "@0xproject/react-shared": "^1.0.11", + "@0xproject/types": "^1.1.0", + "@0xproject/utils": "^1.0.10", "@types/lodash": "4.14.104", "@types/material-ui": "^0.20.0", "@types/node": "*", diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx index 9eb8a7d86..a690a1f03 100644 --- a/packages/react-docs/src/components/signature.tsx +++ b/packages/react-docs/src/components/signature.tsx @@ -135,14 +135,19 @@ function renderTypeParameter( ): React.ReactNode { const typeParam = ( <span> - {`<${typeParameter.name} extends `} - <Type - type={typeParameter.type} - sectionName={sectionName} - typeDefinitionByName={typeDefinitionByName} - docsInfo={docsInfo} - isInPopover={isInPopover} - /> + {`<${typeParameter.name}`} + {!_.isUndefined(typeParameter.type) && ( + <span> + {' extends '} + <Type + type={typeParameter.type} + sectionName={sectionName} + typeDefinitionByName={typeDefinitionByName} + docsInfo={docsInfo} + isInPopover={isInPopover} + /> + </span> + )} {`>`} </span> ); diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts index 09f995672..19605d497 100644 --- a/packages/react-docs/src/utils/typedoc_utils.ts +++ b/packages/react-docs/src/utils/typedoc_utils.ts @@ -419,7 +419,10 @@ export class TypeDocUtils { return func; } private _convertTypeParameter(entity: TypeDocNode, sectionName: string): TypeParameter { - const type = this._convertType(entity.type, sectionName); + let type; + if (!_.isUndefined(entity.type)) { + type = this._convertType(entity.type, sectionName); + } const parameter = { name: entity.name, type, |