1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Allow to close tabs using middle-clicks (#2995)

Signed-off-by: Luca Kröger <l.kroeger01@gmail.com>
This commit is contained in:
Luca Kröger 2021-06-09 15:23:48 +02:00 committed by GitHub
parent f11fb11845
commit 512946a397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 3 deletions

View File

@ -23,7 +23,7 @@ import "./dock-tab.scss";
import React from "react"; import React from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { boundMethod, cssNames, prevDefault } from "../../utils"; import { boundMethod, cssNames, prevDefault, isMiddleClick } from "../../utils";
import { dockStore, IDockTab } from "./dock.store"; import { dockStore, IDockTab } from "./dock.store";
import { Tab, TabProps } from "../tabs"; import { Tab, TabProps } from "../tabs";
import { Icon } from "../icon"; import { Icon } from "../icon";
@ -88,13 +88,13 @@ export class DockTab extends React.Component<DockTabProps> {
const { className, moreActions, ...tabProps } = this.props; const { className, moreActions, ...tabProps } = this.props;
const { title, pinned } = tabProps.value; const { title, pinned } = tabProps.value;
const label = ( const label = (
<div className="flex gaps align-center"> <div className="flex gaps align-center" onAuxClick={isMiddleClick(prevDefault(this.close))}>
<span className="title" title={title}>{title}</span> <span className="title" title={title}>{title}</span>
{moreActions} {moreActions}
{!pinned && ( {!pinned && (
<Icon <Icon
small material="close" small material="close"
title="Close (Ctrl+W)" title="Close (Ctrl+Shift+W)"
onClick={prevDefault(this.close)} onClick={prevDefault(this.close)}
/> />
)} )}

View File

@ -38,3 +38,4 @@ export * from "./convertMemory";
export * from "./convertCpu"; export * from "./convertCpu";
export * from "./metricUnitsToNumber"; export * from "./metricUnitsToNumber";
export * from "./display-booleans"; export * from "./display-booleans";
export * from "./isMiddleClick";

View File

@ -0,0 +1,36 @@
/**
* Copyright (c) 2021 OpenLens Authors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import type React from "react";
// Helper for inlining middleClick checks
// <form onAuxClick={isMiddleClick(() => console.log('do some action'))}>
// <input name="text"/>
// <button type="submit">Action</button>
// </form>
export function isMiddleClick<E extends React.MouseEvent>(callback: (evt: E) => any) {
return function (evt: E) {
if(evt.button === 1) {
return callback(evt);
}
};
}