diff options
author | Fabio Berger <me@fabioberger.com> | 2018-10-15 19:20:30 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-10-15 19:20:30 +0800 |
commit | b3a323efa1fc5d942c2f7052f585acc248394f44 (patch) | |
tree | 1855e925e125f3dfd2f5aeac12b17d164894a8b3 /packages/react-docs/src/components/type.tsx | |
parent | bf9af95654503df94b5b32af74a4cbc8bee7f2ec (diff) | |
download | dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.tar dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.tar.gz dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.tar.bz2 dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.tar.lz dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.tar.xz dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.tar.zst dexon-sol-tools-b3a323efa1fc5d942c2f7052f585acc248394f44.zip |
fix: Nested a tag warning in console by not rendering a tags within type definition popovers
Diffstat (limited to 'packages/react-docs/src/components/type.tsx')
-rw-r--r-- | packages/react-docs/src/components/type.tsx | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx index 1ae1324c6..d579449f4 100644 --- a/packages/react-docs/src/components/type.tsx +++ b/packages/react-docs/src/components/type.tsx @@ -204,7 +204,9 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => { const isExportedClassReference = !!props.type.isExportedClassReference; const typeNameUrlIfExists = !_.isUndefined(props.type.externalLink) ? props.type.externalLink : undefined; if (!_.isUndefined(typeNameUrlIfExists)) { - typeName = ( + typeName = props.isInPopover ? ( + <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span> + ) : ( <Link to={typeNameUrlIfExists} shouldOpenInNewTab={true} fontColor={colors.lightBlueA700}> {typeName} </Link> @@ -218,39 +220,41 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => { ? props.type.name : `${props.docsInfo.typeSectionName}-${typeName}`; typeName = ( - <ScrollLink - to={typeDefinitionAnchorId} - offset={0} - hashSpy={true} - duration={sharedConstants.DOCS_SCROLL_DURATION_MS} - containerId={sharedConstants.SCROLL_CONTAINER_ID} - > + <span> {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? ( <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span> ) : ( - <span - data-tip={true} - data-for={id} - style={{ - color: colors.lightBlueA700, - cursor: 'pointer', - display: 'inline-block', - }} + <ScrollLink + to={typeDefinitionAnchorId} + offset={0} + hashSpy={true} + duration={sharedConstants.DOCS_SCROLL_DURATION_MS} + containerId={sharedConstants.SCROLL_CONTAINER_ID} > - {typeName} - <ReactTooltip type="light" effect="solid" id={id} className="typeTooltip"> - <TypeDefinition - sectionName={props.sectionName} - customType={props.typeDefinitionByName[typeName as string]} - shouldAddId={false} - docsInfo={props.docsInfo} - typeDefinitionByName={props.typeDefinitionByName} - isInPopover={true} - /> - </ReactTooltip> - </span> + <span + data-tip={true} + data-for={id} + style={{ + color: colors.lightBlueA700, + cursor: 'pointer', + display: 'inline-block', + }} + > + {typeName} + <ReactTooltip type="light" effect="solid" id={id} className="typeTooltip"> + <TypeDefinition + sectionName={props.sectionName} + customType={props.typeDefinitionByName[typeName as string]} + shouldAddId={false} + docsInfo={props.docsInfo} + typeDefinitionByName={props.typeDefinitionByName} + isInPopover={true} + /> + </ReactTooltip> + </span> + </ScrollLink> )} - </ScrollLink> + </span> ); } return ( |