This commit is contained in:
Mirco Wittrien 2021-03-20 16:53:58 +01:00
parent a5a6966f56
commit dcf269eeb9
4 changed files with 17 additions and 17 deletions

View File

@ -6616,7 +6616,6 @@ module.exports = (_ => {
}
};
let NativeSubSelectExport = (BDFDB.ModuleUtils.find(m => m == InternalComponents.NativeSubComponents.Select, false) || {exports: {}}).exports;
InternalComponents.LibraryComponents.Select = reactInitialized && class BDFDB_Select extends LibraryModules.React.Component {
handleChange(value) {
this.props.value = value.value || value;
@ -6624,14 +6623,11 @@ module.exports = (_ => {
BDFDB.ReactUtils.forceUpdate(this);
}
render() {
let lightTheme = BDFDB.DiscordUtils.getTheme() == BDFDB.disCN.themelight;
return BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.Flex, {
return BDFDB.ReactUtils.createElement("div", {
className: BDFDB.disCN.selectwrapper,
direction: InternalComponents.LibraryComponents.Flex.Direction.HORIZONTAL,
align: InternalComponents.LibraryComponents.Flex.Align.CENTER,
children: BDFDB.ReactUtils.createElement(InternalComponents.NativeSubComponents.Select, Object.assign({}, this.props, {
lightThemeColorOverrides: NativeSubSelectExport[lightTheme ? "LIGHT_THEME_COLORS" : "DARK_THEME_COLORS"],
darkThemeColorOverrides: NativeSubSelectExport[lightTheme ? "LIGHT_THEME_COLORS" : "DARK_THEME_COLORS"],
children: BDFDB.ReactUtils.createElement(InternalComponents.NativeSubComponents.SearchableSelect, Object.assign({}, this.props, {
maxVisibleItems: this.props.maxVisibleItems || 7,
renderOptionLabel: this.props.optionRenderer,
onChange: this.handleChange.bind(this)
}))
});

View File

@ -359,6 +359,10 @@ img:not([src]), img[src=""], img[src="null"] {
margin-left: 12px;
}
[REPLACE_CLASS_selectwrapper] {
display: flex;
align-items: center;
}
[REPLACE_CLASS_selectwrapper] [REPLACE_CLASS_select] {
flex: 1 1 auto;
}

View File

@ -141,7 +141,7 @@ module.exports = (_ => {
basis: "50%",
options: sounds.map(o => ({value: o, label: o.split(/[-_]/g).map(BDFDB.LibraryModules.StringUtils.upperCaseFirstChar).join(" ")})),
value: this.settings.selections[key],
onChange: BDFDB.LibraryModules.SoundUtils.playSound
onChange: value => BDFDB.LibraryModules.SoundUtils.playSound(value, 0.4)
}));
return settingsItems;

View File

@ -1847,20 +1847,20 @@
filter: brightness(120%);
}
.theme-light .select-1Pkeg4:focus, /* dropdown select nitro subscription */
.theme-light .lookFilled-1h1y05.select-1Pkeg4:focus {
.theme-light .select-2fjwPw:focus, /* dropdown select nitro subscription */
.theme-light .lookFilled-22uAsw.select-2fjwPw:focus {
border-color: rgb(var(--vaccentcolor));
}
.theme-light .lookFilled-1h1y05.select-1Pkeg4:hover.selectOpen-hQuR6b,
.theme-light .lookFilled-1h1y05.selectOpen-hQuR6b {
.theme-light .lookFilled-22uAsw.select-2fjwPw:hover.open-kZ53_U,
.theme-light .lookFilled-22uAsw.open-kZ53_U {
border-color: rgb(var(--vaccentcolor)) rgb(var(--vaccentcolor)) #b9bbbe;
}
.theme-dark .select-1Pkeg4:focus,
.theme-dark .lookFilled-1h1y05.select-1Pkeg4:focus {
.theme-dark .select-2fjwPw:focus,
.theme-dark .lookFilled-22uAsw.select-2fjwPw:focus {
border-color: rgb(var(--vaccentcolor));
}
.theme-dark .lookFilled-1h1y05.select-1Pkeg4:hover.selectOpen-hQuR6b,
.theme-dark .lookFilled-1h1y05.selectOpen-hQuR6b {
.theme-dark .lookFilled-22uAsw.select-2fjwPw:hover.open-kZ53_U,
.theme-dark .lookFilled-22uAsw.open-kZ53_U {
border-color: rgb(var(--vaccentcolor)) rgb(var(--vaccentcolor)) rgba(0, 0, 0, 0.3);
}
.selectedIcon-3uS11H { /* dropdown select selected icon */