This commit is contained in:
Mirco Wittrien 2020-05-22 21:34:20 +02:00
parent ac0331e513
commit f2a78cc013
3 changed files with 55 additions and 14 deletions

View File

@ -4152,6 +4152,7 @@
DiscordClassModules.Checkbox = BDFDB.ModuleUtils.findByProperties("checkboxWrapper", "round");
DiscordClassModules.ColorPicker = BDFDB.ModuleUtils.findByProperties("colorPickerCustom", "customColorPickerInput");
DiscordClassModules.ColorPickerInner = BDFDB.ModuleUtils.findByProperties("saturation", "hue", "wrapper");
DiscordClassModules.ContextMenu = BDFDB.ModuleUtils.findByProperties("contextMenu", "itemGroup");
DiscordClassModules.CtaVerification = BDFDB.ModuleUtils.findByProperties("attendeeCTA", "verificationNotice");
DiscordClassModules.Cursor = BDFDB.ModuleUtils.findByProperties("cursorDefault", "userSelectNone");
DiscordClassModules.CustomStatusIcon = BDFDB.ModuleUtils.findByProperties("textRuler", "emoji", "icon");
@ -4710,6 +4711,29 @@
coloryellow: ["TextColor", "colorStatusYellow"],
contentcolumn: ["SettingsWindow", "contentColumn"],
contentregion: ["SettingsWindow", "contentRegion"],
contextmenu: ["ContextMenu", "contextMenu"],
contextmenucheckbox: ["ContextMenuCheckbox", "checkbox"],
contextmenucheckbox2: ["ContextMenu", "checkbox"],
contextmenucheckboxdisabled: ["ContextMenuCheckbox", "disabled"],
contextmenucheckboxinner: ["ContextMenuCheckbox", "checkboxInner"],
contextmenucheckboxelement: ["ContextMenuCheckbox", "checkboxElement"],
contextmenuhint: ["ContextMenu", "hint"],
contextmenuimage: ["ContextMenu", "image"],
contextmenuitem: ["ContextMenu", "item"],
contextmenuitembrand: ["ContextMenu", "brand"],
contextmenuitemclickable: ["ContextMenu", "clickable"],
contextmenuitemdanger: ["ContextMenu", "danger"],
contextmenuitemdisabled: ["ContextMenu", "disabled"],
contextmenuitemgroup: ["ContextMenu", "itemGroup"],
contextmenuitemtoggle: ["ContextMenu", "itemToggle"],
contextmenuitemselected: ["ContextMenu", "selected"],
contextmenuitemslider: ["ContextMenu", "itemSlider"],
contextmenuitemsubmenu: ["ContextMenu", "itemSubMenu"],
contextmenuitemsubmenucaret: ["ContextMenu", "caret"],
contextmenulabel: ["ContextMenu", "label"],
contextmenuscroller: ["ContextMenu", "scroller"],
contextmenuslider: ["ContextMenu", "slider"],
contextmenusubcontext: ["ContextMenu", "subMenuContext"],
cursordefault: ["Cursor", "cursorDefault"],
cursorpointer: ["Cursor", "cursorPointer"],
customstatusemoji: ["CustomStatusIcon", "emoji"],
@ -6240,6 +6264,7 @@
InternalComponents.NativeSubComponents.MenuSlider = BDFDB.ModuleUtils.findByString("minValue", "maxValue", "sliderContainer");
InternalComponents.NativeSubComponents.PopoutContainer = BDFDB.ModuleUtils.findByName("Popout");
InternalComponents.NativeSubComponents.QuickSelect = BDFDB.ModuleUtils.findByName("QuickSelectWrapper");
InternalComponents.NativeSubComponents.QuickSelectItem = BDFDB.ModuleUtils.findByString("default.item", "default.hint", "danger", "brand");
InternalComponents.NativeSubComponents.RadioGroup = BDFDB.ModuleUtils.findByName("RadioGroup");
InternalComponents.NativeSubComponents.SearchBar = BDFDB.ModuleUtils.find(m => m && m.displayName == "SearchBar" && m.defaultProps.placeholder == BDFDB.LanguageUtils.LanguageStrings.SEARCH);
InternalComponents.NativeSubComponents.Select = BDFDB.ModuleUtils.findByName("SelectTempWrapper");
@ -7721,7 +7746,7 @@
renderPopout: instance => {
let items = options.map(option => {
let selected = option.value && option.value === selectedOption.value || option.key && option.key === selectedOption.key;
return typeof this.props.renderOption == "function" ? this.props.renderOption(option) : BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.ContextMenuItems.Item, {
return typeof this.props.renderOption == "function" ? this.props.renderOption(option) : BDFDB.ReactUtils.createElement(InternalComponents.NativeSubComponents.QuickSelectItem, {
className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.quickselectpopoutoption, selected && BDFDB.disCN.quickselectpopoutoptionselected),
action: selected ? null : _ => {
instance.close();

File diff suppressed because one or more lines are too long

View File

@ -3977,26 +3977,28 @@ body:before {
/* ---- 14.1. CONTEXTMENU ---- */
.styleFlexible-wGDiIL, /* contextmenu container (flexible) */
.styleFixed-sX-yHV, /* contextmenu container (fixed) */
.submenu-2-ysNh, /* contextmenu container (submenu) */
.container-1gR2ZK { /* contextmenu container (boost) */
.contextMenu-HLZMGh, /* contextmenu container (quickselect) */
.styleFlexible-wGDiIL, /* contextmenu container (flexible) */
.styleFixed-sX-yHV, /* contextmenu container (fixed) */
.container-1gR2ZK { /* contextmenu container (boost) */
background: transparent;
box-shadow: 0 0 0 1px rgba(var(--vtransparencycolor), 0.3), 0 2px 10px 0 rgba(var(--vtransparencycolor), 0.3);
}
.contextMenu-HLZMGh,
.styleFlexible-wGDiIL,
.styleFixed-sX-yHV,
.submenu-2-ysNh,
.container-1gR2ZK,
.subMenuContext-2n_9YM {
z-index: 1;
}
.contextMenu-HLZMGh:not(.scroller-2FKFPG):after,
.contextMenu-HLZMGh:not(.scroller-2FKFPG):before,
.styleFlexible-wGDiIL:after,
.styleFlexible-wGDiIL:before,
.styleFixed-sX-yHV:after,
.styleFixed-sX-yHV:before,
.submenu-2-ysNh:after,
.submenu-2-ysNh:before,
.subMenuContext-2n_9YM .scrollerWrap-2lJEkd:after,
.subMenuContext-2n_9YM .scrollerWrap-2lJEkd:before,
.container-1gR2ZK:after,
.container-1gR2ZK:before {
content: "";
@ -4011,15 +4013,17 @@ body:before {
pointer-events: none;
z-index: -1;
}
.contextMenu-HLZMGh:not(.scroller-2FKFPG):after,
.styleFlexible-wGDiIL:after,
.styleFixed-sX-yHV:after,
.submenu-2-ysNh:after,
.subMenuContext-2n_9YM .scrollerWrap-2lJEkd:after,
.container-1gR2ZK:after {
background-color: rgba(var(--vtransparencycolor), calc(var(--vtransparencyalpha) + 0.3));
}
.contextMenu-HLZMGh:not(.scroller-2FKFPG):before,
.styleFlexible-wGDiIL:before,
.styleFixed-sX-yHV:before,
.submenu-2-ysNh:before,
.subMenuContext-2n_9YM .scrollerWrap-2lJEkd:before,
.container-1gR2ZK:before {
background: var(--vpopout) center/var(--vpopoutsize);
filter: blur(var(--vpopoutblur));
@ -4031,6 +4035,7 @@ body:before {
.itemGroup-1tL0uz { /* contextmenu itemgroup */
border-top-color: rgba(var(--fontwhite4), 0.3);
}
.itemBase-tz5SeC, /* contextmenu item (quickselect) */
.item-1tOPte.colorDefault-2K3EoJ { /* contextmenu item */
color: rgb(var(--fontwhite2));
}
@ -4041,16 +4046,20 @@ body:before {
.item-1tOPte.colorDanger-2qLCe1 {
color: #F04747;
}
.clickable-11uBi-:hover,
.selected-BYpGTS,
.item-1tOPte.colorDefault-2K3EoJ.focused-3afm-j,
.item-1tOPte.colorDefault-2K3EoJ:hover:not(.hideInteraction-1iHO1O) {
background-color: rgba(var(--vtransparencycolor), 0.2);
color: rgb(var(--fontwhite1));
}
.clickable-11uBi-.danger-2dXSTE:hover,
.item-1tOPte.colorDanger-2qLCe1.focused-3afm-j,
.item-1tOPte.colorDanger-2qLCe1:hover:not(.hideInteraction-1iHO1O) {
background-color: rgba(240, 71, 71, 0.2);
color: rgb(var(--fontwhite1)) !important;
}
.clickable-11uBi-.brand-3igrJY:hover,
.item-1tOPte.colorBrand-ROmMP1.focused-3afm-j,
.item-1tOPte.colorBrand-ROmMP1:hover:not(.hideInteraction-1iHO1O),
.item-1tOPte.colorPremium-p4p7qO.focused-3afm-j,
@ -4058,15 +4067,22 @@ body:before {
background-color: rgba(var(--vaccentcolor), 0.2);
color: rgb(var(--fontwhite1)) !important;
}
#app-mount .item-1tOPte .checkbox-3s5GYZ {
#app-mount .item-1tOPte .checkbox-3s5GYZ { /* contextmenu checkbox */
color: rgb(var(--vaccentcolor));
}
#app-mount .item-1tOPte.colorDanger-2qLCe1 .checkbox-3s5GYZ {
color: #f04747;
color: #F04747;
}
#app-mount .item-1tOPte .check-1JyqgN {
#app-mount .item-1tOPte .check-1JyqgN { /* contextmenu checkmar */
color: rgb(var(--fontwhite1));
}
#app-mount .checkbox-3kaeSU .checkboxInner-3yjcPe span { /* contextmenu checkbox (quickselect) */
border-color: rgba(var(--fontwhite2), 0.2);
}
#app-mount .clickable-11uBi-:hover .checkbox-3kaeSU .checkboxInner-3yjcPe span,
#app-mount .selected-BYpGTS .checkbox-3kaeSU .checkboxInner-3yjcPe span {
border-color: rgba(var(--fontwhite1), 0.2);
}
.hint-22uc-R {
color: inherit !important;
}