Refactor ...props to ...rest (#6421)

remix-run · Oct 24, 2018 · 65d067f · 65d067f
1 parent 9179af2
commit 65d067f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/react-router/modules/StaticRouter.js b/packages/react-router/modules/StaticRouter.js
@@ -77,7 +77,7 @@ class StaticRouter extends React.Component {
   handleBlock = () => noop;
 
   render() {
-    const { basename, context, location, ...props } = this.props;
+    const { basename, context, location, ...rest } = this.props;
 
     const history = {
       createHref: this.createHref,
@@ -94,7 +94,7 @@ class StaticRouter extends React.Component {
 
     return (
       <Router
-        {...props}
+        {...rest}
         history={history}
         staticContext={this.props.context || {}}
       />

diff --git a/website/modules/components/FakeBrowser.js b/website/modules/components/FakeBrowser.js
@@ -70,7 +70,7 @@ class FakeBrowser extends React.Component {
 
   render() {
     const { url } = this.state;
-    const { children, ...props } = this.props;
+    const { children, ...rest } = this.props;
 
     return (
       <MemoryRouter getUserConfirmation={getUserConfirmation}>
@@ -81,7 +81,7 @@ class FakeBrowser extends React.Component {
               background="white"
               boxShadow="0px 5px 20px hsla(0, 0%, 0%, 0.75)"
               borderRadius="6px"
-              {...props}
+              {...rest}
             >
               <Row
                 background="#eee"