IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: highlight "no subcategories" as active dropdown option (#27478)

Browse Source
This commit is contained in:
Kris 2024-06-14 13:50:13 -04:00 committed by GitHub
parent 63e8c79e2f
commit e245bf2a18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/select-kit/addon/components/category-drop.js
View File

@ -22,6 +22,7 @@ const MORE_COLLECTION = "MORE_COLLECTION";
export default ComboBoxComponent.extend({ export default ComboBoxComponent.extend({
pluginApiIdentifiers: ["category-drop"], pluginApiIdentifiers: ["category-drop"],
classNames: ["category-drop"], classNames: ["category-drop"],
classNameBindings: ["noSubcategories:has-selection"],
value: readOnly("category.id"), value: readOnly("category.id"),
content: readOnly("categoriesWithShortcuts.[]"), content: readOnly("categoriesWithShortcuts.[]"),
noCategoriesLabel: I18n.t("categories.no_subcategories"), noCategoriesLabel: I18n.t("categories.no_subcategories"),
@ -64,6 +65,10 @@ export default ComboBoxComponent.extend({
return CategoryRow; return CategoryRow;
}, },
noSubcategories: computed("selectKit.options.noSubcategories", function () {
return this.selectKit.options.noSubcategories;
}),
displayCategoryDescription: computed(function () { displayCategoryDescription: computed(function () {
return !( return !(
this.get("currentUser.staff") || this.get("currentUser.trust_level") > 0 this.get("currentUser.staff") || this.get("currentUser.trust_level") > 0
@ -101,8 +106,7 @@ export default ComboBoxComponent.extend({
}); });
} }
// If there is a single shortcut, we can have a single "remove filter" // If there is a single shortcut, we can have a single "remove filter" option
// option
if (shortcuts.length === 1 && shortcuts[0].id === ALL_CATEGORIES_ID) { if (shortcuts.length === 1 && shortcuts[0].id === ALL_CATEGORIES_ID) {
shortcuts[0].name = I18n.t("categories.remove_filter"); shortcuts[0].name = I18n.t("categories.remove_filter");
} }

4
app/assets/stylesheets/common/select-kit/category-drop.scss
View File

@ -21,8 +21,10 @@
&.has-selection { &.has-selection {
.category-drop-header { .category-drop-header {
color: var(--quaternary);
border-color: var(--quaternary); border-color: var(--quaternary);
.caret-icon {
color: var(--quaternary);
}
} }
} }