Merge branch 'release/v1.0.3'

Author: Hannes Kruse

README.md

@@ -111,7 +111,8 @@ window.onload = () => {
     };
 
     menu.init();
-    menu.setStructure(tasty.parser.parse(struct));
+    const parser = new tasty.parser();
+    menu.setStructure(parser.parse(structure));
 
     menu.selection$.subscribe(s => {
         if (s.type === 'itemSelection') {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tasty.js",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A Pie- and Marking-Menu Framework written in TypeScript.",
   "scripts": {
     "type-check": "tsc --noEmit",
@@ -18,27 +18,27 @@
   "types": "dist/types/index.d.ts",
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.7.5",
+    "@babel/core": "^7.7.7",
     "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
-    "@babel/preset-env": "^7.7.6",
-    "@babel/preset-typescript": "^7.7.4",
-    "@fortawesome/free-solid-svg-icons": "^5.11.2",
+    "@babel/plugin-proposal-object-rest-spread": "^7.7.7",
+    "@babel/preset-env": "^7.7.7",
+    "@babel/preset-typescript": "^7.7.7",
+    "@fortawesome/free-solid-svg-icons": "^5.12.0",
     "@types/lodash": "^4.14.149",
-    "@typescript-eslint/eslint-plugin": "^2.11.0",
-    "@typescript-eslint/parser": "^2.11.0",
+    "@typescript-eslint/eslint-plugin": "^2.15.0",
+    "@typescript-eslint/parser": "^2.15.0",
     "babel-loader": "^8.0.6",
-    "eslint": "^6.7.2",
+    "eslint": "^6.8.0",
     "fork-ts-checker-webpack-plugin": "^3.1.1",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
     "lodash": "^4.17.15",
-    "paper": "^0.12.3",
-    "rxjs": "^6.5.3",
-    "typescript": "^3.7.3",
-    "webpack": "^4.41.2",
+    "paper": "^0.12.4",
+    "rxjs": "^6.5.4",
+    "typescript": "^3.7.4",
+    "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": "^3.10.1"
   },
   "resolutions": {
     "terser": "3.14.1"

package.json

@@ -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/interfaces.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/base.ts

@@ -1,10 +1,14 @@
 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";
 
+/**
+ * A Checkbox is either selected or not
+ */
 export default class Checkbox extends MenuItem {
+    public readonly TYPE = 'checkbox';
+
     /**
      * Selection Flag
      */
@@ -21,14 +25,27 @@ export default class Checkbox extends MenuItem {
         }
     }
 
+    /**
+     * Set the checkbox state to deselected
+     */
     public deselect(): void {
         this.itemSelected = false;
     }
 
+    /**
+     * Set the checkbox state to selected
+     */
     public select(): void {
         this.itemSelected = true;
     }
 
+    /**
+     * True if checkbox is selected
+     */
+    public isSelected(): boolean {
+        return this.itemSelected;
+    }
+
     /**
      * @see setGeometryColorSelected
      */
@@ -85,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;