[bugfix, update] fixes #101 and resolves #102. Also moved key listener in PrintModal to onKeyDown.js. (#103)

Author: ZhijieZhang

src/apis/index.js

@@ -69,6 +69,7 @@ import isToolDisabled from './isToolDisabled';
 import setNotesPanelSort from './setNotesPanelSort';
 import addSortStrategy from './addSortStrategy';
 import updateOutlines from './updateOutlines';
+import print from './print';
 
 export default {
   loadDocument,
@@ -141,5 +142,6 @@ export default {
   isToolDisabled,
   setNotesPanelSort,
   addSortStrategy,
-  updateOutlines
+  updateOutlines,
+  print
 };

src/apis/print.js

@@ -0,0 +1,6 @@
+import print from 'helpers/print';
+import selectors from 'selectors';
+
+export default store => () => {
+  print(store.dispatch, selectors.isEmbedPrintSupported(store.getState()));  
+};

src/components/PrintModal/PrintModal.js

@@ -7,7 +7,6 @@ import Input from 'components/Input';
 
 import core from 'core';
 import getPagesToPrint from 'helpers/getPagesToPrint';
-import print from 'helpers/print';
 import getClassName from 'helpers/getClassName';
 import actions from 'actions';
 import selectors from 'selectors';
@@ -41,34 +40,13 @@ class PrintModal extends React.PureComponent {
     };
   }
 
-  componentDidMount() {
-    document.addEventListener('keydown', this.onKeyDown);
-  }
-
   componentDidUpdate(prevProps) {
     if (!prevProps.isOpen && this.props.isOpen) {
       this.onChange();
       this.props.closeElements([ 'signatureModal', 'loadingModal', 'progressModal', 'errorModal' ]);
     }
   }
 
-  componentWillUnmount() {
-    document.removeEventListener('keydown', this.onKeyDown);
-  }
-
-  onKeyDown = e => {
-    const { dispatch, isEmbedPrintSupported } = this.props;
-
-    if ((e.metaKey || e.ctrlKey) && e.which === 80) { // (Cmd/Ctrl + P)
-      e.preventDefault();
-      if (this.props.isDisabled) {
-        console.warn('Print has been disabled.');
-      } else {
-        print(dispatch, isEmbedPrintSupported);
-      }
-    }
-  }
-
   onChange = () => {
     const { currentPage, pageLabels } = this.props;
     let pagesToPrint = [];

src/event-listeners/onKeyDown.js

@@ -2,12 +2,15 @@ import core from 'core';
 import openFilePicker from 'helpers/openFilePicker';
 import copyText from 'helpers/copyText';
 import setToolModeAndGroup from 'helpers/setToolModeAndGroup';
-import { zoomIn, zoomOut} from 'helpers/zoom';
+import { zoomIn, zoomOut } from 'helpers/zoom';
+import print from 'helpers/print';
 import createTextAnnotationAndSelect from 'helpers/createTextAnnotationAndSelect';
 import actions from 'actions';
+import selectors from 'selectors'; 
 
-
-export default dispatch => e => {
+export default store => e => {
+  const { dispatch, getState } = store;
+  const state = getState();
   const selectedTextFromCanvas = core.getSelectedText();
   const selectedTextFromDOM = window.getSelection().toString();
 
@@ -51,6 +54,15 @@ export default dispatch => e => {
         } else {
           core.fitToWidth();
         }
+      } else if (e.key === 'P' || e.which === 80) { // (Ctrl/Cmd + P)
+        e.preventDefault();
+        
+        const isPrintDisabled = selectors.isElementDisabled(state, 'printModal');
+        if (isPrintDisabled) {
+          console.warn('Print has been disabled.');
+        } else {
+          print(dispatch, selectors.isEmbedPrintSupported(state));
+        }
       }
     }
   } else {

src/helpers/eventHandler.js

@@ -18,7 +18,7 @@ export default store => {
   const onAnnotationChanged = eventListeners.onAnnotationChanged(dispatch);
   const onStampAnnotationAdded = eventListeners.onStampAnnotationAdded(dispatch);
   const onStickyAnnotationAdded = eventListeners.onStickyAnnotationAdded(store);
-  const onKeyDown = eventListeners.onKeyDown(dispatch);
+  const onKeyDown = eventListeners.onKeyDown(store);
   const onFullScreenChange = eventListeners.onFullScreenChange(dispatch);
   const onLayoutChanged = eventListeners.onLayoutChanged(dispatch); 
 

src/index.js

@@ -184,6 +184,7 @@ if (window.CanvasRenderingContext2D) {
           isReadOnly: apis.isReadOnly,
           isToolDisabled: apis.isToolDisabled,
           loadDocument: apis.loadDocument(store),
+          print: apis.print(store),
           registerTool: apis.registerTool(store),
           removeSearchListener: apis.removeSearchListener(store),
           rotateClockwise: apis.rotateClockwise,

src/redux/actions/exposedActions.js

@@ -114,11 +114,11 @@ export const setSortNotesBy = sortStrategy => {
 export const setNoteDateFormat = noteDateFormat => ({ type: 'SET_NOTE_DATE_FORMAT', payload: { noteDateFormat } });
 export const updateTool = (toolName, properties) => ({ type: 'UPDATE_TOOL', payload: { toolName, properties } });
 export const setCustomPanel = newPanel => ({ type: 'SET_CUSTOM_PANEL', payload: { newPanel } });
-export const useEmbeddedPrint = useEmbeddedPrint => ({ type: 'USE_EMBEDDED_PRINT', payload: { useEmbeddedPrint } });
+export const useEmbeddedPrint = (useEmbeddedPrint = true) => ({ type: 'USE_EMBEDDED_PRINT', payload: { useEmbeddedPrint } });
 export const setPageLabels = pageLabels => dispatch => {
   if (pageLabels.length !== core.getTotalPages()) {
     console.warn('Number of page labels do not match with the total pages.');
     return;
   }
-  dispatch({ type: 'SET_PAGE_LABELS', payload: { pageLabels } });
+  dispatch({ type: 'SET_PAGE_LABELS', payload: { pageLabels: pageLabels.map(String) } });
 };