fix(PagesBuilder): clean up keyboard

egorprnn · May 5, 2021 · 8175522 · 8175522
1 parent 47e96bd
commit 8175522
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vk-io-pages",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Модуль vk-io для создания динамических страниц",
   "scripts": {
     "prebuild": "tsc && node --experimental-modules --es-module-specifier-resolution=node ./scripts/removeEmptyFiles.mjs",

diff --git a/src/PagesBuilder.ts b/src/PagesBuilder.ts
@@ -185,6 +185,8 @@ export class PagesBuilder extends Event.EventEmitter {
 
         if (!this.infinityLoop) {
             keyboard = this.cleanUpKeyboard(keyboard as KeyboardBuilder);
+        } else {
+            keyboard = JSON.parse(keyboard.toString());
         }
 
         const pagePagination = this.pagesNumberFormat.replace("%c", String(pageNumber))
@@ -193,10 +195,12 @@ export class PagesBuilder extends Event.EventEmitter {
         return {
             ...page,
             message: `${this.header}${page.message}${this.footer}\n\n${pagePagination}`,
-            keyboard: JSON.parse(keyboard.toString()).buttons.length ?
-                keyboard
-                :
-                JSON.stringify({})
+            keyboard: JSON.stringify(
+                (keyboard as any).buttons.length ?
+                    keyboard
+                    :
+                    {}
+            )
         };
     }