A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: separate component for tab items in sidebar Signed-off-by: 01zulfi <[email protected]>
01zulfi06df49d5d73b
diff --git a/apps/web/src/components/navigation-menu/index.tsx b/apps/web/src/components/navigation-menu/index.tsxindex ce7a41827..09f441513 100644--- a/apps/web/src/components/navigation-menu/index.tsx+++ b/apps/web/src/components/navigation-menu/index.tsx@@ -85,6 +85,7 @@ import { CREATE_BUTTON_MAP, createBackup } from "../../common";import { TaskManager } from "../../common/task-manager";import { showToast } from "../../utils/toast";import { useStore } from "../../stores/note-store";+import { TabItem } from "./tab-item";type Route = {id: string;@@ -310,15 +311,13 @@ function NavigationMenu(props: NavigationMenuProps) {}}>{tabs.map((tab) => (- <NavigationItem+ <TabItemkey={tab.id}id={tab.id}- isTablet={isTablet}title={tab.title}icon={tab.icon}selected={currentTab === tab.id}onClick={() => setCurrentTab(tab.id)}- showTitle={false}/>))}</Flex>diff --git a/apps/web/src/components/navigation-menu/navigation-item.tsx b/apps/web/src/components/navigation-menu/navigation-item.tsxindex b9cd53b23..ce9ac41fb 100644--- a/apps/web/src/components/navigation-menu/navigation-item.tsx+++ b/apps/web/src/components/navigation-menu/navigation-item.tsx@@ -41,7 +41,6 @@ type NavigationItemProps = {onClick?: () => void;count?: number;menuItems?: MenuItem[];- showTitle?: boolean;};function NavigationItem(@@ -65,7 +64,6 @@ function NavigationItem(count,sx,containerRef,- showTitle = true,...restProps} = props;const isMobile = useMobile();@@ -146,22 +144,21 @@ function NavigationItem(/>)}- {showTitle && (- <Text- variant="body"- sx={{- whiteSpace: "nowrap",- overflow: "hidden",- textOverflow: "ellipsis",- fontWeight: selected ? "bold" : "normal",- color: selected ? "paragraph-selected" : "paragraph",- display: isTablet ? "none" : "block"- }}- ml={1}- data-test-id="title"- >- {title}- {/* {tag && (+ <Text+ variant="body"+ sx={{+ whiteSpace: "nowrap",+ overflow: "hidden",+ textOverflow: "ellipsis",+ fontWeight: selected ? "bold" : "normal",+ color: selected ? "paragraph-selected" : "paragraph",+ display: isTablet ? "none" : "block"+ }}+ ml={1}+ data-test-id="title"+ >+ {title}+ {/* {tag && (<Textvariant="subBody"as="span"@@ -176,8 +173,7 @@ function NavigationItem({tag}</Text>)} */}- </Text>- )}+ </Text></Button>{children ? (childrendiff --git a/apps/web/src/components/navigation-menu/tab-item.tsx b/apps/web/src/components/navigation-menu/tab-item.tsxnew file mode 100644index 000000000..32d88b17e--- /dev/null+++ b/apps/web/src/components/navigation-menu/tab-item.tsx@@ -0,0 +1,92 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import { createButtonVariant } from "@notesnook/theme";+import { Button, Flex, FlexProps } from "@theme-ui/components";+import { PropsWithChildren } from "react";+import { Icon } from "../icons";++type TabItemProps = {+ icon?: Icon;+ title?: string;+ selected?: boolean;+ onClick?: () => void;+};++export function TabItem(props: PropsWithChildren<TabItemProps & FlexProps>) {+ const {+ icon: Icon,+ color,+ title,+ children,+ selected,+ onClick,+ sx,+ ...restProps+ } = props;++ return (+ <Flex+ {...restProps}+ sx={{+ ...createButtonVariant(+ selected ? "background-selected" : "transparent",+ "transparent",+ {+ hover: {+ bg: selected ? "hover-selected" : "hover"+ }+ }+ ),+ borderRadius: "default",+ mx: 1,+ p: 0,+ mt: "3px",+ alignItems: "center",+ position: "relative",+ ":first-of-type": { mt: 1 },+ ":last-of-type": { mb: 1 },+ ":focus": { bg: selected ? "hover-selected" : "hover" },+ ...sx+ }}+ >+ <Button+ data-test-id={`tab-item`}+ sx={{+ px: 2,+ flex: 1,+ alignItems: "center",+ justifyContent: "flex-start",+ display: "flex"+ }}+ title={title}+ onClick={() => {+ if (onClick) onClick();+ }}+ >+ {Icon ? (+ <Icon+ size={20}+ color={color || (selected ? "icon-selected" : "icon")}+ />+ ) : null}+ </Button>+ </Flex>+ );+}