From f47c35a29efb96c851688566fec9fbdbfeaf410c Mon Sep 17 00:00:00 2001 From: Zack Rauen Date: Sun, 14 Nov 2021 00:54:03 -0500 Subject: [PATCH] Update emote menu for Discord's changes --- renderer/src/builtins/emotes/emotemenu.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/renderer/src/builtins/emotes/emotemenu.js b/renderer/src/builtins/emotes/emotemenu.js index 9ae4e679..0ff37072 100644 --- a/renderer/src/builtins/emotes/emotemenu.js +++ b/renderer/src/builtins/emotes/emotemenu.js @@ -35,7 +35,7 @@ export default new class EmoteMenu extends Builtin { if (!head || !body) return childrenReturn; const isActive = activePicker == "bd-emotes"; - const tabProps = head[0].props; + const TabItem = head[0]?.type ?? (() => null); if (!isActive && activePicker == "emoji" && this.hideEmojis) { useExpressionPickerStore.setState({activeView: "bd-emotes"}); @@ -47,16 +47,14 @@ export default new class EmoteMenu extends Builtin { } head.push( - React.createElement("div", { - "id": "bd-emotes-tab", - "role": "tab", + React.createElement(TabItem, { + "aria-controls": "bd-emotes", + "id": "bd-emotes", "aria-selected": isActive, - "className": tabProps.className, - }, React.createElement(tabProps.children.type, { - viewType: "bd-emotes", - isActive: isActive, + "isActive": isActive, + "viewType": "bd-emotes" }, "Twitch") - )); + ); if (isActive) { body.push( React.createElement(EmoteMenuCard, {