js-draw 0.7.2 → 0.9.0

package/dist/src/Color4.js

@@ -63,6 +63,9 @@ export default class Color4 {
         if (text.startsWith('#')) {
             return Color4.fromHex(text);
         }
+        else if (text === 'none' || text === 'transparent') {
+            return Color4.transparent;
+        }
         else {
             // Otherwise, try to use an HTML5Canvas to determine the color
             const canvas = document.createElement('canvas');

package/dist/src/SVGLoader.js

@@ -22,6 +22,7 @@ export const defaultSVGViewRect = new Rect2(0, 0, 500, 500);
 // Key to retrieve unrecognised attributes from an AbstractComponent
 export const svgAttributesDataKey = 'svgAttrs';
 export const svgStyleAttributesDataKey = 'svgStyleAttrs';
+const supportedStrokeFillStyleAttrs = ['stroke', 'fill', 'stroke-width'];
 export default class SVGLoader {
     constructor(source, onFinish, storeUnknown = true) {
         this.source = source;
@@ -123,8 +124,7 @@ export default class SVGLoader {
         try {
             const strokeData = this.strokeDataFromElem(node);
             elem = new Stroke(strokeData);
-            const supportedStyleAttrs = ['stroke', 'fill', 'stroke-width'];
-            this.attachUnrecognisedAttrs(elem, node, new Set([...supportedStyleAttrs, 'd']), new Set(supportedStyleAttrs));
+            this.attachUnrecognisedAttrs(elem, node, new Set([...supportedStrokeFillStyleAttrs, 'd']), new Set(supportedStrokeFillStyleAttrs));
         }
         catch (e) {
             console.error('Invalid path in node', node, '\nError:', e, '\nAdding as an unknown object.');
@@ -193,8 +193,8 @@ export default class SVGLoader {
         const fontSizeMatch = /^([-0-9.e]+)px/i.exec(computedStyles.fontSize);
         const supportedStyleAttrs = [
             'fontFamily',
-            'fill',
-            'transform'
+            'transform',
+            ...supportedStrokeFillStyleAttrs,
         ];
         let fontSize = 12;
         if (fontSizeMatch) {
@@ -204,9 +204,7 @@ export default class SVGLoader {
         const style = {
             size: fontSize,
             fontFamily: computedStyles.fontFamily || elem.style.fontFamily || 'sans-serif',
-            renderingStyle: {
-                fill: Color4.fromString(computedStyles.fill || elem.style.fill || '#000')
-            },
+            renderingStyle: this.getStyle(elem),
         };
         const supportedAttrs = [];
         const transform = this.getTransform(elem, supportedAttrs, computedStyles);

package/dist/src/components/Stroke.js

@@ -36,6 +36,7 @@ export default class Stroke extends AbstractComponent {
         return false;
     }
     render(canvas, visibleRect) {
+        var _a, _b;
         canvas.startObject(this.getBBox());
         for (const part of this.parts) {
             const bbox = this.bboxForPart(part.path.bbox, part.style);
@@ -44,7 +45,7 @@ export default class Stroke extends AbstractComponent {
                     continue;
                 }
                 const muchBiggerThanVisible = bbox.size.x > visibleRect.size.x * 2 || bbox.size.y > visibleRect.size.y * 2;
-                if (muchBiggerThanVisible && !part.path.closedRoughlyIntersects(visibleRect)) {
+                if (muchBiggerThanVisible && !part.path.roughlyIntersects(visibleRect, (_b = (_a = part.style.stroke) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : 0)) {
                     continue;
                 }
             }
@@ -65,7 +66,13 @@ export default class Stroke extends AbstractComponent {
         // Update each part
         this.parts = this.parts.map((part) => {
             const newPath = part.path.transformedBy(affineTransfm);
-            const newBBox = this.bboxForPart(newPath.bbox, part.style);
+            const newStyle = Object.assign(Object.assign({}, part.style), { stroke: part.style.stroke ? Object.assign({}, part.style.stroke) : undefined });
+            // Approximate the scale factor.
+            if (newStyle.stroke) {
+                const scaleFactor = affineTransfm.getScaleFactor();
+                newStyle.stroke.width *= scaleFactor;
+            }
+            const newBBox = this.bboxForPart(newPath.bbox, newStyle);
             if (isFirstPart) {
                 this.contentBBox = newBBox;
                 isFirstPart = false;
@@ -77,7 +84,7 @@ export default class Stroke extends AbstractComponent {
                 path: newPath,
                 startPoint: newPath.startPoint,
                 commands: newPath.parts,
-                style: part.style,
+                style: newStyle,
             };
         });
     }

package/dist/src/components/builders/FreehandLineBuilder.d.ts

@@ -1,44 +1,31 @@
-import AbstractRenderer from '../../rendering/renderers/AbstractRenderer';
+import AbstractRenderer, { RenderablePathSpec } from '../../rendering/renderers/AbstractRenderer';
 import Rect2 from '../../math/Rect2';
 import Stroke from '../Stroke';
 import Viewport from '../../Viewport';
 import { StrokeDataPoint } from '../../types';
 import { ComponentBuilder, ComponentBuilderFactory } from './types';
+import RenderingStyle from '../../rendering/RenderingStyle';
 export declare const makeFreehandLineBuilder: ComponentBuilderFactory;
 export default class FreehandLineBuilder implements ComponentBuilder {
     private startPoint;
     private minFitAllowed;
-    private maxFitAllowed;
     private viewport;
     private isFirstSegment;
-    private pathStartConnector;
-    private mostRecentConnector;
-    private upperSegments;
-    private lowerSegments;
-    private lastUpperBezier;
-    private lastLowerBezier;
     private parts;
-    private buffer;
-    private lastPoint;
-    private lastExitingVec;
-    private currentCurve;
-    private curveStartWidth;
-    private curveEndWidth;
-    private momentum;
+    private curveFitter;
     private bbox;
+    private averageWidth;
+    private widthAverageNumSamples;
     constructor(startPoint: StrokeDataPoint, minFitAllowed: number, maxFitAllowed: number, viewport: Viewport);
     getBBox(): Rect2;
-    private getRenderingStyle;
-    private previewCurrentPath;
-    private previewFullPath;
+    protected getRenderingStyle(): RenderingStyle;
+    protected previewCurrentPath(): RenderablePathSpec | null;
+    protected previewFullPath(): RenderablePathSpec[] | null;
     private previewStroke;
     preview(renderer: AbstractRenderer): void;
     build(): Stroke;
     private roundPoint;
-    private shouldStartNewSegment;
-    private approxCurrentCurveLength;
-    private finalizeCurrentCurve;
-    private currentSegmentToPath;
-    private computeExitingVec;
+    private curveToPathCommands;
+    private addCurve;
     addPoint(newPoint: StrokeDataPoint): void;
 }