fix(Tooltip): Fix page crash when content is null (#2332)

* screener test for remote repo * changelog
microsoft · Feb 11, 2020 · d7896d0 · d7896d0
1 parent 859b8aa
commit d7896d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Fixes
 - Remove dependency on Lodash in TypeScript typings @layershifter ([#2323](https://github.com/microsoft/fluent-ui-react/pull/2323))
 - Fix missing aria-describedby in AlertBehavior @delprzemo ([#2208](https://github.com/microsoft/fluent-ui-react/pull/2208))
+- Fix page crash when `Tooltip` content is null @delprzemo ([#2332](https://github.com/microsoft/fluent-ui-react/pull/2332))
 - Fix `document` usage in `mergeProviderContexts` to get SSR working @layershifter ([#2330](https://github.com/microsoft/fluent-ui-react/pull/2330))
 
 ### Features

diff --git a/packages/react/src/components/Tooltip/Tooltip.tsx b/packages/react/src/components/Tooltip/Tooltip.tsx
@@ -293,6 +293,8 @@ export default class Tooltip extends AutoControlledComponent<TooltipProps, Toolt
       overrideProps: this.getContentProps,
     })
 
+    if (!tooltipContent) return null
+
     return <Ref innerRef={this.contentRef}>{tooltipContent}</Ref>
   }
 

diff --git a/packages/react/src/utils/positioner/Popper.tsx b/packages/react/src/utils/positioner/Popper.tsx
@@ -224,7 +224,7 @@ const Popper: React.FunctionComponent<PopperProps> = props => {
       ? children({ placement: computedPlacement, scheduleUpdate })
       : (children as React.ReactElement)
 
-  return <Ref innerRef={contentRef}>{React.Children.only(child)}</Ref>
+  return child ? <Ref innerRef={contentRef}>{React.Children.only(child)}</Ref> : null
 }
 
 Popper.defaultProps = {