js-draw 0.1.5 → 0.1.8

package/dist/src/geometry/Path.d.ts

@@ -1,5 +1,6 @@
 import { Bezier } from 'bezier-js';
-import { RenderingStyle, RenderablePathSpec } from '../rendering/renderers/AbstractRenderer';
+import { RenderablePathSpec } from '../rendering/renderers/AbstractRenderer';
+import RenderingStyle from '../rendering/RenderingStyle';
 import LineSegment2 from './LineSegment2';
 import Mat33 from './Mat33';
 import Rect2 from './Rect2';
@@ -50,7 +51,9 @@ export default class Path {
     static fromRenderable(renderable: RenderablePathSpec): Path;
     toRenderable(fill: RenderingStyle): RenderablePathSpec;
     toString(): string;
+    serialize(): string;
     static toString(startPoint: Point2, parts: PathCommand[]): string;
     static fromString(pathString: string): Path;
+    static empty: Path;
 }
 export {};

package/dist/src/geometry/Path.js

@@ -203,6 +203,9 @@ export default class Path {
     toString() {
         return Path.toString(this.startPoint, this.parts);
     }
+    serialize() {
+        return this.toString();
+    }
     static toString(startPoint, parts) {
         const result = [];
         const toRoundedString = (num) => {
@@ -445,3 +448,4 @@ export default class Path {
         return new Path(startPos !== null && startPos !== void 0 ? startPos : Vec2.zero, commands);
     }
 }
+Path.empty = new Path(Vec2.zero, []);

package/dist/src/rendering/Display.d.ts

@@ -1,6 +1,8 @@
 import AbstractRenderer from './renderers/AbstractRenderer';
 import { Editor } from '../Editor';
+import { Point2 } from '../geometry/Vec2';
 import RenderingCache from './caching/RenderingCache';
+import Color4 from '../Color4';
 export declare enum RenderingMode {
     DummyRenderer = 0,
     CanvasRenderer = 1
@@ -18,6 +20,7 @@ export default class Display {
     get width(): number;
     get height(): number;
     getCache(): RenderingCache;
+    getColorAt: (_screenPos: Point2) => Color4 | null;
     private initializeCanvasRendering;
     private initializeTextRendering;
     startRerender(): AbstractRenderer;

package/dist/src/rendering/Display.js

@@ -4,6 +4,7 @@ import DummyRenderer from './renderers/DummyRenderer';
 import { Vec2 } from '../geometry/Vec2';
 import RenderingCache from './caching/RenderingCache';
 import TextOnlyRenderer from './renderers/TextOnlyRenderer';
+import Color4 from '../Color4';
 export var RenderingMode;
 (function (RenderingMode) {
     RenderingMode[RenderingMode["DummyRenderer"] = 0] = "DummyRenderer";
@@ -14,6 +15,9 @@ export default class Display {
     constructor(editor, mode, parent) {
         this.editor = editor;
         this.parent = parent;
+        this.getColorAt = (_screenPos) => {
+            return null;
+        };
         if (mode === RenderingMode.CanvasRenderer) {
             this.initializeCanvasRendering();
         }
@@ -106,6 +110,15 @@ export default class Display {
         this.flattenCallback = () => {
             dryInkCtx.drawImage(wetInkCanvas, 0, 0);
         };
+        this.getColorAt = (screenPos) => {
+            const pixel = dryInkCtx.getImageData(screenPos.x, screenPos.y, 1, 1);
+            const data = pixel === null || pixel === void 0 ? void 0 : pixel.data;
+            if (data) {
+                const color = Color4.ofRGBA(data[0] / 255, data[1] / 255, data[2] / 255, data[3] / 255);
+                return color;
+            }
+            return null;
+        };
     }
     initializeTextRendering() {
         const textRendererOutputContainer = document.createElement('div');

package/dist/src/rendering/RenderingStyle.d.ts

@@ -0,0 +1,24 @@
+import Color4 from '../Color4';
+interface RenderingStyle {
+    fill: Color4;
+    stroke?: {
+        color: Color4;
+        width: number;
+    };
+}
+export default RenderingStyle;
+export declare const stylesEqual: (a: RenderingStyle, b: RenderingStyle) => boolean;
+export declare const styleToJSON: (style: RenderingStyle) => {
+    fill: string;
+    stroke: {
+        color: string;
+        width: number;
+    } | undefined;
+};
+export declare const styleFromJSON: (json: Record<string, any>) => {
+    fill: Color4;
+    stroke: {
+        color: Color4;
+        width: any;
+    } | undefined;
+};

package/dist/src/rendering/RenderingStyle.js

@@ -0,0 +1,32 @@
+import Color4 from '../Color4';
+export const stylesEqual = (a, b) => {
+    var _a, _b, _c, _d, _e, _f;
+    const result = a === b || (a.fill.eq(b.fill)
+        && (a.stroke == undefined) === (b.stroke == undefined)
+        && ((_d = (_b = (_a = a.stroke) === null || _a === void 0 ? void 0 : _a.color) === null || _b === void 0 ? void 0 : _b.eq((_c = b.stroke) === null || _c === void 0 ? void 0 : _c.color)) !== null && _d !== void 0 ? _d : true)
+        && ((_e = a.stroke) === null || _e === void 0 ? void 0 : _e.width) === ((_f = b.stroke) === null || _f === void 0 ? void 0 : _f.width));
+    // Map undefined/null -> false
+    return result !== null && result !== void 0 ? result : false;
+};
+// Returns an object that can be converted to a JSON string with
+// JSON.stringify.
+export const styleToJSON = (style) => {
+    const stroke = !style.stroke ? undefined : {
+        color: style.stroke.color.toHexString(),
+        width: style.stroke.width,
+    };
+    return {
+        fill: style.fill.toHexString(),
+        stroke,
+    };
+};
+export const styleFromJSON = (json) => {
+    const stroke = json.stroke ? {
+        color: Color4.fromHex(json.stroke.color),
+        width: json.stroke.width,
+    } : undefined;
+    return {
+        fill: Color4.fromHex(json.fill),
+        stroke,
+    };
+};

package/dist/src/rendering/caching/RenderingCacheNode.js

@@ -44,6 +44,10 @@ export default class RenderingCacheNode {
     generateChildren() {
         if (this.instantiatedChildren.length === 0) {
             const childRects = this.region.divideIntoGrid(cacheDivisionSize, cacheDivisionSize);
+            if (this.region.size.x === 0 || this.region.size.y === 0) {
+                console.warn('Cache element has zero size! Not generating children.');
+                return;
+            }
             for (const rect of childRects) {
                 const child = new RenderingCacheNode(rect, this.cacheState);
                 child.parent = this;
@@ -283,7 +287,7 @@ export default class RenderingCacheNode {
     }
     checkRep() {
         if (this.instantiatedChildren.length !== cacheDivisionSize * cacheDivisionSize && this.instantiatedChildren.length !== 0) {
-            throw new Error('Repcheck: Wrong number of children');
+            throw new Error(`Repcheck: Wrong number of children. Got ${this.instantiatedChildren.length}`);
         }
         if (this.renderedIds[1] !== undefined && this.renderedIds[0] >= this.renderedIds[1]) {
             console.error(this.renderedIds);

package/dist/src/rendering/renderers/AbstractRenderer.d.ts

@@ -1,4 +1,3 @@
-import Color4 from '../../Color4';
 import { LoadSaveDataTable } from '../../components/AbstractComponent';
 import { TextStyle } from '../../components/Text';
 import Mat33 from '../../geometry/Mat33';
@@ -6,13 +5,7 @@ import { PathCommand } from '../../geometry/Path';
 import Rect2 from '../../geometry/Rect2';
 import { Point2, Vec2 } from '../../geometry/Vec2';
 import Viewport from '../../Viewport';
-export interface RenderingStyle {
-    fill: Color4;
-    stroke?: {
-        color: Color4;
-        width: number;
-    };
-}
+import RenderingStyle from '../RenderingStyle';
 export interface RenderablePathSpec {
     startPoint: Point2;
     commands: PathCommand[];

package/dist/src/rendering/renderers/AbstractRenderer.js

@@ -1,11 +1,6 @@
 import Path, { PathCommandType } from '../../geometry/Path';
 import { Vec2 } from '../../geometry/Vec2';
-const stylesEqual = (a, b) => {
-    var _a, _b, _c, _d, _e;
-    return a === b || (a.fill.eq(b.fill)
-        && ((_b = (_a = a.stroke) === null || _a === void 0 ? void 0 : _a.color) === null || _b === void 0 ? void 0 : _b.eq((_c = b.stroke) === null || _c === void 0 ? void 0 : _c.color))
-        && ((_d = a.stroke) === null || _d === void 0 ? void 0 : _d.width) === ((_e = b.stroke) === null || _e === void 0 ? void 0 : _e.width));
-};
+import { stylesEqual } from '../RenderingStyle';
 export default class AbstractRenderer {
     constructor(viewport) {
         this.viewport = viewport;

package/dist/src/rendering/renderers/CanvasRenderer.d.ts

@@ -4,7 +4,8 @@ import Rect2 from '../../geometry/Rect2';
 import { Point2, Vec2 } from '../../geometry/Vec2';
 import Vec3 from '../../geometry/Vec3';
 import Viewport from '../../Viewport';
-import AbstractRenderer, { RenderablePathSpec, RenderingStyle } from './AbstractRenderer';
+import RenderingStyle from '../RenderingStyle';
+import AbstractRenderer, { RenderablePathSpec } from './AbstractRenderer';
 export default class CanvasRenderer extends AbstractRenderer {
     private ctx;
     private ignoreObjectsAboveLevel;

package/dist/src/rendering/renderers/DummyRenderer.d.ts

@@ -4,7 +4,8 @@ import Rect2 from '../../geometry/Rect2';
 import { Point2, Vec2 } from '../../geometry/Vec2';
 import Vec3 from '../../geometry/Vec3';
 import Viewport from '../../Viewport';
-import AbstractRenderer, { RenderingStyle } from './AbstractRenderer';
+import RenderingStyle from '../RenderingStyle';
+import AbstractRenderer from './AbstractRenderer';
 export default class DummyRenderer extends AbstractRenderer {
     clearedCount: number;
     renderedPathCount: number;

package/dist/src/rendering/renderers/SVGRenderer.d.ts

@@ -4,7 +4,8 @@ import Mat33 from '../../geometry/Mat33';
 import Rect2 from '../../geometry/Rect2';
 import { Point2, Vec2 } from '../../geometry/Vec2';
 import Viewport from '../../Viewport';
-import AbstractRenderer, { RenderingStyle } from './AbstractRenderer';
+import RenderingStyle from '../RenderingStyle';
+import AbstractRenderer from './AbstractRenderer';
 export default class SVGRenderer extends AbstractRenderer {
     private elem;
     private currentPath;

package/dist/src/rendering/renderers/TextOnlyRenderer.d.ts

@@ -4,7 +4,8 @@ import Rect2 from '../../geometry/Rect2';
 import Vec3 from '../../geometry/Vec3';
 import Viewport from '../../Viewport';
 import { TextRendererLocalization } from '../localization';
-import AbstractRenderer, { RenderingStyle } from './AbstractRenderer';
+import RenderingStyle from '../RenderingStyle';
+import AbstractRenderer from './AbstractRenderer';
 export default class TextOnlyRenderer extends AbstractRenderer {
     private localizationTable;
     private descriptionBuilder;

package/dist/src/toolbar/HTMLToolbar.d.ts

@@ -1,11 +1,11 @@
 import Editor from '../Editor';
 import { ToolbarLocalization } from './localization';
 import { ActionButtonIcon } from './types';
+export declare const toolbarCSSPrefix = "toolbar-";
 export default class HTMLToolbar {
     private editor;
     private localizationTable;
     private container;
-    private penTypes;
     constructor(editor: Editor, parent: HTMLElement, localizationTable?: ToolbarLocalization);
     setupColorPickers(): void;
     addActionButton(title: string | ActionButtonIcon, command: () => void, parent?: Element): HTMLButtonElement;