diff --git a/package-lock.json b/package-lock.json
index 58f8905dd..cd8664b6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -628,38 +628,115 @@
       "dev": true
     },
     "@material/drawer": {
-      "version": "0.41.0",
-      "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-0.41.0.tgz",
-      "integrity": "sha512-XMKrr9Ci7z69xwYsT1P/JH/BRccwB+HL9UiYzym8SAfZG/4XtP0b5qw+vYMrIZ/NeF0nOEaE8pNHq2XrUz0csA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-1.0.1.tgz",
+      "integrity": "sha512-xgpWg2MZVFWU0MX+H4MmWA0XQO0cxF1XFA0KdyV+7W0bdzpI1x8itM8Xh0suyzqyqDc+GMHG/OxP8KYUv40jeg==",
       "dev": true,
       "requires": {
-        "@material/animation": "^0.41.0",
-        "@material/base": "^0.41.0",
-        "@material/elevation": "^0.41.0",
-        "@material/list": "^0.41.0",
-        "@material/ripple": "^0.41.0",
-        "@material/rtl": "^0.40.1",
-        "@material/shape": "^0.41.0",
-        "@material/theme": "^0.41.0",
-        "@material/typography": "^0.41.0",
-        "focus-trap": "^3.0.0"
+        "@material/animation": "^1.0.0",
+        "@material/base": "^1.0.0",
+        "@material/elevation": "^1.0.0",
+        "@material/list": "^1.0.1",
+        "@material/ripple": "^1.0.1",
+        "@material/rtl": "^0.42.0",
+        "@material/shape": "^1.0.0",
+        "@material/theme": "^1.0.0",
+        "@material/typography": "^1.0.0",
+        "focus-trap": "^4.0.2",
+        "tslib": "^1.9.3"
       },
       "dependencies": {
-        "@material/base": {
-          "version": "0.41.0",
-          "resolved": "https://registry.npmjs.org/@material/base/-/base-0.41.0.tgz",
-          "integrity": "sha512-tEyzwBRu3d1H120SfKsDVYZHcqT5lKohh/7cWKR93aAaPDkSvjpKJIjyu2yuSkjpDduVZGzVocYbOvhUKhhzXQ==",
-          "dev": true
+        "@material/animation": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@material/animation/-/animation-1.0.0.tgz",
+          "integrity": "sha512-Ed5/vggn6ZhSJ87yn3ZS1d826VJNFz73jHF2bSsgRtHDoB8KCuOwQMfdgAgDa4lKDF6CDIPCKBZPKrs2ubehdw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.3"
+          }
+        },
+        "@material/dom": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@material/dom/-/dom-1.0.1.tgz",
+          "integrity": "sha512-7gb9Tk8YBn2fLEa5fJfvDexG0QxvRGDb8c6uZEhvK4bTd2ZHCfHg9KrO+smC6Trbn5jC+FsBvdRZBbMjtS/E4g==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.3"
+          }
+        },
+        "@material/elevation": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-1.0.0.tgz",
+          "integrity": "sha512-TqmvEXmZDYLm2X5lEnjKCsZMDkCXpxFFxL22AfCAQB5L4d0gAS7vqDEE797y4Rp+BBKEcOP71mum1l56RI3NBQ==",
+          "dev": true,
+          "requires": {
+            "@material/animation": "^1.0.0",
+            "@material/feature-targeting": "^0.44.1",
+            "@material/theme": "^1.0.0"
+          }
+        },
+        "@material/list": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@material/list/-/list-1.0.1.tgz",
+          "integrity": "sha512-u9Bx+mghPy2qCHcSH2b0+0jbjTtkXNdiWjb8JDQcYmOUTfFoeQ16GqvjTybRPwoKA0UC9Hc/4U8gYvnK+bReRw==",
+          "dev": true,
+          "requires": {
+            "@material/base": "^1.0.0",
+            "@material/dom": "^1.0.1",
+            "@material/feature-targeting": "^0.44.1",
+            "@material/ripple": "^1.0.1",
+            "@material/rtl": "^0.42.0",
+            "@material/shape": "^1.0.0",
+            "@material/theme": "^1.0.0",
+            "@material/typography": "^1.0.0",
+            "tslib": "^1.9.3"
+          }
         },
         "@material/ripple": {
-          "version": "0.41.0",
-          "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-0.41.0.tgz",
-          "integrity": "sha512-rxEUVWM4AByDlTCH0kkthZQmUuY6eeN0X6cOHBoioFN2vUDk0D0Nfzz/N9FF2AlAf8C2lDDLrTuqnJPVIn+NHA==",
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-1.0.1.tgz",
+          "integrity": "sha512-aBigRoVMjIU2lLDq7TMocI2H2YFbO1hICs5FTdSRp4Yis/QFTrgaW32q8yuHdZI56j+b2BWIWapqA2xpSmCMXQ==",
           "dev": true,
           "requires": {
-            "@material/animation": "^0.41.0",
-            "@material/base": "^0.41.0",
-            "@material/theme": "^0.41.0"
+            "@material/animation": "^1.0.0",
+            "@material/base": "^1.0.0",
+            "@material/dom": "^1.0.1",
+            "@material/feature-targeting": "^0.44.1",
+            "@material/theme": "^1.0.0",
+            "tslib": "^1.9.3"
+          }
+        },
+        "@material/rtl": {
+          "version": "0.42.0",
+          "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-0.42.0.tgz",
+          "integrity": "sha512-VrnrKJzhmspsN8WXHuxxBZ69yM5IwhCUqWr1t1eNfw3ZEvEj7i1g3P31HGowKThIN1dc1Wh4LE14rCISWCtv5w==",
+          "dev": true
+        },
+        "@material/shape": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@material/shape/-/shape-1.0.0.tgz",
+          "integrity": "sha512-zfXEacPQZmH+ujVtaFyfAsYiF46j1QCcFzJeZVouG4pznrbA7XD6614Ywg0wbyWX5iB6hD52ld/IN+R/6oxKqA==",
+          "dev": true,
+          "requires": {
+            "@material/feature-targeting": "^0.44.1"
+          }
+        },
+        "@material/theme": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@material/theme/-/theme-1.0.0.tgz",
+          "integrity": "sha512-Bg/BQLU5MmCwtQ3DHcSs9DodZB8PTvuItv1wXrP54S/wBVwryIB5uMDmERhnItbNnAFbkKhlAuhn1asMmMzfkQ==",
+          "dev": true,
+          "requires": {
+            "@material/feature-targeting": "^0.44.1"
+          }
+        },
+        "@material/typography": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@material/typography/-/typography-1.0.0.tgz",
+          "integrity": "sha512-Oeqbjci1cC7jTE8/n3dwnkqKe9ZeWiaE+rgMtRYtRFw1HvAw14SpGA5EEAS/Li2Hu2KZ50FYCe3HYqShfxtChA==",
+          "dev": true,
+          "requires": {
+            "@material/feature-targeting": "^0.44.1"
           }
         }
       }
