github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 23:26:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: improves positioning of sk in mobile when inside a modal (#9657)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-05-07 09:10:29 +02:00 committed by GitHub
parent 136a545653
commit 87b1d435d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/select-kit/components/select-kit.js
View File

@ -782,8 +782,10 @@ export default Component.extend(
enabled: window.innerWidth <= 450,
phase: "main",
fn({ state }) {
let { x } = state.elements.reference.getBoundingClientRect();
state.modifiersData.popperOffsets.x = -x + 10;
if (!inModal) {
let { x } = state.elements.reference.getBoundingClientRect();
state.modifiersData.popperOffsets.x = -x + 10;
}
}
},
{
@ -791,7 +793,18 @@ export default Component.extend(
enabled: window.innerWidth <= 450,
phase: "beforeWrite",
fn({ state }) {
state.styles.popper.width = `${window.innerWidth - 20}px`;
if (inModal) {
const innerModal = document.querySelector(
"#discourse-modal div.modal-inner-container"
);
if (innerModal) {
state.styles.popper.width = `${innerModal.clientWidth -
20}px`;
}
} else {
state.styles.popper.width = `${window.innerWidth - 20}px`;
}
}
},
{