react-scratchingcard 1.0.1 → 1.0.2

package/README.md

@@ -129,7 +129,7 @@ const App = () => {
 | width             | number          |             |
 | height            | number          |             |
 | image             | File \| string \| {src?: string, default?: string}  |             |
-| imageCrossOrigin  | ?'' \| 'anonymous' \| 'use-credentials' | 'anonymous' |
+| imageCrossOrigin  | ?'' \| 'anonymous' \| 'use-credentials' |             |
 | finishPercent     | ?number         | 70          |
 | brushSize         | ?number         | 20          |
 | fadeOutOnComplete | ?boolean        | true        |
@@ -152,6 +152,8 @@ const App = () => {
 
 Note: pour calculer le pourcentage gratté (`finishPercent`) avec une image distante, le serveur distant doit autoriser CORS.
 
+Le composant n'impose plus CORS par defaut pour une URL distante. `imageCrossOrigin` est utile seulement si ton serveur renvoie deja les en-tetes CORS voulus.
+
 ### CustomBrush
 
 | **name** | **type**       |

package/dist/index.d.ts

@@ -43,6 +43,8 @@ declare class Scratch extends Component<Props, State> {
     brushImage?: any;
     image: HTMLImageElement;
     objectUrl: string | null;
+    scratchedCells: Set<string>;
+    scratchableCellCount: number;
     isFinished: boolean;
     constructor(props: Props);
     componentDidUpdate(prevProps: Props): void;
@@ -52,7 +54,15 @@ declare class Scratch extends Component<Props, State> {
     loadImage(): void;
     componentDidMount(): void;
     reset: () => void;
-    getFilledInPixels(stride: number): number;
+    getCheckZone(): {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    initializeScratchGrid(): void;
+    markScratchArea(x: number, y: number, width: number, height: number): void;
+    getFilledPercentage(): number;
     getMouse(e: any, canvas: HTMLCanvasElement): {
         x: number;
         y: number;

package/dist/index.js

@@ -19,6 +19,8 @@ function _setPrototypeOf(o, p) {
   return _setPrototypeOf(o, p);
 }
 
+var SCRATCH_GRID_SIZE = 4;
+
 var Scratch = /*#__PURE__*/function (_Component) {
   _inheritsLoose(Scratch, _Component);
 
@@ -29,6 +31,8 @@ var Scratch = /*#__PURE__*/function (_Component) {
     _this.isDrawing = false;
     _this.lastPoint = null;
     _this.objectUrl = null;
+    _this.scratchedCells = new Set();
+    _this.scratchableCellCount = 0;
     _this.isFinished = false;
 
     _this.reset = function () {
@@ -37,7 +41,13 @@ var Scratch = /*#__PURE__*/function (_Component) {
 
       _this.ctx.drawImage(_this.image, 0, 0, _this.props.width, _this.props.height);
 
+      _this.initializeScratchGrid();
+
       _this.isFinished = false;
+
+      _this.setState({
+        finished: false
+      });
     };
 
     _this.handleMouseDown = function (e) {
@@ -67,18 +77,24 @@ var Scratch = /*#__PURE__*/function (_Component) {
 
         if (_this.brushImage && _this.props.customBrush) {
           _this.ctx.drawImage(_this.brushImage, x, y, _this.props.customBrush.width, _this.props.customBrush.height);
+
+          _this.markScratchArea(x, y, _this.props.customBrush.width, _this.props.customBrush.height);
         } else {
           _this.ctx.beginPath();
 
           _this.ctx.arc(x, y, _this.props.brushSize || 20, 0, 2 * Math.PI, false);
 
           _this.ctx.fill();
+
+          var radius = _this.props.brushSize || 20;
+
+          _this.markScratchArea(x - radius, y - radius, radius * 2, radius * 2);
         }
       }
 
       _this.lastPoint = currentPoint;
 
-      _this.handlePercentage(_this.getFilledInPixels(32));
+      _this.handlePercentage(_this.getFilledPercentage());
     };
 
     _this.handleMouseUp = function () {
@@ -138,7 +154,10 @@ var Scratch = /*#__PURE__*/function (_Component) {
     var _this2 = this;
 
     this.image = new Image();
-    this.image.crossOrigin = this.props.imageCrossOrigin === undefined ? 'anonymous' : this.props.imageCrossOrigin;
+
+    if (this.props.imageCrossOrigin !== undefined) {
+      this.image.crossOrigin = this.props.imageCrossOrigin;
+    }
 
     this.image.onload = function () {
       _this2.ctx.globalCompositeOperation = 'source-over';
@@ -147,6 +166,8 @@ var Scratch = /*#__PURE__*/function (_Component) {
 
       _this2.ctx.drawImage(_this2.image, 0, 0, _this2.props.width, _this2.props.height);
 
+      _this2.initializeScratchGrid();
+
       _this2.isFinished = false;
 
       _this2.setState({
@@ -170,11 +191,7 @@ var Scratch = /*#__PURE__*/function (_Component) {
     }
   };
 
-  _proto.getFilledInPixels = function getFilledInPixels(stride) {
-    if (!stride || stride < 1) {
-      stride = 1;
-    }
-
+  _proto.getCheckZone = function getCheckZone() {
     var x = 0;
     var y = 0;
     var width = this.canvas.width;
@@ -187,17 +204,51 @@ var Scratch = /*#__PURE__*/function (_Component) {
       height = this.props.customCheckZone.height;
     }
 
-    var pixels = this.ctx.getImageData(x, y, width, height);
-    var total = pixels.data.length / stride;
-    var count = 0;
+    return {
+      x: x,
+      y: y,
+      width: width,
+      height: height
+    };
+  };
 
-    for (var i = 0; i < pixels.data.length; i += stride) {
-      if (parseInt(pixels.data[i], 10) === 0) {
-        count++;
+  _proto.initializeScratchGrid = function initializeScratchGrid() {
+    var zone = this.getCheckZone();
+    var columns = Math.ceil(zone.width / SCRATCH_GRID_SIZE);
+    var rows = Math.ceil(zone.height / SCRATCH_GRID_SIZE);
+    this.scratchedCells = new Set();
+    this.scratchableCellCount = columns * rows;
+  };
+
+  _proto.markScratchArea = function markScratchArea(x, y, width, height) {
+    var zone = this.getCheckZone();
+    var startX = Math.max(zone.x, x);
+    var startY = Math.max(zone.y, y);
+    var endX = Math.min(zone.x + zone.width, x + width);
+    var endY = Math.min(zone.y + zone.height, y + height);
+
+    if (startX >= endX || startY >= endY) {
+      return;
+    }
+
+    var startColumn = Math.floor((startX - zone.x) / SCRATCH_GRID_SIZE);
+    var endColumn = Math.floor((endX - zone.x - 1) / SCRATCH_GRID_SIZE);
+    var startRow = Math.floor((startY - zone.y) / SCRATCH_GRID_SIZE);
+    var endRow = Math.floor((endY - zone.y - 1) / SCRATCH_GRID_SIZE);
+
+    for (var row = startRow; row <= endRow; row++) {
+      for (var column = startColumn; column <= endColumn; column++) {
+        this.scratchedCells.add(column + ":" + row);
       }
     }
+  };
+
+  _proto.getFilledPercentage = function getFilledPercentage() {
+    if (this.scratchableCellCount === 0) {
+      return 0;
+    }
 
-    return Math.round(count / total * 100);
+    return Math.round(this.scratchedCells.size / this.scratchableCellCount * 100);
   };
 
   _proto.getMouse = function getMouse(e, canvas) {