From 50ee6778f3cb77491fad706cca28bfea530eb1b7 Mon Sep 17 00:00:00 2001 From: Gilad Gray Date: Wed, 16 May 2018 13:50:39 -0700 Subject: [PATCH] upgrade documentalist, include index in renderType (#2510) --- packages/docs-data/package.json | 2 +- packages/docs-theme/package.json | 2 +- .../docs-theme/src/components/documentation.tsx | 13 ++++--------- yarn.lock | 6 +++--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/docs-data/package.json b/packages/docs-data/package.json index 85e69b4722..5be3f4c768 100644 --- a/packages/docs-data/package.json +++ b/packages/docs-data/package.json @@ -12,7 +12,7 @@ "dependencies": { "@blueprintjs/core": "^3.0.0-beta.0", "@blueprintjs/docs-theme": "^3.0.0-beta.0", - "documentalist": "^1.2.0", + "documentalist": "^1.3.2", "glob": "^7.1.2", "highlights": "^3.1.1", "marked": "^0.3.6", diff --git a/packages/docs-theme/package.json b/packages/docs-theme/package.json index c9567f68f7..7bc297ad86 100644 --- a/packages/docs-theme/package.json +++ b/packages/docs-theme/package.json @@ -31,7 +31,7 @@ "@blueprintjs/core": "^3.0.0-beta.0", "@blueprintjs/select": "^3.0.0-beta.0", "classnames": "^2.2", - "documentalist": "^1.2.0", + "documentalist": "^1.3.2", "fuzzaldrin-plus": "^0.5.0", "tslib": "^1.9.0" }, diff --git a/packages/docs-theme/src/components/documentation.tsx b/packages/docs-theme/src/components/documentation.tsx index aa1949af23..c9b32fe180 100644 --- a/packages/docs-theme/src/components/documentation.tsx +++ b/packages/docs-theme/src/components/documentation.tsx @@ -128,7 +128,10 @@ export class Documentation extends React.PureComponent docs, renderBlock: block => renderBlock(block, this.props.tagRenderers), - renderType: this.renderType, + renderType: hasTypescriptData(docs) + ? type => + linkify(type, docs.typescript, (name, _d, idx) => ) + : type => type, renderViewSourceLinkText: Utils.isFunction(renderViewSourceLinkText) ? renderViewSourceLinkText : () => "View source", @@ -236,14 +239,6 @@ export class Documentation extends React.PureComponent { - const { docs } = this.props; - let index = 0; - return hasTypescriptData(docs) - ? linkify(type, docs.typescript, name => ) - : type; - }; - private updateHash() { // update state based on current hash location this.handleNavigation(location.hash.slice(1)); diff --git a/yarn.lock b/yarn.lock index 19c3129b75..7f23a74409 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2111,9 +2111,9 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -documentalist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/documentalist/-/documentalist-1.2.0.tgz#0c543d812e27e15ba665b76cf0bb143b36d3acce" +documentalist@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/documentalist/-/documentalist-1.3.2.tgz#26f9a053c00e918d02c3f6865c8b314487427c71" dependencies: "@types/kss" "^3.0.0" glob "^7.1.1"