From ebb4dfa262adb2086c83db487002bb2e1ed5ab88 Mon Sep 17 00:00:00 2001
From: muchnameless <12682826+muchnameless@users.noreply.github.com>
Date: Tue, 12 Apr 2022 17:14:57 +0200
Subject: [PATCH] fix(ActionRow): toJSON should include components (#7739)

* fix(ActionRow): toJSON should include components

* Update packages/discord.js/src/structures/ActionRow.js

Co-authored-by: Suneet Tipirneni <77477100+suneettipirneni@users.noreply.github.com>

* types: extend component

Co-authored-by: Suneet Tipirneni <77477100+suneettipirneni@users.noreply.github.com>
Co-authored-by: suneettipirneni <suneettipirneni@icloud.com>
---
 packages/discord.js/src/structures/ActionRow.js |  8 ++++++++
 packages/discord.js/typings/index.d.ts          | 14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/discord.js/src/structures/ActionRow.js b/packages/discord.js/src/structures/ActionRow.js
index 3d3b247db..b2a09d38d 100644
--- a/packages/discord.js/src/structures/ActionRow.js
+++ b/packages/discord.js/src/structures/ActionRow.js
@@ -17,6 +17,14 @@ class ActionRow extends Component {
      */
     this.components = components.map(c => Components.createComponent(c));
   }
+
+  /**
+   * Returns the API-compatible JSON for this component
+   * @returns {APIActionRowComponent}
+   */
+  toJSON() {
+    return { ...this.data, components: this.components.map(c => c.toJSON()) };
+  }
 }
 
 module.exports = ActionRow;
diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
index 494474b0c..115583679 100644
--- a/packages/discord.js/typings/index.d.ts
+++ b/packages/discord.js/typings/index.d.ts
@@ -246,9 +246,12 @@ export class ActionRowBuilder<
 export type MessageActionRowComponent = ButtonComponent | SelectMenuComponent;
 export type ModalActionRowComponent = TextInputComponent;
 
-export class ActionRow<T extends MessageActionRowComponent | ModalActionRowComponent> {
-  private constructor(data: APIActionRowComponent<APIMessageActionRowComponent>);
+export class ActionRow<T extends MessageActionRowComponent | ModalActionRowComponent> extends Component<
+  APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>
+> {
+  private constructor(data: APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>);
   public readonly components: T[];
+  public toJSON(): APIActionRowComponent<ReturnType<T['toJSON']>>;
 }
 
 export class ActivityFlagsBitField extends BitField<ActivityFlagsString> {
@@ -527,7 +530,12 @@ export class ButtonInteraction<Cached extends CacheType = CacheType> extends Mes
   public inRawGuild(): this is ButtonInteraction<'raw'>;
 }
 
-export class Component<T extends APIMessageComponent | APIModalComponent = APIMessageComponent | APIModalComponent> {
+export type AnyComponent =
+  | APIMessageComponent
+  | APIModalComponent
+  | APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>;
+
+export class Component<T extends AnyComponent = AnyComponent> {
   public readonly data: Readonly<T>;
   public get type(): T['type'];
   public toJSON(): T;