From 260dff75f71a4d80965fb564b47af0f1fe679ea1 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 28 Apr 2025 21:37:02 +0100 Subject: [PATCH] typescript: update --- typescript/types/main.d.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/typescript/types/main.d.ts b/typescript/types/main.d.ts index ea9dbb131..318373d3f 100644 --- a/typescript/types/main.d.ts +++ b/typescript/types/main.d.ts @@ -11,7 +11,7 @@ type MenuBooleanItem = { value: boolean; format?: (value: boolean) => string; - onchange?: (value: boolean) => void; + onchange?: (value: boolean, evt?: TouchCallbackXY) => void; }; /** @@ -20,7 +20,7 @@ type MenuBooleanItem = { type MenuNumberItem = { value: number; format?: (value: number) => string; - onchange?: (value: number) => void; + onchange?: (value: number, evt?: TouchCallbackXY) => void; step?: number; min?: number; max?: number; @@ -56,10 +56,10 @@ type Menu = { ""?: MenuOptions; [key: string]: | MenuOptions - | (() => void) + | ((e?: TouchCallbackXY) => void) | MenuBooleanItem | MenuNumberItem - | { value: string; onchange?: () => void } + | { value: string; onchange?: (value: unknown, evt?: TouchCallbackXY) => void } | undefined; }; @@ -68,8 +68,6 @@ type Menu = { */ type MenuInstance = { draw: () => void; - move: (n: number) => void; - select: () => void; scroller?: MenuScroller; // BangleJS 2 }; @@ -149,7 +147,8 @@ type TapAxis = -2 | -1 | 0 | 1 | 2; type SwipeCallback = (directionLR: -1 | 0 | 1, directionUD?: -1 | 0 | 1) => void; -type TouchCallback = (button: number, xy?: { x: number, y: number }) => void; +type TouchCallbackXY = { x: number, y: number, type: 0 | 2 }; +type TouchCallback = (button?: number, xy?: TouchCallbackXY) => void; type DragCallback = (event: { x: number; @@ -15146,4 +15145,4 @@ declare module "Storage" { * @url http://www.espruino.com/Reference#l_Storage_open */ function open(name: string, mode: "r" | "w" | "a"): StorageFile; -} \ No newline at end of file +}