js-draw 0.24.0 → 0.24.1

package/dist/cjs/shortcuts/KeyBinding.js

@@ -18,7 +18,7 @@ var KeyBinding = /** @class */ (function () {
         var isUpperCaseKey = ((_b = keyEvent.key) === null || _b === void 0 ? void 0 : _b.toUpperCase()) === keyEvent.key
             && ((_c = keyEvent.key) === null || _c === void 0 ? void 0 : _c.toLowerCase()) !== keyEvent.key
             && ((_d = keyEvent.key) === null || _d === void 0 ? void 0 : _d.length) === 1;
-        var isLowercaseKey = ((_e = keyEvent.key) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== keyEvent.key
+        var isLowercaseKey = ((_e = keyEvent.key) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === keyEvent.key
             && !isUpperCaseKey
             && ((_f = keyEvent.key) === null || _f === void 0 ? void 0 : _f.length) === 1;
         var ctrlKey = ((_g = keyEvent.ctrlKey) !== null && _g !== void 0 ? _g : false) || lowercaseKey === 'control';

package/dist/mjs/shortcuts/KeyBinding.mjs

@@ -16,7 +16,7 @@ var KeyBinding = /** @class */ (function () {
         var isUpperCaseKey = ((_b = keyEvent.key) === null || _b === void 0 ? void 0 : _b.toUpperCase()) === keyEvent.key
             && ((_c = keyEvent.key) === null || _c === void 0 ? void 0 : _c.toLowerCase()) !== keyEvent.key
             && ((_d = keyEvent.key) === null || _d === void 0 ? void 0 : _d.length) === 1;
-        var isLowercaseKey = ((_e = keyEvent.key) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== keyEvent.key
+        var isLowercaseKey = ((_e = keyEvent.key) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === keyEvent.key
             && !isUpperCaseKey
             && ((_f = keyEvent.key) === null || _f === void 0 ? void 0 : _f.length) === 1;
         var ctrlKey = ((_g = keyEvent.ctrlKey) !== null && _g !== void 0 ? _g : false) || lowercaseKey === 'control';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-draw",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Draw pictures using a pen, touchscreen, or mouse! JS-draw is a drawing library for JavaScript and TypeScript. ",
   "types": "./dist/mjs/lib.d.ts",
   "main": "./dist/cjs/lib.js",
@@ -71,7 +71,8 @@
     "build": "rm -rf ./dist && mkdir dist && build-tool build",
     "watch": "rm -rf ./dist && mkdir dist && build-tool watch",
     "build-translation-template": "build-tool build-translation-template",
-    "prepack": "npm run dist && cd ../../ && npm run test && cd packages/js-draw"
+    "prepack": "npm run dist && cd ../../ && npm run test && cd packages/js-draw && ts-node tools/copyREADME.ts copy",
+    "postpack": "ts-node tools/copyREADME.ts revert"
   },
   "dependencies": {
     "@melloware/coloris": "0.20.0",

package/src/shortcuts/KeyBinding.ts

@@ -60,7 +60,7 @@ export default class KeyBinding implements KeyCombination {
 		const isUpperCaseKey = keyEvent.key?.toUpperCase() === keyEvent.key
 			&& keyEvent.key?.toLowerCase() !== keyEvent.key
 			&& keyEvent.key?.length === 1;
-		const isLowercaseKey = keyEvent.key?.toLowerCase() !== keyEvent.key
+		const isLowercaseKey = keyEvent.key?.toLowerCase() === keyEvent.key
 			&& !isUpperCaseKey
 			&& keyEvent.key?.length === 1;
 

package/src/tools/PanZoom.test.ts

@@ -307,4 +307,43 @@ describe('PanZoom', () => {
 			lastVisibleRect = editor.viewport.visibleRect;
 		}
 	});
+
+	it('"r" and "R" keyboard shortcuts should rotate the viewport in opposite directions', () => {
+		const editor = createEditor();
+		selectPanZom(editor);
+		editor.viewport.resetTransform(Mat33.identity);
+
+		// Returns the transformed version of [vec], treating the vector as
+		// starting at the center of the editor's visible region.
+		const transformedVec = (vec: Vec2) => {
+			const canvasToScreen = editor.viewport.canvasToScreenTransform;
+			const center = editor.viewport.visibleRect.center;
+
+			const transformedEnd = canvasToScreen.transformVec2(center.plus(vec));
+			const transformedStart = canvasToScreen.transformVec2(center);
+			return transformedEnd.minus(transformedStart);
+		};
+
+		const tolerableError = 0.001;
+
+		expect(transformedVec(Vec2.unitX).length()).toBeCloseTo(1);
+
+		editor.toolController.dispatchInputEvent({
+			kind: InputEvtType.KeyPressEvent,
+			ctrlKey: false,
+			altKey: false,
+			key: 'r',
+		});
+		expect(transformedVec(Vec2.unitX).length()).toBeCloseTo(1);
+		expect(transformedVec(Vec2.unitX)).not.objEq(Vec2.unitX, tolerableError);
+
+		editor.toolController.dispatchInputEvent({
+			kind: InputEvtType.KeyPressEvent,
+			ctrlKey: false,
+			altKey: false,
+			key: 'R',
+		});
+		expect(transformedVec(Vec2.unitX).length()).toBeCloseTo(1);
+		expect(transformedVec(Vec2.unitX)).objEq(Vec2.unitX, tolerableError);
+	});
 });

package/tools/copyREADME.ts

@@ -0,0 +1,62 @@
+
+// Copies this repository's root README and its resources to the js-draw folder
+// prior to bundling. This allows the README to be shown on NPM.
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+
+// Path to the root repository
+const packagePath = path.dirname(__dirname);
+const rootPath = path.dirname(path.dirname(packagePath));
+
+const relativeReadmeResourcesPath = path.join('docs', 'img', 'readme-images');
+const originalReadmePath = path.join(rootPath, 'README.md');
+const targetReadmePath = path.join(packagePath, 'README.md');
+const originalReadmeResourcesPath = path.join(rootPath, relativeReadmeResourcesPath);
+const targetReadmeResourcesPath = path.join(packagePath, relativeReadmeResourcesPath);
+
+const lastArg = process.argv[process.argv.length - 1];
+if (lastArg !== 'revert' && lastArg !== 'copy') {
+	console.log(`Usage: ${process.argv0} revert`);
+	console.log(`  or   ${process.argv0} copy`);
+	process.exit(1);
+}
+
+if (lastArg === 'copy') {
+	console.log('Copying README.md and its dependencies to the js-draw package...');
+	if (fs.existsSync(targetReadmePath)) {
+		console.error('ERROR: README already exists in target location. Exiting.');
+		console.error('Be careful running postpack: It will DELETE this README and associated resources');
+		process.exit(1);
+	}
+
+	if (fs.existsSync(targetReadmeResourcesPath)) {
+		console.error('ERROR: README resources directory already exists in this package. Exiting.');
+		console.error('Be careful running postpack: It will delete this resources directory.');
+		process.exit(1);
+	}
+
+	fs.copyFileSync(originalReadmePath, targetReadmePath);
+	fs.mkdirSync(targetReadmeResourcesPath, { recursive: true });
+
+	for (const filePath of fs.readdirSync(originalReadmeResourcesPath)) {
+		const sourcePath = path.join(originalReadmeResourcesPath, filePath);
+		const targetPath = path.join(targetReadmeResourcesPath, filePath);
+		fs.copyFileSync(sourcePath, targetPath);
+	}
+} else {
+	console.log('Removing the copied README.md and its dependencies from the js-draw package...');
+	if (!fs.existsSync(targetReadmePath)) {
+		console.error('ERROR: README does not exist in target location. Exiting.');
+		process.exit(1);
+	}
+
+	if (!fs.existsSync(targetReadmeResourcesPath)) {
+		console.error('ERROR: README resources directory does not exist in the target location. Exiting.');
+		process.exit(1);
+	}
+
+	fs.unlinkSync(targetReadmePath);
+	fs.rmSync(targetReadmeResourcesPath, { recursive: true });
+}
+
+