[MM-43601] Switch upgrade button to an actual button and moved onClick event (#2080)

This commit is contained in:
Devin Binnie
2022-04-26 09:17:01 -04:00
committed by GitHub
parent 14ceaf677c
commit d1ca1188b4
2 changed files with 14 additions and 10 deletions

View File

@@ -426,19 +426,21 @@ export default class MainPage extends React.PureComponent<Props, State> {
let upgradeIcon; let upgradeIcon;
if (this.state.upgradeStatus !== UpgradeStatus.NONE) { if (this.state.upgradeStatus !== UpgradeStatus.NONE) {
upgradeIcon = ( upgradeIcon = (
<span className={classNames('upgrade-btns', {darkMode: this.state.darkMode})}> <button
className={classNames('upgrade-btns', {darkMode: this.state.darkMode})}
onClick={() => {
if (this.state.upgradeStatus === UpgradeStatus.DOWNLOADING) {
return;
}
window.ipcRenderer.send(this.state.upgradeStatus === UpgradeStatus.DOWNLOADED ? START_UPGRADE : START_DOWNLOAD);
}}
>
<div <div
className={classNames('button upgrade-button', { className={classNames('button upgrade-button', {
rotate: this.state.upgradeStatus === UpgradeStatus.DOWNLOADING, rotate: this.state.upgradeStatus === UpgradeStatus.DOWNLOADING,
})} })}
title={upgradeTooltip} title={upgradeTooltip}
onClick={() => {
if (this.state.upgradeStatus === UpgradeStatus.DOWNLOADING) {
return;
}
window.ipcRenderer.send(this.state.upgradeStatus === UpgradeStatus.DOWNLOADED ? START_UPGRADE : START_DOWNLOAD);
}}
> >
<i <i
className={classNames({ className={classNames({
@@ -449,7 +451,8 @@ export default class MainPage extends React.PureComponent<Props, State> {
/> />
{(this.state.upgradeStatus !== UpgradeStatus.DOWNLOADING) && <div className={'circle'}/>} {(this.state.upgradeStatus !== UpgradeStatus.DOWNLOADING) && <div className={'circle'}/>}
</div> </div>
</span>); </button>
);
} }
let titleBarButtons; let titleBarButtons;

View File

@@ -8,6 +8,8 @@
margin-right: 4px; margin-right: 4px;
text-align: center; text-align: center;
color: rgba(63, 67, 80, 0.56); color: rgba(63, 67, 80, 0.56);
background: none;
border: none;
&:hover { &:hover {
background-color: rgba(63, 67, 80, 0.08); background-color: rgba(63, 67, 80, 0.08);
@@ -15,7 +17,6 @@
} }
.upgrade-button { .upgrade-button {
margin: 7px;
height: 18px; height: 18px;
cursor: pointer; cursor: pointer;