A platform for community discussion. Free, open, simple.
DEV: Add `d-icon-grid-picker` component (#38943)
Sérgio Saquetimd3ed978ec511
diff --git a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scssindex f416329ac06..9ac8ea0d9a1 100644--- a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss+++ b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss@@ -89,23 +89,7 @@align-self: start;}- .form-kit__control-icon {- .select-kit-row .d-icon,- .select-kit-header .d-icon,- .select-kit-header-wrapper .d-icon:first-of-type {- color: var(--icon-color, currentColor);- }-- .select-kit-header-wrapper {- gap: var(--space-2);- }- }-- .form-kit__control-icon .formatted-selection {- display: flex !important; // overrides another important- flex: 0 1 auto;- }-+ #control-icon,#control-emoji {&.form-kit__field .form-kit__container-content {width: auto;diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scssindex 804c04d1a31..6464d79388c 100644--- a/app/assets/stylesheets/common/components/_index.scss+++ b/app/assets/stylesheets/common/components/_index.scss@@ -72,6 +72,7 @@@import "welcome-header";@import "notifications-tracking";@import "emoji-picker";+@import "d-icon-grid-picker";@import "filter-input";@import "filter-navigation";@import "welcome-banner";diff --git a/app/assets/stylesheets/common/components/d-icon-grid-picker.scss b/app/assets/stylesheets/common/components/d-icon-grid-picker.scssnew file mode 100644index 00000000000..014da10be65--- /dev/null+++ b/app/assets/stylesheets/common/components/d-icon-grid-picker.scss@@ -0,0 +1,238 @@+// Custom properties for the grid layout, set on the DMenu/modal container.+// The DMenu identifier generates `.fk-d-menu.d-icon-grid-picker-content`+// which doesn't follow the BEM `__` pattern, so it stays outside the block.+.fk-d-menu.d-icon-grid-picker-content,+.fk-d-menu-modal.d-icon-grid-picker-content {+ z-index: z("modal", "dialog");++ --icon-grid-columns: 12;+ --icon-grid-cell: 36px;+ --icon-grid-gap: 2px;+ --icon-grid-h-padding: 0.5rem;+}++.d-icon-grid-picker {+ /* Apply icon color to the trigger icon when --icon-color is set */+ .fk-d-menu__trigger > .d-icon {+ color: var(--icon-color, currentColor);+ }++ /* Split-button layout: DMenu trigger + clear button side by side */+ &.--has-clear {+ display: inline-flex;++ .fk-d-menu__trigger {+ border-top-right-radius: 0;+ border-bottom-right-radius: 0;+ border-right-color: transparent;+ }++ .d-icon-grid-picker__clear {+ border-top-left-radius: 0;+ border-bottom-left-radius: 0;+ border-left-color: transparent;+ margin-left: 0.1em;+ padding: 0.25em;+ min-width: 0;++ .d-icon {+ font-size: var(--font-down-2);+ }+ }+ }++ &__caret {+ margin-left: 1em;+ font-size: var(--font-down-2);+ }++ &__content {+ display: flex;+ flex-direction: column;+ width: calc(+ var(--icon-grid-columns) * var(--icon-grid-cell) ++ (var(--icon-grid-columns) - 1) * var(--icon-grid-gap) ++ var(--icon-grid-h-padding) * 2 + 8px+ );+ max-height: 380px;+ }++ // Mirrors emoji-picker__filter-container+ &__filter-container {+ background: var(--primary-very-low);+ display: flex;+ height: 50px;+ }++ // Mirrors emoji-picker__filter+ &__filter {+ width: 100%;+ margin: 0.5rem;+ border-radius: var(--d-border-radius);+ box-sizing: border-box;++ input {+ background-color: transparent !important;+ width: 100%;+ }++ .d-icon {+ color: var(--primary-medium);+ }++ &.filter-input-container {+ border-color: transparent;+ background: var(--secondary);+ }+ }++ // Parent grid that both favorites and icon grid share+ &__grid-wrapper {+ display: grid;+ grid-template-columns: repeat(+ var(--icon-grid-columns),+ var(--icon-grid-cell)+ );+ gap: var(--icon-grid-gap);+ padding: var(--icon-grid-h-padding);+ overflow-x: hidden;+ overflow-y: auto;+ max-height: 300px;+ scrollbar-width: thin;+ box-sizing: border-box;+ }++ // Favorites row inherits parent columns via subgrid+ &__favorites {+ display: grid;+ grid-template-columns: subgrid;+ grid-column: 1 / -1;+ padding-bottom: 0.25rem;+ }++ &__selected-name {+ font-size: var(--font-down-1);+ white-space: nowrap;+ padding-left: 0.3em;+ padding-right: 0.5em;+ }++ // Main icon grid inherits parent columns via subgrid+ &__grid {+ display: grid;+ grid-template-columns: subgrid;+ grid-column: 1 / -1;+ }++ &__icon {+ display: flex;+ align-items: center;+ justify-content: center;+ width: var(--icon-grid-cell);+ height: var(--icon-grid-cell);+ cursor: pointer;+ color: var(--icon-color, var(--primary-high));+ border: none;+ background: none;+ padding: 0;+ font: inherit;++ @media (prefers-reduced-motion: no-preference) {+ transition: transform 0.15s ease;+ }++ &:hover,+ &:focus {+ background: var(--primary-very-low);+ border-radius: var(--d-border-radius);++ @media (prefers-reduced-motion: no-preference) {+ transform: scale(1.25);+ }+ }++ &.--selected {+ background: var(--tertiary-low);+ color: var(--tertiary);+ border-radius: var(--d-border-radius);+ }++ // Inner grid so the chip icon aligns with the first grid column+ &.d-icon-grid-picker__selected-chip {+ display: grid;+ grid-template-columns: var(--icon-grid-cell) 1fr;+ align-items: center;+ text-align: left;+ padding: 0;++ // The chip spans multiple columns, so transform: scale() on the+ // whole element would overlap neighbouring cells without triggering+ // a grid reflow. Scale only the inner icon instead.+ &:hover,+ &:focus {+ transform: none;++ @media (prefers-reduced-motion: no-preference) {+ .d-icon {+ transform: scale(1.25);+ }+ }+ }++ .d-icon {+ justify-self: center;++ @media (prefers-reduced-motion: no-preference) {+ transition: transform 0.15s ease;+ }+ }+ }++ .d-icon {+ font-size: var(--font-up-2);+ }+ }++ &__loading {+ display: flex;+ align-items: center;+ justify-content: center;+ min-height: 150px;+ grid-column: 1 / -1;+ }++ &__empty {+ padding: 1em;+ text-align: center;+ color: var(--primary-medium);+ grid-column: 1 / -1;+ }+}++// Mobile overrides+@media screen and (width <= 767px) {+ .fk-d-menu-modal.d-icon-grid-picker-content {+ .d-modal__body {+ padding: 0;+ }++ .d-icon-grid-picker {+ &__content {+ width: 100%;+ }++ &__filter-container {+ width: 100%;+ }++ &__grid-wrapper {+ width: 100%;+ grid-template-columns: repeat(auto-fill, var(--icon-grid-cell));+ justify-content: center;+ max-height: calc(+ var(--composer-vh, 1dvh) * 100 - 50px - env(safe-area-inset-bottom)+ );+ }+ }+ }+}diff --git a/app/assets/stylesheets/common/form-kit/_control-icon.scss b/app/assets/stylesheets/common/form-kit/_control-icon.scssindex 7a0c795033f..7336b91f767 100644--- a/app/assets/stylesheets/common/form-kit/_control-icon.scss+++ b/app/assets/stylesheets/common/form-kit/_control-icon.scss@@ -1,45 +1,15 @@-@use "lib/viewport";-.form-kit__control-icon {- width: 100% !important;- min-width: var(--form-kit-small-input);-- .formatted-selection {- display: none !important;- }-- .d-icon-angle-down,- .d-icon-angle-up {- color: var(--primary-medium) !important;- }-- .select-kit-header-wrapper .d-icon:first-of-type {- color: var(--primary);+ .d-icon-grid-picker {+ width: 100%;+ min-width: var(--form-kit-small-input);}- .select-kit-header {- padding-inline: 0.65em !important;- height: 2em;-- @include viewport.until(sm) {- height: 2.25em;- }-- &:hover:not(:disabled) {- .discourse-no-touch & {- background-color: var(--secondary);- color: var(--primary);- border: 1px solid var(--tertiary);-- .d-icon {- color: inherit;- }- }- }+ .d-icon-grid-picker__caret {+ color: var(--primary-medium);}.form-kit__field.has-error & {- summary {+ .fk-d-menu__trigger {border-color: var(--danger);}}diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 16d766e9e03..148026a57c4 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -3074,6 +3074,20 @@ en:dark_tone: Dark skin tonedefault: Custom emojis+ filter_input:+ clear: "Clear filter"++ d_icon_grid_picker:+ select_icon: "Select icon"+ search_placeholder: "Search icons..."+ no_results: "No icons found"+ results_count:+ one: "%{count} icon found"+ other: "%{count} icons found"+ favorites: "Favorites"+ selected_icon: "Selected icon: %{iconName}"+ clear: "Clear icon"+shared_drafts:title: "Shared Drafts"notice: "This topic is only visible to those who can publish shared drafts."@@ -4779,6 +4793,7 @@ en:icon: "Icon"emoji: "Emoji"select_emoji: "Select emoji"+ select_icon: "Select icon"background_color: "Color"foreground_color: "Text color"color_validations:diff --git a/frontend/discourse/admin/components/site-settings/icon.gjs b/frontend/discourse/admin/components/site-settings/icon.gjsindex 561de0f9870..9175bc2293c 100644--- a/frontend/discourse/admin/components/site-settings/icon.gjs+++ b/frontend/discourse/admin/components/site-settings/icon.gjs@@ -1,7 +1,6 @@import Component from "@glimmer/component";-import { hash } from "@ember/helper";import { action } from "@ember/object";-import IconPicker from "discourse/select-kit/components/icon-picker";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";export default class Icon extends Component {@action@@ -10,17 +9,12 @@ export default class Icon extends Component {}<template>- <IconPicker- @value={{readonly @value}}- @onlyAvailable={{true}}- @options={{hash- maximum=1- disabled=@disabled- caretDownIcon="angle-down"- caretUpIcon="angle-up"- icons=@value- }}+ <DIconGridPicker+ @value={{@value}}@onChange={{this.onChangeIcon}}+ @disabled={{@disabled}}+ @showCaret={{true}}+ @showSelectedName={{true}}/></template>}diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjsindex 1e9458113c7..19c0fd9c3aa 100644--- a/frontend/discourse/admin/components/upsert-category/general.gjs+++ b/frontend/discourse/admin/components/upsert-category/general.gjs@@ -8,6 +8,7 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";import DecoratedHtml from "discourse/components/decorated-html";import EmojiPicker from "discourse/components/emoji-picker";import DTooltip from "discourse/float-kit/components/d-tooltip";@@ -24,7 +25,6 @@ import Composer from "discourse/models/composer";import PermissionType from "discourse/models/permission-type";import CategoryChooser from "discourse/select-kit/components/category-chooser";import GroupChooser from "discourse/select-kit/components/group-chooser";-import IconPicker from "discourse/select-kit/components/icon-picker";import { eq, or } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";@@ -531,21 +531,11 @@ export default class UpsertCategoryGeneral extends Component {as |field|><field.Control>- <IconPicker- @value={{readonly field.value}}- @onlyAvailable={{true}}- @options={{hash- maximum=1- disabled=field.disabled- caretDownIcon="angle-down"- caretUpIcon="angle-up"- icons=field.value- }}+ <DIconGridPicker+ @value={{field.value}}@onChange={{field.set}}- class="form-kit__control-icon"- style={{trustHTML- (concat "--icon-color: #" @transientData.color ";")- }}+ @allowClear={{true}}+ @iconColor={{concat "#" @transientData.color}}/></field.Control></@form.Field>diff --git a/frontend/discourse/app/components/d-button.gjs b/frontend/discourse/app/components/d-button.gjsindex f4a2bfacf3a..40ec4caa4d4 100644--- a/frontend/discourse/app/components/d-button.gjs+++ b/frontend/discourse/app/components/d-button.gjs@@ -19,49 +19,52 @@ import { i18n } from "discourse-i18n";* @property {object} Args** // Text- * @property {string} Args.title- * @property {string} Args.translatedTitle- * @property {string} Args.label- * @property {string} Args.translatedLabel+ * @property {string} [Args.title]+ * @property {string} [Args.translatedTitle]+ * @property {string} [Args.label]+ * @property {string} [Args.translatedLabel]** // Actions / events- * @property {function|object} Args.action- * @property {any} Args.actionParam- * @property {boolean} Args.forwardEvent- * @property {function} Args.onKeyDown+ * @property {function|object} [Args.action]+ * @property {any} [Args.actionParam]+ * @property {boolean} [Args.forwardEvent]+ * @property {function} [Args.onKeyDown]** // Navigation- * @property {string} Args.href- * @property {string} Args.route- * @property {object|object[]} Args.routeModels+ * @property {string} [Args.href]+ * @property {string} [Args.route]+ * @property {object|object[]} [Args.routeModels]** // State- * @property {boolean} Args.isLoading- * @property {boolean} Args.disabled- * @property {boolean} Args.preventFocus+ * @property {boolean} [Args.isLoading]+ * @property {boolean} [Args.disabled]+ * @property {boolean} [Args.preventFocus]** // Display mode* @property {"link"} [Args.display]** // Display / icon- * @property {string} Args.icon- * @property {boolean} Args.ellipsis- * @property {string} Args.suffixIcon+ * @property {string} [Args.icon]+ * @property {boolean} [Args.ellipsis]+ * @property {string} [Args.suffixIcon]** // Accessibility- * @property {string} Args.ariaLabel- * @property {string} Args.translatedAriaLabel- * @property {boolean} Args.ariaExpanded- * @property {boolean} Args.ariaPressed- * @property {string} Args.ariaControls- * @property {boolean} Args.ariaHidden+ * @property {string} [Args.ariaLabel]+ * @property {string} [Args.translatedAriaLabel]+ * @property {boolean} [Args.ariaExpanded]+ * @property {boolean} [Args.ariaPressed]+ * @property {string} [Args.ariaControls]+ * @property {boolean} [Args.ariaHidden]** // HTML attributes- * @property {string} Args.type- * @property {string} Args.id- * @property {string} Args.form- * @property {string} Args.tabindex- * @property {string} Args.class+ * @property {string} [Args.type]+ * @property {string} [Args.id]+ * @property {string} [Args.form]+ * @property {string} [Args.tabindex]+ * @property {string} [Args.class]+ *+ * // Root element type (enables ...attributes type checking)+ * @property {HTMLButtonElement} Element** // Optional yield* @property {object} Blocksdiff --git a/frontend/discourse/app/components/d-icon-grid-picker/content.gjs b/frontend/discourse/app/components/d-icon-grid-picker/content.gjsnew file mode 100644index 00000000000..a2e434929d8--- /dev/null+++ b/frontend/discourse/app/components/d-icon-grid-picker/content.gjs@@ -0,0 +1,399 @@+// @ts-check+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { fn, hash } from "@ember/helper";+import { on } from "@ember/modifier";+import { action } from "@ember/object";+import { service } from "@ember/service";+import { modifier } from "ember-modifier";+/** @type {import("discourse/components/async-content.gjs")} */+import AsyncContent from "discourse/components/async-content";+import FilterInput from "discourse/components/filter-input";+import concatClass from "discourse/helpers/concat-class";+import dIcon from "discourse/helpers/d-icon";+import withEventValue from "discourse/helpers/with-event-value";+import { ajax } from "discourse/lib/ajax";+import { eq } from "discourse/truth-helpers";+import { i18n } from "discourse-i18n";++/* Module-level cache for the unfiltered icon list, keyed by onlyAvailable flag */+const unfilteredIconCache = new Map();++/**+ * The content panel rendered inside the DMenu dropdown or modal.+ * Handles icon search, favorites row, and the async-loaded icon grid.+ *+ * @param {string} value - The currently selected icon ID.+ * @param {Function} onSelect - Called with the selected icon ID when an icon is picked.+ * @param {string[]} [favorites] - Icon IDs to display in a pinned favorites row above the grid.+ * @param {boolean} [showSelectedName] - When true, the selected favorite chip also displays+ * the icon name alongside the icon.+ * @param {boolean} [onlyAvailable] - When true, only shows icons available in the+ * current SVG sprite set. Defaults to true.+ */+export default class DIconGridPickerContent extends Component {+ @service tooltip;++ @tracked filter = "";+ @tracked resultCount = null;++ /**+ * Modifier that measures the natural content width of the selected-chip element+ * and snaps it to the nearest number of grid columns so it aligns with the+ * grid without overflowing. Cell size and gap are read from the+ * `--icon-grid-cell` and `--icon-grid-gap` CSS custom properties.+ */+ snapToGrid = modifier((/** @type {HTMLElement} */ element) => {+ const styles = getComputedStyle(element);+ const cell = parseFloat(styles.getPropertyValue("--icon-grid-cell"));+ const gap = parseFloat(styles.getPropertyValue("--icon-grid-gap"));+ const stride = cell + gap;++ /* Temporarily unconstrain width to measure natural content width */+ element.style.width = "max-content";+ const contentWidth = element.getBoundingClientRect().width;++ const span = Math.ceil(contentWidth / stride);+ element.style.gridColumn = `span ${span}`;+ /* Fill the spanned grid area (inline style overrides the CSS cell width) */+ element.style.width = "100%";+ });++ /**+ * Modifier that registers a hover tooltip showing the icon ID on each grid cell.+ * Skips the selected-chip element since it already displays the name inline.+ */+ registerIconTooltip = modifier((/** @type {HTMLElement} */ element) => {+ const iconId = element.dataset.iconId;+ if (+ !iconId ||+ element.classList.contains("d-icon-grid-picker__selected-chip")+ ) {+ return;+ }++ const instance = this.tooltip.register(element, {+ content: iconId,+ placement: "top",+ fallbackPlacements: ["bottom"],+ triggers: ["hover"],+ animated: false,+ });++ return () => instance.destroy();+ });++ /**+ * Returns the list of favorite icon IDs to display, with the currently+ * selected icon always first (deduplicated against the favorites array).+ *+ * @returns {string[]} Ordered array of icon IDs for the favorites row.+ */+ get displayFavorites() {+ const favs = this.args.favorites || [];+ const value = this.args.value;+ if (!value && !favs.length) {+ return [];+ }+ const result = value ? [value] : [];+ for (const f of favs) {+ if (!result.includes(f)) {+ result.push(f);+ }+ }+ return result;+ }++ /**+ * Whether the favorites row should be visible. Hidden when the user is+ * actively filtering, since search results replace the favorites section.+ *+ * @returns {boolean}+ */+ get hasFavorites() {+ return this.displayFavorites.length > 0 && !this.filter;+ }++ /**+ * Updates the tracked filter string as the user types in the search input.+ *+ * @param {string} value - The current input value.+ */+ @action+ onFilterInput(value) {+ this.filter = value;+ }++ /**+ * Clears the search filter, restoring the full icon list and favorites row.+ */+ @action+ clearFilter() {+ this.filter = "";+ }++ /**+ * Handles arrow key navigation within the icon grid. Uses position-based+ * matching (offsetTop/offsetLeft) for vertical movement so it works+ * regardless of how many columns the grid renders.+ *+ * @param {KeyboardEvent} event+ */+ @action+ onGridKeyDown(event) {+ const target = /** @type {HTMLElement} */ (event.target);+ if (!target.classList.contains("d-icon-grid-picker__icon")) {+ return;+ }++ const wrapper = target.closest(".d-icon-grid-picker__grid-wrapper");+ const allIcons = /** @type {HTMLElement[]} */ ([+ ...wrapper.querySelectorAll(".d-icon-grid-picker__icon"),+ ]);+ const idx = allIcons.indexOf(target);++ switch (event.key) {+ case "ArrowRight": {+ event.preventDefault();+ const next = allIcons[idx + 1];+ if (next) {+ next.focus();+ }+ break;+ }+ case "ArrowLeft": {+ event.preventDefault();+ const prev = allIcons[idx - 1];+ if (prev) {+ prev.focus();+ } else {+ this.focusFilter(wrapper);+ }+ break;+ }+ case "ArrowDown": {+ event.preventDefault();+ event.stopPropagation();+ const below = allIcons+ .filter((el) => el.offsetTop > target.offsetTop)+ .find((el) => el.offsetLeft === target.offsetLeft);+ if (below) {+ below.focus();+ } else {+ /* No exact column match (e.g. selected chip spans columns);+ jump to first icon on the next row */+ const nextRow = allIcons.find(+ (el) => el.offsetTop > target.offsetTop+ );+ nextRow?.focus();+ }+ break;+ }+ case "ArrowUp": {+ event.preventDefault();+ event.stopPropagation();+ const above = [...allIcons]+ .reverse()+ .filter((el) => el.offsetTop < target.offsetTop)+ .find((el) => el.offsetLeft === target.offsetLeft);+ if (above) {+ above.focus();+ } else {+ this.focusFilter(wrapper);+ }+ break;+ }+ }+ }++ /**+ * Unified keydown handler on the content root. Delegates to grid+ * navigation or filter-to-grid focus depending on the event target.+ *+ * @param {KeyboardEvent} event+ */+ @action+ onKeyDown(event) {+ const target = /** @type {HTMLElement} */ (event.target);+ if (+ target.classList.contains("filter-input") &&+ event.key === "ArrowDown"+ ) {+ event.preventDefault();+ /** @type {HTMLElement | null} */ (+ target+ .closest(".d-icon-grid-picker__content")+ ?.querySelector(".d-icon-grid-picker__icon")+ )?.focus();+ return;+ }++ this.onGridKeyDown(event);+ }++ focusFilter(wrapper) {+ wrapper+ .closest(".d-icon-grid-picker__content")+ ?.querySelector(".filter-input")+ ?.focus();+ }++ get resultAnnouncement() {+ if (this.resultCount === null) {+ return "";+ }+ return i18n("d_icon_grid_picker.results_count", {+ count: this.resultCount,+ });+ }++ /**+ * Fetches icons from the server, optionally filtered by a search term.+ * Used as the `@asyncData` callback for the `AsyncContent` loader.+ *+ * @param {string} filter - The search string to filter icons by name.+ * @returns {Promise<Array<{id: string, symbol: string}>>} Array of matching icons.+ */+ @action+ async fetchIcons(filter) {+ const onlyAvailable = this.args.onlyAvailable ?? true;++ if (!filter && unfilteredIconCache.has(onlyAvailable)) {+ const cached = unfilteredIconCache.get(onlyAvailable);+ this.resultCount = cached.length;+ return cached;+ }++ const icons = await ajax("/svg-sprite/picker-search", {+ data: { filter: filter || "", only_available: onlyAvailable },+ });++ if (!filter) {+ unfilteredIconCache.set(onlyAvailable, icons);+ }++ this.resultCount = icons.length;+ return icons;+ }++ <template>+ {{! template-lint-disable no-invalid-interactive }}+ <div+ class="d-icon-grid-picker__content"+ style={{@iconColorStyle}}+ {{on "keydown" this.onKeyDown}}+ >+ <div class="d-icon-grid-picker__filter-container">+ <FilterInput+ {{! @glint-expect-error: FilterInput lacks Element type declaration }}+ aria-label={{i18n "d_icon_grid_picker.search_placeholder"}}+ aria-controls="d-icon-grid-picker-listbox"+ placeholder={{i18n "d_icon_grid_picker.search_placeholder"}}+ @value={{this.filter}}+ @filterAction={{withEventValue this.onFilterInput}}+ @onClearInput={{this.clearFilter}}+ @icons={{hash left="magnifying-glass"}}+ @containerClass="d-icon-grid-picker__filter"+ />+ </div>++ <div+ class="d-icon-grid-picker__grid-wrapper"+ id="d-icon-grid-picker-listbox"+ role="listbox"+ aria-label={{i18n "d_icon_grid_picker.select_icon"}}+ >+ {{#if this.hasFavorites}}+ <div+ class="d-icon-grid-picker__favorites"+ role="group"+ aria-label={{i18n "d_icon_grid_picker.favorites"}}+ >+ {{#each this.displayFavorites as |favIcon|}}+ {{! template-lint-disable require-context-role }}+ {{#if (eq favIcon @value)}}+ <button+ type="button"+ role="option"+ aria-label={{favIcon}}+ aria-selected="true"+ class={{concatClass+ "d-icon-grid-picker__icon --selected"+ (if @showSelectedName "d-icon-grid-picker__selected-chip")+ }}+ data-icon-id={{favIcon}}+ {{this.registerIconTooltip}}+ {{this.snapToGrid}}+ {{on "click" (fn @onSelect favIcon)}}+ >+ {{dIcon favIcon}}+ {{#if @showSelectedName}}+ <span+ class="d-icon-grid-picker__selected-name"+ >{{favIcon}}</span>+ {{/if}}+ </button>+ {{else}}+ {{! template-lint-disable require-context-role }}+ <button+ type="button"+ role="option"+ aria-label={{favIcon}}+ aria-selected="false"+ class="d-icon-grid-picker__icon"+ data-icon-id={{favIcon}}+ {{this.registerIconTooltip}}+ {{on "click" (fn @onSelect favIcon)}}+ >+ {{dIcon favIcon}}+ </button>+ {{/if}}+ {{/each}}+ </div>+ {{/if}}++ <div class="d-icon-grid-picker__grid" role="presentation">+ <AsyncContent+ @asyncData={{this.fetchIcons}}+ @context={{this.filter}}+ @debounce={{true}}+ >+ <:loading>+ <div class="d-icon-grid-picker__loading">+ <div class="spinner"></div>+ </div>+ </:loading>+ <:content as |icons|>+ {{#each icons as |item|}}+ {{! template-lint-disable require-context-role }}+ <button+ type="button"+ role="option"+ aria-label={{item.id}}+ aria-selected={{if (eq item.id @value) "true" "false"}}+ class={{concatClass+ "d-icon-grid-picker__icon"+ (if (eq item.id @value) "--selected")+ }}+ data-icon-id={{item.id}}+ {{this.registerIconTooltip}}+ {{on "click" (fn @onSelect item.id)}}+ >+ {{dIcon item.id}}+ </button>+ {{/each}}+ </:content>+ <:empty>+ <div class="d-icon-grid-picker__empty" role="status">+ {{i18n "d_icon_grid_picker.no_results"}}+ </div>+ </:empty>+ </AsyncContent>+ </div>+ </div>+ <div class="sr-only" aria-live="polite" role="status">+ {{this.resultAnnouncement}}+ </div>+ </div>+ </template>+}diff --git a/frontend/discourse/app/components/d-icon-grid-picker/index.gjs b/frontend/discourse/app/components/d-icon-grid-picker/index.gjsnew file mode 100644index 00000000000..1f32ce4cf28--- /dev/null+++ b/frontend/discourse/app/components/d-icon-grid-picker/index.gjs@@ -0,0 +1,200 @@+// @ts-check+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { action } from "@ember/object";+import { trustHTML } from "@ember/template";+/** @type {import("discourse/components/d-button.gjs").default} */+import DButton from "discourse/components/d-button";+/** @type {import("discourse/components/d-icon-grid-picker/content.gjs").default} */+import DIconGridPickerContent from "discourse/components/d-icon-grid-picker/content";+/** @type {import("discourse/float-kit/components/d-menu.gjs").default} */+import DMenu from "discourse/float-kit/components/d-menu";+import concatClass from "discourse/helpers/concat-class";+import dIcon from "discourse/helpers/d-icon";+import { isValidHex, normalizeHex } from "discourse/lib/color-transformations";+import { i18n } from "discourse-i18n";++/**+ * A grid-based icon picker that displays available icons in a searchable+ * dropdown (desktop) or modal (mobile). Icons are fetched from the+ * `/svg-sprite/picker-search` endpoint and rendered in a 12-column grid.+ *+ * @param {string} value - The currently selected icon ID.+ * @param {Function} onChange - Called with the selected icon ID when an icon is picked.+ * @param {string[]} [favorites] - Icon IDs to display in a pinned favorites row above the grid.+ * @param {boolean} [showSelectedName] - When true, the selected favorite chip also displays+ * the icon name alongside the icon.+ * @param {string} [btnClass] - CSS class(es) for the trigger button. Defaults to "btn-default".+ * @param {string} [label] - Optional text label shown next to the icon in the trigger button.+ * @param {boolean} [allowClear] - When true, shows a clear button next to the trigger+ * in a split-button layout when a value is selected.+ * @param {boolean} [showCaret] - When true, shows a chevron icon in the trigger+ * that flips between angle-down and angle-up based on the menu's expanded state.+ * @param {boolean} [disabled] - When true, disables the trigger button and clear button.+ * @param {boolean} [onlyAvailable] - When true, only shows icons available in the+ * current SVG sprite set. Defaults to true.+ * @param {string} [iconColor] - CSS color value applied to icons in both the trigger+ * and the picker grid via the `--icon-color` custom property.+ * @param {string} [selectedTitle] - Translation key for the trigger button title when an+ * icon is selected. Receives `{iconName}` as an interpolation variable.+ * Defaults to "d_icon_grid_picker.selected_icon".+ * @param {string} [clearTitle] - Translation key for the clear button title.+ * Defaults to "d_icon_grid_picker.clear".+ * @param {boolean} [modalForMobile] - Whether to show as a modal on mobile. Defaults to true.+ * @param {boolean} [inline] - When true, renders the menu inline instead of floating.+ * @param {Function} [onShow] - Called when the picker menu is opened.+ * @param {Function} [onClose] - Called when the picker menu is closed.+ */+export default class DIconGridPicker extends Component {+ @tracked menu = null;++ /**+ * @returns {boolean} Whether to render as a modal on mobile devices.+ */+ get modalForMobile() {+ return this.args.modalForMobile ?? true;+ }++ get btnClass() {+ return this.args.btnClass ?? "btn-default";+ }++ get showClearButton() {+ return this.args.allowClear && this.args.value;+ }++ get triggerTitle() {+ if (!this.args.value) {+ return null;+ }+ const key = this.args.selectedTitle ?? "d_icon_grid_picker.selected_icon";+ return i18n(key, { iconName: this.args.value });+ }++ get clearTitle() {+ return this.args.clearTitle ?? "d_icon_grid_picker.clear";+ }++ get triggerLabel() {+ if (this.args.label !== undefined) {+ return this.args.label;+ }+ if (!this.args.value) {+ return i18n("d_icon_grid_picker.select_icon");+ }+ return null;+ }++ get caretIcon() {+ return this.menu?.expanded ? "angle-up" : "angle-down";+ }++ get iconColorStyle() {+ if (!this.args.iconColor || !isValidHex(this.args.iconColor)) {+ return null;+ }+ return trustHTML(`--icon-color: #${normalizeHex(this.args.iconColor)}`);+ }++ /**+ * Stores the DMenu API instance so the content can close the menu+ * programmatically after an icon is selected.+ *+ * @param {Object} api - The DMenu API instance.+ */+ @action+ onRegisterMenu(api) {+ this.menu = api;+ }++ /**+ * Forwards to the external `@onShow` callback if provided.+ */+ @action+ onShow() {+ this.args.onShow?.();+ }++ /**+ * Handles icon selection by invoking the `@onChange` callback and closing+ * the menu/modal.+ *+ * @param {string} iconId - The selected icon's ID.+ */+ @action+ selectIcon(iconId) {+ this.args.onChange?.(iconId);+ this.menu?.close();+ }++ /**+ * Clears the current icon selection by invoking `@onChange` with null.+ */+ @action+ clearIcon() {+ this.args.onChange?.(null);+ }++ <template>+ <div+ class={{concatClass+ "d-icon-grid-picker"+ (if this.showClearButton "--has-clear")+ }}+ data-value={{@value}}+ style={{this.iconColorStyle}}+ ...attributes+ >+ <DMenu+ @title={{this.triggerTitle}}+ @disabled={{@disabled}}+ @triggerClass={{this.btnClass}}+ @identifier="d-icon-grid-picker"+ @groupIdentifier="d-icon-grid-picker"+ @modalForMobile={{this.modalForMobile}}+ @maxWidth={{490}}+ @autofocus={{true}}+ @onShow={{this.onShow}}+ @onRegisterApi={{this.onRegisterMenu}}+ @onClose={{@onClose}}+ @inline={{@inline}}+ >+ <:trigger>+ {{#if @value}}+ {{dIcon @value}}+ {{/if}}++ {{#if this.triggerLabel}}+ <span class="d-icon-grid-picker__label">{{this.triggerLabel}}</span>+ {{else}}+ ​+ {{/if}}++ {{#if @showCaret}}+ {{dIcon this.caretIcon class="d-icon-grid-picker__caret"}}+ {{/if}}+ </:trigger>+ <:content>+ <DIconGridPickerContent+ @value={{@value}}+ @onSelect={{this.selectIcon}}+ @favorites={{@favorites}}+ @showSelectedName={{@showSelectedName}}+ @onlyAvailable={{@onlyAvailable}}+ @iconColorStyle={{this.iconColorStyle}}+ />+ </:content>+ </DMenu>++ {{#if this.showClearButton}}+ <DButton+ class="btn-default d-icon-grid-picker__clear"+ @icon="xmark"+ @action={{this.clearIcon}}+ @title={{this.clearTitle}}+ @disabled={{@disabled}}+ />+ {{/if}}+ </div>+ </template>+}diff --git a/frontend/discourse/app/components/filter-input.gjs b/frontend/discourse/app/components/filter-input.gjsindex cb14cdc397b..aa3370ae480 100644--- a/frontend/discourse/app/components/filter-input.gjs+++ b/frontend/discourse/app/components/filter-input.gjs@@ -8,6 +8,7 @@ import concatClass from "discourse/helpers/concat-class";import icon from "discourse/helpers/d-icon";import noop from "discourse/helpers/noop";import { and } from "discourse/truth-helpers";+import { i18n } from "discourse-i18n";export default class FilterInput extends Component {@tracked isFocused = false;@@ -67,6 +68,8 @@ export default class FilterInput extends Component {<DButton@icon="xmark"@action={{this.onClearInput}}+ @title={{i18n "filter_input.clear"}}+ aria-label={{i18n "filter_input.clear"}}class="btn-small btn-transparent filter-input-clear-btn"/>{{/if}}diff --git a/frontend/discourse/app/components/group-flair-inputs.gjs b/frontend/discourse/app/components/group-flair-inputs.gjsindex 462cba6ed2c..555bb11f96c 100644--- a/frontend/discourse/app/components/group-flair-inputs.gjs+++ b/frontend/discourse/app/components/group-flair-inputs.gjs@@ -1,11 +1,12 @@/* eslint-disable ember/no-classic-components, ember/no-jquery, ember/no-observers */import Component from "@ember/component";-import { fn, hash } from "@ember/helper";+import { fn } from "@ember/helper";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import { observes, on } from "@ember-decorators/object";import $ from "jquery";import AvatarFlair from "discourse/components/avatar-flair";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";import RadioButton from "discourse/components/radio-button";import TextField from "discourse/components/text-field";import UppyImageUploader from "discourse/components/uppy-image-uploader";@@ -13,7 +14,6 @@ import { ajax } from "discourse/lib/ajax";import discourseDebounce from "discourse/lib/debounce";import getURL from "discourse/lib/get-url";import { convertIconClass } from "discourse/lib/icon-library";-import IconPicker from "discourse/select-kit/components/icon-picker";import { or } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";@@ -135,11 +135,11 @@ export default class GroupFlairInputs extends Component {</div>{{#if this.flairPreviewIcon}}- <IconPicker- @name="icon"+ <DIconGridPicker@value={{this.model.flair_icon}}- @options={{hash maximum=1}}@onChange={{fn (mut this.model.flair_icon)}}+ @showCaret={{true}}+ @label={{unless this.model.flair_icon (i18n "select_placeholder")}}/>{{else if this.flairPreviewImage}}<UppyImageUploaderdiff --git a/frontend/discourse/app/components/modal/sidebar-section-form.gjs b/frontend/discourse/app/components/modal/sidebar-section-form.gjsindex 1e64a4544bc..7e11022f7e8 100644--- a/frontend/discourse/app/components/modal/sidebar-section-form.gjs+++ b/frontend/discourse/app/components/modal/sidebar-section-form.gjs@@ -394,7 +394,7 @@ export default class SidebarSectionForm extends Component {@afterRenderfocusNewRowInput(id) {document- .querySelector(`[data-row-id="${id}"] .icon-picker summary`)+ .querySelector(`[data-row-id="${id}"] .d-icon-grid-picker-trigger`).focus();}diff --git a/frontend/discourse/app/components/sidebar/section-form-link.gjs b/frontend/discourse/app/components/sidebar/section-form-link.gjsindex 27b63d43322..15bd49ba9b1 100644--- a/frontend/discourse/app/components/sidebar/section-form-link.gjs+++ b/frontend/discourse/app/components/sidebar/section-form-link.gjs@@ -1,16 +1,16 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";-import { fn, hash } from "@ember/helper";+import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import DButton from "discourse/components/d-button";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";import concatClass from "discourse/helpers/concat-class";import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import discourseLater from "discourse/lib/later";-import IconPicker from "discourse/select-kit/components/icon-picker";import { i18n } from "discourse-i18n";export default class SectionFormLink extends Component {@@ -101,19 +101,12 @@ export default class SectionFormLink extends Component {{{/if}}<div class="input-group" role="cell">- <IconPicker- @name="icon"+ <DIconGridPicker@value={{@link.icon}}- @options={{hash- maximum=1- caretDownIcon="angle-down"- caretUpIcon="angle-up"- }}- @onlyAvailable={{true}}@onChange={{fn (mut @link.icon)}}+ @showCaret={{true}}+ @btnClass={{@link.iconCssClass}}aria-label={{i18n "sidebar.sections.custom.links.icon.label"}}- class={{@link.iconCssClass}}/>{{#if @link.invalidIconMessage}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/icon.gjs b/frontend/discourse/app/form-kit/components/fk/control/icon.gjsindex 41cb7d8fa8a..4fcd5a373c6 100644--- a/frontend/discourse/app/form-kit/components/fk/control/icon.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/icon.gjs@@ -1,7 +1,6 @@-import { hash } from "@ember/helper";import { action } from "@ember/object";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";import FKBaseControl from "discourse/form-kit/components/fk/control/base";-import IconPicker from "discourse/select-kit/components/icon-picker";export default class FKControlIcon extends FKBaseControl {static controlType = "icon";@@ -12,17 +11,12 @@ export default class FKControlIcon extends FKBaseControl {}<template>- <IconPicker- @value={{readonly @field.value}}- @onlyAvailable={{true}}- @options={{hash- maximum=1- caretDownIcon="angle-down"- caretUpIcon="angle-up"- }}+ <DIconGridPicker+ @value={{@field.value}}@onChange={{this.handleInput}}+ @disabled={{@field.disabled}}+ @showCaret={{true}}+ @showSelectedName={{true}}class="form-kit__control-icon"/></template>diff --git a/frontend/discourse/select-kit/components/icon-picker.js b/frontend/discourse/select-kit/components/icon-picker.jsindex cac38516aef..68a4c36356b 100644--- a/frontend/discourse/select-kit/components/icon-picker.js+++ b/frontend/discourse/select-kit/components/icon-picker.js@@ -3,6 +3,7 @@ import { action, computed } from "@ember/object";import { classNames } from "@ember-decorators/component";import $ from "jquery";import { ajax } from "discourse/lib/ajax";+import deprecated from "discourse/lib/deprecated";import { isDevelopment } from "discourse/lib/environment";import { makeArray } from "discourse/lib/helpers";import {@@ -27,6 +28,11 @@ export default class IconPicker extends MultiSelectComponent {init() {super.init(...arguments);+ deprecated(+ "IconPicker (SelectKit) is deprecated. Use `DIconGridPicker` instead.",+ { id: "discourse.icon-picker", since: "2026.3" }+ );+this._cachedIconsList = null;this._resultCount = 0;diff --git a/frontend/discourse/tests/helpers/form-kit-assertions.js b/frontend/discourse/tests/helpers/form-kit-assertions.jsindex 0ea4d464137..cba34e7e5fd 100644--- a/frontend/discourse/tests/helpers/form-kit-assertions.js+++ b/frontend/discourse/tests/helpers/form-kit-assertions.js@@ -61,11 +61,11 @@ class FieldHelper {case "input-number":case "input-text":return this.element.querySelector(".form-kit__control-input").value;- case "icon": {- return this.element.querySelector(- ".form-kit__control-icon .select-kit-header"- )?.dataset?.value;- }+ case "icon":+ return (+ this.element.querySelector(".d-icon-grid-picker")?.dataset?.value ||+ undefined+ );case "question": {return (this.element.querySelector(".form-kit__control-radio:checked")diff --git a/frontend/discourse/tests/helpers/form-kit-helper.js b/frontend/discourse/tests/helpers/form-kit-helper.jsindex fd8d7fd9108..4f6c9f89710 100644--- a/frontend/discourse/tests/helpers/form-kit-helper.js+++ b/frontend/discourse/tests/helpers/form-kit-helper.js@@ -1,6 +1,5 @@-import { click, fillIn, triggerEvent } from "@ember/test-helpers";+import { click, fillIn, triggerEvent, waitFor } from "@ember/test-helpers";import { query } from "discourse/tests/helpers/qunit-helpers";-import selectKit from "discourse/tests/helpers/select-kit-helper";class Field {constructor(selector) {@@ -62,6 +61,11 @@ class Field {case "checkbox":case "toggle":return this.inputElement.checked;+ case "icon":+ return (+ this.element.querySelector(".d-icon-grid-picker")?.dataset?.value ||+ null+ );default:throw new Error(`Unsupported control type: ${this.controlType}`);}@@ -173,11 +177,9 @@ class Field {async select(value) {switch (this.element.dataset.controlType) {case "icon":- const picker = selectKit(- "#" + this.element.querySelector("details").id- );- await picker.expand();- await picker.selectRowByValue(value);+ await click(".d-icon-grid-picker-trigger");+ await waitFor(`[data-icon-id="${value}"]`);+ await click(`[data-icon-id="${value}"]`);break;case "select":this.inputElement.value = value;diff --git a/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjs b/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjsnew file mode 100644index 00000000000..ca671f79fae--- /dev/null+++ b/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjs@@ -0,0 +1,582 @@+import { click, render, triggerKeyEvent, waitFor } from "@ember/test-helpers";+import { module, test } from "qunit";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import pretender, { response } from "discourse/tests/helpers/create-pretender";++const noop = () => {};++function iconFixtures(ids) {+ return ids.map((id) => ({ id, symbol: `<symbol id="${id}"></symbol>` }));+}++module("Integration | Component | DIconGridPicker", function (hooks) {+ setupRenderingTest(hooks);++ hooks.beforeEach(function () {+ pretender.get("/svg-sprite/picker-search", (request) => {+ const filter = request.queryParams.filter || "";++ if (filter === "no-match-xyz") {+ return response(200, []);+ }++ const allIcons = iconFixtures([+ "pencil",+ "trash-can",+ "gear",+ "heart",+ "star",+ ]);++ if (filter) {+ return response(+ 200,+ allIcons.filter((i) => i.id.includes(filter))+ );+ }++ return response(200, allIcons);+ });+ });++ test("renders trigger with selected icon", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon-pencil")+ .exists("shows the selected icon in the trigger");+ });++ test("clears the selected icon when clear button is clicked", async function (assert) {+ let currentValue = "pencil";+ const onChange = (val) => (currentValue = val);++ await render(+ <template>+ <DIconGridPicker+ @value={{currentValue}}+ @onChange={{onChange}}+ @allowClear={{true}}+ />+ </template>+ );++ assert.dom(".d-icon-grid-picker__clear").exists();+ await click(".d-icon-grid-picker__clear");+ assert.strictEqual(currentValue, null);+ });++ test("does not show clear button when allowClear is false", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ assert.dom(".d-icon-grid-picker__clear").doesNotExist();+ });++ test("does not show clear button when no value", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value={{null}}+ @onChange={{noop}}+ @allowClear={{true}}+ />+ </template>+ );++ assert.dom(".d-icon-grid-picker__clear").doesNotExist();+ });++ test("renders trigger with no icon when no value", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon")+ .doesNotExist("shows no icon when value is empty");+ });++ test("displays icons in the grid after opening", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ assert+ .dom(".d-icon-grid-picker__grid .d-icon-grid-picker__icon")+ .exists({ count: 5 }, "renders all fetched icons");+ });++ test("calls @onChange when an icon is selected", async function (assert) {+ let selectedIcon;+ const onChange = (iconId) => (selectedIcon = iconId);++ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{onChange}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");+ await click('[data-icon-id="gear"]');++ assert.strictEqual(selectedIcon, "gear", "onChange receives the icon ID");+ });++ test("displays favorites row when @favorites is provided", async function (assert) {+ const favorites = ["heart", "star"];++ await render(+ <template>+ <DIconGridPicker+ @value="heart"+ @onChange={{noop}}+ @favorites={{favorites}}+ />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__favorites");++ assert+ .dom(".d-icon-grid-picker__favorites .d-icon-grid-picker__icon")+ .exists({ count: 2 }, "shows the selected icon and favorites");+ });++ test("selected icon has --selected class in favorites", async function (assert) {+ const favorites = ["star"];++ await render(+ <template>+ <DIconGridPicker+ @value="heart"+ @onChange={{noop}}+ @favorites={{favorites}}+ />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__favorites");++ assert+ .dom('.d-icon-grid-picker__favorites [data-icon-id="heart"]')+ .hasClass(+ "--selected",+ "selected icon in favorites has --selected class"+ );+ assert+ .dom('.d-icon-grid-picker__favorites [data-icon-id="star"]')+ .doesNotHaveClass(+ "--selected",+ "non-selected favorite does not have --selected class"+ );+ });++ test("shows selected name when @showSelectedName is true", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value="heart"+ @onChange={{noop}}+ @showSelectedName={{true}}+ />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__favorites");++ assert+ .dom(+ ".d-icon-grid-picker__selected-chip .d-icon-grid-picker__selected-name"+ )+ .hasText("heart", "displays the icon name in the selected chip");+ });++ test("shows empty state when no icons match", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ const input = document.querySelector(+ ".d-icon-grid-picker__filter .filter-input"+ );+ await fillInFilterInput(input, "no-match-xyz");++ await waitFor(".d-icon-grid-picker__empty");++ assert+ .dom(".d-icon-grid-picker__empty")+ .exists("shows the empty state message");+ });++ test("shows caret icon when @showCaret is true", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value="pencil"+ @onChange={{noop}}+ @showCaret={{true}}+ />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon-grid-picker__caret")+ .exists("shows caret icon");+ });++ test("does not show caret icon by default", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon-grid-picker__caret")+ .doesNotExist("caret is hidden by default");+ });++ test("disables trigger when @disabled is true", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value="pencil"+ @onChange={{noop}}+ @disabled={{true}}+ />+ </template>+ );++ assert.dom(".d-icon-grid-picker-trigger").isDisabled();+ });++ test("shows default label when no value", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon-grid-picker__label")+ .exists("shows label when no value");+ });++ test("shows custom label", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} @label="Pick one" />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon-grid-picker__label")+ .hasText("Pick one");+ });++ test("hides label when value is set and no explicit label", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ assert+ .dom(".d-icon-grid-picker-trigger .d-icon-grid-picker__label")+ .doesNotExist("label hidden when icon is selected");+ });++ test("applies default btn-default class to trigger", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ assert.dom(".d-icon-grid-picker-trigger").hasClass("btn-default");+ });++ test("applies custom @btnClass to trigger", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value={{null}}+ @onChange={{noop}}+ @btnClass="btn-primary"+ />+ </template>+ );++ assert.dom(".d-icon-grid-picker-trigger").hasClass("btn-primary");+ assert.dom(".d-icon-grid-picker-trigger").doesNotHaveClass("btn-default");+ });++ test("sets --icon-color CSS variable when @iconColor is provided", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value="pencil"+ @onChange={{noop}}+ @iconColor="#FF0000"+ />+ </template>+ );++ const wrapper = document.querySelector(".d-icon-grid-picker");+ assert.true(+ wrapper.style.cssText.includes("--icon-color: #FF0000"),+ "sets --icon-color custom property"+ );+ });++ test("does not set --icon-color when @iconColor is not provided", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ const wrapper = document.querySelector(".d-icon-grid-picker");+ assert.false(+ wrapper.style.cssText.includes("--icon-color"),+ "no --icon-color custom property"+ );+ });++ test("sets data-value attribute", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ assert.dom(".d-icon-grid-picker").hasAttribute("data-value", "pencil");+ });++ test("sets title on trigger when value is selected", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value="pencil" @onChange={{noop}} />+ </template>+ );++ assert.dom(".d-icon-grid-picker-trigger").hasAttribute("title");+ });++ test("fires @onShow callback when menu opens", async function (assert) {+ let showCalled = false;+ const onShow = () => (showCalled = true);++ await render(+ <template>+ <DIconGridPicker+ @value={{null}}+ @onChange={{noop}}+ @onShow={{onShow}}+ />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ assert.true(showCalled, "onShow was called");+ });++ test("fires @onClose callback when menu closes", async function (assert) {+ let closeCalled = false;+ const onClose = () => (closeCalled = true);++ await render(+ <template>+ <DIconGridPicker+ @value={{null}}+ @onChange={{noop}}+ @onClose={{onClose}}+ />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");+ await click(".d-icon-grid-picker-trigger");+ assert.true(closeCalled, "onClose was called");+ });++ test("grid wrapper has listbox role", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ assert+ .dom(".d-icon-grid-picker__grid-wrapper")+ .hasAttribute("role", "listbox");+ });++ test("icon buttons have option role and aria-selected on selected icon", async function (assert) {+ await render(+ <template><DIconGridPicker @value="gear" @onChange={{noop}} /></template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ assert+ .dom('[data-icon-id="gear"]')+ .hasAttribute("role", "option")+ .hasAttribute("aria-selected", "true");++ assert+ .dom('[data-icon-id="pencil"]')+ .hasAttribute("role", "option")+ .hasAttribute("aria-selected", "false");+ });++ test("arrow keys navigate between icons", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ const firstIcon = document.querySelector(".d-icon-grid-picker__icon");+ firstIcon.focus();++ await triggerKeyEvent(firstIcon, "keydown", "ArrowRight");+ assert+ .dom(document.activeElement)+ .hasAttribute("data-icon-id", "trash-can");++ await triggerKeyEvent(document.activeElement, "keydown", "ArrowLeft");+ assert.dom(document.activeElement).hasAttribute("data-icon-id", "pencil");+ });++ test("ArrowDown from filter focuses first icon", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ const filterInput = document.querySelector(+ ".d-icon-grid-picker__filter .filter-input"+ );+ filterInput.focus();++ await triggerKeyEvent(filterInput, "keydown", "ArrowDown");+ assert.true(+ document.activeElement.classList.contains("d-icon-grid-picker__icon"),+ "first icon is focused"+ );+ });++ test("ArrowUp from first icon focuses filter", async function (assert) {+ await render(+ <template>+ <DIconGridPicker @value={{null}} @onChange={{noop}} />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__icon");++ const firstIcon = document.querySelector(".d-icon-grid-picker__icon");+ firstIcon.focus();++ await triggerKeyEvent(firstIcon, "keydown", "ArrowUp");+ assert.true(+ document.activeElement.classList.contains("filter-input"),+ "filter input is focused"+ );+ });++ test("rejects invalid @iconColor values", async function (assert) {+ await render(+ <template>+ <DIconGridPicker+ @value="pencil"+ @onChange={{noop}}+ @iconColor="red; background: url(evil)"+ />+ </template>+ );++ const wrapper = document.querySelector(".d-icon-grid-picker");+ assert.false(+ wrapper.style.cssText.includes("--icon-color"),+ "does not set --icon-color for invalid value"+ );+ });++ test("hides favorites row while filtering", async function (assert) {+ const favorites = ["heart"];++ await render(+ <template>+ <DIconGridPicker+ @value="heart"+ @onChange={{noop}}+ @favorites={{favorites}}+ />+ </template>+ );++ await click(".d-icon-grid-picker-trigger");+ await waitFor(".d-icon-grid-picker__favorites");++ assert+ .dom(".d-icon-grid-picker__favorites")+ .exists("favorites visible initially");++ const input = document.querySelector(+ ".d-icon-grid-picker__filter .filter-input"+ );+ await fillInFilterInput(input, "gear");++ assert+ .dom(".d-icon-grid-picker__favorites")+ .doesNotExist("favorites hidden while filtering");+ });+});++async function fillInFilterInput(input, value) {+ input.value = value;+ input.dispatchEvent(new Event("input", { bubbles: true }));+ // Wait for debounced async content to resolve+ await new Promise((resolve) => setTimeout(resolve, 300));+ await waitFor(".d-icon-grid-picker__icon, .d-icon-grid-picker__empty");+}diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjsindex 693e42de8f5..637376efb05 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjs@@ -1,4 +1,4 @@-import { render } from "@ember/test-helpers";+import { click, render, waitFor } from "@ember/test-helpers";import { module, test } from "qunit";import Form from "discourse/components/form";import { setupRenderingTest } from "discourse/tests/helpers/component-test";@@ -28,9 +28,11 @@ module("Integration | Component | FormKit | Controls | Icon", function (hooks) {</template>);- await formKit().field("foo").select("pencil");- await formKit().submit();+ await click(".d-icon-grid-picker-trigger");+ await waitFor("[data-icon-id='pencil']");+ await click("[data-icon-id='pencil']");+ await formKit().submit();assert.deepEqual(data.foo, "pencil");assert.form().field("foo").hasValue("pencil");});@@ -52,6 +54,8 @@ module("Integration | Component | FormKit | Controls | Icon", function (hooks) {</template>);- assert.dom(".form-kit__control-icon.is-disabled").exists();+ assert+ .dom(".form-kit__control-icon .d-icon-grid-picker-trigger")+ .isDisabled();});});diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjsindex 4525bdc070e..96ded0116f2 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjs@@ -1,6 +1,7 @@import Component from "@glimmer/component";import { fn, get, hash } from "@ember/helper";import CategoryNotificationsTracking from "discourse/components/category-notifications-tracking";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";import PinnedButton from "discourse/components/pinned-button";import PinnedOptions from "discourse/components/pinned-options";import TopicNotificationsTracking from "discourse/components/topic-notifications-tracking";@@ -10,7 +11,6 @@ import ComboBox from "discourse/select-kit/components/combo-box";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";import FutureDateInputSelector from "discourse/select-kit/components/future-date-input-selector";import GroupChooser from "discourse/select-kit/components/group-chooser";-import IconPicker from "discourse/select-kit/components/icon-picker";import ListSetting from "discourse/select-kit/components/list-setting";import MiniTagChooser from "discourse/select-kit/components/mini-tag-chooser";import MultiSelect from "discourse/select-kit/components/multi-select";@@ -276,10 +276,10 @@ import UserNotificationsDropdown from "discourse/select-kit/components/user-notiget iconPickerCode() {return `-import IconPicker from "discourse/select-kit/components/icon-picker";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";<template>- <IconPicker @name="icon" />+ <DIconGridPicker /></template>`;}@@ -484,8 +484,8 @@ import IconPicker from "discourse/select-kit/components/icon-picker";/></StyleguideExample>- <StyleguideExample @title="<IconPicker>" @code={{this.iconPickerCode}}>- <IconPicker @name="icon" />+ <StyleguideExample @title="<DIconGridPicker>" @code={{this.iconPickerCode}}>+ <DIconGridPicker /></StyleguideExample></template>}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjsindex 8d2a51973cb..6177011e8e9 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs@@ -1,14 +1,14 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";-import { fn, hash } from "@ember/helper";+import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import DButton from "discourse/components/d-button";+import DIconGridPicker from "discourse/components/d-icon-grid-picker";import DToggleSwitch from "discourse/components/d-toggle-switch";import { TOAST } from "discourse/float-kit/lib/constants";import withEventValue from "discourse/helpers/with-event-value";-import IconPicker from "discourse/select-kit/components/icon-picker";import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";@@ -189,10 +189,8 @@ export default class Toasts extends Component {/></Row><Row @name="[@options.data.icon]">- <IconPicker- @name="icon"+ <DIconGridPicker@value={{this.icon}}- @options={{hash maximum=1}}@onChange={{fn (mut this.icon)}}/></Row>diff --git a/spec/system/custom_sidebar_sections_spec.rb b/spec/system/custom_sidebar_sections_spec.rbindex 1b8853087d0..01ecc0afa3b 100644--- a/spec/system/custom_sidebar_sections_spec.rb+++ b/spec/system/custom_sidebar_sections_spec.rb@@ -184,7 +184,9 @@ describe "Custom sidebar sections" dosidebar.click_add_link_buttonis_focused =- page.evaluate_script("document.activeElement.classList.contains('multi-select-header')")+ page.evaluate_script(+ "document.activeElement.classList.contains('d-icon-grid-picker-trigger')",+ )expect(is_focused).to be trueenddiff --git a/spec/system/page_objects/components/d_icon_grid_picker.rb b/spec/system/page_objects/components/d_icon_grid_picker.rbnew file mode 100644index 00000000000..35bd87d5a96--- /dev/null+++ b/spec/system/page_objects/components/d_icon_grid_picker.rb@@ -0,0 +1,94 @@+# frozen_string_literal: true++module PageObjects+ module Components+ class DIconGridPicker < PageObjects::Components::Base+ def initialize(scope = nil)+ @scope = scope+ end++ def expand+ trigger.click+ end++ def select_icon(icon_id)+ find("[data-icon-id='#{icon_id}']").click+ end++ def select_first_icon+ find("[data-icon-id]", match: :first).click+ end++ def filter(term)+ find(".d-icon-grid-picker__filter .filter-input").fill_in(with: term)+ end++ def clear+ scoped(".d-icon-grid-picker__clear").click+ end++ def value+ wrapper["data-value"]+ end++ def has_selected_icon?(icon_id)+ wrapper["data-value"] == icon_id+ end++ def has_no_selected_icon?+ wrapper["data-value"].blank?+ end++ def has_clear_button?+ scoped_has_css?(".d-icon-grid-picker__clear")+ end++ def has_no_clear_button?+ scoped_has_no_css?(".d-icon-grid-picker__clear")+ end++ private++ def wrapper+ scoped(".d-icon-grid-picker")+ end++ def trigger+ scoped(".d-icon-grid-picker-trigger")+ end++ def scoped(selector)+ case @scope+ when Capybara::Node::Element+ @scope.find(selector)+ when String+ find("#{@scope} #{selector}")+ else+ find(selector)+ end+ end++ def scoped_has_css?(selector, **opts)+ case @scope+ when Capybara::Node::Element+ @scope.has_css?(selector, **opts)+ when String+ page.has_css?("#{@scope} #{selector}", **opts)+ else+ page.has_css?(selector, **opts)+ end+ end++ def scoped_has_no_css?(selector, **opts)+ case @scope+ when Capybara::Node::Element+ @scope.has_no_css?(selector, **opts)+ when String+ page.has_no_css?("#{@scope} #{selector}", **opts)+ else+ page.has_no_css?(selector, **opts)+ end+ end+ end+ end+enddiff --git a/spec/system/page_objects/components/form_kit.rb b/spec/system/page_objects/components/form_kit.rbindex 0e9e97161f3..c13f228e747 100644--- a/spec/system/page_objects/components/form_kit.rb+++ b/spec/system/page_objects/components/form_kit.rb@@ -35,7 +35,9 @@ module PageObjectscomponent.find("input").valuewhen "color"component.find("input[type='text']").value- when "icon", "multi-select"+ when "icon"+ PageObjects::Components::DIconGridPicker.new(component).value+ when "multi-select"picker = PageObjects::Components::SelectKit.new(component)picker.valuewhen "tag-chooser"@@ -133,11 +135,9 @@ module PageObjectsdef select(value)case control_typewhen "icon"- selector = component.find(".form-kit__control-icon")["id"]- picker = PageObjects::Components::SelectKit.new("#" + selector)+ picker = PageObjects::Components::DIconGridPicker.new(component)picker.expand- picker.search(value)- picker.select_row_by_value(value)+ picker.select_icon(value)when "multi-select"selector = component.find(".form-kit__control-custom > .multi-select")["id"]picker = PageObjects::Components::SelectKit.new("#" + selector)diff --git a/spec/system/page_objects/modals/sidebar_section_form.rb b/spec/system/page_objects/modals/sidebar_section_form.rbindex e2625f0a318..dce44488bd9 100644--- a/spec/system/page_objects/modals/sidebar_section_form.rb+++ b/spec/system/page_objects/modals/sidebar_section_form.rb@@ -10,10 +10,11 @@ module PageObjectsdef fill_link(name, url, icon = "link")fill_in("link-name", with: name, match: :first)fill_in("link-url", with: url, match: :first)- find(".sidebar-section-form-link .select-kit summary", match: :first).click- fill_in("filter-input-search", with: icon, match: :first)- page.execute_script("window.scrollBy(0,10000)") # this a workaround for subfolder where page UI is broken- find(".select-kit-row.is-highlighted", match: :first).click+ first_link = find(".sidebar-section-form-link", match: :first)+ icon_picker = PageObjects::Components::DIconGridPicker.new(first_link)+ icon_picker.expand+ icon_picker.filter(icon)+ icon_picker.select_icon(icon)enddef mark_as_publicdiff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rbindex 916dd807912..c1f5f11c092 100644--- a/spec/system/simplified_category_creation_spec.rb+++ b/spec/system/simplified_category_creation_spec.rb@@ -7,6 +7,7 @@ describe "Simplified Category Creation" dolet(: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 }@@ -125,10 +126,9 @@ describe "Simplified Category Creation" doform.field("name").fill_in("Test Category")- icon_picker = PageObjects::Components::SelectKit.new(".form-kit__control-icon")icon_picker.expand+ icon_picker.select_first_iconicon_picker.clear- icon_picker.collapsecategory_page.save_settings