Merge branch 'pr/2'

Conflicts:
	src/Pdf.js

Author: mikecousins

.gitignore

@@ -4,3 +4,5 @@ dist
 lib
 npm-debug.log
 .DS_Store
+/.idea/
+/react-pdf-js.iml

src/Pdf.js

@@ -5,6 +5,7 @@ class Pdf extends React.Component {
   constructor(props) {
     super(props);
     this.state = {};
+    this.onGetPdfRaw = this.onGetPdfRaw.bind(this);
     this.onDocumentComplete = this.onDocumentComplete.bind(this);
     this.onPageComplete = this.onPageComplete.bind(this);
   }
@@ -20,10 +21,19 @@ class Pdf extends React.Component {
     const newDocInit = newProps.documentInitParameters;
     const docInit = this.props.documentInitParameters;
 
-    if ((newProps.file && newProps.file !== this.props.file) ||
+    // Only reload if the most significant source has changed!
+    let newSource = newProps.file;
+    let oldSource = newSource ? this.props.file : null;
+    newSource = newSource || newProps.binaryContent;
+    oldSource = newSource && !oldSource ? this.props.binaryContent : oldSource;
+    newSource = newSource || newProps.content;
+    oldSource = newSource && !oldSource ? this.props.content : oldSource;
+
+    if (newSource && newSource !== oldSource &&
+      ((newProps.file && newProps.file !== this.props.file) ||
       (newProps.content && newProps.content !== this.props.content) ||
       (newDocInit && newDocInit !== docInit) ||
-      (newDocInit && docInit && newDocInit.url !== docInit.url)) {
+      (newDocInit && docInit && newDocInit.url !== docInit.url))) {
       this.loadPDFDocument(newProps);
     }
 
@@ -34,12 +44,34 @@ class Pdf extends React.Component {
     }
   }
 
+  componentWillUnmount() {
+    const { pdf } = this.state;
+    pdf.destroy();
+  }
+
+  onGetPdfRaw(pdfRaw) {
+    const { onContentAvailable, onBinaryContentAvailable, binaryToBase64 } = this.props;
+    if (typeof onBinaryContentAvailable === 'function') {
+      onBinaryContentAvailable(pdfRaw);
+    }
+    if (typeof onContentAvailable === 'function') {
+      let convertBinaryToBase64 = this.defaultBinaryToBase64;
+      if (typeof binaryToBase64 === 'function') {
+        convertBinaryToBase64 = binaryToBase64;
+      }
+      onContentAvailable(convertBinaryToBase64(pdfRaw));
+    }
+  }
+
   onDocumentComplete(pdf) {
     this.setState({ pdf });
-    const { onDocumentComplete } = this.props;
+    const { onDocumentComplete, onContentAvailable, onBinaryContentAvailable } = this.props;
     if (typeof onDocumentComplete === 'function') {
       onDocumentComplete(pdf.numPages);
     }
+    if (typeof onContentAvailable === 'function' || typeof onBinaryContentAvailable === 'function') {
+      pdf.getData().then(this.onGetPdfRaw);
+    }
     pdf.getPage(this.props.page).then(this.onPageComplete);
   }
 
@@ -67,6 +99,8 @@ class Pdf extends React.Component {
       reader.onloadend = () =>
         this.loadByteArray(new Uint8Array(reader.result));
       reader.readAsArrayBuffer(props.file);
+    } else if (props.binaryContent) {
+      this.loadByteArray(props.binaryContent);
     } else if (!!props.content) {
       const bytes = window.atob(props.content);
       const byteLength = bytes.length;
@@ -83,6 +117,65 @@ class Pdf extends React.Component {
     }
   }
 
+  // Converts an ArrayBuffer directly to base64, without any intermediate 'convert to string then
+  // use window.btoa' step and without risking a blow of the stack. According to [Jon Leightons's]
+  // tests, this appears to be a faster approach: http://jsperf.com/encoding-xhr-image-data/5
+  // Jon Leighton https://gist.github.com/jonleighton/958841
+  defaultBinaryToBase64(arrayBuffer) {
+    let base64 = '';
+    const encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+
+    const bytes = new Uint8Array(arrayBuffer);
+    const byteLength = bytes.byteLength;
+    const byteRemainder = byteLength % 3;
+    const mainLength = byteLength - byteRemainder;
+
+    let a;
+    let b;
+    let c;
+    let d;
+    let chunk;
+
+    // Main loop deals with bytes in chunks of 3
+    for (let i = 0; i < mainLength; i = i + 3) {
+      // Combine the three bytes into a single integer
+      chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
+
+      // Use bitmasks to extract 6-bit segments from the triplet
+      a = (chunk & 16515072) >> 18; // 16515072 = (2^6 - 1) << 18
+      b = (chunk & 258048) >> 12; // 258048   = (2^6 - 1) << 12
+      c = (chunk & 4032) >> 6; // 4032     = (2^6 - 1) << 6
+      d = chunk & 63;               // 63       = 2^6 - 1
+
+      // Convert the raw binary segments to the appropriate ASCII encoding
+      base64 = [base64, encodings[a], encodings[b], encodings[c], encodings[d]].join('');
+    }
+
+    // Deal with the remaining bytes and padding
+    if (byteRemainder === 1) {
+      chunk = bytes[mainLength];
+
+      a = (chunk & 252) >> 2; // 252 = (2^6 - 1) << 2
+
+      // Set the 4 least significant bits to zero
+      b = (chunk & 3) << 4; // 3   = 2^2 - 1
+
+      base64 = [base64, encodings[a], encodings[b], '=='].join('');
+    } else if (byteRemainder === 2) {
+      chunk = (bytes[mainLength] << 8) | bytes[mainLength + 1];
+
+      a = (chunk & 64512) >> 10; // 64512 = (2^6 - 1) << 10
+      b = (chunk & 1008) >> 4; // 1008  = (2^6 - 1) << 4
+
+      // Set the 2 least significant bits to zero
+      c = (chunk & 15) << 2; // 15    = 2^4 - 1
+
+      base64 = [base64, encodings[a], encodings[b], encodings[c], '='].join('');
+    }
+
+    return base64;
+  }
+
   renderPdf() {
     const { page } = this.state;
     if (page) {
@@ -102,14 +195,19 @@ class Pdf extends React.Component {
     return page ? <canvas ref="canvas" /> : loading || <div>Loading PDF...</div>;
   }
 }
+
 Pdf.displayName = 'react-pdf-js';
 Pdf.propTypes = {
   content: React.PropTypes.string,
-  file: React.PropTypes.string,
   documentInitParameters: React.PropTypes.object,
+  binaryContent: React.PropTypes.object,
+  file: React.PropTypes.any, // Could be File object or URL string.
   loading: React.PropTypes.any,
   page: React.PropTypes.number,
   scale: React.PropTypes.number,
+  onContentAvailable: React.PropTypes.func,
+  onBinaryContentAvailable: React.PropTypes.func.isRequired,
+  binaryToBase64: React.PropTypes.func,
   onDocumentComplete: React.PropTypes.func,
   onPageComplete: React.PropTypes.func,
 };