fix: url not append to the button when nested (#262)

Author: sirily11

packages/telegram-adapter/jest.config.js

@@ -2,5 +2,5 @@
 module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",
-  testPathIgnorePatterns: ["dist"],
+  testMatch: ["**/*.spec.tsx", "**/*.spec.ts"],
 };

packages/telegram-adapter/src/renderer.spec.tsx

@@ -294,4 +294,60 @@ describe("renderElement", () => {
     expect(rendered.reply_markup.inline_keyboard[0].length).toBe(2);
     expect(rendered.reply_markup.inline_keyboard[1].length).toBe(1);
   });
+
+  describe("command with url", () => {
+    it("should render button with url", () => {
+      const buttonElement = new MockComponent("18", InstanceType.Command, {
+        variant: "button",
+        command: "https://example.com",
+      });
+      const rendered = renderElement(buttonElement, parser);
+      expect((rendered.reply_markup!.inline_keyboard[0][0] as any).url).toEqual(
+        "https://example.com",
+      );
+    });
+  });
+
+  it("should render button with url in a row", () => {
+    const buttonElement = new MockComponent("18", InstanceType.Command, {
+      variant: "button",
+      command: "https://example.com",
+    });
+
+    const containerElement = new MockComponent(
+      "19",
+      InstanceType.Container,
+      {},
+    );
+
+    containerElement.appendChild(buttonElement);
+
+    const rendered = renderElement(containerElement, parser);
+    expect((rendered.reply_markup!.inline_keyboard[0][0] as any).url).toEqual(
+      "https://example.com",
+    );
+  });
+
+  it("should render button with url in a col", () => {
+    const buttonElement = new MockComponent("18", InstanceType.Command, {
+      variant: "button",
+      command: "https://example.com",
+    });
+
+    const containerElement = new MockComponent(
+      "19",
+      InstanceType.Container,
+      {},
+    );
+
+    const row1 = new MockComponent("20", InstanceType.Container, {});
+
+    row1.appendChild(buttonElement);
+    containerElement.appendChild(row1);
+
+    const rendered = renderElement(containerElement, parser);
+    expect((rendered.reply_markup!.inline_keyboard[0][0] as any).url).toEqual(
+      "https://example.com",
+    );
+  });
 });

packages/telegram-adapter/src/renderer.ts

@@ -164,6 +164,7 @@ export const renderElement = (
               text: child.text,
               callback_data: child.callback_data,
               web_app: child.web_app,
+              url: child.url,
             });
           } else {
             processResult(child, level + 1);
@@ -211,6 +212,7 @@ export const renderElement = (
             text: button.text,
             callback_data: button.callback_data,
             web_app: button.web_app,
+            url: button.url,
           }));
         }
         return [];

packages/telegram-adapter/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "include": ["src/**/*"],
-  "exclude": ["**/*.spec.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
   "extends": "../typescript-config/react-library.json",
   "compilerOptions": {
     "outDir": "dist",

tests/telegram-e2e-tests/tsconfig.json

@@ -7,6 +7,7 @@
     "esModuleInterop": true,
     "module": "esnext",
     "moduleResolution": "bundler",
+    "inlineSourceMap": true,
     "target": "ES2020",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "skipLibCheck": true,