FIX: category-drop initial state was incorrect (#6743)

This commit is contained in:
Joffrey JAFFEUX
2018-12-10 14:05:00 +01:00
committed by GitHub
parent 314c084e5d
commit e06a8980fb
5 changed files with 110 additions and 13 deletions

View File

@ -17,7 +17,6 @@ export default ComboBoxComponent.extend({
tagName: "li",
categoryStyle: Ember.computed.alias("siteSettings.category_style"),
noCategoriesLabel: I18n.t("categories.no_subcategory"),
mutateAttributes() {},
fullWidthOnMobile: true,
caretDownIcon: "caret-right",
caretUpIcon: "caret-down",
@ -53,14 +52,7 @@ export default ComboBoxComponent.extend({
},
init() {
this._super();
if (this.get("category")) {
this.set("value", this.get("category.id"));
} else {
this.set("value", null);
}
if (!this.get("categories")) this.set("categories", []);
this._super(...arguments);
this.get("rowComponentOptions").setProperties({
hideParentCategory: this.get("subCategory"),
@ -73,6 +65,11 @@ export default ComboBoxComponent.extend({
});
},
didReceiveAttrs() {
if (!this.get("categories")) this.set("categories", []);
this.forceValue(this.get("category.id"));
},
@computed("content")
filterable(content) {
const contentLength = (content && content.length) || 0;

View File

@ -115,6 +115,11 @@ export default SelectKitComponent.extend({
},
mutateContent() {},
forceValues(values) {
this.mutateValues(values);
this._compute();
},
filterComputedContent(computedContent, computedValues, filter) {
return computedContent.filter(c => {
return this._normalize(get(c, "name")).indexOf(filter) > -1;

View File

@ -56,6 +56,11 @@ export default SelectKitComponent.extend({
this.set("value", computedValue);
},
forceValue(value) {
this.mutateValue(value);
this._compute();
},
_beforeWillComputeValue(value) {
if (
!isEmpty(this.get("content")) &&