diff --git a/package-lock.json b/package-lock.json index b7d60b0e..af27544e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "axios": "^1.17.0", "events": "^3.3.0", "gd-eventlog": "^0.1.27", - "incyclist-services": "^1.9.21", + "incyclist-services": "^1.9.22", "mqtt": "^5.15.2", "path-browserify": "^1.0.1", "process": "^0.11.10", @@ -2118,9 +2118,10 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz", - "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz", + "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==", + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -3385,6 +3386,16 @@ "url": "https://opencollective.com/libvips" } }, + "node_modules/@img/sharp-wasm32/node_modules/@emnapi/runtime": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz", + "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==", + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@img/sharp-webcontainers-wasm32": { "version": "0.35.5", "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.5.tgz", @@ -4083,9 +4094,9 @@ } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.5.tgz", - "integrity": "sha512-HshSvXzmBxNzqejd3k/KemgQ3hdREUYFRRrgxOZ+gPljDIsO2SDZrVZMd4Z/HsxudQbE62OVyVFE8z9BCurfjA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.7.tgz", + "integrity": "sha512-zJccwplOAbgfZju95IUHazLnx9RAPtPN2YGJXI6UbrgeaR9QfPjGrQL6ERkSAtnVCA4Q+83ApGyaX5zdpCaKkQ==", "dev": true, "license": "MIT", "optional": true, @@ -4100,8 +4111,8 @@ "url": "https://github.com/sponsors/Brooooooklyn" }, "peerDependencies": { - "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4", - "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4" + "@emnapi/core": "^1.7.1 || 2.0.0-beta.2 || 2.0.0-beta.3", + "@emnapi/runtime": "^1.7.1 || 2.0.0-beta.2 || 2.0.0-beta.3" } }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { @@ -4464,17 +4475,6 @@ "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@oxc-parser/binding-wasm32-wasi/node_modules/@emnapi/runtime": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz", - "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@oxc-parser/binding-win32-arm64-msvc": { "version": "0.127.0", "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.127.0.tgz", @@ -5758,6 +5758,9 @@ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5772,6 +5775,9 @@ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5786,6 +5792,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5800,6 +5809,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5814,6 +5826,9 @@ "loong64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5828,6 +5843,9 @@ "loong64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5842,6 +5860,9 @@ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5856,6 +5877,9 @@ "ppc64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5870,6 +5894,9 @@ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5884,6 +5911,9 @@ "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5898,6 +5928,9 @@ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -12856,9 +12889,9 @@ } }, "node_modules/incyclist-devices": { - "version": "3.0.45", - "resolved": "https://registry.npmjs.org/incyclist-devices/-/incyclist-devices-3.0.45.tgz", - "integrity": "sha512-F4i4Ntpcd7zJkcvQho1y/xpPsgTBZ0pcU7lxKCHp6f2I/PES3Qq8XMNIdOu5i9kuUxxaNyDbIJFBXVWtrc2eqQ==", + "version": "3.0.46", + "resolved": "https://registry.npmjs.org/incyclist-devices/-/incyclist-devices-3.0.46.tgz", + "integrity": "sha512-dtaXjm3LfcJaHG6/Bg7jhTWAtN8LKsXJtSifTQqTyFkn2XyGm+rQKOLUAsN795hIp0YDN/JR56of6t1wAi7Tbg==", "dependencies": { "@protobuf-ts/runtime": "^2.11.1", "@serialport/bindings-interface": "^1.2.2", @@ -12874,13 +12907,13 @@ } }, "node_modules/incyclist-services": { - "version": "1.9.21", - "resolved": "https://registry.npmjs.org/incyclist-services/-/incyclist-services-1.9.21.tgz", - "integrity": "sha512-kWj0Xfa2nA/E15uRy1i6X1CrAat2AYsqsTsYVowyy/CPDzvu5Xzgcu8n63yIiyQ4WP0e7X4GfaYqQiUC0mUXlw==", + "version": "1.9.22", + "resolved": "https://registry.npmjs.org/incyclist-services/-/incyclist-services-1.9.22.tgz", + "integrity": "sha512-YAndkOZyrTesh2cT7KkCncoauNSB8WttXoFEdSAO9mm3TxfSdeVHKQPCAlATIVkwAtgsj57lpt3EE7WtQb+MDA==", "dependencies": { "@garmin/fitsdk": "^21.221.0", "axios": "^1.21.0", - "incyclist-devices": "^3.0.45", + "incyclist-devices": "^3.0.46", "promise.any": "^2.0.6", "semver": "^7.7.4", "tcx-builder": "^1.1.1", diff --git a/package.json b/package.json index 1b95cd67..ca90daa4 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "axios": "^1.17.0", "events": "^3.3.0", "gd-eventlog": "^0.1.27", - "incyclist-services": "^1.9.21", + "incyclist-services": "^1.9.22", "mqtt": "^5.15.2", "path-browserify": "^1.0.1", "process": "^0.11.10", diff --git a/src/components/ButtonBar/ButtonBar.test.tsx b/src/components/ButtonBar/ButtonBar.test.tsx index f619dff1..ce0c11c6 100644 --- a/src/components/ButtonBar/ButtonBar.test.tsx +++ b/src/components/ButtonBar/ButtonBar.test.tsx @@ -42,6 +42,17 @@ describe('Button', () => { expect(touchable?.props.hitSlop.right).toBeLessThan(8); }); + // The compact button is about 34 high (14 text plus 8 padding above and below): with the + // vertical hitSlop, its touch target reaches the 48 dp minimum. + it('in compact layout, its touch target is at least 48 high', () => { + (useScreenLayout as jest.Mock).mockReturnValue('compact'); + + const { getByText } = render(