Merge pull request #4891 from matrix-org/t3chguy/room-list/111

Fix theme selector clicks bubbling out and causing context menu to float away

src/components/structures/UserMenu.tsx

@@ -130,7 +130,10 @@ export default class UserMenu extends React.Component<IProps, IState> {
         this.setState({contextMenuPosition: null});
     };
 
-    private onSwitchThemeClick = () => {
+    private onSwitchThemeClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
         // Disable system theme matching if the user hits this button
         SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false);