Merge branch '6.3' of https://github.com/PDFTron/webviewer-ui into 6.3

src/apis/getMaxZoomLevel.js

@@ -0,0 +1,19 @@
+/**
+ * Return the max zoom level
+ * @method WebViewerInstance#getMaxZoomLevel
+ * @return {number} max zoom level
+ * @example
+WebViewer(...)
+  .then(function(instance) {
+    var docViewer = instance.docViewer;
+
+    // you must have a document loaded when calling this api
+    docViewer.on('documentLoaded', function() {
+      console.log(instance.getMaxZoomLevel());
+    });
+  });
+ */
+
+import zoomFactors from 'constants/zoomFactors';
+
+export default () => zoomFactors.getMaxZoomLevel();

src/apis/getMinZoomLevel.js

@@ -0,0 +1,19 @@
+/**
+ * Return the min zoom level
+ * @method WebViewerInstance#getMinZoomLevel
+ * @return {number} min zoom level
+ * @example
+WebViewer(...)
+  .then(function(instance) {
+    var docViewer = instance.docViewer;
+
+    // you must have a document loaded when calling this api
+    docViewer.on('documentLoaded', function() {
+      console.log(instance.getMinZoomLevel());
+    });
+  });
+ */
+
+import zoomFactors from 'constants/zoomFactors';
+
+export default () => zoomFactors.getMinZoomLevel();

src/apis/index.js

@@ -56,6 +56,8 @@ import getShowSideWindow from './getShowSideWindow';
 import getSideWindowVisibility from './getSideWindowVisibility';
 import getToolMode from './getToolMode';
 import getZoomLevel from './getZoomLevel';
+import getMaxZoomLevel from './getMaxZoomLevel';
+import getMinZoomLevel from './getMinZoomLevel';
 import goToFirstPage from './goToFirstPage';
 import goToLastPage from './goToLastPage';
 import goToNextPage from './goToNextPage';
@@ -158,6 +160,8 @@ export default store => {
     getLayoutMode: getLayoutMode(store),
     getToolMode,
     getZoomLevel,
+    getMaxZoomLevel,
+    getMinZoomLevel,
     hotkeys,
     isElementDisabled: isElementDisabled(store),
     isElementOpen: isElementOpen(store),

src/components/ToggleZoomOverlay/ToggleZoomOverlay.js

@@ -7,7 +7,7 @@ import ToggleElementButton from 'components/ToggleElementButton';
 import { zoomTo } from 'helpers/zoom';
 import selectors from 'selectors';
 import actions from 'actions';
-
+import zoomFactors from 'constants/zoomFactors';
 import './ToggleZoomOverlay.scss';
 
 const ToggleZoomOverlay = () => {
@@ -42,7 +42,10 @@ const ToggleZoomOverlay = () => {
       if (e.target.value === '') {
         setValue(zoom);
       } else {
-        zoomTo(Number(e.target.value) / 100);
+        let zoomValue = (e.target.value) / 100;
+        zoomValue = Math.max(zoomValue, zoomFactors.getMinZoomLevel());
+        zoomValue = Math.min(zoomValue, zoomFactors.getMaxZoomLevel());
+        zoomTo(zoomValue);
       }
     }
   };

src/constants/zoomFactors.js

@@ -26,4 +26,6 @@ export const stepToZoomFactorRangesMap = {
 export default {
   setMinZoomLevel,
   setMaxZoomLevel,
+  getMinZoomLevel,
+  getMaxZoomLevel
 };