{
- if (isSubWiki) {
- await window.service.wiki.requestOpenTiddlerInWiki(tagName);
- } else {
- const activeWorkspace = await window.service.workspace.getActiveWorkspace();
- if (activeWorkspace?.id === id) {
- await window.service.wiki.requestWikiSendActionMessage('tm-home');
+
+ {
+ if (isSubWiki) {
+ await window.service.wiki.requestOpenTiddlerInWiki(tagName);
} else {
- await window.service.workspaceView.setActiveWorkspaceView(id);
+ const activeWorkspace = await window.service.workspace.getActiveWorkspace();
+ if (activeWorkspace?.id === id) {
+ await window.service.wiki.requestWikiSendActionMessage('tm-home');
+ } else {
+ await window.service.workspaceView.setActiveWorkspaceView(id);
+ }
}
- }
- }}
- onContextMenu={() => {
- const template = [
- {
- label: t('WorkspaceSelector.EditWorkspace'),
- click: async () => await window.service.window.open(WindowNames.editWorkspace, { workspaceID: id }),
- },
- {
- label: t('WorkspaceSelector.RemoveWorkspace'),
- click: async () => await window.service.workspaceView.removeWorkspaceView(id),
- },
- ];
-
- if (!active && !isSubWiki) {
- template.splice(1, 0, {
- label: hibernated ? 'Wake Up Workspace' : 'Hibernate Workspace',
- click: async () => {
- if (hibernated) {
- return await window.service.workspaceView.wakeUpWorkspaceView(id);
- }
- return await window.service.workspaceView.hibernateWorkspaceView(id);
+ }}
+ onContextMenu={() => {
+ const template = [
+ {
+ label: t('WorkspaceSelector.EditWorkspace'),
+ click: async () => await window.service.window.open(WindowNames.editWorkspace, { workspaceID: id }),
},
- });
- }
+ {
+ label: t('WorkspaceSelector.RemoveWorkspace'),
+ click: async () => await window.service.workspaceView.removeWorkspaceView(id),
+ },
+ ];
- void window.service.menu.buildContextMenuAndPopup(template);
- }}
- />
+ if (!active && !isSubWiki) {
+ template.splice(1, 0, {
+ label: hibernated ? 'Wake Up Workspace' : 'Hibernate Workspace',
+ click: async () => {
+ if (hibernated) {
+ return await window.service.workspaceView.wakeUpWorkspaceView(id);
+ }
+ return await window.service.workspaceView.hibernateWorkspaceView(id);
+ },
+ });
+ }
+
+ void window.service.menu.buildContextMenuAndPopup(template);
+ }}
+ />
+
);
}
-
-export default sortableElement(SortableWorkspaceSelector);
diff --git a/src/pages/Main/WorkspaceSelector.tsx b/src/pages/Main/WorkspaceSelector.tsx
index 60c94818..38abd491 100644
--- a/src/pages/Main/WorkspaceSelector.tsx
+++ b/src/pages/Main/WorkspaceSelector.tsx
@@ -1,11 +1,13 @@
+import Promise from 'bluebird';
import React, { useState, useEffect } from 'react';
-import classNames from 'classnames';
import { useTranslation } from 'react-i18next';
import BadgeRaw from '@material-ui/core/Badge';
import styled, { css } from 'styled-components';
import defaultIcon from '../../images/default-icon.png';
+Promise.config({ cancellation: true });
+
// TODO: &:hover { background: theme.palette.action.hover;
const Root = styled.div<{ hibernated?: boolean; active?: boolean }>`
height: fit-content;
@@ -125,10 +127,14 @@ export default function WorkspaceSelector({
const { t } = useTranslation();
const [shortWorkspaceName, shortWorkspaceNameSetter] = useState(t('Loading'));
useEffect(() => {
- void (async () => {
- const baseName = await window.service.context.getBaseName(workspaceName);
+ const setBaseNamePromise = new Promise((resolve) => {
+ window.service.context.getBaseName(workspaceName).then((baseName) => resolve(baseName));
+ });
+
+ setBaseNamePromise.then((baseName) => {
shortWorkspaceNameSetter(baseName !== undefined ? baseName : t('WorkspaceSelector.BadWorkspacePath'));
- })();
+ });
+ return () => setBaseNamePromise.cancel();
}, [workspaceName]);
return (
diff --git a/src/pages/Main/index.tsx b/src/pages/Main/index.tsx
index 699f207f..b63cb144 100644
--- a/src/pages/Main/index.tsx
+++ b/src/pages/Main/index.tsx
@@ -1,7 +1,8 @@
import React from 'react';
-import arrayMove from 'array-move';
import styled, { css } from 'styled-components';
import { AsyncReturnType } from 'type-fest';
+import { DndContext } from '@dnd-kit/core';
+import { SortableContext, arrayMove, verticalListSortingStrategy } from '@dnd-kit/sortable';
import SimpleBar from 'simplebar-react';
import 'simplebar/dist/simplebar.min.css';
@@ -24,7 +25,7 @@ import DraggableRegion from './DraggableRegion';
import arrowWhite from '@/images/arrow-white.png';
import arrowBlack from '@/images/arrow-black.png';
-import SortableWorkspaceSelector, { SortableContainer } from './SortableWorkspaceSelector';
+import { SortableWorkspaceSelector } from './SortableWorkspaceSelector';
import { IWorkspace } from '@services/workspaces/interface';
import { IPreferences } from '@services/preferences/interface';
@@ -180,6 +181,7 @@ export default function Main(): JSX.Element {
}, {} as AsyncReturnType);
const requestReload = async (): Promise => await window.service.window.reload(window.meta.windowName);
+ const workspaceIDs = workspacesList.map((workspace) => workspace.id);
return (
{workspacesList.length > 0 && }
@@ -187,10 +189,11 @@ export default function Main(): JSX.Element {
{sidebar === true && (
- {
- if (oldIndex === newIndex) return;
+ {
+ if (over === null || active.id === over.id) return;
+ const oldIndex = workspaceIDs.indexOf(active.id);
+ const newIndex = workspaceIDs.indexOf(over.id);
const newWorkspacesList = arrayMove(workspacesList, oldIndex, newIndex);
const newWorkspaces: Record = {};
@@ -201,10 +204,12 @@ export default function Main(): JSX.Element {
await window.service.workspace.setWorkspaces(newWorkspaces);
}}>
- {workspacesList.map((workspace, index) => (
-
- ))}
-
+
+ {workspacesList.map((workspace, index) => (
+
+ ))}
+
+
await window.service.window.open(WindowNames.addWorkspace)} />