Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: return only boolean for disabled #8965

Merged
merged 3 commits into from
Dec 24, 2022
Merged

fix: return only boolean for disabled #8965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c18443d
fix: return only boolean for `disabled`
MrMythicalYT Dec 23, 2022
fbc637c
fix: return only boolean for `disabled`
MrMythicalYT Dec 23, 2022
b73010f
Merge branch 'main' into fix/component-disabled
kodiakhq[bot] Dec 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/discord.js/src/structures/BaseSelectMenuComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ class BaseSelectMenuComponent extends Component {

/**
* Whether this select menu is disabled
* @type {?boolean}
* @type {boolean}
* @readonly
*/
get disabled() {
return this.data.disabled ?? null;
return this.data.disabled ?? false;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/discord.js/src/structures/ButtonComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class ButtonComponent extends Component {

/**
* Whether this button is disabled
* @type {?boolean}
* @type {boolean}
* @readonly
*/
get disabled() {
return this.data.disabled ?? null;
return this.data.disabled ?? false;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/discord.js/typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ export class ButtonComponent extends Component<APIButtonComponent> {
public get style(): ButtonStyle;
public get label(): string | null;
public get emoji(): APIMessageComponentEmoji | null;
public get disabled(): boolean | null;
public get disabled(): boolean;
public get customId(): string | null;
public get url(): string | null;
}
Expand Down Expand Up @@ -759,7 +759,7 @@ export class BaseSelectMenuComponent<Data extends APISelectMenuComponent> extend
public get maxValues(): number | null;
public get minValues(): number | null;
public get customId(): string;
public get disabled(): boolean | null;
public get disabled(): boolean;
}

export class StringSelectMenuComponent extends BaseSelectMenuComponent<APIStringSelectComponent> {
Expand Down