Merge remote-tracking branch 'call_em_all_-_master/master' (issue #148)

* call_em_all_-_master/master: fix: comment typo (mui#7523) [Docs] Add v0.18.7 to versions.json v0.18.7 [CHANGELOG] Prepare v0.18.7 [ListItem] Fix triggers onTouchTap when disabled (mui#7486) [Popover] Scroll Container issue (mui#7472) [Table] Don't set height to tbody (mui#7484) docs: fix typo in Avatar readme (mui#7478) # Conflicts: # src/Popover/Popover.js # merged both versions
manchesergit · Jul 24, 2017 · 86d26f2 · 86d26f2
2 parents 5d58410 + 923ba96
commit 86d26f2
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,31 @@
 ## HEAD
 
+## 0.18.7
+###### _Jul 23, 2017_
+
+Big thanks to the 11 contributors who made this release possible.
+As always, we are focusing on bug fixes.
+
+##### Component Fixes / Enhancements
+
+- [Table] Don't set height to tbody (#7484) @GAumala
+- [Popover] Scroll Container issue (#7472) @gorkemcnr
+- [ListItem] Fix triggers onTouchTap when disabled (#7486) @jonashartwig
+- [Chip] Fix warning when using onRequestDelete (#7407) @leMaik
+- [Datepicker] Option to select year first (#7367) @chrisjbrown
+- [List] Fix clicking "Toggle Nested Items" icon triggering left checkbox toggle (#7171) @hwo411
+
+##### Docs
+
+- [ROADMAP] Update the release plan for v1: fasteeer (#7428) @oliviertassinari
+- [docs] Update ROADMAP.md with v1-alpha branch (#7345) @whyvez
+- [docs] Update CONTRIBUTING.md with v1-alpha branch (#7371) @akshaynaik404
+- [docs] Fix typo in Avatar (#7478) @brianlheim
+
+##### Core
+
+N.A
+
 ## 0.18.6
 ###### _Jul 4, 2017_
 

diff --git a/docs/src/app/components/pages/components/Avatar/README.md b/docs/src/app/components/pages/components/Avatar/README.md
@@ -1,5 +1,5 @@
 ## Avatar
 
-Avatars can be used to represent people or object.
+Avatars can be used to represent people or objects.
 
 ### Examples
diff --git a/docs/src/www/versions.json b/docs/src/www/versions.json
@@ -1,5 +1,6 @@
 [
   "HEAD",
+  "v0.18.7",
   "v0.18.6",
   "v0.18.5",
   "v0.18.4",

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "material-ui-build",
   "private": true,
   "author": "Material-UI Team",
-  "version": "0.18.6",
+  "version": "0.18.7",
   "description": "React Components that Implement Google's Material Design.",
   "main": "./src/index.js",
   "keywords": [

diff --git a/src/List/ListItem.js b/src/List/ListItem.js
@@ -596,6 +596,7 @@ class ListItem extends Component {
       onMouseLeave, // eslint-disable-line no-unused-vars
       onNestedListToggle, // eslint-disable-line no-unused-vars
       onTouchStart, // eslint-disable-line no-unused-vars
+      onTouchTap, // eslint-disable-line no-unused-vars
       rightAvatar,
       rightIcon,
       rightIconButton,
@@ -742,6 +743,7 @@ class ListItem extends Component {
               onTouchStart={this.handleTouchStart}
               onTouchEnd={this.handleTouchEnd}
               onTouchTap={this.handleTouchTap}
+              disabled={disabled}
               ref={(node) => this.button = node}
               style={Object.assign({}, styles.root, style)}
             >

diff --git a/src/Menu/Menu.js b/src/Menu/Menu.js
@@ -19,7 +19,7 @@ function getStyles(props, context) {
 
   const styles = {
     root: {
-      // Nested div bacause the List scales x faster than it scales y
+      // Nested div because the List scales x faster than it scales y
       zIndex: muiTheme.zIndex.menu,
       maxHeight: maxHeight,
       overflowY: maxHeight ? 'auto' : null,

diff --git a/src/Popover/Popover.js b/src/Popover/Popover.js
@@ -79,6 +79,14 @@ class Popover extends Component {
      * received focus and return focus to that element when the popover closes
      */
     returnFocusOnBlur: PropTypes.bool,
+    /**
+     * Represents the parent scrollable container.
+     * It can be an element or a string like `window`.
+     */
+    scrollableContainer: PropTypes.oneOfType([
+      PropTypes.object,
+      PropTypes.string,
+    ]),
     /**
      * Override the inline-styles of the root element.
      */
@@ -115,6 +123,7 @@ class Popover extends Component {
     onRequestClose: () => {},
     open: false,
     returnFocusOnBlur: true,
+    scrollableContainer: 'window',
     style: {
       overflowY: 'auto',
     },
@@ -361,8 +370,8 @@ class Popover extends Component {
       targetPosition = this.applyAutoPositionIfNeeded(anchor, target, targetOrigin, anchorOrigin, targetPosition);
     }
 
-    targetEl.style.top = `${Math.max(0, targetPosition.top)}px`;
-    targetEl.style.left = `${Math.max(0, targetPosition.left)}px`;
+    targetEl.style.top = `${targetPosition.top}px`;
+    targetEl.style.left = `${targetPosition.left}px`;
     targetEl.style.maxHeight = `${window.innerHeight}px`;
   };
 
@@ -477,7 +486,7 @@ class Popover extends Component {
     return (
       <div style={styles.root}>
         <EventListener
-          target="window"
+          target={this.props.scrollableContainer}
           onScroll={this.handleScroll}
           onResize={this.handleResize}
           onKeyUp={this.handleKeyUp}

diff --git a/src/Table/Table.js b/src/Table/Table.js
@@ -186,7 +186,6 @@ class Table extends Component {
         onRowHoverExit: this.onRowHoverExit,
         onRowSelection: this.onRowSelection,
         selectable: this.props.selectable,
-        style: Object.assign({height: this.props.height}, base.props.style),
       }
     );
   }