Skip to content

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

UX: Improve icon and emoji picker styles on category creation (#39893)

Kris6e8b249b309a
diff --git a/app/assets/stylesheets/common/components/d-icon-grid-picker.scss b/app/assets/stylesheets/common/components/d-icon-grid-picker.scss
index 014da10be65..d3597c1af62 100644
--- a/app/assets/stylesheets/common/components/d-icon-grid-picker.scss
+++ b/app/assets/stylesheets/common/components/d-icon-grid-picker.scss
@@ -13,10 +13,14 @@
.d-icon-grid-picker {
/* Apply icon color to the trigger icon when --icon-color is set */
- .fk-d-menu__trigger > .d-icon {
+ .fk-d-menu__trigger > .d-icon:not(.d-icon-grid-picker__caret) {
color: var(--icon-color, currentColor);
}
+ &.--has-label .d-icon-grid-picker-trigger {
+ gap: var(--space-2);
+ }
+
/* Split-button layout: DMenu trigger + clear button side by side */
&.--has-clear {
display: inline-flex;
@@ -42,7 +46,6 @@
}
&__caret {
- margin-left: 1em;
font-size: var(--font-down-2);
}
diff --git a/app/assets/stylesheets/common/components/emoji-picker.scss b/app/assets/stylesheets/common/components/emoji-picker.scss
index 435110fe98f..4d3e9871f7a 100644
--- a/app/assets/stylesheets/common/components/emoji-picker.scss
+++ b/app/assets/stylesheets/common/components/emoji-picker.scss
@@ -15,9 +15,16 @@
}
.emoji-picker-trigger {
+ gap: var(--space-2);
+
.d-icon + .d-button-label {
margin-left: 0.25em;
}
+
+ .d-icon.emoji-picker__caret {
+ font-size: var(--font-down-2);
+ margin-left: 0;
+ }
}
.emoji-picker {
diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjs
index ec0ce45eac2..f6ec35215c7 100644
--- a/frontend/discourse/admin/components/upsert-category/general.gjs
+++ b/frontend/discourse/admin/components/upsert-category/general.gjs
@@ -741,7 +741,8 @@ export default class UpsertCategoryGeneral extends Component {
<DIconGridPicker
@value={{field.value}}
@onChange={{field.set}}
- @allowClear={{true}}
+ @showCaret={{true}}
+ @showSelectedName={{true}}
@iconColor={{concat "#" @transientData.color}}
/>
</field.Control>
@@ -764,6 +765,9 @@ export default class UpsertCategoryGeneral extends Component {
@didSelectEmoji={{field.set}}
@modalForMobile={{false}}
@btnClass="btn-default btn-emoji"
+ @icon={{null}}
+ @showCaret={{true}}
+ @showSelectedName={{true}}
@label={{unless
field.value
(i18n "category.select_emoji")
diff --git a/frontend/discourse/app/components/emoji-picker/index.gjs b/frontend/discourse/app/components/emoji-picker/index.gjs
index 6a825f5bd8b..0347e00b47d 100644
--- a/frontend/discourse/app/components/emoji-picker/index.gjs
+++ b/frontend/discourse/app/components/emoji-picker/index.gjs
@@ -1,4 +1,5 @@
import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
import { concat } from "@ember/helper";
import { action } from "@ember/object";
import EmojiPickerContent from "discourse/components/emoji-picker/content";
@@ -8,13 +9,15 @@ import dIcon from "discourse/ui-kit/helpers/d-icon";
import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";
export default class EmojiPicker extends Component {
+ @tracked menu = null;
+
@action
onRegisterMenu(api) {
this.menu = api;
}
get icon() {
- return this.args.icon ?? "far-face-smile";
+ return this.args.icon === undefined ? "far-face-smile" : this.args.icon;
}
get context() {
@@ -25,9 +28,27 @@ export default class EmojiPicker extends Component {
return this.args.modalForMobile ?? true;
}
+ get triggerLabel() {
+ if (this.args.label !== undefined) {
+ return this.args.label;
+ }
+ if (this.args.emoji && this.args.showSelectedName) {
+ return this.args.emoji;
+ }
+ return null;
+ }
+
+ get caretIcon() {
+ return this.menu?.expanded ? "angle-up" : "angle-down";
+ }
+
+ get hasLabel() {
+ return this.args.emoji && this.triggerLabel;
+ }
+
<template>
<DMenu
- @triggerClass={{dConcatClass @btnClass}}
+ @triggerClass={{dConcatClass @btnClass (if this.hasLabel "--has-label")}}
@onRegisterApi={{this.onRegisterMenu}}
@identifier="emoji-picker"
@groupIdentifier="emoji-picker"
@@ -41,15 +62,19 @@ export default class EmojiPicker extends Component {
<:trigger>
{{#if @emoji}}
{{dReplaceEmoji (concat ":" @emoji ":")}}
- {{else}}
+ {{else if this.icon}}
{{dIcon this.icon}}
{{/if}}
- {{#if @label}}
- <span class="d-button-label">{{@label}}</span>
+ {{#if this.triggerLabel}}
+ <span class="d-button-label">{{this.triggerLabel}}</span>
{{else}}
&#8203;
{{/if}}
+
+ {{#if @showCaret}}
+ {{dIcon this.caretIcon class="emoji-picker__caret"}}
+ {{/if}}
</:trigger>
<:content>
diff --git a/frontend/discourse/app/form-kit/components/fk/control/emoji.gjs b/frontend/discourse/app/form-kit/components/fk/control/emoji.gjs
index d96cb291160..d2e98b5369c 100644
--- a/frontend/discourse/app/form-kit/components/fk/control/emoji.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/control/emoji.gjs
@@ -17,6 +17,9 @@ export default class FKControlEmoji extends FKBaseControl {
@didSelectEmoji={{this.updateField}}
@modalForMobile={{false}}
@btnClass="btn-emoji"
+ @icon={{null}}
+ @showCaret={{true}}
+ @showSelectedName={{true}}
/>
</template>
}
diff --git a/frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjs b/frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjs
index aa966664493..e418b0bd5b3 100644
--- a/frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjs
+++ b/frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjs
@@ -23,8 +23,9 @@ import { i18n } from "discourse-i18n";
* @property {string} Args.value - The currently selected icon ID.
* @property {Function} Args.onChange - Called with the selected icon ID when an icon is picked.
* @property {string[]} [Args.favorites] - Icon IDs to display in a pinned favorites row above the grid.
- * @property {boolean} [Args.showSelectedName] - When true, the selected favorite chip also displays
- * the icon name alongside the icon.
+ * @property {boolean} [Args.showSelectedName] - When true, the selected icon's name is shown
+ * alongside the icon in both the trigger button and the favorites chip. Adds a
+ * `--has-label` modifier to the root element when the trigger renders the name.
* @property {string} [Args.btnClass] - CSS class(es) for the trigger button. Defaults to "btn-default".
* @property {string} [Args.label] - Optional text label shown next to the icon in the trigger button.
* @property {boolean} [Args.allowClear] - When true, shows a clear button next to the trigger
@@ -73,6 +74,10 @@ export default class DIconGridPicker extends Component {
return this.args.allowClear && this.args.value;
}
+ get hasLabel() {
+ return this.args.value && this.triggerLabel;
+ }
+
get triggerTitle() {
if (!this.args.value) {
return null;
@@ -92,6 +97,9 @@ export default class DIconGridPicker extends Component {
if (!this.args.value) {
return i18n("d_icon_grid_picker.select_icon");
}
+ if (this.args.showSelectedName) {
+ return this.args.value;
+ }
return null;
}
@@ -150,6 +158,7 @@ export default class DIconGridPicker extends Component {
class={{dConcatClass
"d-icon-grid-picker"
(if this.showClearButton "--has-clear")
+ (if this.hasLabel "--has-label")
}}
data-value={{@value}}
style={{this.iconColorStyle}}
diff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rb
index 7ed6e56736b..9a9f875a197 100644
--- a/spec/system/simplified_category_creation_spec.rb
+++ b/spec/system/simplified_category_creation_spec.rb
@@ -7,7 +7,6 @@ describe "Simplified Category Creation" do
let(:category_page) { PageObjects::Pages::Category.new }
let(:form) { PageObjects::Components::FormKit.new(".form-kit") }
- let(:icon_picker) { PageObjects::Components::DIconGridPicker.new }
let(:category_type_card) { PageObjects::Components::CategoryTypeCard.new }
let(:category_permission_row) { PageObjects::Components::CategoryPermissionRow.new }
let(:toasts) { PageObjects::Components::Toasts.new }
@@ -123,20 +122,6 @@ describe "Simplified Category Creation" do
)
end
- it "shows error when icon is missing" do
- category_page.visit_new_category
-
- form.field("name").fill_in("Test Category")
-
- icon_picker.expand
- icon_picker.select_first_icon
- icon_picker.clear
-
- category_page.save_settings
-
- expect(form.field("icon")).to have_errors(I18n.t("js.category.validations.icon_required"))
- end
-
it "shows advanced tabs when toggled" do
category_page.visit_general(category)