Skip to content

Commit

Permalink
Merge pull request #40902 from nextcloud/fix/36965-fix-nc-select-on-u…
Browse files Browse the repository at this point in the history
…sers-table

Append to body all selects inside of user table
  • Loading branch information
JuliaKirschenheuter committed Oct 17, 2023
2 parents cd6b10f + ba0fadd commit ad7d20e
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
8 changes: 7 additions & 1 deletion apps/settings/src/components/Users/UserRow.vue
Expand Up @@ -123,6 +123,7 @@
:disabled="isLoadingField"
:loading="loading.groups"
:multiple="true"
:append-to-body="false"
:options="availableGroups"
:placeholder="t('settings', 'Add user to group')"
:taggable="settings.isAdmin"
Expand Down Expand Up @@ -152,6 +153,7 @@
:disabled="isLoadingField"
:loading="loading.subadmins"
label="name"
:append-to-body="false"
:multiple="true"
:no-wrap="true"
:options="subAdminsGroups"
Expand All @@ -177,6 +179,7 @@
:create-option="validateQuota"
:disabled="isLoadingField"
:loading="loading.quota"
:append-to-body="false"
:clearable="false"
:input-id="'quota' + uniqueId"
:options="quotaOptions"
Expand Down Expand Up @@ -208,6 +211,7 @@
:disabled="isLoadingField"
:loading="loading.languages"
:clearable="false"
:append-to-body="false"
:options="availableLanguages"
:placeholder="t('settings', 'No language set')"
:value="userLanguage"
Expand Down Expand Up @@ -249,6 +253,7 @@
:input-id="'manager' + uniqueId"
:close-on-select="true"
:disabled="isLoadingField"
:append-to-body="false"
:loading="loadingPossibleManagers || loading.manager"
label="displayname"
:options="possibleManagers"
Expand Down Expand Up @@ -900,7 +905,6 @@ export default {
.user-list__row {
@include row;
border-bottom: 1px solid var(--color-border);
&:hover {
background-color: var(--color-background-hover);
Expand All @@ -920,6 +924,8 @@ export default {
@include cell;
&__cell {
border-bottom: 1px solid var(--color-border);
:deep {
.input-field,
.input-field__main-wrapper,
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/Users/VirtualList.vue
Expand Up @@ -168,6 +168,7 @@ export default Vue.extend({
--cell-width: 200px;
--cell-width-large: 300px;
--cell-min-width: calc(var(--cell-width) - (2 * var(--cell-padding)));
--sticky-column-z-index: calc(var(--vs-dropdown-z-index) + 1); // Keep the sticky column on top of the select dropdown
// Necessary for virtual scroll optimized rendering
display: block;
Expand All @@ -183,7 +184,7 @@ export default Vue.extend({
&__header {
top: 0;
z-index: 20;
z-index: calc(var(--sticky-column-z-index) + 1);
}
&__footer {
Expand Down
4 changes: 2 additions & 2 deletions apps/settings/src/components/Users/shared/styles.scss
Expand Up @@ -52,7 +52,7 @@
&--avatar,
&--displayname {
position: sticky;
z-index: 10;
z-index: var(--sticky-column-z-index);
background-color: var(--color-main-background);
}

Expand Down Expand Up @@ -106,7 +106,7 @@
&--actions {
position: sticky;
right: 0;
z-index: 10;
z-index: var(--sticky-column-z-index);
display: flex;
flex-direction: row;
align-items: center;
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

0 comments on commit ad7d20e

Please sign in to comment.