♻️ Update paper imports

Author: Hannes Kruse

src/lib/interfaces.ts

@@ -1,5 +1,4 @@
 import {Observable, Subject} from "rxjs";
-import {Color, Item, Point} from "paper";
 import {ClickState, DragState, MenuItemEventType, SettingsGroup} from "./enums";
 import Trace from "../utlis/trace";
 
@@ -9,8 +8,8 @@ import Trace from "../utlis/trace";
  * @see {Menu}
  */
 export interface MenuData {
-    inputPosition$: Subject<Point>;
-    inputPosition: Point;
+    inputPosition$: Subject<paper.Point>;
+    inputPosition: paper.Point;
     inputActivation$: Subject<Input>;
     inputDeactivation$: Subject<Input>;
 
@@ -39,7 +38,7 @@ export interface Input {
  * DragDefinition state data
  */
 export interface DragDefinition {
-    readonly position: Point;
+    readonly position: paper.Point;
     readonly state: DragState;
 }
 
@@ -84,7 +83,7 @@ export interface MenuEventDefinition {
  * to - To state
  */
 export interface AnimationDefinition {
-    target: Item;
+    target: paper.Item;
     from?: AnimatableData;
     to?: AnimatableData;
     options?: AnimationOptions;
@@ -102,12 +101,12 @@ export interface AnimationOptions {
  * Animatable Data
  */
 export interface AnimatableData {
-    [key: string]: Point | Color | number | string | null | undefined | Record<string, string | number | Point>;
+    [key: string]: paper.Point | paper.Color | number | string | null | undefined | Record<string, string | number | paper.Point>;
 
-    position?: Point | number;
-    scaling?: Point | number;
+    position?: paper.Point | number;
+    scaling?: paper.Point | number;
     opacity?: number;
-    fillColor?: string | Color | null;
+    fillColor?: string | paper.Color | null;
 }
 
 /**

src/lib/menu/base.ts

@@ -1,17 +1,15 @@
-import {Group} from 'paper';
-
 /**
  * This class removes the automatic hitTest calls from paper.js as they are not needed
  */
-export default class Base extends Group {
+export default class Base extends paper.Group {
     //@ts-ignore
     public hitTestAll(point: paper.Point, options?: object): paper.HitResult[] {
         return [];
     }
 
     //@ts-ignore
     public hitTest(point: paper.Point, options?: object): paper.HitResult {
-        return undefined;
+        return new paper.HitResult();
     }
 
     // @ts-ignore

src/lib/menu/checkbox.ts

@@ -1,7 +1,6 @@
 import MenuItem from "./menu-item";
 import {MenuItemEventType, SettingsGroup} from "../enums";
 import ColorFactory from "../../utlis/color-factory";
-import {Path, Rectangle, Size} from "paper";
 import {ZERO_POINT as CENTER} from "../constants";
 
 /**
@@ -44,7 +43,7 @@ export default class Checkbox extends MenuItem {
      * True if checkbox is selected
      */
     public isSelected(): boolean {
-        return this.itemSelected === true;
+        return this.itemSelected;
     }
 
     /**
@@ -103,16 +102,16 @@ export default class Checkbox extends MenuItem {
     protected setupGeometry(): void {
         let rectangleSize = this.settings[SettingsGroup.GEOMETRY].size * 1.75;
 
-        let rectangle = new Rectangle(
+        let rectangle = new paper.Rectangle(
             CENTER,
-            new Size(rectangleSize, rectangleSize)
+            new paper.Size(rectangleSize, rectangleSize)
         );
         rectangle.center = CENTER;
 
         let cornerRadius = this.settings[SettingsGroup.CHECKBOX].cornerRadius;
-        let cornerSize = new Size(cornerRadius, cornerRadius);
+        let cornerSize = new paper.Size(cornerRadius, cornerRadius);
 
-        this._geometry = new Path.Rectangle(rectangle, cornerSize);
+        this._geometry = new paper.Path.Rectangle(rectangle, cornerSize);
 
         this.setGeometryColorDefault();
         this.geometry.strokeScaling = false;