Skip to content

A platform for community discussion. Free, open, simple.

UX: Align `DComboButton` menus with the trigger's trailing edge (#42493)

Sérgio Saquetima18c5b33033c
diff --git a/frontend/discourse/app/ui-kit/d-combo-button.gjs b/frontend/discourse/app/ui-kit/d-combo-button.gjs
index b09e571ebb3..6f0f1556a74 100644
--- a/frontend/discourse/app/ui-kit/d-combo-button.gjs
+++ b/frontend/discourse/app/ui-kit/d-combo-button.gjs
@@ -2,6 +2,7 @@ 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
@@ -19,8 +20,13 @@ class Button extends Component {
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="chevron-down"
+ @icon={{or @icon "chevron-down"}}
+ @placement={{or @placement "bottom-end"}}
class="d-combo-button-menu"
...attributes
>
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.gjs
new file mode 100644
index 00000000000..342008e97fd
--- /dev/null
+++ b/frontend/discourse/tests/integration/ui-kit/d-combo-button-test.gjs
@@ -0,0 +1,75 @@
+import { render, 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";
+
+module("Integration | ui-kit | DComboButton", function (hooks) {
+ setupRenderingTest(hooks);
+
+ async function open() {
+ await triggerEvent(".fk-d-menu__trigger", "click");
+ }
+
+ 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|>
+ <combo.Button @translatedLabel="Action" />
+ <combo.Menu @inline={{true}} @visibilityOptimizer="none">
+ content
+ </combo.Menu>
+ </DComboButton>
+ </template>
+ );
+ await open();
+
+ assert.dom(".fk-d-menu").hasAttribute("data-placement", "bottom-end");
+ });
+
+ test("@placement overrides the default alignment", async function (assert) {
+ await render(
+ <template>
+ <DComboButton class="--has-menu" as |combo|>
+ <combo.Button @translatedLabel="Action" />
+ <combo.Menu
+ @inline={{true}}
+ @visibilityOptimizer="none"
+ @placement="bottom-start"
+ >
+ content
+ </combo.Menu>
+ </DComboButton>
+ </template>
+ );
+ await open();
+
+ assert.dom(".fk-d-menu").hasAttribute("data-placement", "bottom-start");
+ });
+
+ test("the menu trigger uses a chevron icon by default", async function (assert) {
+ await render(
+ <template>
+ <DComboButton class="--has-menu" as |combo|>
+ <combo.Button @translatedLabel="Action" />
+ <combo.Menu @inline={{true}}>content</combo.Menu>
+ </DComboButton>
+ </template>
+ );
+
+ assert.dom(".fk-d-menu__trigger .d-icon-chevron-down").exists();
+ });
+
+ test("@icon overrides the default trigger icon", async function (assert) {
+ await render(
+ <template>
+ <DComboButton class="--has-menu" as |combo|>
+ <combo.Button @translatedLabel="Action" />
+ <combo.Menu @inline={{true}} @icon="gear">content</combo.Menu>
+ </DComboButton>
+ </template>
+ );
+
+ assert.dom(".fk-d-menu__trigger .d-icon-gear").exists();
+ assert.dom(".fk-d-menu__trigger .d-icon-chevron-down").doesNotExist();
+ });
+});