A platform for community discussion. Free, open, simple.
DEV: Convert `DComboButton` to Typescript and fixes small CSS issues (#42537)
Sérgio Saquetim6214354bbd10
diff --git a/app/assets/stylesheets/common/components/d-combo-button.scss b/app/assets/stylesheets/common/components/d-combo-button.scssindex c4f18bb2e85..98938e97747 100644--- a/app/assets/stylesheets/common/components/d-combo-button.scss+++ b/app/assets/stylesheets/common/components/d-combo-button.scss@@ -20,6 +20,21 @@font-size: var(--font-down-1);}}++ // A filled variant reads the gutter above as a slot between two solid fills.+ // A bordered one has no fill to separate, so the same gutter leaves the top+ // and bottom border unpainted across it; those halves overlap onto one shared+ // line instead. :where() adds no specificity, so theme overrides still win.+ .d-combo-button-button:where(.btn-default) {+ border-right: var(--d-button-default-border);+ }++ // Both facing edges stay painted and overlap exactly, so they coincide into a+ // single 1px divider instead of stacking into a 2px double line.+ .d-combo-button-menu:where(.btn-default) {+ border-left: var(--d-button-default-border);+ margin-left: -1px;+ }}@include viewport.until(sm) {diff --git a/frontend/discourse/app/components/create-topic-button.gjs b/frontend/discourse/app/components/create-topic-button.gjsindex 0ebe1378104..998a9de7604 100644--- a/frontend/discourse/app/components/create-topic-button.gjs+++ b/frontend/discourse/app/components/create-topic-button.gjs@@ -28,6 +28,10 @@ export default class CreateTopicButton extends Component {};}+ /**+ * Classes for the button half only. The variant is not repeated here; it goes+ * to the group as `@btnTypeClass`, which applies it to both halves.+ */get btnClasses() {const additionalClasses = applyValueTransformer("create-topic-button-class",@@ -35,13 +39,10 @@ export default class CreateTopicButton extends Component {this.transformerContext);- return dConcatClass(- this.args.btnClass,- this.btnTypeClass,- ...additionalClasses- );+ return dConcatClass(this.args.btnClass, ...additionalClasses);}+ /** Classes for the drafts menu half only. */get draftMenuClasses() {const additionalClasses = applyValueTransformer("create-topic-button-draft-menu-class",@@ -49,7 +50,7 @@ export default class CreateTopicButton extends Component {this.transformerContext);- return dConcatClass(this.btnTypeClass, ...additionalClasses);+ return dConcatClass(...additionalClasses);}<template>@@ -59,6 +60,7 @@ export default class CreateTopicButton extends Component {@label={{this.label}}@icon={{@icon}}@btnId={{this.btnId}}+ @btnTypeClass={{this.btnTypeClass}}@btnClasses={{this.btnClasses}}@draftMenuClasses={{this.draftMenuClasses}}@showDrafts={{@showDrafts}}diff --git a/frontend/discourse/app/components/topic-dismiss-buttons.gjs b/frontend/discourse/app/components/topic-dismiss-buttons.gjsindex 819200cb13a..656938b1d3d 100644--- a/frontend/discourse/app/components/topic-dismiss-buttons.gjs+++ b/frontend/discourse/app/components/topic-dismiss-buttons.gjs@@ -5,7 +5,6 @@ import DismissReadModal from "discourse/components/modal/dismiss-read";import DButton from "discourse/ui-kit/d-button";import DComboButton from "discourse/ui-kit/d-combo-button";import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class TopicDismissButtons extends Component {@@ -144,42 +143,38 @@ export default class TopicDismissButtons extends Component {{{~#if @showResetNew~}}{{#if @showNewDismissCombo}}<DComboButton- class={{dConcatClass- "topic-dismiss-buttons__combo"- (if this.showDismissNewMenu "--has-menu")- }}+ @hasMenu={{this.showDismissNewMenu}}+ @btnTypeClass="btn-default dismiss-read"+ class="topic-dismiss-buttons__combo"as |combo|><combo.Button@action={{this.dismissNew}}@translatedLabel={{this.dismissNewLabel}}id="dismiss-new-{{@position}}"- class="btn-default dismiss-read topic-dismiss-buttons__button"+ class="topic-dismiss-buttons__button"/>- {{#if this.showDismissNewMenu}}- <combo.Menu- @identifier="dismiss-new-menu"- @onRegisterApi={{this.registerDMenu}}- @modalForMobile={{true}}- @placement="bottom-end"- aria-label={{i18n "topics.bulk.dismiss_new_menu"}}- id="dismiss-new-menu-{{@position}}"- class="btn-default dismiss-read topic-dismiss-buttons__menu"- >- <DDropdownMenu as |dropdown|>- <dropdown.item class="topic-dismiss-buttons__menu-item">- <DButton- @action={{this.dismissNewAndStopTracking}}- @translatedLabel={{i18n- "topics.bulk.dismiss_and_stop_tracking"- }}- class="btn-secondary dismiss-new-stop-tracking"- />- </dropdown.item>- </DDropdownMenu>- </combo.Menu>- {{/if}}+ <combo.Menu+ @identifier="dismiss-new-menu"+ @onRegisterApi={{this.registerDMenu}}+ @modalForMobile={{true}}+ aria-label={{i18n "topics.bulk.dismiss_new_menu"}}+ id="dismiss-new-menu-{{@position}}"+ class="topic-dismiss-buttons__menu"+ >+ <DDropdownMenu as |dropdown|>+ <dropdown.item class="topic-dismiss-buttons__menu-item">+ <DButton+ @action={{this.dismissNewAndStopTracking}}+ @translatedLabel={{i18n+ "topics.bulk.dismiss_and_stop_tracking"+ }}+ class="btn-secondary dismiss-new-stop-tracking"+ />+ </dropdown.item>+ </DDropdownMenu>+ </combo.Menu></DComboButton>{{else}}<DButtondiff --git a/frontend/discourse/app/components/topic-drafts-dropdown.gjs b/frontend/discourse/app/components/topic-drafts-dropdown.gjsindex 18bc9654a9d..0b00a1bdc03 100644--- a/frontend/discourse/app/components/topic-drafts-dropdown.gjs+++ b/frontend/discourse/app/components/topic-drafts-dropdown.gjs@@ -12,7 +12,6 @@ import { or } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";import DComboButton from "discourse/ui-kit/d-combo-button";import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const DRAFTS_LIMIT = 4;@@ -100,10 +99,9 @@ export default class TopicDraftsDropdown extends Component {<template><DComboButton- class={{dConcatClass- "topic-create-button__combo"- (if @showDrafts "--has-menu")- }}+ @hasMenu={{@showDrafts}}+ @btnTypeClass={{@btnTypeClass}}+ class="topic-create-button__combo"aria-label={{i18n "topic.create_group"}}...attributesas |combo|@@ -117,50 +115,48 @@ export default class TopicDraftsDropdown extends Component {class={{@btnClasses}}/>- {{#if @showDrafts}}- <combo.Menu- @identifier="topic-drafts-menu"- @title={{i18n "drafts.dropdown.title"}}- @onShow={{this.onShowMenu}}- @onRegisterApi={{this.onRegisterApi}}- @modalForMobile={{true}}- aria-label={{i18n "drafts.dropdown.title"}}- class={{@draftMenuClasses}}- >- <DDropdownMenu as |dropdown|>- {{#each this.drafts as |draft|}}- <dropdown.item class="topic-drafts-item">- <DButton- @action={{fn this.resumeDraft draft}}- @icon={{this.draftIcon draft}}- @translatedLabel={{or- draft.title- (i18n "drafts.dropdown.untitled")- }}- class="btn-secondary"- />- </dropdown.item>- {{/each}}-- {{#if this.showViewAll}}- <dropdown.divider />-- <dropdown.item>- <DButton- @href="/my/activity/drafts"- @model={{this.currentUser}}- class="btn-link view-all-drafts"- >- <span- data-other-drafts={{this.otherDraftsCount}}- >{{this.otherDraftsText}}</span>- <span>{{i18n "drafts.dropdown.view_all"}}</span>- </DButton>- </dropdown.item>- {{/if}}- </DDropdownMenu>- </combo.Menu>- {{/if}}+ <combo.Menu+ @identifier="topic-drafts-menu"+ @title={{i18n "drafts.dropdown.title"}}+ @onShow={{this.onShowMenu}}+ @onRegisterApi={{this.onRegisterApi}}+ @modalForMobile={{true}}+ aria-label={{i18n "drafts.dropdown.title"}}+ class={{@draftMenuClasses}}+ >+ <DDropdownMenu as |dropdown|>+ {{#each this.drafts as |draft|}}+ <dropdown.item class="topic-drafts-item">+ <DButton+ @action={{fn this.resumeDraft draft}}+ @icon={{this.draftIcon draft}}+ @translatedLabel={{or+ draft.title+ (i18n "drafts.dropdown.untitled")+ }}+ class="btn-secondary"+ />+ </dropdown.item>+ {{/each}}++ {{#if this.showViewAll}}+ <dropdown.divider />++ <dropdown.item>+ <DButton+ @href="/my/activity/drafts"+ @model={{this.currentUser}}+ class="btn-link view-all-drafts"+ >+ <span+ data-other-drafts={{this.otherDraftsCount}}+ >{{this.otherDraftsText}}</span>+ <span>{{i18n "drafts.dropdown.view_all"}}</span>+ </DButton>+ </dropdown.item>+ {{/if}}+ </DDropdownMenu>+ </combo.Menu></DComboButton></template>}diff --git a/frontend/discourse/app/ui-kit/d-button.gts b/frontend/discourse/app/ui-kit/d-button.gtsindex c5c51f59ed7..9013925848a 100644--- a/frontend/discourse/app/ui-kit/d-button.gts+++ b/frontend/discourse/app/ui-kit/d-button.gts@@ -21,7 +21,7 @@ type DButtonAction = DButtonActionCallback | DButtonActionObject;type RouteModel = string | number | object;-interface DButtonSignature {+export interface DButtonSignature {Args: {// Texttitle?: string;@@ -104,7 +104,7 @@ export default class DButton extends Component<DButtonSignature> {return this.forceDisabled || this.args.disabled;}- get btnType() {+ get btnContentClass() {if (this.args.icon) {return this.computedLabel ? "btn-icon-text" : "btn-icon";}@@ -249,7 +249,7 @@ export default class DButton extends Component<DButtonSignature> {(if @isLoading "is-loading")(if this.btnLink "btn-link" "btn")(if this.noText "no-text")- this.btnType+ this.btnContentClass}}{{! For legacy compatibility. Prefer passing these as html attributes. }}id={{@id}}diff --git a/frontend/discourse/app/ui-kit/d-combo-button.gjs b/frontend/discourse/app/ui-kit/d-combo-button.gjsdeleted file mode 100644index 6f0f1556a74..00000000000--- a/frontend/discourse/app/ui-kit/d-combo-button.gjs+++ /dev/null@@ -1,47 +0,0 @@-import Component from "@glimmer/component";-import { hash } from "@ember/helper";-import curryComponent from "ember-curry-component";-import DMenu from "discourse/float-kit/components/d-menu";-import { or } from "discourse/truth-helpers";-import DButton from "discourse/ui-kit/d-button";--// eslint-disable-next-line ember/no-empty-glimmer-component-classes-class Button extends Component {- <template>- {{#let (curryComponent DButton this.args) as |CurriedComponent|}}- <CurriedComponent class="d-combo-button-button" ...attributes>- {{yield}}- </CurriedComponent>- {{/let}}- </template>-}--// eslint-disable-next-line ember/no-empty-glimmer-component-classes-class Menu extends Component {- <template>- {{#let (curryComponent DMenu this.args) as |CurriedComponent|}}- {{! The trigger sits at the group's trailing edge, so the float aligns- there. Both defaults are written as fallbacks because invocation-site- arguments beat curried ones, which would otherwise make them- overrides. }}- <CurriedComponent- @icon={{or @icon "chevron-down"}}- @placement={{or @placement "bottom-end"}}- class="d-combo-button-menu"- ...attributes- >- <:content>- {{yield}}- </:content>- </CurriedComponent>- {{/let}}- </template>-}--const DComboButton = <template>- <div class="d-combo-button" role="group" ...attributes>- {{yield (hash Button=Button Menu=Menu)}}- </div>-</template>;--export default DComboButton;diff --git a/frontend/discourse/app/ui-kit/d-combo-button.gts b/frontend/discourse/app/ui-kit/d-combo-button.gtsnew file mode 100644index 00000000000..6ad978f83ea--- /dev/null+++ b/frontend/discourse/app/ui-kit/d-combo-button.gts@@ -0,0 +1,151 @@+import Component from "@glimmer/component";+import { cached } from "@glimmer/tracking";+import { hash } from "@ember/helper";+import { getOwner } from "@ember/owner";+import type { WithBoundArgs } from "@glint/template";+import curryComponent from "ember-curry-component";+import DMenu, { DMenuSignature } from "discourse/float-kit/components/d-menu";+import { or } from "discourse/truth-helpers";+import DButton, { DButtonSignature } from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";++/** Arguments the group supplies to a half, which must not reach `DButton`/`DMenu`. */+const GROUP_ARGS = ["hasMenu", "btnTypeClass"];++function forwardedArgs(args: object): Record<string, unknown> {+ const forwarded: Record<string, unknown> = { ...args };+ GROUP_ARGS.forEach((name) => delete forwarded[name]);+ return forwarded;+}++interface GroupArgs {+ /** A `btn-*` class applied to both halves, so a call site states the variant once. */+ btnTypeClass?: string;+}++interface ButtonSignature {+ Element: HTMLButtonElement;+ Args: DButtonSignature["Args"] & GroupArgs;+ Blocks: { default: [] };+}++interface MenuSignature {+ Element: HTMLElement;+ Args: DMenuSignature["Args"] &+ GroupArgs & {+ /** Curried in by the group; the menu renders only when it is true. */+ hasMenu?: boolean;+ };+ Blocks: { default: [] };+}++class Button extends Component<ButtonSignature> {+ get buttonArgs() {+ return forwardedArgs(this.args);+ }++ <template>+ {{#let (curryComponent DButton this.buttonArgs) as |CurriedComponent|}}+ {{! A per-half class arrives as a splatted attribute, which Glimmer appends+ to this one rather than replacing it, so a call site can add to the+ group's variant without restating it. }}+ <CurriedComponent+ class={{dConcatClass "d-combo-button-button" @btnTypeClass}}+ ...attributes+ >+ {{yield}}+ </CurriedComponent>+ {{/let}}+ </template>+}++class Menu extends Component<MenuSignature> {+ get menuArgs() {+ return forwardedArgs(this.args);+ }++ <template>+ {{#if @hasMenu}}+ {{#let (curryComponent DMenu this.menuArgs) as |CurriedComponent|}}+ {{! The trigger sits at the group's trailing edge, so the float aligns+ there. Both defaults are written as fallbacks because invocation-site+ arguments beat curried ones, which would otherwise make them+ overrides. }}+ <CurriedComponent+ @icon={{or @icon "chevron-down"}}+ @placement={{or @placement "bottom-end"}}+ class={{dConcatClass "d-combo-button-menu" @btnTypeClass}}+ ...attributes+ >+ <:content>+ {{yield}}+ </:content>+ </CurriedComponent>+ {{/let}}+ {{/if}}+ </template>+}++/** The two halves yielded to the block, pre-bound to the group's own arguments. */+export interface DComboButtonParts {+ Button: WithBoundArgs<typeof Button, "btnTypeClass">;+ Menu: WithBoundArgs<typeof Menu, "hasMenu" | "btnTypeClass">;+}++interface DComboButtonSignature {+ Element: HTMLDivElement;+ Args: GroupArgs & {+ /**+ * Whether the group has a menu. Decides both whether `combo.Menu` renders and+ * whether `--has-menu` is published, so the two can never disagree.+ */+ hasMenu?: boolean;+ };+ Blocks: { default: [DComboButtonParts] };+}++/**+ * A button paired with an optional dropdown menu, rendered as one joined control.+ *+ * Pass `@hasMenu` rather than adding `--has-menu` by hand: the group publishes+ * that class itself and uses the same flag to decide whether the menu renders.+ *+ * @example+ * ```gjs+ * <DComboButton @hasMenu={{this.hasDrafts}} @btnTypeClass="btn-default" as |combo|>+ * <combo.Button @label="topic.create" @action={{this.createTopic}} />+ * <combo.Menu @identifier="drafts">+ * <DDropdownMenu as |dropdown|>…</DDropdownMenu>+ * </combo.Menu>+ * </DComboButton>+ * ```+ */+export default class DComboButton extends Component<DComboButtonSignature> {+ /**+ * The yielded halves, each bound to the arguments the group supplies. Cached so+ * a rerender hands the block the same component classes rather than freshly+ * curried ones, which would tear the control down and rebuild it.+ */+ @cached+ get parts(): DComboButtonParts {+ const owner = getOwner(this)!;+ const { hasMenu, btnTypeClass } = this.args;++ return {+ Button: curryComponent(Button, { btnTypeClass }, owner),+ Menu: curryComponent(Menu, { hasMenu, btnTypeClass }, owner),+ };+ }++ <template>+ {{! Themes select this modifier class, so it stays published even where core+ stops depending on it. }}+ <div+ class={{dConcatClass "d-combo-button" (if @hasMenu "--has-menu")}}+ role="group"+ ...attributes+ >+ {{yield (hash Button=this.parts.Button Menu=this.parts.Menu)}}+ </div>+ </template>+}diff --git a/frontend/discourse/float-kit/components/d-menu.gts b/frontend/discourse/float-kit/components/d-menu.gtsindex 8af5b007927..fe7698ef1c6 100644--- a/frontend/discourse/float-kit/components/d-menu.gts+++ b/frontend/discourse/float-kit/components/d-menu.gts@@ -61,7 +61,7 @@ type DMenuOptionArgs<Data> = Partial<onRegisterApi?: (instance: DMenuInstance) => void;};-interface DMenuSignature<Data = unknown> {+export interface DMenuSignature<Data = unknown> {Element: HTMLElement;Args: DMenuOptionArgs<Data> & {// Arguments the component reads directly and forwards to the trigger button;diff --git a/frontend/discourse/tests/integration/ui-kit/d-combo-button-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-combo-button-test.gjsindex 342008e97fd..48b7f0ebbea 100644--- a/frontend/discourse/tests/integration/ui-kit/d-combo-button-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-combo-button-test.gjs@@ -1,4 +1,5 @@-import { render, triggerEvent } from "@ember/test-helpers";+import { tracked } from "@glimmer/tracking";+import { render, rerender, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import DComboButton from "discourse/ui-kit/d-combo-button";@@ -13,7 +14,7 @@ module("Integration | ui-kit | DComboButton", function (hooks) {test("the menu aligns with the trailing edge of its trigger by default", async function (assert) {await render(<template>- <DComboButton class="--has-menu" as |combo|>+ <DComboButton @hasMenu={{true}} as |combo|><combo.Button @translatedLabel="Action" /><combo.Menu @inline={{true}} @visibilityOptimizer="none">content@@ -29,7 +30,7 @@ module("Integration | ui-kit | DComboButton", function (hooks) {test("@placement overrides the default alignment", async function (assert) {await render(<template>- <DComboButton class="--has-menu" as |combo|>+ <DComboButton @hasMenu={{true}} as |combo|><combo.Button @translatedLabel="Action" /><combo.Menu@inline={{true}}@@ -49,7 +50,7 @@ module("Integration | ui-kit | DComboButton", function (hooks) {test("the menu trigger uses a chevron icon by default", async function (assert) {await render(<template>- <DComboButton class="--has-menu" as |combo|>+ <DComboButton @hasMenu={{true}} as |combo|><combo.Button @translatedLabel="Action" /><combo.Menu @inline={{true}}>content</combo.Menu></DComboButton>@@ -62,7 +63,7 @@ module("Integration | ui-kit | DComboButton", function (hooks) {test("@icon overrides the default trigger icon", async function (assert) {await render(<template>- <DComboButton class="--has-menu" as |combo|>+ <DComboButton @hasMenu={{true}} as |combo|><combo.Button @translatedLabel="Action" /><combo.Menu @inline={{true}} @icon="gear">content</combo.Menu></DComboButton>@@ -72,4 +73,122 @@ module("Integration | ui-kit | DComboButton", function (hooks) {assert.dom(".fk-d-menu__trigger .d-icon-gear").exists();assert.dom(".fk-d-menu__trigger .d-icon-chevron-down").doesNotExist();});++ test("@hasMenu publishes --has-menu and renders the menu", async function (assert) {+ await render(+ <template>+ <DComboButton @hasMenu={{true}} as |combo|>+ <combo.Button @translatedLabel="Action" />+ <combo.Menu @inline={{true}}>content</combo.Menu>+ </DComboButton>+ </template>+ );++ assert.dom(".d-combo-button").hasClass("--has-menu");+ assert.dom(".d-combo-button-menu").exists();+ });++ test("without @hasMenu neither the class nor the menu is rendered", async function (assert) {+ await render(+ <template>+ <DComboButton as |combo|>+ <combo.Button @translatedLabel="Action" />+ <combo.Menu @inline={{true}}>content</combo.Menu>+ </DComboButton>+ </template>+ );++ assert.dom(".d-combo-button").doesNotHaveClass("--has-menu");+ assert.dom(".d-combo-button-menu").doesNotExist();+ assert+ .dom(".d-combo-button-button")+ .exists("the button half still renders");+ });++ test("toggling @hasMenu moves the class and the menu together", async function (assert) {+ const state = new (class {+ @tracked hasMenu = false;+ })();++ await render(+ <template>+ <DComboButton @hasMenu={{state.hasMenu}} as |combo|>+ <combo.Button @translatedLabel="Action" />+ <combo.Menu @inline={{true}}>content</combo.Menu>+ </DComboButton>+ </template>+ );++ assert.dom(".d-combo-button").doesNotHaveClass("--has-menu");+ assert.dom(".d-combo-button-menu").doesNotExist();++ state.hasMenu = true;+ await rerender();++ assert.dom(".d-combo-button").hasClass("--has-menu");+ assert.dom(".d-combo-button-menu").exists();++ state.hasMenu = false;+ await rerender();++ assert.dom(".d-combo-button").doesNotHaveClass("--has-menu");+ assert.dom(".d-combo-button-menu").doesNotExist();+ });++ test("@btnTypeClass reaches both halves", async function (assert) {+ await render(+ <template>+ <DComboButton @hasMenu={{true}} @btnTypeClass="btn-default" as |combo|>+ <combo.Button @translatedLabel="Action" />+ <combo.Menu @inline={{true}}>content</combo.Menu>+ </DComboButton>+ </template>+ );++ assert.dom(".d-combo-button-button").hasClass("btn-default");+ assert.dom(".d-combo-button-menu").hasClass("btn-default");+ });++ test("a per-half class is kept alongside @btnTypeClass", async function (assert) {+ await render(+ <template>+ <DComboButton @hasMenu={{true}} @btnTypeClass="btn-default" as |combo|>+ <combo.Button @translatedLabel="Action" class="dismiss-read" />+ <combo.Menu @inline={{true}} class="dismiss-menu">content</combo.Menu>+ </DComboButton>+ </template>+ );++ assert.dom(".d-combo-button-button").hasClass("btn-default");+ assert.dom(".d-combo-button-button").hasClass("dismiss-read");+ assert.dom(".d-combo-button-menu").hasClass("btn-default");+ assert.dom(".d-combo-button-menu").hasClass("dismiss-menu");+ });++ test("--has-menu survives a consumer's dynamic class changing", async function (assert) {+ const state = new (class {+ @tracked extra = "first";+ })();++ await render(+ <template>+ <DComboButton @hasMenu={{true}} class={{state.extra}} as |combo|>+ <combo.Button @translatedLabel="Action" />+ <combo.Menu @inline={{true}}>content</combo.Menu>+ </DComboButton>+ </template>+ );++ assert.dom(".d-combo-button").hasClass("--has-menu");+ assert.dom(".d-combo-button").hasClass("first");++ state.extra = "second";+ await rerender();++ assert+ .dom(".d-combo-button")+ .hasClass("--has-menu", "the group's own token is not dropped");+ assert.dom(".d-combo-button").hasClass("second");+ assert.dom(".d-combo-button").doesNotHaveClass("first");+ });});diff --git a/frontend/discourse/type-tests/ui-kit/d-combo-button-test.gts b/frontend/discourse/type-tests/ui-kit/d-combo-button-test.gtsnew file mode 100644index 00000000000..8dff7275108--- /dev/null+++ b/frontend/discourse/type-tests/ui-kit/d-combo-button-test.gts@@ -0,0 +1,56 @@+import DComboButton from "discourse/ui-kit/d-combo-button";++declare const hasDrafts: boolean;+declare const variant: string;++// Asserts the group declares its own arguments while each yielded half keeps the+// full `DButton`/`DMenu` argument surface. Each valid usage must compile; each+// invalid usage must be flagged (a missing error fails pnpm lint:types via the+// glint-expect-error directives).+const Test = <template>+ {{! The group's own arguments, with the halves carrying theirs }}+ <DComboButton @hasMenu={{hasDrafts}} @btnTypeClass={{variant}} as |combo|>+ <combo.Button @label="topic.create" @icon="plus" @disabled={{false}} />+ <combo.Menu+ @identifier="drafts"+ @placement="bottom-end"+ @autofocus={{true}}+ >+ content+ </combo.Menu>+ </DComboButton>++ {{! Both group arguments are optional }}+ <DComboButton as |combo|>+ <combo.Button @translatedLabel="Action" />+ <combo.Menu>content</combo.Menu>+ </DComboButton>++ {{! Attributes reach the group's element and both halves }}+ <DComboButton class="group" aria-label="Group" as |combo|>+ <combo.Button class="half" id="act" />+ <combo.Menu class="half" aria-label="More" />+ </DComboButton>++ {{! @glint-expect-error - @hasMenu is a boolean, not a string }}+ <DComboButton @hasMenu="yes" as |combo|><combo.Button /></DComboButton>++ {{! @glint-expect-error - @btnTypeClass is a string, not a boolean }}+ <DComboButton @btnTypeClass={{true}} as |combo|><combo.Button+ /></DComboButton>++ {{! @glint-expect-error - the group rejects an unknown argument }}+ <DComboButton @totallyBogus={{true}} as |combo|><combo.Button+ /></DComboButton>++ <DComboButton as |combo|>+ {{! @glint-expect-error - the button half rejects an unknown argument }}+ <combo.Button @totallyBogus={{true}} />+ {{! @glint-expect-error - DButton's @disabled is a boolean }}+ <combo.Button @disabled="yes" />+ {{! @glint-expect-error - the menu half rejects an unknown argument }}+ <combo.Menu @totallyBogus={{true}} />+ </DComboButton>+</template>;++export default Test;diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjsindex f18c485d10d..b5b0563dd67 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjs@@ -272,10 +272,9 @@ export default class AiAgentListEditor extends Component {/><actions.Wrapped><DComboButton- class={{dConcatClass- "ai-agent-list-editor__new-combo"- (if this.hasAgents "--has-menu")- }}+ @hasMenu={{this.hasAgents}}+ @btnTypeClass={{this.newAgentButtonClasses}}+ class="ai-agent-list-editor__new-combo"aria-label={{i18n "discourse_ai.ai_agent.new_group"}}as |combo|>@@ -284,67 +283,58 @@ export default class AiAgentListEditor extends Component {@ariaLabel="discourse_ai.ai_agent.new"@action={{this.newAgent}}@icon="plus"- class={{dConcatClass- this.newAgentButtonClasses- "ai-agent-list-editor__new-button"- }}+ class="ai-agent-list-editor__new-button"/>- {{#if this.hasAgents}}- <combo.Menu- @identifier="duplicate-agent-menu"- @title={{i18n "discourse_ai.ai_agent.duplicate"}}- @placement="bottom-end"- @modalForMobile={{true}}- @autofocus={{true}}- @onRegisterApi={{this.registerDuplicateMenu}}- @onClose={{this.clearDuplicateFilter}}- @triggerClass={{dConcatClass- this.newAgentButtonClasses- "ai-agent-list-editor__duplicate-menu"- }}- aria-label={{i18n "discourse_ai.ai_agent.duplicate"}}- >- <div class="ai-agent-list-editor__duplicate-picker">- <DFilterInput- @value={{this.duplicateFilter}}- @filterAction={{this.filterDuplicateAgents}}- @onClearInput={{this.clearDuplicateFilter}}- @icons={{hash left="magnifying-glass"}}- placeholder={{i18n- "discourse_ai.ai_agent.duplicate_search"- }}- aria-label={{i18n- "discourse_ai.ai_agent.duplicate_search"- }}- data-test-duplicate-agent-filter- autofocus- />- <DDropdownMenu- class="ai-agent-list-editor__duplicate-results"- as |dropdown|- >- {{#each this.filteredDuplicateAgents as |agent|}}- <dropdown.item>- <DButton- @action={{fn this.duplicateAgent agent}}- @translatedLabel={{agent.name}}- @icon="copy"- class="btn-transparent"- data-test-duplicate-agent-option- />- </dropdown.item>- {{else}}- <li- class="ai-agent-list-editor__duplicate-empty"- role="status"- >- {{i18n "discourse_ai.ai_agent.filters.no_results"}}- </li>- {{/each}}- </DDropdownMenu>- </div>- </combo.Menu>- {{/if}}+ <combo.Menu+ @identifier="duplicate-agent-menu"+ @title={{i18n "discourse_ai.ai_agent.duplicate"}}+ @modalForMobile={{true}}+ @autofocus={{true}}+ @onRegisterApi={{this.registerDuplicateMenu}}+ @onClose={{this.clearDuplicateFilter}}+ @triggerClass="ai-agent-list-editor__duplicate-menu"+ aria-label={{i18n "discourse_ai.ai_agent.duplicate"}}+ >+ <div class="ai-agent-list-editor__duplicate-picker">+ <DFilterInput+ @value={{this.duplicateFilter}}+ @filterAction={{this.filterDuplicateAgents}}+ @onClearInput={{this.clearDuplicateFilter}}+ @icons={{hash left="magnifying-glass"}}+ placeholder={{i18n+ "discourse_ai.ai_agent.duplicate_search"+ }}+ aria-label={{i18n+ "discourse_ai.ai_agent.duplicate_search"+ }}+ data-test-duplicate-agent-filter+ autofocus+ />+ <DDropdownMenu+ class="ai-agent-list-editor__duplicate-results"+ as |dropdown|+ >+ {{#each this.filteredDuplicateAgents as |agent|}}+ <dropdown.item>+ <DButton+ @action={{fn this.duplicateAgent agent}}+ @translatedLabel={{agent.name}}+ @icon="copy"+ class="btn-transparent"+ data-test-duplicate-agent-option+ />+ </dropdown.item>+ {{else}}+ <li+ class="ai-agent-list-editor__duplicate-empty"+ role="status"+ >+ {{i18n "discourse_ai.ai_agent.filters.no_results"}}+ </li>+ {{/each}}+ </DDropdownMenu>+ </div>+ </combo.Menu></DComboButton></actions.Wrapped></:actions>diff --git a/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjsindex 18c4b37b232..952750a40a0 100644--- a/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs+++ b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs@@ -255,9 +255,13 @@ export default class DiscoursePostEventStatus extends Component {</:content></DMenu>{{else}}- <DComboButton class="going-button --has-menu" as |combo|>+ <DComboButton+ @hasMenu={{true}}+ @btnTypeClass={{statusButtonClass this.isGoing}}+ class="going-button"+ as |combo|+ ><combo.Button- class={{statusButtonClass this.isGoing}}@ariaPressed={{this.isGoing}}@disabled={{this.goingButtonDisabled}}@icon={{this.goingTriggerIcon}}@@ -270,7 +274,6 @@ export default class DiscoursePostEventStatus extends Component {/><combo.Menu@identifier="discourse-post-event-going-menu"- @triggerClass={{statusButtonClass this.isGoing}}@disabled={{this.goingButtonDisabled}}@onRegisterApi={{this.registerGoingMenu}}>diff --git a/plugins/styleguide/assets/javascripts/discourse/components/examples/molecules/combo-button.gjs b/plugins/styleguide/assets/javascripts/discourse/components/examples/molecules/combo-button.gjsnew file mode 100644index 00000000000..5c079e91595--- /dev/null+++ b/plugins/styleguide/assets/javascripts/discourse/components/examples/molecules/combo-button.gjs@@ -0,0 +1,47 @@+import DButton from "discourse/ui-kit/d-button";+import DComboButton from "discourse/ui-kit/d-combo-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";++const noop = () => {};++// Both variants are shown because the joined seam between the halves is styled+// differently for each, and an outlined regression is invisible on a filled one.+export default <template>+ <div class="styleguide--combo-button">+ <DComboButton @hasMenu={{true}} @btnTypeClass="btn-default" as |combo|>+ <combo.Button @translatedLabel="New topic" @icon="far-pen-to-square" />+ <combo.Menu @identifier="styleguide-combo-default">+ <DDropdownMenu as |dropdown|>+ <dropdown.item>+ <DButton+ @translatedLabel="Resume draft"+ @icon="reply"+ @action={{noop}}+ class="btn-secondary"+ />+ </dropdown.item>+ </DDropdownMenu>+ </combo.Menu>+ </DComboButton>++ <DComboButton @hasMenu={{true}} @btnTypeClass="btn-primary" as |combo|>+ <combo.Button @translatedLabel="New topic" @icon="far-pen-to-square" />+ <combo.Menu @identifier="styleguide-combo-primary">+ <DDropdownMenu as |dropdown|>+ <dropdown.item>+ <DButton+ @translatedLabel="Resume draft"+ @icon="reply"+ @action={{noop}}+ class="btn-secondary"+ />+ </dropdown.item>+ </DDropdownMenu>+ </combo.Menu>+ </DComboButton>++ <DComboButton @btnTypeClass="btn-default" as |combo|>+ <combo.Button @translatedLabel="No menu" @icon="far-pen-to-square" />+ </DComboButton>+ </div>+</template>diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/combo-button.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/combo-button.gjsnew file mode 100644index 00000000000..94ba0d69ee5--- /dev/null+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/combo-button.gjs@@ -0,0 +1,9 @@+import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";+import ComboButtonExample from "../../examples/molecules/combo-button";+import comboButtonSource from "../../examples/molecules/combo-button?source=file";++export default <template>+ <StyleguideExample @title="<DComboButton>" @code={{comboButtonSource}}>+ <ComboButtonExample />+ </StyleguideExample>+</template>diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js b/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.jsindex c14e98510a2..d7d418cc94c 100644--- a/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js+++ b/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js@@ -12,6 +12,7 @@ import topicLink from "../components/sections/atoms/10-topic-link-status";import breadCrumbs from "../components/sections/molecules/bread-crumbs";import categories from "../components/sections/molecules/categories";import charCounter from "../components/sections/molecules/char-counter";+import comboButton from "../components/sections/molecules/combo-button";import dialog from "../components/sections/molecules/dialog";import emptyState from "../components/sections/molecules/empty-state";import menus from "../components/sections/molecules/menus";@@ -72,6 +73,7 @@ const SECTIONS = [{ component: breadCrumbs, category: "molecules", id: "bread-crumbs" },{ component: categories, category: "molecules", id: "categories" },{ component: charCounter, category: "molecules", id: "char-counter" },+ { component: comboButton, category: "molecules", id: "combo-button" },{ component: emptyState, category: "molecules", id: "empty-state" },{ component: navigationBar, category: "molecules", id: "navigation-bar" },{diff --git a/plugins/styleguide/config/locales/client.en.yml b/plugins/styleguide/config/locales/client.en.ymlindex 066c4e498b4..260ce3bc964 100644--- a/plugins/styleguide/config/locales/client.en.yml+++ b/plugins/styleguide/config/locales/client.en.yml@@ -121,5 +121,7 @@ en:char_counter:title: "Character Counter"placeholder: "Enter your text here..."+ combo_button:+ title: "Combo Button"segmented_control:title: "Segmented Control (Button toggle group)"diff --git a/plugins/styleguide/spec/system/smoke_test_spec.rb b/plugins/styleguide/spec/system/smoke_test_spec.rbindex 2ec5accf0d2..3a093226c1e 100644--- a/plugins/styleguide/spec/system/smoke_test_spec.rb+++ b/plugins/styleguide/spec/system/smoke_test_spec.rb@@ -26,6 +26,7 @@ RSpec.describe "Styleguide Smoke Test" do{ href: "/molecules/bread-crumbs", title: "Bread Crumbs" },{ href: "/molecules/categories", title: "Categories" },{ href: "/molecules/char-counter", title: "Character Counter" },+ { href: "/molecules/combo-button", title: "Combo Button" },{ href: "/molecules/empty-state", title: "Empty State" },{ href: "/molecules/menus", title: "Menus" },{ href: "/molecules/navigation-bar", title: "Navigation Bar" },