@@ -8017,12 +8094,12 @@
       "dev": true
     },
     "focus-trap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-3.0.0.tgz",
-      "integrity": "sha512-jTFblf0tLWbleGjj2JZsAKbgtZTdL1uC48L8FcmSDl4c2vDoU4NycN1kgV5vJhuq1mxNFkw7uWZ1JAGlINWvyw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-4.0.2.tgz",
+      "integrity": "sha512-HtLjfAK7Hp2qbBtLS6wEznID1mPT+48ZnP2nkHzgjpL4kroYHg0CdqJ5cTXk+UO5znAxF5fRUkhdyfgrhh8Lzw==",
       "dev": true,
       "requires": {
-        "tabbable": "^3.1.0",
+        "tabbable": "^3.1.2",
         "xtend": "^4.0.1"
       }
     },
@@ -16837,9 +16914,9 @@
       }
     },
     "tabbable": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-3.1.1.tgz",
-      "integrity": "sha512-583MHIOwictf7+zbxqO/L5fBqMN6Li4SJ1XTKQA9WzHRA7c2BB+D+Ny7Y6kGqU2u+rHK59+oRzrBvMU53aZz+A==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-3.1.2.tgz",
+      "integrity": "sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ==",
       "dev": true
     },
     "table": {
diff --git a/package.json b/package.json
index a68f470e4..4c1152d64 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@material/chips": "^1.0.0",
     "@material/dialog": "^0.43.0",
     "@material/dom": "^0.41.0",
-    "@material/drawer": "^0.41.0",
+    "@material/drawer": "^1.0.1",
     "@material/fab": "^0.41.0",
     "@material/floating-label": "^0.41.0",
     "@material/icon-button": "^0.41.0",
@@ -147,8 +147,8 @@
     "react-dom": "^16.4.2",
     "react-router-dom": "^4.3.1",
     "remap-istanbul": "^0.12.0",
-    "rimraf": "^2.6.3",
     "resemblejs": "^3.0.1",
+    "rimraf": "^2.6.3",
     "sass-loader": "^6.0.7",
     "testdouble": "^3.6.0",
     "ts-loader": "^3.5.0",
diff --git a/packages/drawer/README.md b/packages/drawer/README.md
index 0bb641e9a..99bdd0bfe 100644
--- a/packages/drawer/README.md
+++ b/packages/drawer/README.md
@@ -419,6 +419,7 @@ modal | Boolean | Indicates that the drawer is of type modal.
 dismissible | Boolean | Indicates that the drawer is of type dismissible.
 tag | String | Customizes the drawer tag type (default to `<aside>`).
 open | boolean | If true, opens drawer. If false, closes drawer.
+innerRef | RefObject | Root drawer element ref.
 
 ## Sass Mixins
 
diff --git a/packages/drawer/index.tsx b/packages/drawer/index.tsx
index 20b81ae04..6c5cad6c2 100644
--- a/packages/drawer/index.tsx
+++ b/packages/drawer/index.tsx
@@ -26,8 +26,7 @@ import {
   MDCDismissibleDrawerFoundation,
   MDCModalDrawerFoundation,
   util,
-// @ts-ignore no .d.ts file
-} from '@material/drawer/dist/mdc.drawer';
+} from '@material/drawer';
 // @ts-ignore no .d.ts file
 import {MDCListFoundation} from '@material/list/dist/mdc.list';
 import DrawerHeader from './Header';
