diff --git a/common/web/gesture-recognizer/src/tools/unit-test-resources/src/inputSequenceSimulator.ts b/common/web/gesture-recognizer/src/tools/unit-test-resources/src/inputSequenceSimulator.ts index 1f997a0041..9f2e834066 100644 --- a/common/web/gesture-recognizer/src/tools/unit-test-resources/src/inputSequenceSimulator.ts +++ b/common/web/gesture-recognizer/src/tools/unit-test-resources/src/inputSequenceSimulator.ts @@ -57,6 +57,7 @@ export class InputSequenceSimulator { return { _arr: arr, // Obviously, this isn't a standard member of TouchList. length: arr.length, + //@ts-ignore item: function(i: number) { return this._arr[i]; } } } diff --git a/common/web/gesture-recognizer/src/tools/unit-test-resources/src/sequenceRecorder.ts b/common/web/gesture-recognizer/src/tools/unit-test-resources/src/sequenceRecorder.ts index bb584bd792..a8070ac4fa 100644 --- a/common/web/gesture-recognizer/src/tools/unit-test-resources/src/sequenceRecorder.ts +++ b/common/web/gesture-recognizer/src/tools/unit-test-resources/src/sequenceRecorder.ts @@ -1,4 +1,4 @@ -import { GestureDebugSource } from "@keymanapp/gesture-recognizer"; +import { GestureDebugSource, GestureSource } from "@keymanapp/gesture-recognizer"; import { HostFixtureLayoutController } from "./hostFixtureLayoutController.js"; import { RecordedCoordSequenceSet } from "./inputRecording.js"; @@ -32,9 +32,9 @@ export class SequenceRecorder { } private _attachRecognizerHooks() { - this.controller.recognizer.on('inputstart', (wrappedSequence: WrappedInputSequence) => { + this.controller.recognizer.on('inputstart', (wrappedSequence: GestureSource) => { const id = wrappedSequence.identifier; - this.records[id] = wrappedSequence; + this.records[id] = wrappedSequence as WrappedInputSequence; this.startOrder.push(id); }); diff --git a/web/src/tsconfig.dom.json b/web/src/tsconfig.dom.json index 3227a5cac3..47f2d25016 100644 --- a/web/src/tsconfig.dom.json +++ b/web/src/tsconfig.dom.json @@ -3,6 +3,9 @@ "extends": "../tsconfig.base.json", "compilerOptions": { "lib": [ "DOM", "ES6"], + // TODO: These override ../tsconfig.base.json settings, and so should be removed if possible, + // but existing code in web/ breaks some of these settings "noImplicitAny": false, + "strictFunctionTypes": false } } \ No newline at end of file diff --git a/web/tsconfig.base.json b/web/tsconfig.base.json index a7c122a93d..aac6de4f32 100644 --- a/web/tsconfig.base.json +++ b/web/tsconfig.base.json @@ -11,9 +11,8 @@ "target": "es5", // TODO: These override ../tsconfig.base.json settings, and so should be removed if possible, - // but existing code in web/ breaks some of these settinsg + // but existing code in web/ breaks some of these settings "noImplicitReturns": false, - "strictFunctionTypes": false, "strictNullChecks": false, // Other settings - declaration files, sourcemapping, and other miscellaneous bits.