replace utils mixin with selectKitPropUtils in other select-kit components

tyb-talks · tyb-talks · commit 2012bcd24bb9 · 2025-05-22T17:35:38.000+08:00
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
@@ -7,7 +7,7 @@ import {
 } from "@ember-decorators/component";
 import { makeArray } from "discourse/lib/helpers";
 import { isValidInput } from "select-kit/lib/input-utils";
-import UtilsMixin from "select-kit/mixins/utils";
+import selectKitPropUtils from "select-kit/lib/select-kit-prop-utils";
 
 @classNames("select-kit-header")
 @classNameBindings("isFocused")
@@ -19,7 +19,8 @@ import UtilsMixin from "select-kit/mixins/utils";
   "buttonTitle:title",
   "selectKit.options.autofocus:autofocus"
 )
-export default class SelectKitHeader extends Component.extend(UtilsMixin) {
+@selectKitPropUtils
+export default class SelectKitHeader extends Component {
   selectKit = null;
   role = "listbox";
   tabindex = 0;
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.gjs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.gjs
@@ -13,7 +13,7 @@ import icon from "discourse/helpers/d-icon";
 import { makeArray } from "discourse/lib/helpers";
 import { i18n } from "discourse-i18n";
 import { isValidInput } from "select-kit/lib/input-utils";
-import UtilsMixin from "select-kit/mixins/utils";
+import selectKitPropUtils from "select-kit/lib/select-kit-prop-utils";
 
 @classNames("select-kit-row")
 @tagName("li")
@@ -35,7 +35,8 @@ import UtilsMixin from "select-kit/mixins/utils";
   "isNone:none",
   "item.classNames"
 )
-export default class SelectKitRow extends Component.extend(UtilsMixin) {
+@selectKitPropUtils
+export default class SelectKitRow extends Component {
   tabIndex = 0;
   index = 0;
   role = "menuitemradio";
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-choice.gjs b/app/assets/javascripts/select-kit/addon/components/selected-choice.gjs
@@ -6,10 +6,11 @@ import { guidFor } from "@ember/object/internals";
 import { tagName } from "@ember-decorators/component";
 import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
-import UtilsMixin from "select-kit/mixins/utils";
+import selectKitPropUtils from "select-kit/lib/select-kit-prop-utils";
 
 @tagName("")
-export default class SelectedChoice extends Component.extend(UtilsMixin) {
+@selectKitPropUtils
+export default class SelectedChoice extends Component {
   item = null;
   selectKit = null;
   extraClass = null;
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-name.gjs b/app/assets/javascripts/select-kit/addon/components/selected-name.gjs
@@ -8,10 +8,11 @@ import { and } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import icon from "discourse/helpers/d-icon";
 import { makeArray } from "discourse/lib/helpers";
-import UtilsMixin from "select-kit/mixins/utils";
+import selectKitPropUtils from "select-kit/lib/select-kit-prop-utils";
 
 @tagName("")
-export default class SelectedName extends Component.extend(UtilsMixin) {
+@selectKitPropUtils
+export default class SelectedName extends Component {
   name = null;
   value = null;
   headerTitle = null;
