diff --git a/packages/terra-application-navigation/CHANGELOG.md b/packages/terra-application-navigation/CHANGELOG.md index eba0522c987..7d04fa29da5 100644 --- a/packages/terra-application-navigation/CHANGELOG.md +++ b/packages/terra-application-navigation/CHANGELOG.md @@ -6,6 +6,9 @@ * Updated to terra-functional-testing * Remove extraneous application bases from tests. +* Fixed + * Prevent error when using focus trap with react-intl v5 + ## 1.46.0 - (February 9, 2021) * Fixed diff --git a/packages/terra-application-navigation/src/ApplicationNavigation.jsx b/packages/terra-application-navigation/src/ApplicationNavigation.jsx index 9fb81e855f5..d4e14076615 100644 --- a/packages/terra-application-navigation/src/ApplicationNavigation.jsx +++ b/packages/terra-application-navigation/src/ApplicationNavigation.jsx @@ -211,20 +211,29 @@ const ApplicationNavigation = ({ }} className={cx('drawer-menu-focus-trap-container')} > - + {/* + The following div has been added to prevent a "Cannot read property 'ownerDocument' of null" error when using react-intl v5. + See link for more info: https://github.com/focus-trap/focus-trap-react/issues/44#issuecomment-543770159 + This div could be removed with a newer version of FocusTrap + */} +
+ +
); } diff --git a/packages/terra-application-navigation/tests/jest/__snapshots__/ApplicationNavigation.test.jsx.snap b/packages/terra-application-navigation/tests/jest/__snapshots__/ApplicationNavigation.test.jsx.snap index fb7ae238566..fa321608339 100644 --- a/packages/terra-application-navigation/tests/jest/__snapshots__/ApplicationNavigation.test.jsx.snap +++ b/packages/terra-application-navigation/tests/jest/__snapshots__/ApplicationNavigation.test.jsx.snap @@ -64,66 +64,70 @@ exports[`ApplicationNavigation correctly applies the theme context className 1`] } paused={false} > - - -
+ className="header" + > +
+
-
- - + + +
- - my test hero -
- } - navigationItems={ - Array [ - Object { - "key": "my-test-key", - "text": "test-text", - }, - ] - } - notifications={ - Object { - "my-test-key-1": 3, +
+ + my test hero +
} - } - onSelectHelp={[Function]} - onSelectLogout={[Function]} - onSelectNavigationItem={[Function]} - onSelectSettings={[Function]} - onSelectUtilityItem={[Function]} - titleConfig={ - Object { - "title": "test-title", + navigationItems={ + Array [ + Object { + "key": "my-test-key", + "text": "test-text", + }, + ] } - } - userConfig={ - Object { - "detail": "user-detail", - "imageSrc": "user-src", - "initials": "user-initials", - "name": "user-name", + notifications={ + Object { + "my-test-key-1": 3, + } } - } - utilityItems={ - Array [ + onSelectHelp={[Function]} + onSelectLogout={[Function]} + onSelectNavigationItem={[Function]} + onSelectSettings={[Function]} + onSelectUtilityItem={[Function]} + titleConfig={ Object { - "icon": - my icon - , - "key": "my-test-key-2", - "text": "test-text-2", - }, - ] - } - /> + "title": "test-title", + } + } + userConfig={ + Object { + "detail": "user-detail", + "imageSrc": "user-src", + "initials": "user-initials", + "name": "user-name", + } + } + utilityItems={ + Array [ + Object { + "icon": + my icon + , + "key": "my-test-key-2", + "text": "test-text-2", + }, + ] + } + /> +