Skip to content

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

Implement inline databases (#153)

Hakan Shehu6aca87de55df
diff --git a/packages/ui/src/components/databases/boards/board-view.tsx b/packages/ui/src/components/databases/boards/board-view.tsx
index b28cc665..0a08cfc6 100644
--- a/packages/ui/src/components/databases/boards/board-view.tsx
+++ b/packages/ui/src/components/databases/boards/board-view.tsx
@@ -6,6 +6,7 @@ import { BoardViewSettings } from '@colanode/ui/components/databases/boards/boar
import { ViewFilterButton } from '@colanode/ui/components/databases/search/view-filter-button';
import { ViewSearchBar } from '@colanode/ui/components/databases/search/view-search-bar';
import { ViewSortButton } from '@colanode/ui/components/databases/search/view-sort-button';
+import { ViewFullscreenButton } from '@colanode/ui/components/databases/view-fullscreen-button';
import { ViewTabs } from '@colanode/ui/components/databases/view-tabs';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
@@ -23,6 +24,7 @@ export const BoardView = () => {
<div className="flex flex-row justify-between border-b">
<ViewTabs />
<div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
+ <ViewFullscreenButton />
<BoardViewSettings />
<ViewSortButton />
<ViewFilterButton />
diff --git a/packages/ui/src/components/databases/calendars/calendar-view.tsx b/packages/ui/src/components/databases/calendars/calendar-view.tsx
index 3f497c1b..6beddd19 100644
--- a/packages/ui/src/components/databases/calendars/calendar-view.tsx
+++ b/packages/ui/src/components/databases/calendars/calendar-view.tsx
@@ -7,6 +7,7 @@ import { CalendarViewSettings } from '@colanode/ui/components/databases/calendar
import { ViewFilterButton } from '@colanode/ui/components/databases/search/view-filter-button';
import { ViewSearchBar } from '@colanode/ui/components/databases/search/view-search-bar';
import { ViewSortButton } from '@colanode/ui/components/databases/search/view-sort-button';
+import { ViewFullscreenButton } from '@colanode/ui/components/databases/view-fullscreen-button';
import { ViewTabs } from '@colanode/ui/components/databases/view-tabs';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
@@ -25,6 +26,7 @@ export const CalendarView = () => {
<ViewTabs />
<div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
{groupByField && <CalendarViewNoValueCount field={groupByField} />}
+ <ViewFullscreenButton />
<CalendarViewSettings />
<ViewSortButton />
<ViewFilterButton />
diff --git a/packages/ui/src/components/databases/database-views.tsx b/packages/ui/src/components/databases/database-views.tsx
index 1822330a..d0942b21 100644
--- a/packages/ui/src/components/databases/database-views.tsx
+++ b/packages/ui/src/components/databases/database-views.tsx
@@ -8,7 +8,11 @@ import { DatabaseViewsContext } from '@colanode/ui/contexts/database-views';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
-export const DatabaseViews = () => {
+interface DatabaseViewsProps {
+ inline?: boolean;
+}
+
+export const DatabaseViews = ({ inline = false }: DatabaseViewsProps) => {
const workspace = useWorkspace();
const database = useDatabase();
const [activeViewId, setActiveViewId] = useState<string | null>(null);
@@ -31,7 +35,12 @@ export const DatabaseViews = () => {
return (
<DatabaseViewsContext.Provider
- value={{ views, activeViewId: activeViewId ?? '', setActiveViewId }}
+ value={{
+ views,
+ activeViewId: activeViewId ?? '',
+ setActiveViewId,
+ inline,
+ }}
>
<div className="h-full w-full overflow-y-auto">
<ScrollAreaPrimitive.Root className="relative overflow-hidden">
diff --git a/packages/ui/src/components/databases/tables/table-view.tsx b/packages/ui/src/components/databases/tables/table-view.tsx
index 109531f8..c8ed54ec 100644
--- a/packages/ui/src/components/databases/tables/table-view.tsx
+++ b/packages/ui/src/components/databases/tables/table-view.tsx
@@ -7,6 +7,7 @@ import { TableViewBody } from '@colanode/ui/components/databases/tables/table-vi
import { TableViewHeader } from '@colanode/ui/components/databases/tables/table-view-header';
import { TableViewRecordCreateRow } from '@colanode/ui/components/databases/tables/table-view-record-create-row';
import { TableViewSettings } from '@colanode/ui/components/databases/tables/table-view-settings';
+import { ViewFullscreenButton } from '@colanode/ui/components/databases/view-fullscreen-button';
import { ViewTabs } from '@colanode/ui/components/databases/view-tabs';
export const TableView = () => {
@@ -15,6 +16,7 @@ export const TableView = () => {
<div className="flex flex-row justify-between border-b">
<ViewTabs />
<div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
+ <ViewFullscreenButton />
<TableViewSettings />
<ViewSortButton />
<ViewFilterButton />
diff --git a/packages/ui/src/components/databases/view-fullscreen-button.tsx b/packages/ui/src/components/databases/view-fullscreen-button.tsx
new file mode 100644
index 00000000..214738e6
--- /dev/null
+++ b/packages/ui/src/components/databases/view-fullscreen-button.tsx
@@ -0,0 +1,24 @@
+import { Fullscreen } from 'lucide-react';
+
+import { useDatabase } from '@colanode/ui/contexts/database';
+import { useDatabaseViews } from '@colanode/ui/contexts/database-views';
+import { useLayout } from '@colanode/ui/contexts/layout';
+
+export const ViewFullscreenButton = () => {
+ const database = useDatabase();
+ const views = useDatabaseViews();
+ const layout = useLayout();
+
+ if (!views.inline) {
+ return null;
+ }
+
+ return (
+ <button
+ className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50"
+ onClick={() => layout.previewLeft(database.id, true)}
+ >
+ <Fullscreen className="size-4" />
+ </button>
+ );
+};
diff --git a/packages/ui/src/components/documents/document-editor.tsx b/packages/ui/src/components/documents/document-editor.tsx
index 8a23a892..7718a38c 100644
--- a/packages/ui/src/components/documents/document-editor.tsx
+++ b/packages/ui/src/components/documents/document-editor.tsx
@@ -39,6 +39,7 @@ import {
ParagraphCommand,
TodoCommand,
DatabaseCommand,
+ DatabaseInlineCommand,
} from '@colanode/ui/editor/commands';
import {
BlockquoteNode,
@@ -211,6 +212,7 @@ export const DocumentEditor = ({
BulletListCommand,
CodeBlockCommand,
OrderedListCommand,
+ DatabaseInlineCommand,
DatabaseCommand,
DividerCommand,
TodoCommand,
diff --git a/packages/ui/src/contexts/database-views.ts b/packages/ui/src/contexts/database-views.ts
index 73dab347..9cef8621 100644
--- a/packages/ui/src/contexts/database-views.ts
+++ b/packages/ui/src/contexts/database-views.ts
@@ -6,6 +6,7 @@ interface DatabaseViewsContext {
views: LocalDatabaseViewNode[];
activeViewId: string;
setActiveViewId: (viewId: string) => void;
+ inline: boolean;
}
export const DatabaseViewsContext = createContext<DatabaseViewsContext>(
diff --git a/packages/ui/src/editor/commands/database-inline.tsx b/packages/ui/src/editor/commands/database-inline.tsx
new file mode 100644
index 00000000..a656baa3
--- /dev/null
+++ b/packages/ui/src/editor/commands/database-inline.tsx
@@ -0,0 +1,43 @@
+import { DatabaseZap } from 'lucide-react';
+
+import { EditorCommand } from '@colanode/client/types';
+
+export const DatabaseInlineCommand: EditorCommand = {
+ key: 'database-inline',
+ name: 'Database - Inline',
+ description: 'Insert a database inline in the current document',
+ keywords: ['database', 'inline'],
+ icon: DatabaseZap,
+ disabled: false,
+ async handler({ editor, range, context }) {
+ if (context == null) {
+ return;
+ }
+
+ const { accountId, workspaceId, documentId } = context;
+ const output = await window.colanode.executeMutation({
+ type: 'database.create',
+ name: 'Untitled',
+ accountId,
+ workspaceId,
+ parentId: documentId,
+ });
+
+ if (!output.success) {
+ return;
+ }
+
+ editor
+ .chain()
+ .focus()
+ .deleteRange(range)
+ .insertContent({
+ type: 'database',
+ attrs: {
+ id: output.output.id,
+ inline: true,
+ },
+ })
+ .run();
+ },
+};
diff --git a/packages/ui/src/editor/commands/database.tsx b/packages/ui/src/editor/commands/database.tsx
index ebbcae61..a82e5d55 100644
--- a/packages/ui/src/editor/commands/database.tsx
+++ b/packages/ui/src/editor/commands/database.tsx
@@ -4,9 +4,9 @@ import { EditorCommand } from '@colanode/client/types';
export const DatabaseCommand: EditorCommand = {
key: 'database',
- name: 'Database',
- description: 'Insert a nested database',
- keywords: ['database'],
+ name: 'Database - Full Page',
+ description: 'Insert a full page database',
+ keywords: ['database', 'full', 'page'],
icon: Database,
disabled: false,
async handler({ editor, range, context }) {
diff --git a/packages/ui/src/editor/commands/index.tsx b/packages/ui/src/editor/commands/index.tsx
index 19462dfc..441c8a6f 100644
--- a/packages/ui/src/editor/commands/index.tsx
+++ b/packages/ui/src/editor/commands/index.tsx
@@ -3,6 +3,7 @@ import { BlockquoteCommand } from '@colanode/ui/editor/commands/blockquote';
import { BulletListCommand } from '@colanode/ui/editor/commands/bullet-list';
import { CodeBlockCommand } from '@colanode/ui/editor/commands/code-block';
import { DatabaseCommand } from '@colanode/ui/editor/commands/database';
+import { DatabaseInlineCommand } from '@colanode/ui/editor/commands/database-inline';
import { DividerCommand } from '@colanode/ui/editor/commands/divider';
import { FileCommand } from '@colanode/ui/editor/commands/file';
import { FolderCommand } from '@colanode/ui/editor/commands/folder';
@@ -31,4 +32,5 @@ export {
ParagraphCommand,
TodoCommand,
DatabaseCommand,
+ DatabaseInlineCommand,
};
diff --git a/packages/ui/src/editor/extensions/commander.tsx b/packages/ui/src/editor/extensions/commander.tsx
index 6d1b50d9..5675e2be 100644
--- a/packages/ui/src/editor/extensions/commander.tsx
+++ b/packages/ui/src/editor/extensions/commander.tsx
@@ -146,7 +146,7 @@ const CommandList = ({
key={item.key}
onClick={() => selectItem(index)}
>
- <div className="flex size-10 items-center justify-center rounded-md border border-stone-200 bg-white">
+ <div className="flex size-10 min-w-10 items-center justify-center rounded-md border border-stone-200 bg-white">
<item.icon className="size-5" />
</div>
<div>
diff --git a/packages/ui/src/editor/extensions/database.tsx b/packages/ui/src/editor/extensions/database.tsx
index 1a9d6c71..9d6735b0 100644
--- a/packages/ui/src/editor/extensions/database.tsx
+++ b/packages/ui/src/editor/extensions/database.tsx
@@ -14,6 +14,9 @@ export const DatabaseNode = Node.create({
id: {
default: null,
},
+ inline: {
+ default: false,
+ },
};
},
renderHTML({ HTMLAttributes }) {
diff --git a/packages/ui/src/editor/views/database.tsx b/packages/ui/src/editor/views/database.tsx
index 2acb9115..b8940cab 100644
--- a/packages/ui/src/editor/views/database.tsx
+++ b/packages/ui/src/editor/views/database.tsx
@@ -3,33 +3,34 @@ import { NodeViewWrapper } from '@tiptap/react';
import { LocalDatabaseNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
+import { Database } from '@colanode/ui/components/databases/database';
+import { DatabaseViews } from '@colanode/ui/components/databases/database-views';
import { useLayout } from '@colanode/ui/contexts/layout';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useNodeContainer } from '@colanode/ui/hooks/use-node-container';
export const DatabaseNodeView = ({ node }: NodeViewProps) => {
- const workspace = useWorkspace();
const layout = useLayout();
const id = node.attrs.id;
- const nodeGetQuery = useLiveQuery({
- type: 'node.get',
- nodeId: id,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- if (!id) {
+ const data = useNodeContainer<LocalDatabaseNode>(id);
+
+ if (data.isPending) {
return null;
}
- if (nodeGetQuery.isPending) {
+ if (!data.node) {
return null;
}
- const database = nodeGetQuery.data as LocalDatabaseNode;
- if (!database) {
- return null;
+ const { node: database, role } = data;
+ if (node.attrs.inline) {
+ return (
+ <NodeViewWrapper data-id={node.attrs.id} className="my-4 w-full">
+ <Database database={database} role={role}>
+ <DatabaseViews inline />
+ </Database>
+ </NodeViewWrapper>
+ );
}
const name = database.attributes.name ?? 'Unnamed';
@@ -38,7 +39,7 @@ export const DatabaseNodeView = ({ node }: NodeViewProps) => {
return (
<NodeViewWrapper
data-id={node.attrs.id}
- className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
+ className="my-0.5 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
layout.previewLeft(id, true);
}}