fixed listmenu

Author: Jurorno9

build/scripts/menus.js

@@ -76,6 +76,7 @@ function menu(
 		ArrangedElements.stringified.push(["<No Options Provided>"])
 		ArrangedElements.data.push([null]); // not needed, but nice to keep data and string in sync.
 	}
+
 	if(!callback){
 		//overload 1, just display a menu with no callback
 		Call.menu(target.con, registeredListeners.none, title, description, ArrangedElements.stringified);
@@ -124,9 +125,11 @@ function menu(
 export function pageMenu(title:string, description:string, elements:GUI_Element[][], target:FishPlayer, callback: (opts: {data:any, text:string, sender:FishPlayer, outputSuccess:(message:string) => void, outputFail:(message:string) => void;}) => void){
 	let pages = elements.length
 	function drawpage(index:number){
-		let e:GUI_Element[] = [new GUI_Page(index+1,pages)]
+		let e:GUI_Element[] = [];
 		e.push(...elements[index])
+		e.push(new GUI_Page(index+1, pages))
 		menu(title,description,e, target, (res) => {
+			// handle control element of the ui
 			if(typeof res.data === 'string'){
 				switch (res.data) {
 					case "left":
@@ -141,20 +144,23 @@ export function pageMenu(title:string, description:string, elements:GUI_Element[
 				default:
 					callback(res);	
 				}
+			}else{
+				callback(res.data);
 			}
 		})
 		return;
 	}
+	drawpage(0);
 
 }
-//auto formats a array into a page menu
 //TODO make list a GUI_Element[] instead of a single Container
-export function listMenu(title:string, description:string, list:GUI_Container,target:FishPlayer, callback: (opts: {data:any, text:string, sender:FishPlayer, outputSuccess:(message:string) => void, outputFail:(message:string) => void;}) => void, pageSize:number = 10){
-	let buttons = { data:[] as any[][],}
-	list.data()[0].reduce((result, _, index) => { if (index % pageSize === 0) { buttons.data.push(buttons.data.slice(index, index + pageSize));}return result;});
-	let pages:GUI_Element[][] = [];
-	buttons.data.forEach(page => {pages.push([new GUI_Container(page,1,list.stringifier)])})//wrap each page in a container
-	pageMenu(title,description,pages,target,callback);
+export function listMenu(title:string, description:string, list:GUI_Container, target:FishPlayer, callback: (opts: {data:any, text:string, sender:FishPlayer, outputSuccess:(message:string) => void, outputFail:(message:string) => void;}) => void, pageSize:number = 10){
+	let pooledData:any[] = [];
+	list.data().flat().forEach((data) => {pooledData.push(data)});
+	let pagedData:any[][] = pooledData.reduce((res, _, index) => {if (index % pageSize === 0) {res.push(pooledData.slice(index, index + pageSize));}return res;}, [] as any[][]);
+	let pagesElements:GUI_Element[][] = [];
+	pagedData.forEach(pageData => pagesElements.push([new GUI_Container(pageData,1,list.stringifier)]));
+	pageMenu(title,description,pagesElements,target,callback);
 }
 //#endregion
 //#region GUI Elements
@@ -163,8 +169,6 @@ interface GUI_Element{
 	format():string[][],
 	data():any[][]
 }
-
-//const reservedStrings = ["left", "center", "right"] // strings used for paged menus, cannot be handled correct
 export class GUI_Container implements GUI_Element {
 	constructor(
 		public options:any[], 
@@ -183,8 +187,8 @@ export class GUI_Page implements GUI_Element{
 		public currentPage:number,
 		public pages:number
 	){}
-	public format = () => {return([["<--"], [`${this.currentPage}/${this.pages}`], ["-->"]])};
-	public data = () => {return([["left","center","left"]])}
+	public format = () => {return(to2DArray(["<--", `${this.currentPage}/${this.pages}`, "-->"],3))};
+	public data = () => {return([["left","center","right"]])}
 
 }
 export class GUI_Confirm implements GUI_Element{
@@ -197,5 +201,4 @@ export {
 	registeredListeners as listeners,
 	menu
 };
-
-
+//#endregion

build/scripts/playerCommands.js

@@ -7,7 +7,7 @@ import * as api from './api';
 import { command, commandList, fail, formatArg, Perm, Req } from './commands';
 import { FishServer, Gamemode, rules, text } from './config';
 import { FishEvents, fishState, ipPortPattern, recentWhispers, tileHistory, uuidPattern } from './globals';
-import { GUI_Cancel, GUI_Confirm, GUI_Container, listMenu, menu } from './menus';
+import { GUI_Cancel, GUI_Confirm, GUI_Container, GUI_Page, listMenu, menu, pageMenu } from './menus';
 import { FishPlayer } from './players';
 import { Rank, RoleFlag } from './ranks';
 import type { FishCommandData } from './types';
@@ -892,14 +892,16 @@ Win rate: ${target.stats.gamesWon / target.stats.gamesFinished}`
 			);
 		}
 	},
-	/*
+	
 	debug:{
 		args: [],
 		description: "mcdebug, do not add to pr",
 		perm:Perm.none,
 		handler({sender}){
-			menu("debug list menu", "", [new GUI_Container(["option1", "option2", "option3"]), new GUI_Container(["option4", "option5", "option6"], 1)],sender, ({data}) => {Log.info(`Data ${data}`)})
+			//menu("debug page menu", "", [new GUI_Page(1,2)], sender)
+			//pageMenu("Multi Page Menu", "", [[new GUI_Container(["1", "2", "3", "4"], 1)], [new GUI_Container(["5", "6", "7", "8"],1)], [new GUI_Confirm()]], sender, ({data}) =>{Log.info(`Button ${data} Pressed`)});
+			listMenu("listmenu", "", new GUI_Container(["option1","option2","option3","option4","option5","option6","option7","option8","option9","option10","option11","option12","option13","option14","option15","option16","option17","option18","option19","option20",]),sender,({data}) =>{Log.info(`Button ${data} Pressed`)})
 		}
 	},
-	*/
+	
 });