Merge pull request #334 from Dessia-tech/feat/interactiveobject

[8] Feat/interactiveobject

Author: Tanguylo

.gitignore

@@ -22,6 +22,7 @@ downloads/
 eggs/
 .eggs/
 lib/
+libdev/
 lib64/
 node_modules/
 parts/

.pre-commit-config.yaml

@@ -6,7 +6,6 @@ repos:
     rev: v3.2.0
     hooks:
       - id: trailing-whitespace
-        exclude: libdev/
       - id: check-docstring-first
       - id: check-json
       - id: check-added-large-files
@@ -15,4 +14,3 @@ repos:
       - id: requirements-txt-fixer
       - id: check-merge-conflict
       - id: end-of-file-fixer
-        exclude: libdev/

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.23.0]
+### Fix
+- Remove offline mode
+
+### Refactor
+- Implements InteractiveObject for handling all mouse objects in one class
+
 ## [0.22.0]
 ### Add
 - Integer axes only show integer ticks

cypress/e2e/axes.cy.ts

@@ -22,8 +22,8 @@ describe('Axis', function() {
 
     axis.draw(context);
 
-    cy.wrap(context.fill).should('have.been.calledWith', axis.drawPath);
-    cy.wrap(context.stroke).should('have.been.calledWith', axis.drawPath);
+    cy.wrap(context.fill).should('have.been.calledWith', axis.drawnPath);
+    cy.wrap(context.stroke).should('have.been.calledWith', axis.drawnPath);
   });
 
   it('should be well created without vector features', function() {

cypress/e2e/baseShape.cy.ts

@@ -153,7 +153,7 @@ describe('Shape', function() {
   it('should initialize Shape without any arguments', function() {
     const shape = new Shape();
     expect(shape.path instanceof Path2D, "path").to.be.true;
-    expect(shape.scaledPath instanceof Path2D, "scaledPath").to.be.true;
+    expect(shape.drawnPath instanceof Path2D, "drawnPath").to.be.true;
     expect(shape.inStrokeScale.y, "inStrokeScale").to.equal(1);
     expect(shape.lineWidth, "lineWidth").to.equal(1);
     expect(shape.dashLine.length, "dashLine").to.equal(0);
@@ -187,8 +187,8 @@ describe('Shape', function() {
 
     shape.draw(context);
 
-    cy.wrap(context.fill).should('have.been.calledWith', shape.scaledPath);
-    cy.wrap(context.stroke).should('have.been.calledWith', shape.scaledPath);
+    cy.wrap(context.fill).should('have.been.calledWith', shape.drawnPath);
+    cy.wrap(context.stroke).should('have.been.calledWith', shape.drawnPath);
   });
 
   // Shape can be hovered over

cypress/e2e/figures.cy.ts

@@ -122,15 +122,20 @@ describe("Figure", function() {
         ]);
         scatter.initRubberBandMultiplot(multiplotRubberBands);
 
-        expect(multiplotRubberBands, "empty multiplotRubberBands").to.deep.equal(referenceRubberBands);
+        scatter.axes.forEach(axis => {
+            expect(multiplotRubberBands.get(axis.name).minValue, `empty rubberband ${axis.name}.minValue`).to.deep.equal(referenceRubberBands.get(axis.name).minValue);
+            expect(multiplotRubberBands.get(axis.name).maxValue, `empty rubberband ${axis.name}.minValue`).to.deep.equal(referenceRubberBands.get(axis.name).maxValue);
+        });
 
         scatter.axes[0].rubberBand.minValue = 1;
         scatter.axes[0].rubberBand.maxValue = 4;
         scatter.axes[1].rubberBand.minValue = 2;
         scatter.axes[1].rubberBand.maxValue = 5;
         scatter.updateRubberBandMultiplot(multiplotRubberBands);
-
-        expect(multiplotRubberBands, "edited multiplotRubberBands").to.deep.equal(referenceRubberBands);
+        scatter.axes.forEach(axis => {
+            expect(multiplotRubberBands.get(axis.name).minValue, `edited rubberband ${axis.name}.minValue`).to.deep.equal(referenceRubberBands.get(axis.name).minValue);
+            expect(multiplotRubberBands.get(axis.name).maxValue, `edited rubberband ${axis.name}.minValue`).to.deep.equal(referenceRubberBands.get(axis.name).maxValue);
+        });
     });
 });
 
@@ -233,12 +238,12 @@ describe("Histogram", function() {
 
     it("should hover/click on bar", function () {
         const [canvasMouse, frameMouse, mouseCoords] = histogram.projectMouse({"offsetX": 350, "offsetY": 420} as MouseEvent);
-        histogram.mouseMove(canvasMouse, frameMouse, mouseCoords);
+        histogram.castMouseMove(canvasMouse, frameMouse, mouseCoords);
         expect(histogram.hoveredIndices[1], "hoveredIndices[1]").to.equal(7);
         expect(histogram.hoveredIndices.length, "hoveredIndices.length").to.equal(3);
 
-        histogram.mouseDown(canvasMouse, frameMouse, mouseCoords);
-        histogram.mouseUp(false)
+        histogram.castMouseDown(canvasMouse, frameMouse, mouseCoords);
+        histogram.castMouseUp(false)
         expect(histogram.clickedIndices[2], "clickedIndices[2]").to.equal(8);
         expect(histogram.clickedIndices[0], "clickedIndices[0]").to.equal(6);
     });

cypress/e2e/visualRegressions.cy.ts

@@ -66,9 +66,9 @@ FIGURES_DATA.forEach(figureData => {
                 cy.window().then((win) => {
                     const draw = win.eval('plot_data');
                     const [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 746, "offsetY": 176} as MouseEvent);
-                    draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
-                    draw.mouseDown(canvasMouse, frameMouse, mouseCoords);
-                    draw.mouseUp(false);
+                    draw.castMouseMove(canvasMouse, frameMouse, mouseCoords);
+                    draw.castMouseDown(canvasMouse, frameMouse, mouseCoords);
+                    draw.castMouseUp(false);
                     draw.draw();
                     cy.compareSnapshot(describeTitle + this.test.title, 0.05);
                 });
@@ -78,11 +78,11 @@ FIGURES_DATA.forEach(figureData => {
                 cy.window().then((win) => {
                     const draw = win.eval('plot_data');
                     let [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 814, "offsetY": 196} as MouseEvent);
-                    draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
+                    draw.castMouseMove(canvasMouse, frameMouse, mouseCoords);
                     expect(draw.relativeObjects.shapes[23].isHovered).to.be.true;
 
                     [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 822, "offsetY": 196} as MouseEvent);
-                    draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
+                    draw.castMouseMove(canvasMouse, frameMouse, mouseCoords);
                     expect(draw.relativeObjects.shapes[23].isHovered).to.be.true;
                 });
             });