mirror of
https://github.com/quine-global/hyper.git
synced 2026-01-16 05:38:41 -09:00
move Hyper container to function component
This commit is contained in:
parent
57c781b951
commit
dc6af45971
1 changed files with 81 additions and 85 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
import React from 'react';
|
import React, {forwardRef, useEffect, useRef} from 'react';
|
||||||
import type {MousetrapInstance} from 'mousetrap';
|
import type {MousetrapInstance} from 'mousetrap';
|
||||||
import Mousetrap from 'mousetrap';
|
import Mousetrap from 'mousetrap';
|
||||||
|
|
||||||
|
|
@ -15,131 +15,127 @@ import type Terms from '../components/terms';
|
||||||
|
|
||||||
const isMac = /Mac/.test(navigator.userAgent);
|
const isMac = /Mac/.test(navigator.userAgent);
|
||||||
|
|
||||||
class Hyper extends React.PureComponent<HyperProps> {
|
const Hyper = forwardRef<HTMLDivElement, HyperProps>((props, ref) => {
|
||||||
mousetrap!: MousetrapInstance;
|
const mousetrap = useRef<MousetrapInstance | null>(null);
|
||||||
terms!: Terms;
|
const terms = useRef<Terms | null>(null);
|
||||||
constructor(props: HyperProps) {
|
|
||||||
super(props);
|
|
||||||
}
|
|
||||||
|
|
||||||
componentDidUpdate(prev: HyperProps) {
|
useEffect(() => {
|
||||||
const {lastConfigUpdate} = this.props;
|
void attachKeyListeners();
|
||||||
if (lastConfigUpdate && lastConfigUpdate !== prev.lastConfigUpdate) {
|
}, [props.lastConfigUpdate]);
|
||||||
void this.attachKeyListeners();
|
useEffect(() => {
|
||||||
}
|
handleFocusActive(props.activeSession);
|
||||||
if (prev.activeSession !== this.props.activeSession) {
|
}, [props.activeSession]);
|
||||||
this.handleFocusActive(this.props.activeSession);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
handleFocusActive = (uid?: string | null) => {
|
const handleFocusActive = (uid?: string | null) => {
|
||||||
const term = uid && this.terms.getTermByUid(uid);
|
const term = uid && terms.current?.getTermByUid(uid);
|
||||||
if (term) {
|
if (term) {
|
||||||
term.focus();
|
term.focus();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
handleSelectAll = () => {
|
const handleSelectAll = () => {
|
||||||
const term = this.terms.getActiveTerm();
|
const term = terms.current?.getActiveTerm();
|
||||||
if (term) {
|
if (term) {
|
||||||
term.selectAll();
|
term.selectAll();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
async attachKeyListeners() {
|
const attachKeyListeners = async () => {
|
||||||
if (!this.mousetrap) {
|
if (!mousetrap.current) {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||||
this.mousetrap = new (Mousetrap as any)(window, true);
|
mousetrap.current = new (Mousetrap as any)(window, true);
|
||||||
this.mousetrap.stopCallback = () => {
|
mousetrap.current!.stopCallback = () => {
|
||||||
// All events should be intercepted even if focus is in an input/textarea
|
// All events should be intercepted even if focus is in an input/textarea
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
this.mousetrap.reset();
|
mousetrap.current.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
const keys = await getRegisteredKeys();
|
const keys = await getRegisteredKeys();
|
||||||
Object.keys(keys).forEach((commandKeys) => {
|
Object.keys(keys).forEach((commandKeys) => {
|
||||||
this.mousetrap.bind(
|
mousetrap.current?.bind(
|
||||||
commandKeys,
|
commandKeys,
|
||||||
(e) => {
|
(e) => {
|
||||||
const command = keys[commandKeys];
|
const command = keys[commandKeys];
|
||||||
// We should tell to xterm that it should ignore this event.
|
// We should tell xterm to ignore this event.
|
||||||
(e as any).catched = true;
|
(e as any).catched = true;
|
||||||
this.props.execCommand(command, getCommandHandler(command), e);
|
props.execCommand(command, getCommandHandler(command), e);
|
||||||
shouldPreventDefault(command) && e.preventDefault();
|
shouldPreventDefault(command) && e.preventDefault();
|
||||||
},
|
},
|
||||||
'keydown'
|
'keydown'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
componentDidMount() {
|
useEffect(() => {
|
||||||
void this.attachKeyListeners();
|
void attachKeyListeners();
|
||||||
window.rpc.on('term selectAll', this.handleSelectAll);
|
window.rpc.on('term selectAll', handleSelectAll);
|
||||||
}
|
}, []);
|
||||||
|
|
||||||
onTermsRef = (terms: Terms) => {
|
const onTermsRef = (_terms: Terms) => {
|
||||||
this.terms = terms;
|
terms.current = _terms;
|
||||||
window.focusActiveTerm = (uid?: string) => {
|
window.focusActiveTerm = (uid?: string) => {
|
||||||
if (uid) {
|
if (uid) {
|
||||||
this.handleFocusActive(uid);
|
handleFocusActive(uid);
|
||||||
} else {
|
} else {
|
||||||
this.terms.getActiveTerm().focus();
|
terms.current?.getActiveTerm()?.focus();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillUnmount() {
|
useEffect(() => {
|
||||||
this.mousetrap?.reset();
|
return () => {
|
||||||
}
|
mousetrap.current?.reset();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
render() {
|
const {isMac: isMac_, customCSS, uiFontFamily, borderColor, maximized, fullScreen} = props;
|
||||||
const {isMac: isMac_, customCSS, uiFontFamily, borderColor, maximized, fullScreen} = this.props;
|
const borderWidth = isMac_ ? '' : `${maximized ? '0' : '1'}px`;
|
||||||
const borderWidth = isMac_ ? '' : `${maximized ? '0' : '1'}px`;
|
stylis.set({prefix: false});
|
||||||
stylis.set({prefix: false});
|
return (
|
||||||
return (
|
<div id="hyper" ref={ref}>
|
||||||
<div id="hyper">
|
<div
|
||||||
<div
|
style={{fontFamily: uiFontFamily, borderColor, borderWidth}}
|
||||||
style={{fontFamily: uiFontFamily, borderColor, borderWidth}}
|
className={`hyper_main ${isMac_ && 'hyper_mainRounded'} ${fullScreen ? 'fullScreen' : ''}`}
|
||||||
className={`hyper_main ${isMac_ && 'hyper_mainRounded'} ${fullScreen ? 'fullScreen' : ''}`}
|
>
|
||||||
>
|
<HeaderContainer />
|
||||||
<HeaderContainer />
|
<TermsContainer ref_={onTermsRef} />
|
||||||
<TermsContainer ref_={this.onTermsRef} />
|
{props.customInnerChildren}
|
||||||
{this.props.customInnerChildren}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<NotificationsContainer />
|
|
||||||
|
|
||||||
{this.props.customChildren}
|
|
||||||
|
|
||||||
<style jsx>
|
|
||||||
{`
|
|
||||||
.hyper_main {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
border: 1px solid #333;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hyper_mainRounded {
|
|
||||||
border-radius: 10.5px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
{/*
|
|
||||||
Add custom CSS to Hyper.
|
|
||||||
We add a scope to the customCSS so that it can get around the weighting applied by styled-jsx
|
|
||||||
*/}
|
|
||||||
<style dangerouslySetInnerHTML={{__html: stylis('#hyper', customCSS)}} />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
|
||||||
}
|
<NotificationsContainer />
|
||||||
}
|
|
||||||
|
{props.customChildren}
|
||||||
|
|
||||||
|
<style jsx>
|
||||||
|
{`
|
||||||
|
.hyper_main {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
border: 1px solid #333;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hyper_mainRounded {
|
||||||
|
border-radius: 10.5px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
`}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
{/*
|
||||||
|
Add custom CSS to Hyper.
|
||||||
|
We add a scope to the customCSS so that it can get around the weighting applied by styled-jsx
|
||||||
|
*/}
|
||||||
|
<style dangerouslySetInnerHTML={{__html: stylis('#hyper', customCSS)}} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
Hyper.displayName = 'Hyper';
|
||||||
|
|
||||||
const mapStateToProps = (state: HyperState) => {
|
const mapStateToProps = (state: HyperState) => {
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue