Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Clode node container or modal on delete

Hakan Shehu6bb7077f0e6d
diff --git a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
index b1b6078d..69077ecd 100644
--- a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
@@ -51,6 +51,7 @@ export const ChannelDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
+ workspace.closeNode(nodeId);
},
});
}}
diff --git a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
index d95c4614..69fea26d 100644
--- a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
@@ -51,6 +51,7 @@ export const DatabaseDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
+ workspace.closeNode(nodeId);
},
});
}}
diff --git a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
index f4908dbc..6c9a15f9 100644
--- a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
@@ -51,6 +51,7 @@ export const FolderDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
+ workspace.closeNode(nodeId);
},
});
}}
diff --git a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
index 0f295886..20311f98 100644
--- a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
@@ -51,6 +51,7 @@ export const PageDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
+ workspace.closeNode(nodeId);
},
});
}}
diff --git a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
index 8ece6c8e..09bae1ba 100644
--- a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
@@ -51,6 +51,7 @@ export const RecordDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
+ workspace.closeNode(nodeId);
},
});
}}
diff --git a/apps/desktop/src/renderer/components/records/values/record-number-value.tsx b/apps/desktop/src/renderer/components/records/values/record-number-value.tsx
index 83391489..4210883d 100644
--- a/apps/desktop/src/renderer/components/records/values/record-number-value.tsx
+++ b/apps/desktop/src/renderer/components/records/values/record-number-value.tsx
@@ -29,7 +29,7 @@ export const RecordNumberValue = ({ field }: RecordNumberValueProps) => {
});
}
}}
- className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text shadow-none"
/>
);
};
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
index b3c96bc3..e6120088 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -44,6 +44,9 @@ export const Workspace = () => {
isNodeActive(id) {
return id === main;
},
+ isModalActive(id) {
+ return id === modal;
+ },
openInModal(modal) {
setSearchParams((prev) => {
prev.set('modal', modal);
@@ -56,6 +59,25 @@ export const Workspace = () => {
return prev;
});
},
+ closeMain() {
+ setSearchParams((prev) => {
+ prev.delete('main');
+ return prev;
+ });
+ },
+ closeNode(id) {
+ if (id === main) {
+ setSearchParams((prev) => {
+ prev.delete('main');
+ return prev;
+ });
+ } else if (id === modal) {
+ setSearchParams((prev) => {
+ prev.delete('modal');
+ return prev;
+ });
+ }
+ },
openSettings() {
setOpenSettings(true);
},
diff --git a/apps/desktop/src/renderer/contexts/workspace.ts b/apps/desktop/src/renderer/contexts/workspace.ts
index f26a5b01..ba9d06b3 100644
--- a/apps/desktop/src/renderer/contexts/workspace.ts
+++ b/apps/desktop/src/renderer/contexts/workspace.ts
@@ -5,7 +5,10 @@ interface WorkspaceContext extends Workspace {
openInMain: (nodeId: string) => void;
isNodeActive: (nodeId: string) => boolean;
openInModal: (nodeId: string) => void;
+ isModalActive: (nodeId: string) => boolean;
closeModal: () => void;
+ closeMain: () => void;
+ closeNode: (nodeId: string) => void;
openSettings: () => void;
}