diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs index e6c7dd5634b..cfde179c326 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs @@ -29,6 +29,9 @@ value=selectedGroup valueProperty=null nameProperty=null + options=(hash + placementStrategy="absolute" + ) }} {{combo-box class="permission-selector" @@ -36,6 +39,9 @@ content=category.availablePermissions onChange=(action "onSelectPermission") value=selectedPermission + options=(hash + placementStrategy="absolute" + ) }} {{d-button action=(action "addPermission" selectedGroup selectedPermission) diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs index fab2c089fde..dfb2e1c8d0d 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs @@ -39,6 +39,9 @@ content=searchPrioritiesOptions value=category.search_priority onChange=(action (mut category.search_priority)) + options=(hash + placementStrategy="absolute" + ) }} @@ -148,7 +151,15 @@ {{i18n "category.default_view"}}
- {{combo-box valueProperty="value" id="category-default-view" content=availableViews value=category.default_view}} + {{combo-box + valueProperty="value" + id="category-default-view" + content=availableViews + value=category.default_view + options=(hash + placementStrategy="absolute" + ) + }}
@@ -157,7 +168,15 @@ {{i18n "category.default_top_period"}}
- {{combo-box valueProperty="value" id="category-default-period" content=availableTopPeriods value=category.default_top_period}} + {{combo-box + valueProperty="value" + id="category-default-period" + content=availableTopPeriods + value=category.default_top_period + options=(hash + placementStrategy="absolute" + ) + }}
@@ -168,7 +187,16 @@
{{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}} {{#unless isDefaultSortOrder}} - {{combo-box castBoolean=true valueProperty="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}} + {{combo-box + castBoolean=true + valueProperty="value" + content=sortAscendingOptions + value=category.sort_ascending + none="category.sort_options.default" + options=(hash + placementStrategy="absolute" + ) + }} {{/unless}}
@@ -187,7 +215,15 @@ - {{combo-box valueProperty="value" id="subcategory-list-style" content=availableSubcategoryListStyles value=category.subcategory_list_style}} + {{combo-box + valueProperty="value" + id="subcategory-list-style" + content=availableSubcategoryListStyles + value=category.subcategory_list_style + options=(hash + placementStrategy="absolute" + ) + }} {{/if}} diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index ed78c9ed78d..30a37cf4501 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -267,6 +267,7 @@ export default Component.extend( closeOnChange: true, limitMatches: null, placement: "bottom-start", + placementStrategy: null, filterComponent: "select-kit/select-kit-filter", selectedNameComponent: "selected-name", castInteger: false @@ -814,10 +815,15 @@ export default Component.extend( popper.style.width = `${anchor.offsetWidth}px`; } + let placementStrategy = this.selectKit.options.placementStrategy; + if (!placementStrategy) { + placementStrategy = this.inModal ? "fixed" : "absolute"; + } + /* global Popper:true */ this.popper = Popper.createPopper(anchor, popper, { eventsEnabled: false, - strategy: inModal ? "fixed" : "absolute", + strategy: placementStrategy, placement: this.selectKit.options.placement, modifiers: [ {