-
Notifications
You must be signed in to change notification settings - Fork 64
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KeybindRecorder #511
base: v4.8.0
Are you sure you want to change the base?
KeybindRecorder #511
Changes from all commits
bc2d55d
544f1f4
1d83f6c
d502144
3e5aaaa
8159828
e94856d
5d1fd41
253e5d4
46fce46
2af1ae1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,6 +36,7 @@ | |
"installdir", | ||
"Jsonifiable", | ||
"konami", | ||
"keybind", | ||
"lezer", | ||
"LOCALAPPDATA", | ||
"logname", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
.rp-keybind-container { | ||
padding: 10px; | ||
display: flex; | ||
align-items: center; | ||
} | ||
|
||
.rp-keybind-container:not(.recording) { | ||
box-shadow: 0px 0px 2.5px #161616; | ||
} | ||
|
||
.rp-keybind-container:hover:not(.recording) { | ||
border: 0px solid #ffffff; | ||
box-shadow: 0px 0px 2.5px #ffffff; | ||
} | ||
|
||
.rp-keybind-container.recording > * { | ||
border-color: #e73434; | ||
box-shadow: 0px 0px 0.25px #e73434; | ||
} | ||
|
||
.rp-keybind-container .text { | ||
margin-right: 10px; | ||
} | ||
|
||
.rp-keybind-container .text-truncate { | ||
white-space: nowrap; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
display: -webkit-box; | ||
-webkit-box-orient: vertical; | ||
-webkit-line-clamp: 1; | ||
max-height: 2em; | ||
} | ||
|
||
.rp-keybind-container > .buttons { | ||
display: flex; | ||
justify-content: flex-end; | ||
flex-grow: 1; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button { | ||
height: 25px; | ||
position: relative; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
margin-right: 10px; | ||
padding: 5px 10px; | ||
border-radius: 5px; | ||
opacity: 0.75; | ||
cursor: pointer; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button.recording:hover { | ||
background-color: #e7343414; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button:hover { | ||
background-color: var(--background-secondary-alt); | ||
} | ||
|
||
.rp-keybind-container > .buttons .button .icon { | ||
display: inline-block; | ||
margin-right: 5px; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button .button-text { | ||
display: none; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button:hover .icon { | ||
display: none; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button:hover .button-text { | ||
display: inline-block; | ||
} | ||
|
||
.rp-keybind-container.recording .text, | ||
.rp-keybind-container.recording .button-text { | ||
color: #e73434 !important; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button { | ||
transition: padding 0.2s ease; | ||
} | ||
|
||
.rp-keybind-container > .buttons .button:hover { | ||
padding: 5px 15px; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,295 @@ | ||
import React from "@common/react"; | ||
|
||
import { FormItem, Text } from "."; | ||
import { KeyboardEvent } from "electron"; | ||
import "./KeybindItem.css"; | ||
|
||
type ValueArray = Array<{ | ||
altKey: boolean | undefined; | ||
code: string | undefined; | ||
ctrlKey: boolean | undefined; | ||
key: string | undefined; | ||
keyCode: number | undefined; | ||
metaKey: boolean | undefined; | ||
shiftKey: boolean | undefined; | ||
}>; | ||
|
||
interface ButtonsProps { | ||
isRecording: boolean; | ||
toggleRecording: () => void; | ||
recordedKeybind: ValueArray; | ||
clearKeybind: () => void; | ||
} | ||
|
||
interface KeybindProps { | ||
title?: string; | ||
children?: string; | ||
note?: string; | ||
value: ValueArray; | ||
placeholder?: string; | ||
onChange: (newValue: ValueArray) => void; | ||
} | ||
interface KeybindState { | ||
recordedKeybind: ValueArray; | ||
currentlyPressed: number[]; | ||
isRecording: boolean; | ||
isEditing: boolean; | ||
timer: null | NodeJS.Timer; | ||
} | ||
|
||
interface ExtendedKeyboardEvent extends KeyboardEvent { | ||
code: string | undefined; | ||
key: string | undefined; | ||
keyCode: number | undefined; | ||
} | ||
export type KeybindType = React.ComponentClass<KeybindProps, KeybindState>; | ||
|
||
const Buttons: React.FC<ButtonsProps> = (props) => { | ||
if (!props.recordedKeybind.length && !props.isRecording) { | ||
return ( | ||
<div className="buttons"> | ||
<div | ||
className={`button ${props.isRecording ? "recording" : ""}`} | ||
onClick={(event) => { | ||
event.stopPropagation(); | ||
props.toggleRecording(); | ||
}}> | ||
<svg | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Make a new component for each icon, they don't need to be exported, just to make this clear. |
||
className="icon" | ||
fill={props.isRecording ? "#ff0000" : "var(--channel-icon)"} | ||
viewBox="0 0 24 24" | ||
style={{ width: "24px", height: "24px" }}> | ||
<path d="M19.745 5a2.25 2.25 0 0 1 2.25 2.25v9.505a2.25 2.25 0 0 1-2.25 2.25H4.25A2.25 2.25 0 0 1 2 16.755V7.25A2.25 2.25 0 0 1 4.25 5h15.495Zm-2.495 9.5H6.75l-.102.007a.75.75 0 0 0 0 1.486L6.75 16h10.5l.102-.007a.75.75 0 0 0 0-1.486l-.102-.007ZM16.5 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-2.995 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2ZM6 8a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm2.995 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z" /> | ||
</svg> | ||
<Text.Normal className="button-text">Record Keybind</Text.Normal> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i18n missing here and applies to other texts. You can use Discord's strings. |
||
</div> | ||
</div> | ||
); | ||
} | ||
|
||
if (props.isRecording) { | ||
return ( | ||
<div className="buttons"> | ||
<div | ||
className={`button ${props.isRecording ? "recording" : ""}`} | ||
onClick={(event) => { | ||
event.stopPropagation(); | ||
props.toggleRecording(); | ||
}}> | ||
<svg | ||
className="icon" | ||
fill={props.isRecording ? "#ff0000" : "var(--channel-icon)"} | ||
viewBox="0 0 24 24" | ||
style={{ width: "24px", height: "24px" }}> | ||
<path d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm3.53 6.47-.084-.073a.75.75 0 0 0-.882-.007l-.094.08L12 10.939l-2.47-2.47-.084-.072a.75.75 0 0 0-.882-.007l-.094.08-.073.084a.75.75 0 0 0-.007.882l.08.094L10.939 12l-2.47 2.47-.072.084a.75.75 0 0 0-.007.882l.08.094.084.073a.75.75 0 0 0 .882.007l.094-.08L12 13.061l2.47 2.47.084.072a.75.75 0 0 0 .882.007l.094-.08.073-.084a.75.75 0 0 0 .007-.882l-.08-.094L13.061 12l2.47-2.47.072-.084a.75.75 0 0 0 .007-.882l-.08-.094-.084-.073.084.073Z" /> | ||
</svg> | ||
<Text.Normal className="button-text">Stop Recording</Text.Normal> | ||
</div> | ||
</div> | ||
); | ||
} | ||
|
||
return ( | ||
<div className="buttons"> | ||
<div | ||
className={`button ${props.isRecording ? "recording" : ""}`} | ||
onClick={(event) => { | ||
event.stopPropagation(); | ||
props.toggleRecording(); | ||
}}> | ||
<svg | ||
className="icon" | ||
fill={props.isRecording ? "#ff0000" : "var(--channel-icon)"} | ||
viewBox="0 0 24 24" | ||
style={{ width: "24px", height: "24px" }}> | ||
<path d="M19.745 5a2.25 2.25 0 0 1 2.25 2.25v9.505a2.25 2.25 0 0 1-2.25 2.25H4.25A2.25 2.25 0 0 1 2 16.755V7.25A2.25 2.25 0 0 1 4.25 5h15.495Zm-2.495 9.5H6.75l-.102.007a.75.75 0 0 0 0 1.486L6.75 16h10.5l.102-.007a.75.75 0 0 0 0-1.486l-.102-.007ZM16.5 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-2.995 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2ZM6 8a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm2.995 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z" /> | ||
</svg> | ||
<Text.Normal className="button-text">Edit Keybind</Text.Normal> | ||
</div> | ||
<div | ||
className={`button ${props.isRecording ? "recording" : ""}`} | ||
onClick={(event) => { | ||
event.stopPropagation(); | ||
props.clearKeybind(); | ||
}}> | ||
<svg | ||
className="icon" | ||
fill={props.isRecording ? "#ff0000" : "var(--channel-icon)"} | ||
viewBox="0 0 24 24" | ||
style={{ width: "24px", height: "24px" }}> | ||
<path d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm3.53 6.47-.084-.073a.75.75 0 0 0-.882-.007l-.094.08L12 10.939l-2.47-2.47-.084-.072a.75.75 0 0 0-.882-.007l-.094.08-.073.084a.75.75 0 0 0-.007.882l.08.094L10.939 12l-2.47 2.47-.072.084a.75.75 0 0 0-.007.882l.08.094.084.073a.75.75 0 0 0 .882.007l.094-.08L12 13.061l2.47 2.47.084.072a.75.75 0 0 0 .882.007l.094-.08.073-.084a.75.75 0 0 0 .007-.882l-.08-.094L13.061 12l2.47-2.47.072-.084a.75.75 0 0 0 .007-.882l-.08-.094-.084-.073.084.073Z" /> | ||
</svg> | ||
<Text.Normal className="button-text">Clear Keybind</Text.Normal> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default class KeybindRecorder extends React.Component<KeybindProps, KeybindState> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You have to export two components from this file. One is KeybindRecorder, the clean component without any of our modifications, which must be as similar as possible to the original. The other is KeybindRecorderItem, must be a KeybindRecorder wrapped in a FormItem. |
||
public constructor(props: KeybindProps) { | ||
super(props); | ||
this.state = { | ||
recordedKeybind: props.value ?? [], | ||
currentlyPressed: [], | ||
isRecording: false, | ||
isEditing: false, | ||
timer: null, | ||
}; | ||
} | ||
|
||
public resetTimer(): void { | ||
clearTimeout(this.state.timer!); | ||
} | ||
|
||
public stopRecording(): void { | ||
this.setState({ | ||
isRecording: false, | ||
currentlyPressed: [], | ||
}); | ||
this.props.onChange(this.state.recordedKeybind); | ||
} | ||
|
||
public startRecording(): void { | ||
this.setState({ | ||
isRecording: true, | ||
recordedKeybind: [], | ||
currentlyPressed: [], | ||
timer: setTimeout(() => { | ||
this.stopRecording(); | ||
}, 3000), | ||
}); | ||
} | ||
|
||
public editRecording(): void { | ||
this.setState({ | ||
isRecording: true, | ||
isEditing: true, | ||
currentlyPressed: [], | ||
timer: setTimeout(() => { | ||
this.stopRecording(); | ||
}, 3000), | ||
}); | ||
} | ||
|
||
public clearKeybind(): void { | ||
this.setState({ | ||
recordedKeybind: [], | ||
currentlyPressed: [], | ||
}); | ||
this.props.onChange([]); | ||
} | ||
|
||
public toggleRecording(): void { | ||
if (this.state.isRecording) { | ||
this.stopRecording(); | ||
} else if (this.state.recordedKeybind.length) { | ||
this.editRecording(); | ||
} else { | ||
this.startRecording(); | ||
} | ||
} | ||
|
||
public handleKeyDown(event: ExtendedKeyboardEvent): void { | ||
this.resetTimer(); | ||
const { isRecording, recordedKeybind, isEditing } = this.state; | ||
if ( | ||
isRecording && | ||
event?.keyCode && | ||
(!recordedKeybind.some((ck) => ck?.keyCode === event?.keyCode) || isEditing) | ||
) { | ||
this.setState((prevState) => ({ | ||
recordedKeybind: isEditing | ||
? [ | ||
{ | ||
altKey: event.altKey, | ||
code: event.code, | ||
ctrlKey: event.ctrlKey, | ||
key: event.key, | ||
keyCode: event.keyCode, | ||
metaKey: event.metaKey, | ||
shiftKey: event.shiftKey, | ||
}, | ||
] | ||
: [ | ||
...prevState.recordedKeybind, | ||
{ | ||
altKey: event.altKey, | ||
code: event.code, | ||
ctrlKey: event.ctrlKey, | ||
key: event.key, | ||
keyCode: event.keyCode, | ||
metaKey: event.metaKey, | ||
shiftKey: event.shiftKey, | ||
}, | ||
], | ||
currentlyPressed: [...prevState.currentlyPressed, event.keyCode!], | ||
})); | ||
if (isEditing) { | ||
this.setState({ | ||
isEditing: false, | ||
}); | ||
} | ||
} | ||
} | ||
|
||
public handleKeyUp(event: ExtendedKeyboardEvent): void { | ||
const { isRecording } = this.state; | ||
if (isRecording) { | ||
this.setState((prevState) => ({ | ||
currentlyPressed: prevState.currentlyPressed.filter((ps) => ps === event.keyCode), | ||
})); | ||
} | ||
} | ||
|
||
public componentDidMount(): void { | ||
document.addEventListener("keydown", this.handleKeyDown.bind(this)); | ||
document.addEventListener("keyup", this.handleKeyUp.bind(this)); | ||
} | ||
|
||
public componentWillUnmount(): void { | ||
document.removeEventListener("keydown", this.handleKeyDown.bind(this)); | ||
document.removeEventListener("keyup", this.handleKeyUp.bind(this)); | ||
} | ||
|
||
public componentDidUpdate(_prevProps: KeybindProps, prevState: KeybindState): void { | ||
const { isRecording, currentlyPressed } = this.state; | ||
if (isRecording && currentlyPressed.length === 0 && prevState.currentlyPressed.length !== 0) { | ||
this.stopRecording(); | ||
} | ||
} | ||
|
||
public render(): React.ReactNode { | ||
const { recordedKeybind, isRecording } = this.state; | ||
|
||
return ( | ||
<FormItem | ||
title={this.props.title ?? this.props.children} | ||
style={{ marginBottom: 20 }} | ||
note={this.props.note} | ||
notePosition="after" | ||
divider={true}> | ||
<div | ||
className={`rp-keybind-container ${isRecording ? "recording" : ""}`} | ||
onClick={this.toggleRecording.bind(this)}> | ||
<Text.H4 className="text text-truncate"> | ||
{recordedKeybind?.length | ||
? recordedKeybind | ||
?.map((rk) => | ||
rk?.code?.toLowerCase()?.includes("right") | ||
? `RIGHT ${rk?.key?.toUpperCase()}` | ||
: rk?.key?.toUpperCase(), | ||
) | ||
.join(" + ") | ||
: this.props.placeholder ?? "No Keybind Set"} | ||
</Text.H4> | ||
<Buttons | ||
isRecording={isRecording} | ||
toggleRecording={this.toggleRecording.bind(this)} | ||
recordedKeybind={recordedKeybind} | ||
clearKeybind={this.clearKeybind.bind(this)} | ||
/> | ||
</div> | ||
</FormItem> | ||
); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Speaking of how the keybind recorder looks, it needs to be as similar as possible to how Discord has it. Remember to use CSS variables.