refactor: remove the separate ModalActionRow

discordjs · Feb 9, 2022 · e30c279 · e30c279
1 parent 680506e
commit e30c279
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 108 deletions.
diff --git a/src/structures/MessageActionRow.js b/src/structures/MessageActionRow.js
@@ -12,14 +12,16 @@ class MessageActionRow extends BaseMessageComponent {
    * Components that can be placed in an action row
    * * MessageButton
    * * MessageSelectMenu
-   * @typedef {MessageButton|MessageSelectMenu} MessageActionRowComponent
+   * * InputTextComponent
+   * @typedef {MessageButton|MessageSelectMenu|InputTextComponent} MessageActionRowComponent
    */
 
   /**
    * Options for components that can be placed in an action row
    * * MessageButtonOptions
    * * MessageSelectMenuOptions
-   * @typedef {MessageButtonOptions|MessageSelectMenuOptions} MessageActionRowComponentOptions
+   * * InputTextComponentOptions
+   * @typedef {MessageButtonOptions|MessageSelectMenuOptions|InputTextComponentOptions} MessageActionRowComponentOptions
    */
 
   /**

diff --git a/src/structures/Modal.js b/src/structures/Modal.js
@@ -8,7 +8,7 @@ class Modal {
    * @typedef {object} ModalOptions
    * @property {string} [customId] A unique string to be sent in the interaction when clicked
    * @property {string} [title] The title to be displayed on this modal
-   * @property {ModalActionRow[]|ModalActionRow[]} [components]
+   * @property {MessageActionRow[]|MessageActionRowOptions[]} [components]
    * Action rows containing interactive components for the modal (input text components)
    */
 
@@ -18,8 +18,8 @@ class Modal {
    */
   constructor(data = {}, client = null) {
     /**
-     * A list of ModalActionRows in the modal
-     * @type {ModalActionRow[]}
+     * A list of MessageActionRows in the modal
+     * @type {MessageActionRow[]}
      */
     this.components = data.components?.map(c => BaseMessageComponent.create(c, client)) ?? [];
 
@@ -38,7 +38,7 @@ class Modal {
 
   /**
    * Adds components to the modal.
-   * @param {...ModalActionRowResolvable[]} components The components to add
+   * @param {...MessageActionRowResolvable[]} components The components to add
    * @returns {Modal}
    */
   addComponents(...components) {
@@ -48,7 +48,7 @@ class Modal {
 
   /**
    * Sets the components of the modal.
-   * @param {...ModalActionRowResolvable[]} components The components to set
+   * @param {...MessageActionRowResolvable[]} components The components to set
    * @returns {Modal}
    */
   setComponents(...components) {
@@ -70,7 +70,7 @@ class Modal {
    * Removes, replaces, and inserts components in the modal.
    * @param {number} index The index to start at
    * @param {number} deleteCount The number of components to remove
-   * @param {...ModalActionRowResolvable[]} [components] The replacing components
+   * @param {...MessageActionRowResolvable[]} [components] The replacing components
    * @returns {Modal}
    */
   spliceComponents(index, deleteCount, ...components) {

diff --git a/src/structures/ModalActionRow.js b/src/structures/ModalActionRow.js
diff --git a/src/structures/ModalSubmitInteraction.js b/src/structures/ModalSubmitInteraction.js
@@ -16,7 +16,7 @@ class ModalSubmitInteraction extends Interaction {
 
     /**
      * The inputs within the modal
-     * @type {Array<ModalActionRow<ModalActionRowComponent>>}
+     * @type {Array<MessageActionRow<MessageActionRowComponent>>}
      */
     this.components = data.data.components?.map(c => BaseMessageComponent.create(c, this.client)) ?? [];
   }