js-draw 0.17.1 → 0.17.2

package/src/components/TextComponent.test.ts

@@ -72,7 +72,7 @@ describe('TextComponent', () => {
 		expect(text.getStyle().color).objEq(Color4.green);
 	});
 
-	it('restyling the duplicate of a TextComponent should preserve the original\'s style', () => {
+	it('calling forceStyle on the duplicate of a TextComponent should preserve the original\'s style', () => {
 		const originalStyle: TextStyle = {
 			size: 11,
 			fontFamily: 'sans-serif',

package/src/components/TextComponent.ts

@@ -5,7 +5,7 @@ import Rect2 from '../math/Rect2';
 import Editor from '../Editor';
 import { Vec2 } from '../math/Vec2';
 import AbstractRenderer from '../rendering/renderers/AbstractRenderer';
-import { TextStyle, textStyleFromJSON, textStyleToJSON } from '../rendering/TextRenderingStyle';
+import { cloneTextStyle, TextStyle, textStyleFromJSON, textStyleToJSON } from '../rendering/TextRenderingStyle';
 import AbstractComponent from './AbstractComponent';
 import { ImageComponentLocalization } from './localization';
 import RestyleableComponent, { ComponentStyle, createRestyleComponentCommand } from './RestylableComponent';
@@ -170,7 +170,7 @@ export default class TextComponent extends AbstractComponent implements Restylea
 
 	public forceStyle(style: ComponentStyle, editor: Editor|null): void {
 		if (style.textStyle) {
-			this.style = style.textStyle;
+			this.style = cloneTextStyle(style.textStyle);
 		} else if (style.color) {
 			this.style = {
 				...this.style,
@@ -197,12 +197,7 @@ export default class TextComponent extends AbstractComponent implements Restylea
 
 	// See this.getStyle
 	public getTextStyle() {
-		return {
-			...this.style,
-			renderingStyle: {
-				...this.style.renderingStyle,
-			},
-		};
+		return cloneTextStyle(this.style);
 	}
 
 	public getBaselinePos() {
@@ -219,7 +214,14 @@ export default class TextComponent extends AbstractComponent implements Restylea
 	}
 
 	protected createClone(): AbstractComponent {
-		return new TextComponent(this.textObjects, this.transform, this.style);
+		const clonedTextObjects = this.textObjects.map(obj => {
+			if (typeof obj === 'string') {
+				return obj;
+			} else {
+				return obj.createClone() as TextComponent;
+			}
+		});
+		return new TextComponent(clonedTextObjects, this.transform, this.style);
 	}
 
 	public getText() {

package/src/rendering/RenderingStyle.ts

@@ -10,6 +10,15 @@ interface RenderingStyle {
 
 export default RenderingStyle;
 
+export const cloneStyle = (style: RenderingStyle) => {
+	return {
+		fill: style.fill,
+		stroke: style.stroke ? {
+			...style.stroke
+		} : undefined,
+	};
+};
+
 export const stylesEqual = (a: RenderingStyle, b: RenderingStyle): boolean => {
 	const result = a === b || (a.fill.eq(b.fill)
 		&& (a.stroke == undefined) === (b.stroke == undefined)

package/src/rendering/TextRenderingStyle.ts

@@ -1,4 +1,4 @@
-import RenderingStyle, { styleFromJSON, styleToJSON } from './RenderingStyle';
+import RenderingStyle, { cloneStyle, styleFromJSON, styleToJSON } from './RenderingStyle';
 
 export interface TextStyle {
 	size: number;
@@ -10,6 +10,13 @@ export interface TextStyle {
 
 export default TextStyle;
 
+export const cloneTextStyle = (style: TextStyle) => {
+	return {
+		...style,
+		renderingStyle: cloneStyle(style.renderingStyle),
+	};
+};
+
 export const textStyleFromJSON = (json: any) => {
 	if (typeof json === 'string') {
 		json = JSON.parse(json);

package/src/tools/FindTool.ts

@@ -49,7 +49,8 @@ export default class FindTool extends BaseTool {
 		}
 
 		if (matchIdx < matches.length) {
-			this.editor.dispatch(this.editor.viewport.zoomTo(matches[matchIdx], true, true));
+			const undoable = false;
+			this.editor.dispatch(this.editor.viewport.zoomTo(matches[matchIdx], true, true), undoable);
 			this.editor.announceForAccessibility(
 				this.editor.localization.focusedFoundText(matchIdx + 1, matches.length)
 			);

package/src/util/assertions.ts

@@ -1,7 +1,55 @@
 
-// Compile-time assertion that a branch of code is unreachable.
-// See https://stackoverflow.com/a/39419171/17055750
-// @internal
+/**
+ * Compile-time assertion that a branch of code is unreachable.
+ * @internal
+ */
 export const assertUnreachable = (key: never): never => {
+	// See https://stackoverflow.com/a/39419171/17055750
 	throw new Error(`Should be unreachable. Key: ${key}.`);
 };
+
+
+/**
+ * Throws an exception if the typeof given value is not a number or `value` is NaN.
+ * 
+ * @example
+ * ```ts
+ * const foo: unknown = 3;
+ * assertIsNumber(foo);
+ * 
+ * assertIsNumber('hello, world'); // throws an Error.
+ * ```
+ * 
+ * 
+ */
+export const assertIsNumber = (value: any, allowNaN: boolean = false): value is number => {
+	if (typeof value !== 'number' || (!allowNaN && isNaN(value))) {
+		throw new Error('Given value is not a number');
+		// return false;
+	}
+
+	return true;
+};
+
+/**
+ * Throws if any of `values` is not of type number.
+ */
+export const assertIsNumberArray = (
+	values: any[], allowNaN: boolean = false
+): values is number[] => {
+	if (typeof values !== 'object') {
+		throw new Error('Asserting isNumberArray: Given entity is not an array');
+	}
+
+	if (!assertIsNumber(values['length'])) {
+		return false;
+	}
+
+	for (const value of values) {
+		if (!assertIsNumber(value, allowNaN)) {
+			return false;
+		}
+	}
+
+	return true;
+};