From 13f1e36190d963a78f4a8163e63d8d3415df0324 Mon Sep 17 00:00:00 2001
From: Nick Gong <gptt916@hotmail.com>
Date: Fri, 5 Mar 2021 20:09:13 -0500
Subject: [PATCH] fix(SideNav): pass additional props provided to SideNav to
 the rendered nav element (#7960)

* fix(SideNav): pass additional props as other to rendered component

* Apply suggestions from code review

Co-authored-by: TJ Egan <tw15egan@gmail.com>

* chore(tests): update snapshots

* chore(SideNav): comment out unused default props

* chore(tests): update snapshots

Co-authored-by: TJ Egan <tw15egan@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../__snapshots__/PublicAPI-test.js.snap      |  1 -
 .../react/src/components/UIShell/SideNav.js   | 19 +++++++++++--------
 .../__snapshots__/SideNav-test.js.snap        |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
index e8504e1968e9..2b0b03e2ad66 100644
--- a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
+++ b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -6998,7 +6998,6 @@ Map {
       "isChildOfHeader": true,
       "isFixedNav": false,
       "isPersistent": true,
-      "translateById": [Function],
     },
     "propTypes": Object {
       "addFocusListeners": Object {
diff --git a/packages/react/src/components/UIShell/SideNav.js b/packages/react/src/components/UIShell/SideNav.js
index e01067da3659..12a88afe2057 100644
--- a/packages/react/src/components/UIShell/SideNav.js
+++ b/packages/react/src/components/UIShell/SideNav.js
@@ -32,6 +32,7 @@ const SideNav = React.forwardRef(function SideNav(props, ref) {
     isPersistent,
     addFocusListeners,
     addMouseListeners,
+    ...other
   } = props;
 
   const { current: controlled } = useRef(expandedProp !== undefined);
@@ -120,7 +121,8 @@ const SideNav = React.forwardRef(function SideNav(props, ref) {
         ref={ref}
         className={`${prefix}--side-nav__navigation ${className}`}
         {...accessibilityLabel}
-        {...eventHandlers}>
+        {...eventHandlers}
+        {...other}>
         {childrenToRender}
       </nav>
     </>
@@ -128,13 +130,14 @@ const SideNav = React.forwardRef(function SideNav(props, ref) {
 });
 
 SideNav.defaultProps = {
-  translateById: (id) => {
-    const translations = {
-      'carbon.sidenav.state.open': 'Close',
-      'carbon.sidenav.state.closed': 'Open',
-    };
-    return translations[id];
-  },
+  // TO-DO: comment back in when footer is added for rails
+  // translateById: (id) => {
+  //   const translations = {
+  //     'carbon.sidenav.state.open': 'Close',
+  //     'carbon.sidenav.state.closed': 'Open',
+  //   };
+  //   return translations[id];
+  // },
   defaultExpanded: false,
   isChildOfHeader: true,
   isFixedNav: false,
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap
index 068a79818428..3f0dff98b0d9 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap
@@ -9,7 +9,6 @@ exports[`SideNav should render 1`] = `
   isChildOfHeader={true}
   isFixedNav={false}
   isPersistent={true}
-  translateById={[Function]}
 >
   <div
     className="bx--side-nav__overlay"