@@ -39,6 +38,8 @@ import {FocusTrap} from 'focus-trap';
 
 const {cssClasses: listCssClasses} = MDCListFoundation;
 
+type RefCallback<T> = (node: T) => void;
+
 export interface DrawerProps extends React.HTMLProps<HTMLElement>{
   className?: string;
   open?: boolean;
@@ -47,15 +48,20 @@ export interface DrawerProps extends React.HTMLProps<HTMLElement>{
   tag?: string;
   dismissible?: boolean;
   modal?: boolean;
+  innerRef?: RefCallback<HTMLElement> | React.RefObject<HTMLElement>;
 };
 
 interface DrawerState {
   classList: Set<string>;
 };
 
+const isRefObject = function(ref: DrawerProps['innerRef']): ref is React.RefObject<HTMLElement> {
+  return typeof ref !== 'function';
+};
+
 class Drawer extends React.Component<DrawerProps, DrawerState> {
   previousFocus: HTMLElement | null = null;
-  foundation: MDCDismissibleDrawerFoundation | MDCModalDrawerFoundation;
+  foundation?: MDCDismissibleDrawerFoundation | MDCModalDrawerFoundation;
   focusTrap?: FocusTrap;
   drawerElement: React.RefObject<HTMLDivElement> = React.createRef();
 
@@ -106,7 +112,7 @@ class Drawer extends React.Component<DrawerProps, DrawerState> {
     if (changedToModal || changedToDismissible) {
       this.initFoundation();
     }
-    if (open !== prevProps.open) {
+    if (open !== prevProps.open && this.foundation) {
       open ? this.foundation.open() : this.foundation.close();
     }
   }
@@ -117,7 +123,7 @@ class Drawer extends React.Component<DrawerProps, DrawerState> {
   }
 
   private initializeFocusTrap = () => {
-    this.focusTrap = util.createFocusTrapInstance(this.drawerElement.current);
+    this.focusTrap = util.createFocusTrapInstance(this.drawerElement.current!);
   };
 
   get classes() {
@@ -184,15 +190,34 @@ class Drawer extends React.Component<DrawerProps, DrawerState> {
   handleKeyDown = (evt: React.KeyboardEvent<HTMLElement>) => {
     this.props.onKeyDown!(evt);
     if (!this.foundation) return;
-    this.foundation.handleKeydown(evt);
+    this.foundation.handleKeydown(evt.nativeEvent);
   };
 
   handleTransitionEnd = (evt: React.TransitionEvent<HTMLElement>) => {
     this.props.onTransitionEnd!(evt);
     if (!this.foundation) return;
-    this.foundation.handleTransitionEnd(evt);
+    this.foundation.handleTransitionEnd(evt.nativeEvent);
   };
 
+  attachRef = (node: HTMLElement) => {
+    const {innerRef} = this.props;
+
+    // https://github.com/facebook/react/issues/13029#issuecomment-410002316
+    // @ts-ignore this is acceptable according to the comment above
+    this.drawerElement.current = node;
+
+    if (!innerRef) {
+      return;
+    }
+
+    if (isRefObject(innerRef)) {
+      // @ts-ignore same as above
+      innerRef.current = node;
+    } else {
+      innerRef(node);
+    }
+  }
+
   render() {
     const {
       /* eslint-disable no-unused-vars */
@@ -203,9 +228,10 @@ class Drawer extends React.Component<DrawerProps, DrawerState> {
       dismissible,
       children,
       className,
+      innerRef,
+      modal,
       /* eslint-enable no-unused-vars */
       tag: Tag,
-      modal,
       ...otherProps
     } = this.props;
 
@@ -215,7 +241,7 @@ class Drawer extends React.Component<DrawerProps, DrawerState> {
           // @ts-ignore */}
         <Tag
           className={this.classes}
-          ref={this.drawerElement}
+          ref={this.attachRef}
           onKeyDown={this.handleKeyDown}
           onTransitionEnd={this.handleTransitionEnd}
           {...otherProps}
@@ -226,11 +252,12 @@ class Drawer extends React.Component<DrawerProps, DrawerState> {
       </React.Fragment>
     );
   }
+
   renderScrim() {
     return (
       <div
         className='mdc-drawer-scrim'
-        onClick={() => this.foundation.handleScrimClick()}
+        onClick={() => (this.foundation as MDCModalDrawerFoundation).handleScrimClick()}
       />
     );
   }
diff --git a/packages/drawer/package.json b/packages/drawer/package.json
index d54544a52..f00a91207 100644
--- a/packages/drawer/package.json
+++ b/packages/drawer/package.json
@@ -17,7 +17,7 @@
     "url": "https://github.com/material-components/material-components-web-react.git"
   },
   "dependencies": {
-    "@material/drawer": "^0.41.0",
+    "@material/drawer": "^1.0.1",
     "@material/list": "^0.41.0",
     "classnames": "^2.2.6",
     "focus-trap": "^3.0.0",
diff --git a/test/unit/drawer/index.test.tsx b/test/unit/drawer/index.test.tsx
index 43a7bacf4..37a19e15c 100644
--- a/test/unit/drawer/index.test.tsx
+++ b/test/unit/drawer/index.test.tsx
@@ -2,10 +2,16 @@ import * as React from 'react';
 import {assert} from 'chai';
 import {shallow, mount} from 'enzyme';
 import * as td from 'testdouble';
+import {MDCModalDrawerFoundation, MDCDismissibleDrawerFoundation, MDCDrawerAdapter} from '@material/drawer';
 import Drawer from '../../../packages/drawer/index';
 import {Options, DeactivateOptions, FocusTrap} from 'focus-trap'; // eslint-disable-line no-unused-vars
 import {coerceForTesting} from '../helpers/types';
 
+function getAdapter(foundation: MDCModalDrawerFoundation | MDCDismissibleDrawerFoundation): MDCDrawerAdapter {
+  // @ts-ignore adapter_ property is marked as protected in mdc-web. We need to override this behaviour for testing
+  return foundation.adapter_;
+}
+
 suite('Drawer');
 
 test('creates foundation if dismissible', () => {
@@ -25,30 +31,30 @@ test('doesnot create foundation if standard', () => {
 
 test('when props.open updates to true, #foundation.open is called when dismissible', () => {
   const wrapper = shallow<Drawer>(<Drawer dismissible />);
-  wrapper.instance().foundation.open = td.func();
+  wrapper.instance().foundation!.open = coerceForTesting<() => void>(td.func());
   wrapper.setProps({open: true});
-  td.verify(wrapper.instance().foundation.open(), {times: 1});
+  td.verify(wrapper.instance().foundation!.open(), {times: 1});
 });
 
 test('when props.open updates to false from true, #foundation.close is called when dismissible', () => {
   const wrapper = shallow<Drawer>(<Drawer open dismissible />);
-  wrapper.instance().foundation.close = td.func();
+  wrapper.instance().foundation!.close = coerceForTesting<() => void>(td.func());
   wrapper.setProps({open: false});
-  td.verify(wrapper.instance().foundation.close(), {times: 1});
+  td.verify(wrapper.instance().foundation!.close(), {times: 1});
 });
 
 test('when props.open updates to true, #foundation.open is called when modal', () => {
   const wrapper = shallow<Drawer>(<Drawer modal />);
-  wrapper.instance().foundation.open = td.func();
+  wrapper.instance().foundation!.open = coerceForTesting<() => void>(td.func());
   wrapper.setProps({open: true});
-  td.verify(wrapper.instance().foundation.open(), {times: 1});
+  td.verify(wrapper.instance().foundation!.open(), {times: 1});
 });
 
 test('when props.open updates to false from true, #foundation.close is called when modal', () => {
   const wrapper = shallow<Drawer>(<Drawer open modal />);
-  wrapper.instance().foundation.close = td.func();
+  wrapper.instance().foundation!.close = coerceForTesting<() => void>(td.func());
   wrapper.setProps({open: false});
-  td.verify(wrapper.instance().foundation.close(), {times: 1});
+  td.verify(wrapper.instance().foundation!.close(), {times: 1});
 });
 
 test('when changes from permanent to modal drawer with no foundation, creates a foundation', () => {
@@ -75,18 +81,18 @@ test('when the drawer changes from dismissible to modal the foundation changes '
 
 test('when the drawer changes from dismissible to modal the original foundation calls destroy', () => {
   const wrapper = shallow<Drawer>(<Drawer dismissible />);
-  const destroy = td.func();
-  wrapper.instance().foundation = {destroy};
+  const foundation = wrapper.instance().foundation;
+  foundation!.destroy = coerceForTesting<() => void>(td.func());
   wrapper.setProps({modal: true});
-  td.verify(destroy(), {times: 1});
+  td.verify(foundation!.destroy(), {times: 1});
 });
 
 test('#componentWillUnmount destroys foundation', () => {
   const wrapper = shallow<Drawer>(<Drawer dismissible />);
   const foundation = wrapper.instance().foundation;
-  foundation.destroy = td.func();
+  foundation!.destroy = coerceForTesting<() => void>(td.func());
   wrapper.unmount();
-  td.verify(foundation.destroy(), {times: 1});
+  td.verify(foundation!.destroy(), {times: 1});
 });
 
 test('has dismissible drawer class when props.dismissible is true', () => {
@@ -106,21 +112,21 @@ test('has mdc drawer class', () => {
 
 test('#adapter.addClass should update state with new className', () => {
   const wrapper = mount<Drawer>(<Drawer modal />);
-  wrapper.instance().foundation.adapter_.addClass('test-class');
+  getAdapter(wrapper.instance().foundation!).addClass('test-class');
   assert.isTrue(wrapper.state().classList.has('test-class'));
 });
 
 test('#adapter.removeClass should update state with new className', () => {
   const wrapper = mount<Drawer>(<Drawer modal />);
   wrapper.setState({classList: new Set(['test-class'])});
-  wrapper.instance().foundation.adapter_.removeClass('test-class');
+  getAdapter(wrapper.instance().foundation!).removeClass('test-class');
   assert.isFalse(wrapper.state().classList.has('test-class'));
 });
 
 test('#adapter.hasClass returns true if class is contained in classes', () => {
   const wrapper = mount<Drawer>(<Drawer modal />);
   wrapper.setState({classList: new Set(['test-class'])});
-  assert.isTrue(wrapper.instance().foundation.adapter_.hasClass('test-class'));
+  assert.isTrue(getAdapter(wrapper.instance().foundation!).hasClass('test-class'));
 });
 
 test('#adapter.elementHasClass should return true when element has class', () => {
@@ -142,15 +148,15 @@ test('#adapter.elementHasClass should return false when element does not have cl
     .childAt(0)
     .childAt(0)
     .getDOMNode();
-  const hasClass = wrapper
-    .instance()
-    .foundation.adapter_.elementHasClass(element, 'test-class');
+  const hasClass = getAdapter(
+    wrapper.instance().foundation!
+  ).elementHasClass(element, 'test-class');
   assert.isFalse(hasClass);
 });
 
 test('#adapter.saveFocus updates previousFocus', () => {
   const wrapper = shallow<Drawer>(<Drawer modal />);
-  wrapper.instance().foundation.adapter_.saveFocus();
+  getAdapter(wrapper.instance().foundation!).saveFocus();
   assert.exists(wrapper.instance().previousFocus);
 });
 test(
@@ -174,7 +180,7 @@ test(
       .childAt(0)
       .getDOMNode());
     drawerButtonElement.focus();
-    wrapper.instance().foundation.adapter_.restoreFocus();
+    getAdapter(wrapper.instance().foundation!).restoreFocus();
     assert.equal(focusedElement, document.activeElement);
     div.remove();
     focusedElement.remove();
@@ -195,7 +201,7 @@ test('#adapter.focusActiveNavigationItem focuses on first list item in drawer',
     </Drawer>,
     options
   );
-  wrapper.instance().foundation.adapter_.focusActiveNavigationItem();
+  getAdapter(wrapper.instance().foundation!).focusActiveNavigationItem();
   assert.isTrue(
     document.activeElement!.classList.contains('mdc-list-item--activated')
   );
@@ -205,14 +211,14 @@ test('#adapter.focusActiveNavigationItem focuses on first list item in drawer',
 test('#adapter.notifyClose calls props.onClose', () => {
   const onClose = coerceForTesting<() => void>(td.func());
   const wrapper = shallow<Drawer>(<Drawer modal onClose={onClose} />);
-  wrapper.instance().foundation.adapter_.notifyClose();
+  getAdapter(wrapper.instance().foundation!).notifyClose();
   td.verify(onClose(), {times: 1});
 });
 
 test('#adapter.notifyOpen calls props.onOpen', () => {
   const onOpen = coerceForTesting<() => void>(td.func());
   const wrapper = shallow<Drawer>(<Drawer modal onOpen={onOpen} />);
-  wrapper.instance().foundation.adapter_.notifyOpen();
+  getAdapter(wrapper.instance().foundation!).notifyOpen();
   td.verify(onOpen(), {times: 1});
 });
 
@@ -220,7 +226,7 @@ test('#adapter.trapFocus calls focusTrap.activate if modal variant', () => {
   const wrapper = shallow<Drawer>(<Drawer modal />);
   const activate = coerceForTesting<(activateOptions?: Pick<Options, 'onActivate'>) => void>(td.func());
   wrapper.instance().focusTrap = coerceForTesting<FocusTrap>({activate});
-  wrapper.instance().foundation.adapter_.trapFocus();
+  getAdapter(wrapper.instance().foundation!).trapFocus();
   td.verify(activate(), {times: 1});
 });
 
@@ -228,7 +234,7 @@ test('#adapter.releaseFocus calls focusTrap.deactivate if modal variant', () =>
   const wrapper = shallow<Drawer>(<Drawer modal />);
   const deactivate = coerceForTesting<(deactivateOptions?: DeactivateOptions) => void>(td.func());
   wrapper.instance().focusTrap = coerceForTesting<FocusTrap>({deactivate});
-  wrapper.instance().foundation.adapter_.releaseFocus();
+  getAdapter(wrapper.instance().foundation!).releaseFocus();
   td.verify(deactivate(), {times: 1});
 });
 
@@ -242,10 +248,14 @@ test('event keydown triggers props.onKeyDown', () => {
 
 test('event keydown triggers foundation.handleKeydown', () => {
   const wrapper = shallow<Drawer>(<Drawer modal />);
-  wrapper.instance().foundation.handleKeydown = td.func();
-  const evt = coerceForTesting<React.KeyboardEvent>({});
+  const foundation = wrapper.instance().foundation as MDCModalDrawerFoundation;
+  foundation.handleKeydown = coerceForTesting<(event: KeyboardEvent) => void>(
+    td.func()
+  );
+  const nativeEvent = coerceForTesting<KeyboardEvent>({});
+  const evt = coerceForTesting<React.KeyboardEvent>({nativeEvent});
   wrapper.childAt(0).simulate('keydown', evt);
-  td.verify(wrapper.instance().foundation.handleKeydown(evt), {times: 1});
+  td.verify(foundation.handleKeydown(nativeEvent), {times: 1});
 });
 
 test('event transitionend triggers props.onTransitionEnd', () => {
@@ -258,10 +268,12 @@ test('event transitionend triggers props.onTransitionEnd', () => {
 
 test('event transitionend triggers foundation.handleTransitionEnd', () => {
   const wrapper = shallow<Drawer>(<Drawer modal />);
-  wrapper.instance().foundation.handleTransitionEnd = td.func();
-  const evt = coerceForTesting<React.TransitionEvent>({});
+  const foundation = wrapper.instance().foundation as MDCModalDrawerFoundation;
+  foundation.handleTransitionEnd = coerceForTesting<() => void>(td.func());
+  const nativeEvent = coerceForTesting<TransitionEvent>({});
+  const evt = coerceForTesting<React.TransitionEvent>({nativeEvent});
   wrapper.childAt(0).simulate('transitionend', evt);
-  td.verify(wrapper.instance().foundation.handleTransitionEnd(evt), {
+  td.verify(foundation.handleTransitionEnd(nativeEvent), {
     times: 1,
   });
 });
@@ -278,8 +290,23 @@ test('renders scrim when props.modal is true', () => {
 
 test('click on scrim calls #foundation.handleScrimClick', () => {
   const wrapper = shallow<Drawer>(<Drawer modal />);
-  wrapper.instance().foundation.handleScrimClick = td.func();
+  const foundation = wrapper.instance().foundation as MDCModalDrawerFoundation;
+  foundation.handleScrimClick = coerceForTesting<() => void>(td.func());
   const scrim = wrapper.childAt(1);
   scrim.simulate('click');
-  td.verify(wrapper.instance().foundation.handleScrimClick(), {times: 1});
+  td.verify(foundation.handleScrimClick(), {times: 1});
+});
+
+test('handles object refs correctly', () => {
+  const myRef = React.createRef<HTMLElement>();
+  const wrapper = mount<Drawer>(<Drawer innerRef={myRef} />);
+  assert.isNotNull(myRef.current);
+  assert.isNotNull(wrapper.instance().drawerElement.current);
+});
+
+test('it handles function refs correctly', () => {
+  const refFn = coerceForTesting<(node: HTMLElement) => void>(td.func());
+  const wrapper = mount<Drawer>(<Drawer innerRef={refFn} />);
+  assert.isNotNull(wrapper.instance().drawerElement.current);
+  td.verify(refFn(wrapper.instance().drawerElement.current!), {times: 1});
 });