Skip to content

Commit

Permalink
Fixed error that prevented compilation
Browse files Browse the repository at this point in the history
Signed-off-by: AlexDygma <alex@dygma.com>
  • Loading branch information
AlexDygma committed Jul 29, 2022
1 parent 8820412 commit 622b792
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
9 changes: 6 additions & 3 deletions src/renderer/modules/KeyVisualizer/KeyVisualizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,10 @@ class KeyVisualizer extends React.Component {
<Title text={`${rows ? rows[superkeyAction].title : "Selected value"}`} headingLevel={4} />
<div className="keySelectedBox">
<div className="keySelectedValue">{oldValue}</div>
<ListModifiers keyCode={oldKeyCode?.base ? oldKeyCode.base + oldKeyCode.modified : oldKeyCode} size="sm" />
<ListModifiers
keyCode={oldKeyCode !== undefined && oldKeyCode.base ? oldKeyCode.base + oldKeyCode.modified : oldKeyCode}
size="sm"
/>
</div>
</div>
) : (
Expand All @@ -190,7 +193,7 @@ class KeyVisualizer extends React.Component {
<Title text="New value" headingLevel={4} />
<div className="keySelectedBox">
<div className="keySelectedValue">{newValue}</div>
<ListModifiers keyCode={keyCode?.base ? keyCode.base + keyCode.modified : keyCode} />
<ListModifiers keyCode={keyCode !== undefined && keyCode.base ? keyCode.base + keyCode.modified : keyCode} />
</div>
</div>
) : (
Expand All @@ -201,7 +204,7 @@ class KeyVisualizer extends React.Component {
<Title text="New value" headingLevel={4} />
<div className="keySelectedBox">
<div className="keySelectedValue">{newValue}</div>
<ListModifiers keyCode={keyCode?.base ? keyCode.base + keyCode.modified : keyCode} />
<ListModifiers keyCode={keyCode !== undefined && keyCode.base ? keyCode.base + keyCode.modified : keyCode} />
</div>
</div>
) : (
Expand Down
18 changes: 16 additions & 2 deletions src/renderer/modules/KeysTabs/NoKeyTransparentTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,15 @@ class NoKeyTransparentTab extends Component {
onClick={() => {
onKeySelect(0);
}}
selected={keyCode?.base ? (keyCode.base + keyCode.modified == 0 ? true : false) : keyCode == 0 ? true : false}
selected={
keyCode !== undefined && keyCode.base
? keyCode.base + keyCode.modified == 0
? true
: false
: keyCode == 0
? true
: false
}
/>
</div>
<div className="keysButtonsList">
Expand All @@ -66,7 +74,13 @@ class NoKeyTransparentTab extends Component {
onKeySelect(65535);
}}
selected={
keyCode?.base ? (keyCode.base + keyCode.modified == 65535 ? true : false) : keyCode == 65535 ? true : false
keyCode !== undefined && keyCode.base
? keyCode.base + keyCode.modified == 65535
? true
: false
: keyCode == 65535
? true
: false
}
/>
</div>
Expand Down

0 comments on commit 622b792

Please sign in to comment.