feat(list): add ripple to list-item (#894)

material-components · May 30, 2019 · c0dfb94 · c0dfb94
1 parent 4d64627
commit c0dfb94
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/packages/list/ListItem.tsx b/packages/list/ListItem.tsx
@@ -22,19 +22,21 @@
 
 import React from 'react';
 import classnames from 'classnames';
+import {closest} from '@material/dom/ponyfill';
+import {withRipple, InjectedProps} from '@material/react-ripple';
 import {MDCListFoundation} from '@material/list/foundation';
+
 import {ListItemContext, ListItemContextShape} from './index';
-import {closest} from '@material/dom/ponyfill';
 
 export interface ListItemProps<T extends HTMLElement = HTMLElement>
-  extends React.HTMLProps<T>,
-    ListItemContextShape {
+  extends React.HTMLProps<T>, ListItemContextShape, InjectedProps<T> {
   checkboxList?: boolean;
   radioList?: boolean;
   tag?: string;
   activated?: boolean;
   selected?: boolean;
   ref?: React.Ref<any>;
+  initRipple?: (surface: T) => void;
 }
 
 export interface ListItemState {
@@ -87,9 +89,12 @@ export class ListItemBase<
 
   componentDidMount() {
     this.initializeTabIndex();
+    if (this.props.initRipple) {
+      this.props.initRipple(this.listItemElement.current as T);
+    }
   }
 
-  componentDidUpdate(prevProps: ListItemProps) {
+  componentDidUpdate(prevProps: ListItemProps<T>) {
     if (prevProps.tabIndex !== this.props.tabIndex) {
       this.setState({tabIndex: this.props.tabIndex});
     }
@@ -176,6 +181,7 @@ export class ListItemBase<
       className,
       children,
       role,
+      initRipple,
       checkboxList,
       radioList,
       onDestroy,
@@ -224,4 +230,5 @@ const ListItem: React.FunctionComponent<ListItemProps> = (props) => {
   );
 };
 
-export default ListItem;
+// export default ListItem;
+export default withRipple<ListItemProps, HTMLElement>(ListItem);
diff --git a/packages/list/package.json b/packages/list/package.json
@@ -20,6 +20,7 @@
     "@material/list": "^1.0.0",
     "@material/react-checkbox": "^0.10.0",
     "@material/react-radio": "^0.10.0",
+    "@material/react-ripple": "^0.12.0",
     "classnames": "^2.2.6",
     "memoize-one": "^5.0.4",
     "react": "^16.4.2"

diff --git a/packages/menu/MenuListItem.tsx b/packages/menu/MenuListItem.tsx
@@ -33,7 +33,14 @@ class MenuListItem<T extends HTMLElement = HTMLElement> extends React.Component<
   {}
 > {
   render() {
-    const {role = 'menuitem', children, ...otherProps} = this.props;
+    const {
+      role = 'menuitem',
+      children,
+      /* eslint-disable no-unused-vars */
+      computeBoundingRect,
+      /* eslint-disable no-unused-vars */
+      ...otherProps
+    } = this.props;
 
     return (
       <ListItem role={role} {...otherProps}>