lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Fix Tooltip component 

* Moves internal reference to the centralized DiscordModules.Tooltip component
* Adds `BdApi.Components` namespace with the `Tooltip` component.
This commit is contained in:
Strencher 2023-02-27 22:11:09 +01:00
parent 860efb26cc
commit d343b702b1
8 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renderer/src/modules/api/index.js
View File

@ -12,6 +12,7 @@ import Utils from "./utils";
import Webpack from "./webpack";
import * as Legacy from "./legacy";
import ContextMenu from "./contextmenu";
import {DiscordModules} from "modules";
const bounded = new Map();
const PluginAPI = new AddonAPI(PluginManager);
@ -118,5 +119,10 @@ BdApi.DOM = DOMAPI;
*/
BdApi.ContextMenu = ContextMenuAPI;
BdApi.Components = {
get Tooltip() {return DiscordModules.Tooltip;}
};
Object.freeze(BdApi);
Object.freeze(BdApi.prototype);
Object.freeze(BdApi.Components);

2
renderer/src/modules/api/webpack.js
View File

@ -110,4 +110,4 @@ const Webpack = {
Object.freeze(Webpack);
Object.freeze(Webpack.Filters);
export default Webpack;
export default Webpack;

11
renderer/src/modules/discordmodules.js
View File

@ -6,7 +6,7 @@
*/
import Utilities from "./utilities";
import WebpackModules from "./webpackmodules";
import WebpackModules, {Filters} from "./webpackmodules";
export default Utilities.memoizeObject({
get React() {return WebpackModules.getByProps("createElement", "cloneElement");},
@ -154,5 +154,12 @@ export default Utilities.memoizeObject({
return Object.assign({}, guildsWrapper, guilds, pill, listItem);
},
get LayerStack() {return WebpackModules.getByProps("pushLayer");}
get LayerStack() {return WebpackModules.getByProps("pushLayer");},
get Tooltip() {
// Make fallback component just pass children, so it can at least render that.
const fallback = props => props.children?.({}) ?? null;
return WebpackModules.getModule(Filters.byPrototypeFields(["renderTooltip"]), {searchExports: true}) ?? fallback;
}
});

9
renderer/src/ui/customcss/editor.jsx
View File

@ -1,8 +1,7 @@
import {React, WebpackModules, DiscordModules, Settings} from "modules";
import {React, DiscordModules, Settings} from "modules";
import Checkbox from "./checkbox";
const Tooltip = WebpackModules.getByPrototypes("renderTooltip");
const ThemeStore = DiscordModules.ThemeStore;
const languages = ["abap", "abc", "actionscript", "ada", "apache_conf", "asciidoc", "assembly_x86", "autohotkey", "batchfile", "bro", "c_cpp", "c9search", "cirru", "clojure", "cobol", "coffee", "coldfusion", "csharp", "csound_document", "csound_orchestra", "csound_score", "css", "curly", "d", "dart", "diff", "dockerfile", "dot", "drools", "dummy", "dummysyntax", "eiffel", "ejs", "elixir", "elm", "erlang", "forth", "fortran", "ftl", "gcode", "gherkin", "gitignore", "glsl", "gobstones", "golang", "graphqlschema", "groovy", "haml", "handlebars", "haskell", "haskell_cabal", "haxe", "hjson", "html", "html_elixir", "html_ruby", "ini", "io", "jack", "jade", "java", "javascript", "json", "jsoniq", "jsp", "jssm", "jsx", "julia", "kotlin", "latex", "less", "liquid", "lisp", "livescript", "logiql", "lsl", "lua", "luapage", "lucene", "makefile", "markdown", "mask", "matlab", "maze", "mel", "mushcode", "mysql", "nix", "nsis", "objectivec", "ocaml", "pascal", "perl", "pgsql", "php", "pig", "powershell", "praat", "prolog", "properties", "protobuf", "python", "r", "razor", "rdoc", "red", "rhtml", "rst", "ruby", "rust", "sass", "scad", "scala", "scheme", "scss", "sh", "sjs", "smarty", "snippets", "soy_template", "space", "sql", "sqlserver", "stylus", "svg", "swift", "tcl", "tex", "text", "textile", "toml", "tsx", "twig", "typescript", "vala", "vbscript", "velocity", "verilog", "vhdl", "wollok", "xml", "xquery", "yaml", "django"];
@ -108,11 +107,11 @@ export default class CodeEditor extends React.Component {
}
makeButton(button) {
return <Tooltip color="primary" position="top" text={button.tooltip}>
return <DiscordModules.Tooltip color="primary" position="top" text={button.tooltip}>
{props => {
return <button {...props} className="btn btn-primary" onClick={(event) => {button.onClick(event, this.value);}}>{button.label}</button>;
}}
</Tooltip>;
</DiscordModules.Tooltip>;
}
render() {
@ -135,4 +134,4 @@ export default class CodeEditor extends React.Component {
</div>
</div>;
}
}
}

11
renderer/src/ui/settings/addoncard.jsx
View File

@ -25,7 +25,6 @@ const LinkIcons = {
patreon: PatreonIcon
};
const Tooltip = WebpackModules.getByPrototypes("renderTooltip");
const LayerManager = {
pushLayer(component) {
DiscordModules.Dispatcher.dispatch({
@ -149,19 +148,19 @@ export default class AddonCard extends React.Component {
}
makeButton(title, children, action) {
return <Tooltip color="primary" position="top" text={title}>
return <DiscordModules.Tooltip color="primary" position="top" text={title}>
{(props) => {
return <div {...props} className="bd-addon-button" onClick={action}>{children}</div>;
}}
</Tooltip>;
</DiscordModules.Tooltip>;
}
makeControlButton(title, children, action, {danger = false, disabled = false} = {}) {
return <Tooltip color="primary" position="top" text={title}>
return <DiscordModules.Tooltip color="primary" position="top" text={title}>
{(props) => {
return <button {...props} className={"bd-button bd-addon-button" + (danger ? " bd-button-danger" : "") + (disabled ? " bd-button-disabled" : "")} onClick={action}>{children}</button>;
}}
</Tooltip>;
</DiscordModules.Tooltip>;
}
render() {
@ -192,4 +191,4 @@ Object.defineProperty(AddonCard.prototype, "render", {
configurable: false,
set: function() {Logger.warn("AddonCard", "Addon policy for plugins #5 https://github.com/BetterDiscord/BetterDiscord/wiki/Addon-Policies#plugins");},
get: () => originalRender
});
});

10
renderer/src/ui/settings/addonlist.jsx
View File

@ -1,5 +1,5 @@
import Logger from "common/logger";
import {React, Strings, Events, WebpackModules, DataStore} from "modules";
import {React, Strings, Events, DataStore, DiscordModules} from "modules";
import Modals from "../modals";
import SettingsTitle from "./title";
@ -13,8 +13,6 @@ import GridIcon from "../icons/grid";
import NoResults from "../blankslates/noresults";
import EmptyImage from "../blankslates/emptyimage";
const Tooltip = WebpackModules.getByPrototypes("renderTooltip");
export default class AddonList extends React.Component {
constructor(props) {
@ -115,11 +113,11 @@ export default class AddonList extends React.Component {
}
makeControlButton(title, children, action, selected = false) {
return <Tooltip color="primary" position="top" text={title}>
return <DiscordModules.Tooltip color="primary" position="top" text={title}>
{(props) => {
return <button {...props} className={"bd-button bd-view-button" + (selected ? " selected" : "")} onClick={action}>{children}</button>;
}}
</Tooltip>;
</DiscordModules.Tooltip>;
}
render() {
@ -213,4 +211,4 @@ Object.defineProperty(AddonList.prototype, "render", {
configurable: false,
set: function() {Logger.warn("AddonList", "Addon policy for plugins #5 https://github.com/BetterDiscord/BetterDiscord/wiki/Addon-Policies#plugins");},
get: () => originalRender
});
});

14
renderer/src/ui/settings/components/color.jsx
View File

@ -1,6 +1,4 @@
import {React, WebpackModules} from "modules";
const TooltipWrapper = WebpackModules.getByPrototypes("renderTooltip");
import {DiscordModules, React} from "modules";
const Checkmark = React.memo((props) => (
<svg width="16" height="16" viewBox="0 0 24 24" {...props}>
@ -73,7 +71,7 @@ export default class Color extends React.Component {
return <div className="bd-color-picker-container">
<div className="bd-color-picker-controls">
<TooltipWrapper text="Default" position="bottom">
<DiscordModules.Tooltip text="Default" position="bottom">
{props => (
<div {...props} className="bd-color-picker-default" style={{backgroundColor: resolveColor(defaultValue)}} onClick={() => this.onChange({target: {value: defaultValue}})}>
{intValue === resolveColor(defaultValue, false)
@ -82,15 +80,15 @@ export default class Color extends React.Component {
}
</div>
)}
</TooltipWrapper>
<TooltipWrapper text="Custom Color" position="bottom">
</DiscordModules.Tooltip>
<DiscordModules.Tooltip text="Custom Color" position="bottom">
{props => (
<div className="bd-color-picker-custom">
<Dropper color={getContrastColor(resolveColor(this.state.value, true))} />
<input {...props} style={{backgroundColor: resolveColor(this.state.value)}} type="color" className="bd-color-picker" value={resolveColor(this.state.value)} onChange={this.onChange} />
</div>
)}
</TooltipWrapper>
</DiscordModules.Tooltip>
</div>
<div className="bd-color-picker-swatch">
{
@ -106,4 +104,4 @@ export default class Color extends React.Component {
</div>
</div>;
}
}
}

8
renderer/src/ui/settings/sidebarheader.jsx
View File

@ -1,10 +1,8 @@
import {Changelog} from "data";
import {React, WebpackModules} from "modules";
import {DiscordModules, React} from "modules";
import HistoryIcon from "../icons/history";
import Modals from "../modals";
const Tooltip = WebpackModules.getByPrototypes("renderTooltip");
export default class SettingsTitle extends React.Component {
renderHeader() {
return <h2 className="bd-sidebar-header-label">BetterDiscord</h2>;
@ -13,13 +11,13 @@ export default class SettingsTitle extends React.Component {
render() {
return <div className="bd-sidebar-header">
{this.renderHeader()}
<Tooltip color="primary" position="top" text="Changelog">
<DiscordModules.Tooltip color="primary" position="top" text="Changelog">
{props =>
<div {...props} className="bd-changelog-button" onClick={() => Modals.showChangelogModal(Changelog)}>
<HistoryIcon className="bd-icon" size="16px" />
</div>
}
</Tooltip>
</DiscordModules.Tooltip>
</div>;
}
}