1.2.11 Improved fake scrollbar

ealush · Aug 15, 2017 · f94e452 · f94e452
1 parent 3d5d3a3
commit f94e452
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 82 deletions.
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -16,7 +16,7 @@
       <body>
         <div id="root"></div>
         <div id="error-display"></div>
-        <script src="static/preview.56b6191e94ff97cdc1bf.bundle.js"></script>
+        <script src="static/preview.77d1a63fd6652ab7d7ab.bundle.js"></script>
       </body>
     </html>
 
diff --git a/docs/index.html b/docs/index.html
@@ -38,7 +38,7 @@
       </head>
       <body style="margin: 0;">
         <div id="root"></div>
-        <script src="static/manager.d6a42eb6d12b67ebe0b2.bundle.js"></script>
+        <script src="static/manager.1bab24b126040818739b.bundle.js"></script>
       </body>
     </html>
 
diff --git a/docs/static/manager.1bab24b126040818739b.bundle.js b/docs/static/manager.1bab24b126040818739b.bundle.js
diff --git a/docs/static/manager.1bab24b126040818739b.bundle.js.map b/docs/static/manager.1bab24b126040818739b.bundle.js.map
diff --git a/docs/static/manager.d6a42eb6d12b67ebe0b2.bundle.js b/docs/static/manager.d6a42eb6d12b67ebe0b2.bundle.js
diff --git a/docs/static/manager.d6a42eb6d12b67ebe0b2.bundle.js.map b/docs/static/manager.d6a42eb6d12b67ebe0b2.bundle.js.map
diff --git a/docs/static/preview.56b6191e94ff97cdc1bf.bundle.js b/docs/static/preview.56b6191e94ff97cdc1bf.bundle.js
diff --git a/docs/static/preview.56b6191e94ff97cdc1bf.bundle.js.map b/docs/static/preview.56b6191e94ff97cdc1bf.bundle.js.map
diff --git a/docs/static/preview.77d1a63fd6652ab7d7ab.bundle.js b/docs/static/preview.77d1a63fd6652ab7d7ab.bundle.js
diff --git a/docs/static/preview.77d1a63fd6652ab7d7ab.bundle.js.map b/docs/static/preview.77d1a63fd6652ab7d7ab.bundle.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emoji-picker-react",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "React emoji-picker component",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/src/EmojiPicker/helpers/adjust_scrollbar/index.js b/src/EmojiPicker/helpers/adjust_scrollbar/index.js
@@ -1,7 +1,8 @@
 export default function adjustScrollbar(scrollHeight, scrollTop, listHeight, _scroller) {
-    const wholeRange = (scrollHeight),
+
+    const wholeRange = scrollHeight - listHeight,
         visibleRange = (listHeight - 15),
-        newPos = ((scrollTop) * visibleRange) / wholeRange;
+        newPos = (scrollTop * visibleRange) / (wholeRange);
 
     _scroller.setAttribute('style', `transform: translateY(${newPos}px)`);
 }
diff --git a/src/EmojiPicker/index.js b/src/EmojiPicker/index.js
@@ -136,7 +136,7 @@ class EmojiPicker extends Component {
             active = this.active,
             _active = this._categories[active];
 
-        if (!isFFMac) {
+        if (!isFFMac && !(this.scrollHeight <= this.listHeight)) {
             adjustScrollbar(this.scrollHeight, scrollTop, this.listHeight, this._scroller);
             this.hideScrollIndicator();
             this._scroller.classList.add('shown');