mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
* Fix cluster frame display issue - Add some defensive code to prevent this sort of infinite loop - Add some unit tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix unit tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * Factor out injectable for getting of cluster config data Signed-off-by: Sebastian Malton <sebastian@malton.name>
110 lines
3.7 KiB
TypeScript
110 lines
3.7 KiB
TypeScript
/**
|
|
* Copyright (c) OpenLens Authors. All rights reserved.
|
|
* Licensed under MIT License. See LICENSE in root directory for more information.
|
|
*/
|
|
|
|
|
|
import "./command-container.scss";
|
|
import { disposeOnUnmount, observer } from "mobx-react";
|
|
import React from "react";
|
|
import { Dialog } from "../dialog";
|
|
import { CommandDialog } from "./command-dialog";
|
|
import type { ClusterId } from "../../../common/cluster-types";
|
|
import type { CommandOverlay } from "./command-overlay.injectable";
|
|
import commandOverlayInjectable from "./command-overlay.injectable";
|
|
import type { ipcRendererOn } from "../../../common/ipc";
|
|
import { broadcastMessage } from "../../../common/ipc";
|
|
import { withInjectables } from "@ogre-tools/injectable-react";
|
|
import type { AddWindowEventListener } from "../../window/event-listener.injectable";
|
|
import windowAddEventListenerInjectable from "../../window/event-listener.injectable";
|
|
import type { IComputedValue } from "mobx";
|
|
import matchedClusterIdInjectable from "../../navigation/matched-cluster-id.injectable";
|
|
import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable";
|
|
import isMacInjectable from "../../../common/vars/is-mac.injectable";
|
|
import legacyOnChannelListenInjectable from "../../ipc/legacy-channel-listen.injectable";
|
|
|
|
interface Dependencies {
|
|
addWindowEventListener: AddWindowEventListener;
|
|
commandOverlay: CommandOverlay;
|
|
clusterId: ClusterId | undefined;
|
|
matchedClusterId: IComputedValue<ClusterId | undefined>;
|
|
isMac: boolean;
|
|
legacyOnChannelListen: typeof ipcRendererOn;
|
|
}
|
|
|
|
@observer
|
|
class NonInjectedCommandContainer extends React.Component<Dependencies> {
|
|
private escHandler = (event: KeyboardEvent) => {
|
|
if (event.key === "Escape") {
|
|
event.stopPropagation();
|
|
this.props.commandOverlay.close();
|
|
}
|
|
};
|
|
|
|
handleCommandPalette = () => {
|
|
const matchedClusterId = this.props.matchedClusterId.get();
|
|
|
|
if (matchedClusterId !== undefined) {
|
|
broadcastMessage(`command-palette:${matchedClusterId}:open`);
|
|
} else {
|
|
this.props.commandOverlay.open(<CommandDialog />);
|
|
}
|
|
};
|
|
|
|
onKeyboardShortcut(action: () => void) {
|
|
return ({ key, shiftKey, ctrlKey, altKey, metaKey }: KeyboardEvent) => {
|
|
const ctrlOrCmd = this.props.isMac ? metaKey && !ctrlKey : !metaKey && ctrlKey;
|
|
|
|
if (key === "p" && shiftKey && ctrlOrCmd && !altKey) {
|
|
action();
|
|
}
|
|
};
|
|
}
|
|
|
|
componentDidMount() {
|
|
const { clusterId, addWindowEventListener, commandOverlay } = this.props;
|
|
|
|
const action = clusterId
|
|
? () => commandOverlay.open(<CommandDialog />)
|
|
: this.handleCommandPalette;
|
|
const ipcChannel = clusterId
|
|
? `command-palette:${clusterId}:open`
|
|
: "command-palette:open";
|
|
|
|
disposeOnUnmount(this, [
|
|
this.props.legacyOnChannelListen(ipcChannel, action),
|
|
addWindowEventListener("keydown", this.onKeyboardShortcut(action)),
|
|
addWindowEventListener("keyup", this.escHandler, true),
|
|
]);
|
|
}
|
|
|
|
render() {
|
|
const { commandOverlay } = this.props;
|
|
|
|
return (
|
|
<Dialog
|
|
isOpen={commandOverlay.isOpen}
|
|
animated={true}
|
|
onClose={commandOverlay.close}
|
|
modal={false}
|
|
>
|
|
<div id="command-container">
|
|
{commandOverlay.component}
|
|
</div>
|
|
</Dialog>
|
|
);
|
|
}
|
|
}
|
|
|
|
export const CommandContainer = withInjectables<Dependencies>(NonInjectedCommandContainer, {
|
|
getProps: (di, props) => ({
|
|
...props,
|
|
clusterId: di.inject(hostedClusterIdInjectable),
|
|
addWindowEventListener: di.inject(windowAddEventListenerInjectable),
|
|
commandOverlay: di.inject(commandOverlayInjectable),
|
|
matchedClusterId: di.inject(matchedClusterIdInjectable),
|
|
isMac: di.inject(isMacInjectable),
|
|
legacyOnChannelListen: di.inject(legacyOnChannelListenInjectable),
|
|
}),
|
|
});
|