Merge 4535cf6 into d4fde73

twobin · Jan 6, 2018 · c5a7112 · c5a7112
2 parents d4fde73 + 4535cf6
commit c5a7112
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/examples/index.html b/examples/index.html
@@ -25,6 +25,8 @@
   .widget-list.overflow {
     position: relative;
     height: 500px;
+    display: flex;
+    flex-direction: column;
     overflow-y: scroll;
     -webkit-overflow-scrolling: touch;
   }
@@ -54,7 +56,7 @@
   }
   .loading, .widget {
     width: 100%;
-    height: 200px;
+    flex-grow: 1;
     text-align: center;
     padding-top: 50px;
     margin: 10px 0;

diff --git a/src/index.jsx b/src/index.jsx
@@ -284,7 +284,7 @@ class LazyLoad extends Component {
            this.props.children :
              this.props.placeholder ?
                 this.props.placeholder :
-                <div style={{ height: this.props.height }} className="lazyload-placeholder" />;
+                <div style={{ height: this.props.height, minHeight: this.props.height }} className="lazyload-placeholder" />;
   }
 }
 

diff --git a/src/utils/scrollParent.js b/src/utils/scrollParent.js
@@ -27,7 +27,7 @@ export default (node) => {
       continue;
     }
 
-    if (overflowRegex.test(overflow) && overflowRegex.test(overflowX) && overflowRegex.test(overflowY)) {
+    if (overflowRegex.test(overflow) || overflowRegex.test(overflowX) || overflowRegex.test(overflowY)) {
       return parent;
     }
 

diff --git a/test/specs/lazyload.spec.js b/test/specs/lazyload.spec.js
@@ -221,7 +221,7 @@ describe('LazyLoad', () => {
   describe('Overflow', () => {
     // https://github.com/jasonslyvia/react-lazyload/issues/71
     // http://stackoverflow.com/a/6433475/761124
-    it('should not detect a overflow container when only one of the scroll property is auto\/scroll', () => {
+    it('should not detect an overflow container when only one of the scroll property is auto\/scroll', () => {
       ReactDOM.render(
         <div
           id="realOverflowContainer"