TagSpaces is an offline, open source, document manager with tagging support
chore: preparation for a new calendar perspective
Ilian Sapundshiev00f371a1f34c
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsxindex fe13d58c0..552f6fdc6 100644--- a/src/renderer/components/FolderContainer.tsx+++ b/src/renderer/components/FolderContainer.tsx@@ -146,6 +146,9 @@ function FolderContainer(props: Props) {const perspectiveToggleButtons = [];AvailablePerspectives.forEach((perspective) => {+ if (perspective.id === PerspectiveIDs.CALENDAR) {+ return;+ }perspectiveToggleButtons.push(<ToggleButtonvalue={perspective.id}diff --git a/src/renderer/components/PerspectiveSelector.tsx b/src/renderer/components/PerspectiveSelector.tsxindex de672dc64..719491920 100644--- a/src/renderer/components/PerspectiveSelector.tsx+++ b/src/renderer/components/PerspectiveSelector.tsx@@ -16,18 +16,17 @@**/-import React from 'react';-import { useSelector } from 'react-redux';-import ListItemIcon from '@mui/material/ListItemIcon';-import LayersClearIcon from '@mui/icons-material/LayersClear';-import ListItemText from '@mui/material/ListItemText';+import { BetaLabel } from '-/components/HelperComponents';import TsSelect from '-/components/TsSelect';-import MenuItem from '@mui/material/MenuItem';import { AvailablePerspectives, PerspectiveIDs } from '-/perspectives';import { Pro } from '-/pro';-import { BetaLabel, ProLabel } from '-/components/HelperComponents';+import { isDesktopMode, isDevMode } from '-/reducers/settings';+import LayersClearIcon from '@mui/icons-material/LayersClear';+import ListItemIcon from '@mui/material/ListItemIcon';+import ListItemText from '@mui/material/ListItemText';+import MenuItem from '@mui/material/MenuItem';import { useTranslation } from 'react-i18next';-import { isDesktopMode } from '-/reducers/settings';+import { useSelector } from 'react-redux';interface Props {defaultValue: string;@@ -39,6 +38,7 @@ interface Props {function PerspectiveSelector(props: Props) {const { defaultValue, onChange, testId, label, fullWidth = true } = props;+ const devMode: boolean = useSelector(isDevMode);const desktopMode = useSelector(isDesktopMode);const { t } = useTranslation();@@ -59,6 +59,9 @@ function PerspectiveSelector(props: Props) {);AvailablePerspectives.forEach((perspective) => {+ if (!devMode && perspective.id === PerspectiveIDs.CALENDAR) {+ return;+ }let includePerspective = true;if (!Pro && perspective.pro === true) {includePerspective = false;diff --git a/src/renderer/components/RenderPerspective.tsx b/src/renderer/components/RenderPerspective.tsxindex 0eba0bc36..b22864453 100644--- a/src/renderer/components/RenderPerspective.tsx+++ b/src/renderer/components/RenderPerspective.tsx@@ -20,20 +20,20 @@ import React, { useEffect, useReducer } from 'react';import AppConfig from '-/AppConfig';-import { Pro } from '-/pro';-import { PerspectiveIDs } from '-/perspectives';-import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';+import CustomDragLayer from '-/components/CustomDragLayer';import LoadingLazy from '-/components/LoadingLazy';-import { SortedDirContextProvider } from '-/perspectives/grid/hooks/SortedDirContextProvider';+import TargetFileBox from '-/components/TargetFileBox';import { PaginationContextProvider } from '-/hooks/PaginationContextProvider';-import { ThumbGenerationContextProvider } from '-/hooks/ThumbGenerationContextProvider';import { PerspectiveSettingsContextProvider } from '-/hooks/PerspectiveSettingsContextProvider';+import { ThumbGenerationContextProvider } from '-/hooks/ThumbGenerationContextProvider';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';-import CustomDragLayer from '-/components/CustomDragLayer';-import TargetFileBox from '-/components/TargetFileBox';-import { NativeTypes } from 'react-dnd-html5-backend';+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';+import { PerspectiveIDs } from '-/perspectives';+import { SortedDirContextProvider } from '-/perspectives/grid/hooks/SortedDirContextProvider';+import { Pro } from '-/pro';import useFirstRender from '-/utils/useFirstRender';+import { NativeTypes } from 'react-dnd-html5-backend';const GridPerspective = React.lazy(() =>@@ -141,6 +141,20 @@ function FolderVizPerspectiveAsync(props) {);}+let CalendarPerspective = React.Fragment;+if (Pro && Pro.Perspectives && Pro.Perspectives.CalendarPerspective) {+ CalendarPerspective = Pro.Perspectives.CalendarPerspective;+}+function CalendarPerspectiveAsync(props) {+ return (+ <React.Suspense fallback={<LoadingLazy />}>+ <ThumbGenerationContextProvider>+ <CalendarPerspective {...props} />+ </ThumbGenerationContextProvider>+ </React.Suspense>+ );+}+const WelcomePanel = React.lazy(() => import(/* webpackChunkName: "WelcomePanel" */ './WelcomePanel'),);@@ -194,6 +208,9 @@ function RenderPerspective(props: Props) {if (Pro && currentPerspective === PerspectiveIDs.FOLDERVIZ) {return <FolderVizPerspectiveAsync />;}+ if (Pro && currentPerspective === PerspectiveIDs.CALENDAR) {+ return <CalendarPerspectiveAsync />;+ }return <GridPerspectiveAsync />;}diff --git a/src/renderer/perspectives/common/DirectoryMenuItems.tsx b/src/renderer/perspectives/common/DirectoryMenuItems.tsxindex 33c4bf6a7..46c0c10bb 100644--- a/src/renderer/perspectives/common/DirectoryMenuItems.tsx+++ b/src/renderer/perspectives/common/DirectoryMenuItems.tsx@@ -25,9 +25,9 @@ import {import { BetaLabel, ProLabel } from '-/components/HelperComponents';import InfoIcon from '-/components/InfoIcon';import MenuKeyBinding from '-/components/menus/MenuKeyBinding';-import { AvailablePerspectives } from '-/perspectives';+import { AvailablePerspectives, PerspectiveIDs } from '-/perspectives';import { Pro } from '-/pro';-import { getKeyBindingObject } from '-/reducers/settings';+import { getKeyBindingObject, isDevMode } from '-/reducers/settings';import { TS } from '-/tagspaces.namespace';import { CommonLocation } from '-/utils/CommonLocation';import Divider from '@mui/material/Divider';@@ -66,6 +66,7 @@ export function getDirectoryMenuItems(changeFolderBackground?: () => void,) {const keyBindings = useSelector(getKeyBindingObject);+ const devMode: boolean = useSelector(isDevMode);const menuItems = [];if (selectedEntries.length < 2) {if (perspectiveMode) {@@ -489,6 +490,9 @@ export function getDirectoryMenuItems(if (perspective.beta) {badge = <BetaLabel />;}+ if (!devMode && perspective.id === PerspectiveIDs.CALENDAR) {+ return;+ }menuItems.push(<MenuItemkey={perspective.key}diff --git a/src/renderer/perspectives/index.tsx b/src/renderer/perspectives/index.tsxindex 75703205e..91a16f448 100644--- a/src/renderer/perspectives/index.tsx+++ b/src/renderer/perspectives/index.tsx@@ -106,4 +106,4 @@ AvailablePerspectives.push(GalleryPerspectiveMeta);AvailablePerspectives.push(MapiquePerspectiveMeta);AvailablePerspectives.push(KanbanPerspectiveMeta);AvailablePerspectives.push(FolderVizPerspectiveMeta);-// AvailablePerspectives.push(CalendarPerspectiveMeta);+AvailablePerspectives.push(CalendarPerspectiveMeta);