datasync-blob 1.0.1 → 1.0.2

package/dist/components/DsBlob.js

@@ -20,26 +20,60 @@ class DsBlob extends _react.Component {
     //console.log("imageSource = ",imageSource);
     var canvas = document.createElement('canvas'),
       context,
-      maxWidth = 800,
-      maxHeight = 800,
       width = imageSource.width,
       height = imageSource.height;
-    if (width > height) {
-      if (width > maxWidth) {
-        height *= maxWidth / width;
-        width = maxWidth;
+
+    //Exact size props are set
+    if (this.props.width && this.props.height) {
+      //Check image size
+      if (width > this.props.width || height > this.props.height) {
+        alert("L'image est trop grande, le format requis est " + this.props.width + "x" + this.props.height);
+        return;
       }
-    } else {
-      if (height > maxHeight) {
-        width *= maxHeight / height;
-        height = maxHeight;
+
+      //Check image size
+      if (width < this.props.width || height < this.props.height) {
+        alert("L'image est trop petite, le format requis est " + this.props.width + "x" + this.props.height);
+        return;
       }
     }
+
+    //Max size props are set
+    if (this.props.maxWidth && this.props.maxHeight) {
+      if (width > height) {
+        //Check resize is enabled
+        if (!this.props.reduceImage) {
+          alert("L'image est trop large, la largeur maximale est de " + this.props.maxWidth);
+          return;
+        }
+        if (width > this.props.maxWidth) {
+          height *= this.props.maxWidth / width;
+          width = this.props.maxWidth;
+        }
+      } else {
+        if (height > this.props.maxHeight) {
+          //Check resize is enabled
+          if (!this.props.reduceImage) {
+            alert("L'image est trop haute, la hauteur maximale est de " + this.props.maxHeight);
+            return;
+          }
+          width *= this.props.maxHeight / height;
+          height = this.props.maxHeight;
+        }
+      }
+    }
+
+    //Build 2d picture
     canvas.width = width;
     canvas.height = height;
     context = canvas.getContext('2d');
     context.drawImage(imageSource, 0, 0, width, height);
-    let canvasData = canvas.toDataURL('image/jpg', 0.6); //Jpeg quality reduced from 0.8 down to 0.6
+
+    //Jpeg conversion
+    let jpegCompressionRatio = this.props.jpegQuality && this.props.jpegQuality > 0 && this.props.jpegQuality < 1 ? this.props.jpegQuality : 1;
+    let canvasData = canvas.toDataURL('image/jpg', jpegCompressionRatio); //Jpeg conversion
+
+    console.log("jpegCompressionRatio->", jpegCompressionRatio, " canvasData.length = ", canvasData.length);
     if (this.props.removebase64) {
       //remove base64 prefix if property is set
       this.props.uploadPicture({
@@ -81,7 +115,7 @@ class DsBlob extends _react.Component {
   onInputChange = e => {
     const errs = [];
     const files = Array.from(e.target.files);
-    const types = ['image/png', 'image/jpeg'];
+    const types = ['image/png', 'image/jpeg', 'image/gif'];
     const _1Mo = 1024 * 1024;
     const SizeLimit = 9;
     console.clear();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datasync-blob",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Datasync Blob component",
   "main": "./dist/components/DsBlob.js",
   "files": ["./dist"],