mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Move sidebar cluster block to separate component
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
parent
a9c06da121
commit
7ba834c5ba
52
src/renderer/components/layout/sidebar-cluster.module.css
Normal file
52
src/renderer/components/layout/sidebar-cluster.module.css
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.SidebarCluster {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 1.25rem;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:focus-visible {
|
||||||
|
background: var(--blue);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: var(--sidebarLogoBackground);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.clusterName {
|
||||||
|
font-weight: bold;
|
||||||
|
overflow: hidden;
|
||||||
|
word-break: break-word;
|
||||||
|
color: var(--textColorAccent);
|
||||||
|
display: -webkit-box;
|
||||||
|
/* Simulate text-overflow:ellipsis styles but for multiple text lines */
|
||||||
|
-webkit-line-clamp: 3;
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu {
|
||||||
|
width: 184px;
|
||||||
|
margin-top: -10px;
|
||||||
|
}
|
||||||
126
src/renderer/components/layout/sidebar-cluster.tsx
Normal file
126
src/renderer/components/layout/sidebar-cluster.tsx
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
/**
|
||||||
|
* 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 styles from "./sidebar-cluster.module.css";
|
||||||
|
import { observable } from "mobx";
|
||||||
|
import React, { useState } from "react";
|
||||||
|
import { HotbarStore } from "../../../common/hotbar-store";
|
||||||
|
import { broadcastMessage } from "../../../common/ipc";
|
||||||
|
import type { CatalogEntity, CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity";
|
||||||
|
import { IpcRendererNavigationEvents } from "../../navigation/events";
|
||||||
|
import { Avatar } from "../avatar/avatar";
|
||||||
|
import { Icon } from "../icon";
|
||||||
|
import { navigate } from "../../navigation";
|
||||||
|
import { Menu, MenuItem } from "../menu";
|
||||||
|
import { ConfirmDialog } from "../confirm-dialog";
|
||||||
|
|
||||||
|
const contextMenu: CatalogEntityContextMenuContext = observable({
|
||||||
|
menuItems: [],
|
||||||
|
navigate: (url: string, forceMainFrame = true) => {
|
||||||
|
if (forceMainFrame) {
|
||||||
|
broadcastMessage(IpcRendererNavigationEvents.NAVIGATE_IN_APP, url);
|
||||||
|
} else {
|
||||||
|
navigate(url);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
function onMenuItemClick(menuItem: CatalogEntityContextMenu) {
|
||||||
|
if (menuItem.confirm) {
|
||||||
|
ConfirmDialog.open({
|
||||||
|
okButtonProps: {
|
||||||
|
primary: false,
|
||||||
|
accent: true,
|
||||||
|
},
|
||||||
|
ok: () => {
|
||||||
|
menuItem.onClick();
|
||||||
|
},
|
||||||
|
message: menuItem.confirm.message,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
menuItem.onClick();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SidebarCluster({ clusterEntity }: { clusterEntity: CatalogEntity }) {
|
||||||
|
const [opened, setOpened] = useState(false);
|
||||||
|
|
||||||
|
if (!clusterEntity) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const onMenuOpen = () => {
|
||||||
|
const hotbarStore = HotbarStore.getInstance();
|
||||||
|
const isAddedToActive = HotbarStore.getInstance().isAddedToActive(clusterEntity);
|
||||||
|
const title = isAddedToActive
|
||||||
|
? "Remove from Hotbar"
|
||||||
|
: "Add to Hotbar";
|
||||||
|
const onClick = isAddedToActive
|
||||||
|
? () => hotbarStore.removeFromHotbar(metadata.uid)
|
||||||
|
: () => hotbarStore.addToHotbar(clusterEntity);
|
||||||
|
|
||||||
|
contextMenu.menuItems = [{ title, onClick }];
|
||||||
|
clusterEntity.onContextMenuOpen(contextMenu);
|
||||||
|
|
||||||
|
setOpened(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggle = () => {
|
||||||
|
setOpened(!opened);
|
||||||
|
};
|
||||||
|
|
||||||
|
const { metadata, spec } = clusterEntity;
|
||||||
|
const id = `cluster-${metadata.uid}`;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={styles.SidebarCluster} tabIndex={0} id={id}>
|
||||||
|
<Avatar
|
||||||
|
title={metadata.name}
|
||||||
|
colorHash={`${metadata.name}-${metadata.source}`}
|
||||||
|
width={40}
|
||||||
|
height={40}
|
||||||
|
src={spec.icon?.src}
|
||||||
|
/>
|
||||||
|
<div className={styles.clusterName}>
|
||||||
|
{metadata.name}
|
||||||
|
</div>
|
||||||
|
<Icon material="arrow_drop_down"/>
|
||||||
|
<Menu
|
||||||
|
usePortal
|
||||||
|
htmlFor={id}
|
||||||
|
isOpen={opened}
|
||||||
|
open={onMenuOpen}
|
||||||
|
closeOnClickItem
|
||||||
|
closeOnClickOutside
|
||||||
|
close={toggle}
|
||||||
|
className={styles.menu}
|
||||||
|
>
|
||||||
|
{
|
||||||
|
contextMenu.menuItems.map((menuItem) => (
|
||||||
|
<MenuItem key={menuItem.title} onClick={() => onMenuItemClick(menuItem)}>
|
||||||
|
{menuItem.title}
|
||||||
|
</MenuItem>
|
||||||
|
))
|
||||||
|
}
|
||||||
|
</Menu>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -40,29 +40,3 @@
|
|||||||
padding: 3px;
|
padding: 3px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cluster {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1.25rem;
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
&:focus-visible {
|
|
||||||
background: var(--blue);
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: var(--sidebarLogoBackground);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.clusterName {
|
|
||||||
@apply font-bold overflow-hidden;
|
|
||||||
word-break: break-word;
|
|
||||||
color: var(--textColorAccent);
|
|
||||||
display: -webkit-box;
|
|
||||||
/* Simulate text-overflow:ellipsis styles but for multiple text lines */
|
|
||||||
-webkit-line-clamp: 3;
|
|
||||||
-webkit-box-orient: vertical;
|
|
||||||
}
|
|
||||||
|
|||||||
@ -47,6 +47,7 @@ import type { CatalogEntityContextMenuContext } from "../../../common/catalog";
|
|||||||
import { HotbarStore } from "../../../common/hotbar-store";
|
import { HotbarStore } from "../../../common/hotbar-store";
|
||||||
import { broadcastMessage } from "../../../common/ipc";
|
import { broadcastMessage } from "../../../common/ipc";
|
||||||
import { IpcRendererNavigationEvents } from "../../navigation/events";
|
import { IpcRendererNavigationEvents } from "../../navigation/events";
|
||||||
|
import { SidebarCluster } from "./sidebar-cluster";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className?: string;
|
className?: string;
|
||||||
@ -246,7 +247,8 @@ export class Sidebar extends React.Component<Props> {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={cssNames("flex flex-col", className)} data-testid="cluster-sidebar">
|
<div className={cssNames("flex flex-col", className)} data-testid="cluster-sidebar">
|
||||||
{this.renderCluster()}
|
{/* {this.renderCluster()} */}
|
||||||
|
<SidebarCluster clusterEntity={this.clusterEntity}/>
|
||||||
<div className={styles.sidebarNav}>
|
<div className={styles.sidebarNav}>
|
||||||
<SidebarItem
|
<SidebarItem
|
||||||
id="cluster"
|
id="cluster"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user