Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Dark theme & color customizations (#194)
Hakan Shehufc3669bedbd5
diff --git a/apps/web/index.html b/apps/web/index.htmlindex f556731a..f8ff73e2 100644--- a/apps/web/index.html+++ b/apps/web/index.html@@ -8,6 +8,26 @@<meta name="description" content="Colanode" /><link rel="manifest" href="/manifest.json" /><title>Colanode</title>++ <style>+ :root {+ --background: oklch(1 0 0);+ --foreground: oklch(0.145 0 0);+ }++ @media (prefers-color-scheme: dark) {+ :root {+ --background: oklch(0.145 0 0);+ --foreground: oklch(0.985 0 0);+ }+ }++ body,+ html {+ background-color: var(--background);+ color: var(--foreground);+ }+ </style></head><body><div id="root"></div>diff --git a/packages/client/src/handlers/mutations/index.ts b/packages/client/src/handlers/mutations/index.tsindex a71cb882..a701d9ae 100644--- a/packages/client/src/handlers/mutations/index.ts+++ b/packages/client/src/handlers/mutations/index.ts@@ -61,12 +61,10 @@ import { RecordFieldValueSetMutationHandler } from './records/record-field-valueimport { RecordNameUpdateMutationHandler } from './records/record-name-update';import { ServerCreateMutationHandler } from './servers/server-create';import { ServerDeleteMutationHandler } from './servers/server-delete';-import { SpaceAvatarUpdateMutationHandler } from './spaces/space-avatar-update';import { SpaceChildReorderMutationHandler } from './spaces/space-child-reorder';import { SpaceCreateMutationHandler } from './spaces/space-create';import { SpaceDeleteMutationHandler } from './spaces/space-delete';-import { SpaceDescriptionUpdateMutationHandler } from './spaces/space-description-update';-import { SpaceNameUpdateMutationHandler } from './spaces/space-name-update';+import { SpaceUpdateMutationHandler } from './spaces/space-update';import { UserRoleUpdateMutationHandler } from './users/user-role-update';import { UserStorageUpdateMutationHandler } from './users/user-storage-update';import { UsersCreateMutationHandler } from './users/users-create';@@ -135,9 +133,7 @@ export const buildMutationHandlerMap = ('folder.create': new FolderCreateMutationHandler(app),'file.create': new FileCreateMutationHandler(app),'file.download': new FileDownloadMutationHandler(app),- 'space.avatar.update': new SpaceAvatarUpdateMutationHandler(app),- 'space.description.update': new SpaceDescriptionUpdateMutationHandler(app),- 'space.name.update': new SpaceNameUpdateMutationHandler(app),+ 'space.update': new SpaceUpdateMutationHandler(app),'space.child.reorder': new SpaceChildReorderMutationHandler(app),'account.update': new AccountUpdateMutationHandler(app),'view.update': new ViewUpdateMutationHandler(app),diff --git a/packages/client/src/handlers/mutations/spaces/space-avatar-update.ts b/packages/client/src/handlers/mutations/spaces/space-avatar-update.tsdeleted file mode 100644index 299d4400..00000000--- a/packages/client/src/handlers/mutations/spaces/space-avatar-update.ts+++ /dev/null@@ -1,38 +0,0 @@-import { WorkspaceMutationHandlerBase } from '@colanode/client/handlers/mutations/workspace-mutation-handler-base';-import { MutationHandler } from '@colanode/client/lib/types';-import { MutationError, MutationErrorCode } from '@colanode/client/mutations';-import {- SpaceAvatarUpdateMutationInput,- SpaceAvatarUpdateMutationOutput,-} from '@colanode/client/mutations/spaces/space-avatar-update';-import { SpaceAttributes } from '@colanode/core';--export class SpaceAvatarUpdateMutationHandler- extends WorkspaceMutationHandlerBase- implements MutationHandler<SpaceAvatarUpdateMutationInput>-{- async handleMutation(- input: SpaceAvatarUpdateMutationInput- ): Promise<SpaceAvatarUpdateMutationOutput> {- const workspace = this.getWorkspace(input.accountId, input.workspaceId);-- const result = await workspace.nodes.updateNode<SpaceAttributes>(- input.spaceId,- (attributes) => {- attributes.avatar = input.avatar;- return attributes;- }- );-- if (result === 'unauthorized') {- throw new MutationError(- MutationErrorCode.SpaceUpdateForbidden,- "You don't have permission to update this space."- );- }-- return {- success: true,- };- }-}diff --git a/packages/client/src/handlers/mutations/spaces/space-create.ts b/packages/client/src/handlers/mutations/spaces/space-create.tsindex 37b48402..c11be2a5 100644--- a/packages/client/src/handlers/mutations/spaces/space-create.ts+++ b/packages/client/src/handlers/mutations/spaces/space-create.ts@@ -45,6 +45,7 @@ export class SpaceCreateMutationHandler[workspace.userId]: 'admin',},description: input.description,+ avatar: input.avatar,};await workspace.nodes.createNode({diff --git a/packages/client/src/handlers/mutations/spaces/space-name-update.ts b/packages/client/src/handlers/mutations/spaces/space-name-update.tsdeleted file mode 100644index c895ef83..00000000--- a/packages/client/src/handlers/mutations/spaces/space-name-update.ts+++ /dev/null@@ -1,38 +0,0 @@-import { WorkspaceMutationHandlerBase } from '@colanode/client/handlers/mutations/workspace-mutation-handler-base';-import { MutationHandler } from '@colanode/client/lib/types';-import { MutationError, MutationErrorCode } from '@colanode/client/mutations';-import {- SpaceNameUpdateMutationInput,- SpaceNameUpdateMutationOutput,-} from '@colanode/client/mutations/spaces/space-name-update';-import { SpaceAttributes } from '@colanode/core';--export class SpaceNameUpdateMutationHandler- extends WorkspaceMutationHandlerBase- implements MutationHandler<SpaceNameUpdateMutationInput>-{- async handleMutation(- input: SpaceNameUpdateMutationInput- ): Promise<SpaceNameUpdateMutationOutput> {- const workspace = this.getWorkspace(input.accountId, input.workspaceId);-- const result = await workspace.nodes.updateNode<SpaceAttributes>(- input.spaceId,- (attributes) => {- attributes.name = input.name;- return attributes;- }- );-- if (result === 'unauthorized') {- throw new MutationError(- MutationErrorCode.SpaceUpdateForbidden,- "You don't have permission to update this space."- );- }-- return {- success: true,- };- }-}diff --git a/packages/client/src/handlers/mutations/spaces/space-description-update.ts b/packages/client/src/handlers/mutations/spaces/space-update.tssimilarity index 71%rename from packages/client/src/handlers/mutations/spaces/space-description-update.tsrename to packages/client/src/handlers/mutations/spaces/space-update.tsindex 811834f3..8eb7b95c 100644--- a/packages/client/src/handlers/mutations/spaces/space-description-update.ts+++ b/packages/client/src/handlers/mutations/spaces/space-update.ts@@ -2,24 +2,26 @@ import { WorkspaceMutationHandlerBase } from '@colanode/client/handlers/mutationimport { MutationHandler } from '@colanode/client/lib/types';import { MutationError, MutationErrorCode } from '@colanode/client/mutations';import {- SpaceDescriptionUpdateMutationInput,- SpaceDescriptionUpdateMutationOutput,-} from '@colanode/client/mutations/spaces/space-description-update';+ SpaceUpdateMutationInput,+ SpaceUpdateMutationOutput,+} from '@colanode/client/mutations/spaces/space-update';import { SpaceAttributes } from '@colanode/core';-export class SpaceDescriptionUpdateMutationHandler+export class SpaceUpdateMutationHandlerextends WorkspaceMutationHandlerBase- implements MutationHandler<SpaceDescriptionUpdateMutationInput>+ implements MutationHandler<SpaceUpdateMutationInput>{async handleMutation(- input: SpaceDescriptionUpdateMutationInput- ): Promise<SpaceDescriptionUpdateMutationOutput> {+ input: SpaceUpdateMutationInput+ ): Promise<SpaceUpdateMutationOutput> {const workspace = this.getWorkspace(input.accountId, input.workspaceId);const result = await workspace.nodes.updateNode<SpaceAttributes>(input.spaceId,(attributes) => {+ attributes.name = input.name;attributes.description = input.description;+ attributes.avatar = input.avatar;return attributes;});diff --git a/packages/client/src/handlers/queries/emojis/emoji-search.ts b/packages/client/src/handlers/queries/emojis/emoji-search.tsindex ba4d62d6..9603327d 100644--- a/packages/client/src/handlers/queries/emojis/emoji-search.ts+++ b/packages/client/src/handlers/queries/emojis/emoji-search.ts@@ -3,7 +3,6 @@ import { ChangeCheckResult, QueryHandler } from '@colanode/client/lib/types';import { EmojiSearchQueryInput } from '@colanode/client/queries/emojis/emoji-search';import { AppService } from '@colanode/client/services/app-service';import { Emoji } from '@colanode/client/types/emojis';-import { Event } from '@colanode/client/types/events';export class EmojiSearchQueryHandlerimplements QueryHandler<EmojiSearchQueryInput>@@ -31,11 +30,9 @@ export class EmojiSearchQueryHandlerreturn emojis;}- public async checkForChanges(- _: Event,- __: EmojiSearchQueryInput,- ___: Emoji[]- ): Promise<ChangeCheckResult<EmojiSearchQueryInput>> {+ public async checkForChanges(): Promise<+ ChangeCheckResult<EmojiSearchQueryInput>+ > {return {hasChanges: false,};diff --git a/packages/client/src/handlers/queries/emojis/emoji-svg-get.ts b/packages/client/src/handlers/queries/emojis/emoji-svg-get.tsnew file mode 100644index 00000000..6ab5ba0f--- /dev/null+++ b/packages/client/src/handlers/queries/emojis/emoji-svg-get.ts@@ -0,0 +1,42 @@+import { ChangeCheckResult, QueryHandler } from '@colanode/client/lib/types';+import { EmojiSvgGetQueryInput } from '@colanode/client/queries/emojis/emoji-svg-get';+import { AppService } from '@colanode/client/services/app-service';++export class EmojiSvgGetQueryHandler+ implements QueryHandler<EmojiSvgGetQueryInput>+{+ private readonly app: AppService;++ constructor(app: AppService) {+ this.app = app;+ }++ public async handleQuery(+ input: EmojiSvgGetQueryInput+ ): Promise<string | null> {+ if (!this.app.assets.emojis) {+ return null;+ }++ const row = await this.app.assets.emojis+ .selectFrom('emoji_svgs')+ .select('svg')+ .where('skin_id', '=', input.id)+ .executeTakeFirst();++ if (!row) {+ return null;+ }++ const svg = row.svg.toString('utf-8');+ return svg;+ }++ public async checkForChanges(): Promise<+ ChangeCheckResult<EmojiSvgGetQueryInput>+ > {+ return {+ hasChanges: false,+ };+ }+}diff --git a/packages/client/src/handlers/queries/icons/icon-svg-get.ts b/packages/client/src/handlers/queries/icons/icon-svg-get.tsnew file mode 100644index 00000000..20851e22--- /dev/null+++ b/packages/client/src/handlers/queries/icons/icon-svg-get.ts@@ -0,0 +1,42 @@+import { ChangeCheckResult, QueryHandler } from '@colanode/client/lib/types';+import { IconSvgGetQueryInput } from '@colanode/client/queries/icons/icon-svg-get';+import { AppService } from '@colanode/client/services/app-service';++export class IconSvgGetQueryHandler+ implements QueryHandler<IconSvgGetQueryInput>+{+ private readonly app: AppService;++ constructor(app: AppService) {+ this.app = app;+ }++ public async handleQuery(+ input: IconSvgGetQueryInput+ ): Promise<string | null> {+ if (!this.app.assets.icons) {+ return null;+ }++ const row = await this.app.assets.icons+ .selectFrom('icon_svgs')+ .select('svg')+ .where('id', '=', input.id)+ .executeTakeFirst();++ if (!row) {+ return null;+ }++ const svg = row.svg.toString('utf-8');+ return svg;+ }++ public async checkForChanges(): Promise<+ ChangeCheckResult<IconSvgGetQueryInput>+ > {+ return {+ hasChanges: false,+ };+ }+}diff --git a/packages/client/src/handlers/queries/index.ts b/packages/client/src/handlers/queries/index.tsindex c4668abc..c9a2de12 100644--- a/packages/client/src/handlers/queries/index.ts+++ b/packages/client/src/handlers/queries/index.ts@@ -18,6 +18,7 @@ import { EmojiGetQueryHandler } from './emojis/emoji-get';import { EmojiGetBySkinIdQueryHandler } from './emojis/emoji-get-by-skin-id';import { EmojiListQueryHandler } from './emojis/emoji-list';import { EmojiSearchQueryHandler } from './emojis/emoji-search';+import { EmojiSvgGetQueryHandler } from './emojis/emoji-svg-get';import { DownloadListManualQueryHandler } from './files/download-list-manual';import { FileDownloadRequestGetQueryHandler } from './files/file-download-request-get';import { FileListQueryHandler } from './files/file-list';@@ -28,6 +29,7 @@ import { UploadListPendingQueryHandler } from './files/upload-list-pending';import { IconCategoryListQueryHandler } from './icons/icon-category-list';import { IconListQueryHandler } from './icons/icon-list';import { IconSearchQueryHandler } from './icons/icon-search';+import { IconSvgGetQueryHandler } from './icons/icon-svg-get';import { RadarDataGetQueryHandler } from './interactions/radar-data-get';import { MessageListQueryHandler } from './messages/message-list';import { NodeChildrenGetQueryHandler } from './nodes/node-children-get';@@ -101,5 +103,7 @@ export const buildQueryHandlerMap = (app: AppService): QueryHandlerMap => {'upload.list.pending': new UploadListPendingQueryHandler(app),'download.list.manual': new DownloadListManualQueryHandler(app),'temp.file.get': new TempFileGetQueryHandler(app),+ 'icon.svg.get': new IconSvgGetQueryHandler(app),+ 'emoji.svg.get': new EmojiSvgGetQueryHandler(app),};};diff --git a/packages/client/src/mutations/index.ts b/packages/client/src/mutations/index.tsindex fb043370..c86ee5ff 100644--- a/packages/client/src/mutations/index.ts+++ b/packages/client/src/mutations/index.ts@@ -56,11 +56,9 @@ export * from './records/record-field-value-set';export * from './records/record-name-update';export * from './servers/server-create';export * from './servers/server-delete';-export * from './spaces/space-avatar-update';export * from './spaces/space-create';export * from './spaces/space-delete';-export * from './spaces/space-description-update';-export * from './spaces/space-name-update';+export * from './spaces/space-update';export * from './spaces/space-child-reorder';export * from './workspaces/workspace-create';export * from './workspaces/workspace-delete';diff --git a/packages/client/src/mutations/spaces/space-avatar-update.ts b/packages/client/src/mutations/spaces/space-avatar-update.tsdeleted file mode 100644index 696ccd95..00000000--- a/packages/client/src/mutations/spaces/space-avatar-update.ts+++ /dev/null@@ -1,20 +0,0 @@-export type SpaceAvatarUpdateMutationInput = {- type: 'space.avatar.update';- accountId: string;- workspaceId: string;- spaceId: string;- avatar: string;-};--export type SpaceAvatarUpdateMutationOutput = {- success: boolean;-};--declare module '@colanode/client/mutations' {- interface MutationMap {- 'space.avatar.update': {- input: SpaceAvatarUpdateMutationInput;- output: SpaceAvatarUpdateMutationOutput;- };- }-}diff --git a/packages/client/src/mutations/spaces/space-create.ts b/packages/client/src/mutations/spaces/space-create.tsindex 3fff485b..47e8927b 100644--- a/packages/client/src/mutations/spaces/space-create.ts+++ b/packages/client/src/mutations/spaces/space-create.ts@@ -4,6 +4,7 @@ export type SpaceCreateMutationInput = {workspaceId: string;name: string;description: string;+ avatar?: string | null;};export type SpaceCreateMutationOutput = {diff --git a/packages/client/src/mutations/spaces/space-description-update.ts b/packages/client/src/mutations/spaces/space-description-update.tsdeleted file mode 100644index 36457d5e..00000000--- a/packages/client/src/mutations/spaces/space-description-update.ts+++ /dev/null@@ -1,20 +0,0 @@-export type SpaceDescriptionUpdateMutationInput = {- type: 'space.description.update';- accountId: string;- workspaceId: string;- spaceId: string;- description: string;-};--export type SpaceDescriptionUpdateMutationOutput = {- success: boolean;-};--declare module '@colanode/client/mutations' {- interface MutationMap {- 'space.description.update': {- input: SpaceDescriptionUpdateMutationInput;- output: SpaceDescriptionUpdateMutationOutput;- };- }-}diff --git a/packages/client/src/mutations/spaces/space-name-update.ts b/packages/client/src/mutations/spaces/space-name-update.tsdeleted file mode 100644index 78f10c2b..00000000--- a/packages/client/src/mutations/spaces/space-name-update.ts+++ /dev/null@@ -1,20 +0,0 @@-export type SpaceNameUpdateMutationInput = {- type: 'space.name.update';- accountId: string;- workspaceId: string;- spaceId: string;- name: string;-};--export type SpaceNameUpdateMutationOutput = {- success: boolean;-};--declare module '@colanode/client/mutations' {- interface MutationMap {- 'space.name.update': {- input: SpaceNameUpdateMutationInput;- output: SpaceNameUpdateMutationOutput;- };- }-}diff --git a/packages/client/src/mutations/spaces/space-update.ts b/packages/client/src/mutations/spaces/space-update.tsnew file mode 100644index 00000000..9a0ac30e--- /dev/null+++ b/packages/client/src/mutations/spaces/space-update.ts@@ -0,0 +1,22 @@+export type SpaceUpdateMutationInput = {+ type: 'space.update';+ accountId: string;+ workspaceId: string;+ spaceId: string;+ name: string;+ description: string;+ avatar?: string | null;+};++export type SpaceUpdateMutationOutput = {+ success: boolean;+};++declare module '@colanode/client/mutations' {+ interface MutationMap {+ 'space.update': {+ input: SpaceUpdateMutationInput;+ output: SpaceUpdateMutationOutput;+ };+ }+}diff --git a/packages/client/src/queries/emojis/emoji-svg-get.ts b/packages/client/src/queries/emojis/emoji-svg-get.tsnew file mode 100644index 00000000..b4882545--- /dev/null+++ b/packages/client/src/queries/emojis/emoji-svg-get.ts@@ -0,0 +1,13 @@+export type EmojiSvgGetQueryInput = {+ type: 'emoji.svg.get';+ id: string;+};++declare module '@colanode/client/queries' {+ interface QueryMap {+ 'emoji.svg.get': {+ input: EmojiSvgGetQueryInput;+ output: string | null;+ };+ }+}diff --git a/packages/client/src/queries/icons/icon-svg-get.ts b/packages/client/src/queries/icons/icon-svg-get.tsnew file mode 100644index 00000000..55535746--- /dev/null+++ b/packages/client/src/queries/icons/icon-svg-get.ts@@ -0,0 +1,13 @@+export type IconSvgGetQueryInput = {+ type: 'icon.svg.get';+ id: string;+};++declare module '@colanode/client/queries' {+ interface QueryMap {+ 'icon.svg.get': {+ input: IconSvgGetQueryInput;+ output: string | null;+ };+ }+}diff --git a/packages/client/src/queries/index.ts b/packages/client/src/queries/index.tsindex c8f4ee35..6f73061d 100644--- a/packages/client/src/queries/index.ts+++ b/packages/client/src/queries/index.ts@@ -44,6 +44,8 @@ export * from './files/upload-list';export * from './files/download-list-manual';export * from './files/temp-file-get';export * from './files/upload-list-pending';+export * from './icons/icon-svg-get';+export * from './emojis/emoji-svg-get';// eslint-disable-next-line @typescript-eslint/no-empty-object-typeexport interface QueryMap {}diff --git a/packages/client/src/types/apps.ts b/packages/client/src/types/apps.tsindex 2373d641..0517d0d3 100644--- a/packages/client/src/types/apps.ts+++ b/packages/client/src/types/apps.ts@@ -1,3 +1,5 @@+import { ThemeColor, ThemeMode } from '@colanode/client/types';+export type AppType = 'desktop' | 'web';export type WindowSize = {@@ -34,11 +36,27 @@ export type AppAccountMetadata = {updatedAt: string | null;};+export type AppThemeModeMetadata = {+ key: 'theme.mode';+ value: ThemeMode;+ createdAt: string;+ updatedAt: string | null;+};++export type AppThemeColorMetadata = {+ key: 'theme.color';+ value: ThemeColor;+ createdAt: string;+ updatedAt: string | null;+};+export type AppMetadata =| AppPlatformMetadata| AppVersionMetadata| AppWindowSizeMetadata- | AppAccountMetadata;+ | AppAccountMetadata+ | AppThemeModeMetadata+ | AppThemeColorMetadata;export type AppMetadataKey = AppMetadata['key'];@@ -47,4 +65,6 @@ export type AppMetadataMap = {version: AppVersionMetadata;'window.size': AppWindowSizeMetadata;account: AppAccountMetadata;+ 'theme.mode': AppThemeModeMetadata;+ 'theme.color': AppThemeColorMetadata;};diff --git a/packages/client/src/types/index.ts b/packages/client/src/types/index.tsindex 7ccd1b09..7b37e87a 100644--- a/packages/client/src/types/index.ts+++ b/packages/client/src/types/index.ts@@ -11,5 +11,6 @@ export * from './icons';export * from './nodes';export * from './radars';export * from './servers';+export * from './themes';export * from './users';export * from './workspaces';diff --git a/packages/client/src/types/themes.ts b/packages/client/src/types/themes.tsnew file mode 100644index 00000000..463083eb--- /dev/null+++ b/packages/client/src/types/themes.ts@@ -0,0 +1,9 @@+export type ThemeMode = 'light' | 'dark';+export type ThemeColor =+ | 'red'+ | 'rose'+ | 'orange'+ | 'green'+ | 'blue'+ | 'yellow'+ | 'violet';diff --git a/packages/client/src/types/workspaces.ts b/packages/client/src/types/workspaces.tsindex cf8bdb11..6c10b670 100644--- a/packages/client/src/types/workspaces.ts+++ b/packages/client/src/types/workspaces.ts@@ -73,4 +73,5 @@ export enum SpecialContainerTabPath {WorkspaceDelete = 'workspace/delete',AccountSettings = 'account/settings',AccountLogout = 'account/logout',+ AppAppearance = 'app/appearance',}diff --git a/packages/ui/src/components/accounts/account-update.tsx b/packages/ui/src/components/accounts/account-update.tsxindex 885b609e..73d262a8 100644--- a/packages/ui/src/components/accounts/account-update.tsx+++ b/packages/ui/src/components/accounts/account-update.tsx@@ -114,7 +114,7 @@ export const AccountUpdate = ({ account }: { account: Account }) => {/><divclassName={cn(- `absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-gray-50 group-hover:inline-flex`,+ `absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-accent/50 group-hover:inline-flex`,isUploadingAvatar ? 'inline-flex' : 'hidden')}>diff --git a/packages/ui/src/components/app-loader.tsx b/packages/ui/src/components/app-loader.tsxindex f606fa06..06f88d33 100644--- a/packages/ui/src/components/app-loader.tsx+++ b/packages/ui/src/components/app-loader.tsx@@ -1,16 +1,17 @@+import { DelayedComponent } from '@colanode/ui/components/ui/delayed-component';import { Spinner } from '@colanode/ui/components/ui/spinner';export const AppLoader = () => {return (<div className="min-w-screen flex h-full min-h-screen w-full items-center justify-center">- <div className="flex flex-col items-center gap-8 text-center">- <h2 className="font-neotrax text-4xl text-gray-800">- loading your workspaces- </h2>- <div>- <Spinner />+ <DelayedComponent>+ <div className="flex flex-col items-center gap-8 text-center">+ <h2 className="font-neotrax text-4xl">loading your workspaces</h2>+ <div>+ <Spinner />+ </div></div>- </div>+ </DelayedComponent></div>);};diff --git a/packages/ui/src/components/app.tsx b/packages/ui/src/components/app.tsxindex 0b2b0967..342f3c9b 100644--- a/packages/ui/src/components/app.tsx+++ b/packages/ui/src/components/app.tsx@@ -3,10 +3,10 @@ import { useState, useEffect } from 'react';import { AppType } from '@colanode/client/types';import { Account } from '@colanode/ui/components/accounts/account';import { Login } from '@colanode/ui/components/accounts/login';+import { AppThemeProvider } from '@colanode/ui/components/app/app-theme-provider';import { AppLoader } from '@colanode/ui/components/app-loader';import { RadarProvider } from '@colanode/ui/components/radar-provider';import { ServerProvider } from '@colanode/ui/components/servers/server-provider';-import { DelayedComponent } from '@colanode/ui/components/ui/delayed-component';import { AppContext } from '@colanode/ui/contexts/app';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';@@ -37,11 +37,7 @@ export const App = ({ type }: AppProps) => {appMetadataListQuery.isPending ||accountListQuery.isPending) {- return (- <DelayedComponent>- <AppLoader />- </DelayedComponent>- );+ return <AppLoader />;}const accountMetadata = appMetadataListQuery.data?.find(@@ -87,15 +83,17 @@ export const App = ({ type }: AppProps) => {},}}>- <RadarProvider>- {!openLogin && account ? (- <ServerProvider domain={account.server}>- <Account key={account.id} account={account} />- </ServerProvider>- ) : (- <Login />- )}- </RadarProvider>+ <AppThemeProvider>+ <RadarProvider>+ {!openLogin && account ? (+ <ServerProvider domain={account.server}>+ <Account key={account.id} account={account} />+ </ServerProvider>+ ) : (+ <Login />+ )}+ </RadarProvider>+ </AppThemeProvider></AppContext.Provider>);};diff --git a/packages/ui/src/components/app/app-appearance-settings-tab.tsx b/packages/ui/src/components/app/app-appearance-settings-tab.tsxnew file mode 100644index 00000000..8f0d2915--- /dev/null+++ b/packages/ui/src/components/app/app-appearance-settings-tab.tsx@@ -0,0 +1,10 @@+import { Palette } from 'lucide-react';++export const AppAppearanceSettingsTab = () => {+ return (+ <div className="flex items-center space-x-2">+ <Palette className="size-4" />+ <span>Appearance</span>+ </div>+ );+};diff --git a/packages/ui/src/components/app/app-appearance-settings.tsx b/packages/ui/src/components/app/app-appearance-settings.tsxnew file mode 100644index 00000000..798a9f95--- /dev/null+++ b/packages/ui/src/components/app/app-appearance-settings.tsx@@ -0,0 +1,142 @@+import { Check, Laptop, Moon, Sun } from 'lucide-react';++import { ThemeColor, ThemeMode } from '@colanode/client/types';+import { Button } from '@colanode/ui/components/ui/button';+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';+import { Separator } from '@colanode/ui/components/ui/separator';+import { useApp } from '@colanode/ui/contexts/app';+import { cn } from '@colanode/ui/lib/utils';++interface ThemeModeOption {+ key: string;+ value: ThemeMode | null;+ label: string;+ icon: typeof Laptop;+ title: string;+}++const themeModeOptions: ThemeModeOption[] = [+ {+ key: 'system',+ value: null,+ label: 'System',+ icon: Laptop,+ title: 'Follow system',+ },+ {+ key: 'light',+ value: 'light',+ label: 'Light',+ icon: Sun,+ title: 'Light theme',+ },+ {+ key: 'dark',+ value: 'dark',+ label: 'Dark',+ icon: Moon,+ title: 'Dark theme',+ },+];++const themeColorOptions = [+ { value: 'default', label: 'Default', color: 'oklch(0.205 0 0)' },+ { value: 'blue', label: 'Blue', color: 'oklch(0.623 0.214 259.815)' },+ { value: 'red', label: 'Red', color: 'oklch(0.637 0.237 25.331)' },+ { value: 'rose', label: 'Rose', color: 'oklch(0.645 0.246 16.439)' },+ { value: 'orange', label: 'Orange', color: 'oklch(0.705 0.213 47.604)' },+ { value: 'green', label: 'Green', color: 'oklch(0.723 0.219 149.579)' },+ { value: 'yellow', label: 'Yellow', color: 'oklch(0.795 0.184 86.047)' },+ { value: 'violet', label: 'Violet', color: 'oklch(0.606 0.25 292.717)' },+];++export const AppAppearanceSettings = () => {+ const app = useApp();+ const themeMode = app.getMetadata('theme.mode');+ const themeColor = app.getMetadata('theme.color');++ return (+ <Container>+ <ContainerBody className="max-w-4xl space-y-8">+ <div>+ <h2 className="text-2xl font-semibold tracking-tight">Appearance</h2>+ <Separator className="mt-3" />+ </div>++ <div className="flex items-center gap-3">+ {themeModeOptions.map((option) => {+ const isActive =+ option.value === null ? !themeMode : themeMode === option.value;+ const Icon = option.icon;++ return (+ <Button+ key={option.key}+ variant="outline"+ onClick={() => {+ if (option.value === null) {+ app.deleteMetadata('theme.mode');+ } else {+ app.setMetadata('theme.mode', option.value);+ }+ }}+ className={cn(+ 'h-10 min-w-32 justify-center gap-2 relative',+ isActive && 'ring-1 ring-ring border-primary'+ )}+ title={option.title}+ >+ <Icon className="size-5" />+ {option.label}+ {isActive && (+ <Check className="size-5 absolute -top-2 -right-2 text-background bg-primary rounded-full p-0.5" />+ )}+ </Button>+ );+ })}+ </div>++ <div>+ <h2 className="text-2xl font-semibold tracking-tight">Color</h2>+ <Separator className="mt-3" />+ </div>+ <div className="grid grid-cols-2 md:grid-cols-4 gap-3 max-w-2xl">+ {themeColorOptions.map((option) => {+ const isDefault = option.value === 'default';+ const isActive = isDefault+ ? !themeColor+ : themeColor === option.value;++ return (+ <Button+ key={option.value}+ variant="outline"+ onClick={() => {+ if (isDefault) {+ app.deleteMetadata('theme.color');+ } else {+ app.setMetadata('theme.color', option.value as ThemeColor);+ }+ }}+ className={cn(+ 'h-10 justify-start gap-3 text-left relative',+ isActive && 'ring-1 ring-ring border-primary'+ )}+ title={option.label}+ >+ <div+ className="size-5 rounded-full border border-border/50 flex-shrink-0"+ style={{ backgroundColor: option.color }}+ />+ {option.label}+ {isActive && (+ <Check className="size-5 absolute -top-2 -right-2 text-background bg-primary rounded-full p-0.5" />+ )}+ </Button>+ );+ })}+ </div>+ </ContainerBody>+ </Container>+ );+};diff --git a/packages/ui/src/components/app/app-theme-provider.tsx b/packages/ui/src/components/app/app-theme-provider.tsxnew file mode 100644index 00000000..aca646cf--- /dev/null+++ b/packages/ui/src/components/app/app-theme-provider.tsx@@ -0,0 +1,73 @@+import { useEffect, useState } from 'react';++import { ThemeMode } from '@colanode/client/types';+import { useApp } from '@colanode/ui/contexts/app';+import { ThemeContext } from '@colanode/ui/contexts/theme';+import { getSystemTheme, getThemeVariables } from '@colanode/ui/lib/themes';++export const AppThemeProvider = ({+ children,+}: {+ children: React.ReactNode;+}) => {+ const app = useApp();+ const [systemTheme, setSystemTheme] = useState<ThemeMode>(getSystemTheme());++ const themeMode = app.getMetadata('theme.mode') ?? systemTheme;+ const themeColor = app.getMetadata('theme.color');++ useEffect(() => {+ if (typeof window === 'undefined' || !window.matchMedia) {+ return;+ }++ const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');++ const handleChange = (event: MediaQueryListEvent) => {+ setSystemTheme(event.matches ? 'dark' : 'light');+ };++ mediaQuery.addEventListener('change', handleChange);++ return () => {+ mediaQuery.removeEventListener('change', handleChange);+ };+ }, []);++ useEffect(() => {+ if (typeof window === 'undefined') {+ return;+ }++ const htmlElement = document.documentElement;++ if (themeMode === 'dark') {+ htmlElement.classList.add('dark');+ } else {+ htmlElement.classList.remove('dark');+ }++ return () => {+ htmlElement.classList.remove('dark');+ };+ }, [themeMode]);++ useEffect(() => {+ if (typeof window === 'undefined') {+ return;+ }++ const themeVariables = getThemeVariables(themeMode, themeColor);+ const htmlElement = document.documentElement;++ Object.entries(themeVariables).forEach(([key, value]) => {+ htmlElement.style.setProperty(key, value);+ });+ }, [themeColor, themeMode]);++ return (+ <ThemeContext.Provider value={{ mode: themeMode, color: themeColor }}>+ {children}+ </ThemeContext.Provider>+ );+};diff --git a/packages/ui/src/components/avatars/avatar-image.tsx b/packages/ui/src/components/avatars/avatar-image.tsxindex d79473c8..4e91813f 100644--- a/packages/ui/src/components/avatars/avatar-image.tsx+++ b/packages/ui/src/components/avatars/avatar-image.tsx@@ -21,7 +21,7 @@ export const AvatarImage = (props: AvatarProps) => {<divclassName={cn(getAvatarSizeClasses(props.size),- 'object-cover rounded bg-gray-200',+ 'object-cover rounded bg-muted',props.className)}/>diff --git a/packages/ui/src/components/avatars/avatar-upload.tsx b/packages/ui/src/components/avatars/avatar-upload.tsxindex a117a2f8..5ab2dff3 100644--- a/packages/ui/src/components/avatars/avatar-upload.tsx+++ b/packages/ui/src/components/avatars/avatar-upload.tsx@@ -2,6 +2,7 @@ import { useState } from 'react';import { toast } from 'sonner';import { Button } from '@colanode/ui/components/ui/button';+import { Input } from '@colanode/ui/components/ui/input';import { Spinner } from '@colanode/ui/components/ui/spinner';import { useAccount } from '@colanode/ui/contexts/account';import { useMutation } from '@colanode/ui/hooks/use-mutation';@@ -22,7 +23,7 @@ export const AvatarUpload = ({ onUpload }: AvatarUploadProps) => {};return (- <div className="h-[280px] min-h-[280px] w-[340px] min-w-[340px] p-1">+ <div className="h-[280px] min-h-[280px] w-[335px] min-w-[335px] p-1"><formclassName="mb-5 flex gap-x-2"onSubmit={async (e) => {@@ -34,10 +35,9 @@ export const AvatarUpload = ({ onUpload }: AvatarUploadProps) => {}}}>- <input+ <Inputtype="text"name="url"- className="w-full flex-1 rounded-md bg-gray-100 p-2 text-xs focus:outline-none"placeholder="Paste link to an image..."onChange={(e) => setUrl(e.target.value)}autoComplete="off"@@ -91,9 +91,9 @@ export const AvatarUpload = ({ onUpload }: AvatarUploadProps) => {{isPending && <Spinner className="mr-1" />}Upload file</Button>- <div className="mt-4 flex flex-col gap-y-4 text-center text-xs text-gray-500">- <div className="">Recommended size is 280px x 280px</div>- <div className="">The maximum size per file is 5MB.</div>+ <div className="mt-4 flex flex-col gap-2 text-center text-xs text-muted-foreground">+ <div>Recommended size is 280px x 280px</div>+ <div>The maximum size per file is 5MB.</div></div></div>);diff --git a/packages/ui/src/components/channels/channel-form.tsx b/packages/ui/src/components/channels/channel-form.tsxindex b95306ff..168f5be2 100644--- a/packages/ui/src/components/channels/channel-form.tsx+++ b/packages/ui/src/components/channels/channel-form.tsx@@ -83,7 +83,7 @@ export const ChannelForm = ({id={id}name={name}avatar={avatar}- className="h-6 w-6"+ className="size-6"/></Button></AvatarPopover>diff --git a/packages/ui/src/components/collaborators/node-collaborator-role-dropdown.tsx b/packages/ui/src/components/collaborators/node-collaborator-role-dropdown.tsxindex 891c79cc..383fca39 100644--- a/packages/ui/src/components/collaborators/node-collaborator-role-dropdown.tsx+++ b/packages/ui/src/components/collaborators/node-collaborator-role-dropdown.tsx@@ -64,7 +64,7 @@ export const NodeCollaboratorRoleDropdown = ({return (<DropdownMenu><DropdownMenuTrigger asChild>- <p className="flex cursor-pointer flex-row items-center p-1 text-sm text-muted-foreground hover:bg-gray-50">+ <p className="flex cursor-pointer flex-row items-center p-1 text-sm text-muted-foreground hover:bg-accent">{currentRole?.name}<ChevronDown className="ml-2 size-4 text-muted-foreground" /></p>diff --git a/packages/ui/src/components/collaborators/node-collaborator-search.tsx b/packages/ui/src/components/collaborators/node-collaborator-search.tsxindex 41cc993a..02ac3faf 100644--- a/packages/ui/src/components/collaborators/node-collaborator-search.tsx+++ b/packages/ui/src/components/collaborators/node-collaborator-search.tsx@@ -18,6 +18,11 @@ import {PopoverContent,PopoverTrigger,} from '@colanode/ui/components/ui/popover';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';@@ -87,34 +92,39 @@ export const NodeCollaboratorSearch = ({className="h-9"/><CommandEmpty>No collaborator found.</CommandEmpty>- <CommandList>- <CommandGroup className="h-min">- {users.map((user) => (- <CommandItem- key={user.id}- onSelect={() => {- onChange([...value, user]);- setQuery('');- }}- >- <div className="flex w-full flex-row items-center gap-2">- <Avatar- id={user.id}- name={user.name}- avatar={user.avatar}- className="h-7 w-7"- />- <div className="flex flex-grow flex-col">- <p className="text-sm">{user.name}</p>- <p className="text-xs text-muted-foreground">- {user.email}- </p>- </div>- </div>- </CommandItem>- ))}- </CommandGroup>- </CommandList>+ <ScrollArea className="h-80">+ <ScrollViewport>+ <CommandList className="max-h-none overflow-hidden">+ <CommandGroup className="h-min">+ {users.map((user) => (+ <CommandItem+ key={user.id}+ onSelect={() => {+ onChange([...value, user]);+ setQuery('');+ }}+ >+ <div className="flex w-full flex-row items-center gap-2">+ <Avatar+ id={user.id}+ name={user.name}+ avatar={user.avatar}+ className="h-7 w-7"+ />+ <div className="flex flex-grow flex-col">+ <p className="text-sm">{user.name}</p>+ <p className="text-xs text-muted-foreground">+ {user.email}+ </p>+ </div>+ </div>+ </CommandItem>+ ))}+ </CommandGroup>+ </CommandList>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></Command></PopoverContent></Popover>diff --git a/packages/ui/src/components/databases/boards/board-view-column.tsx b/packages/ui/src/components/databases/boards/board-view-column.tsxindex 2f224ac1..d2798134 100644--- a/packages/ui/src/components/databases/boards/board-view-column.tsx+++ b/packages/ui/src/components/databases/boards/board-view-column.tsx@@ -24,7 +24,7 @@ export const BoardViewColumn = () => {const divRef = useRef<HTMLDivElement>(null);const dropRef = drop(divRef);- const dragOverClass = boardView.dragOverClass ?? 'bg-gray-50';+ const dragOverClass = boardView.dragOverClass ?? 'bg-muted';return (<divdiff --git a/packages/ui/src/components/databases/boards/board-view-record-card.tsx b/packages/ui/src/components/databases/boards/board-view-record-card.tsxindex 9c8672cb..62407c40 100644--- a/packages/ui/src/components/databases/boards/board-view-record-card.tsx+++ b/packages/ui/src/components/databases/boards/board-view-record-card.tsx@@ -34,7 +34,7 @@ export const BoardViewRecordCard = () => {ref={dragRef as React.Ref<HTMLDivElement>}role="presentation"key={record.id}- className="animate-fade-in flex cursor-pointer flex-col gap-1 rounded-md border p-2 text-left hover:bg-gray-50"+ className="animate-fade-in flex cursor-pointer flex-col gap-1 rounded-md border p-2 text-left hover:bg-accent"onClick={() => {layout.previewLeft(record.id, true);}}diff --git a/packages/ui/src/components/databases/boards/board-view-record-create-card.tsx b/packages/ui/src/components/databases/boards/board-view-record-create-card.tsxindex 3994e344..71812827 100644--- a/packages/ui/src/components/databases/boards/board-view-record-create-card.tsx+++ b/packages/ui/src/components/databases/boards/board-view-record-create-card.tsx@@ -21,7 +21,7 @@ export const BoardViewRecordCreateCard = ({return (<buttontype="button"- className="animate-fade-in flex h-8 w-full cursor-pointer flex-row items-center gap-1 text-muted-foreground hover:bg-gray-50 mt-2"+ className="animate-fade-in flex h-8 w-full cursor-pointer flex-row items-center gap-1 text-muted-foreground hover:bg-accent mt-2 rounded-md"onClick={() => view.createRecord(filters)}><Plus className="size-4" />diff --git a/packages/ui/src/components/databases/boards/board-view-settings.tsx b/packages/ui/src/components/databases/boards/board-view-settings.tsxindex 524370b2..5fe8b9f0 100644--- a/packages/ui/src/components/databases/boards/board-view-settings.tsx+++ b/packages/ui/src/components/databases/boards/board-view-settings.tsx@@ -90,7 +90,7 @@ export const BoardViewSettings = () => {key={field.id}className={cn('flex flex-row items-center justify-between gap-2 p-0.5',- 'cursor-pointer rounded-md hover:bg-gray-50'+ 'cursor-pointer rounded-md hover:bg-accent')}><div className="flex flex-row items-center gap-2">@@ -153,7 +153,7 @@ export const BoardViewSettings = () => {<div className="flex flex-col gap-2 text-sm"><p className="my-1 font-semibold">Settings</p><div- className="flex cursor-pointer flex-row items-center gap-1 rounded-md p-0.5 hover:bg-gray-50"+ className="flex cursor-pointer flex-row items-center gap-1 rounded-md p-0.5 hover:bg-accent"onClick={() => {setOpenDelete(true);setOpen(false);diff --git a/packages/ui/src/components/databases/calendars/calendar-view-day.tsx b/packages/ui/src/components/databases/calendars/calendar-view-day.tsxindex 4fb223af..26ac8aec 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-day.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-day.tsx@@ -27,7 +27,7 @@ export const CalendarViewDay = ({const isToday = isSameDay(date, new Date());return (- <div className="animate-fade-in group/calendar-day flex w-full flex-col gap-1 h-40 p-2 border-r first:border-l border-gray-100 overflow-auto">+ <div className="animate-fade-in group/calendar-day flex w-full flex-col gap-1 h-40 p-2 border-r first:border-l border-border overflow-auto"><divclassName={cn('flex w-full justify-end text-sm',@@ -44,7 +44,9 @@ export const CalendarViewDay = ({)}<pclassName={- isToday ? 'rounded-md bg-red-500 py-1 px-2 text-white' : ''+ isToday+ ? 'rounded-md bg-red-500 dark:bg-red-900 py-1 px-2 text-white'+ : ''}>{date.getDate()}diff --git a/packages/ui/src/components/databases/calendars/calendar-view-grid.tsx b/packages/ui/src/components/databases/calendars/calendar-view-grid.tsxindex 94542247..feffd388 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-grid.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-grid.tsx@@ -109,7 +109,7 @@ export const CalendarViewGrid = ({ field }: CalendarViewGridProps) => {defaultClassNames.weekday),week: cn(- 'flex w-full mt-2 border-b first:border-t border-gray-100',+ 'flex w-full mt-2 border-b first:border-t border-border',defaultClassNames.week),week_number_header: cn(diff --git a/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx b/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsxindex 19953102..01abb101 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx@@ -10,6 +10,11 @@ import {DialogTitle,DialogDescription,} from '@colanode/ui/components/ui/dialog';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useDatabase } from '@colanode/ui/contexts/database';import { useDatabaseView } from '@colanode/ui/contexts/database-view';import { useWorkspace } from '@colanode/ui/contexts/workspace';@@ -62,14 +67,21 @@ export const CalendarViewNoValueCount = ({<p>({noValueCount.toLocaleString()})</p></div></DialogTrigger>- <DialogContent className="w-128 min-w-128 min-h-40 max-h-128 overflow-auto p-4">+ <DialogContent className="w-128 min-w-128 min-h-40 overflow-hidden p-4"><DialogHeader><DialogTitle>{view.name}</DialogTitle><DialogDescription>Record with no {field.name} value ({noValueCount.toLocaleString()})</DialogDescription></DialogHeader>- <CalendarViewNoValueList filters={filters} field={field} />+ <ScrollArea className="h-96">+ <ScrollViewport>+ <div className="max-h-none overflow-hidden pr-4">+ <CalendarViewNoValueList filters={filters} field={field} />+ </div>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></DialogContent></Dialog>);diff --git a/packages/ui/src/components/databases/calendars/calendar-view-record-card.tsx b/packages/ui/src/components/databases/calendars/calendar-view-record-card.tsxindex dc0dc46d..b6e869f4 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-record-card.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-record-card.tsx@@ -15,7 +15,7 @@ export const CalendarViewRecordCard = () => {<divrole="presentation"key={record.id}- className="animate-fade-in flex justify-start items-start cursor-pointer flex-col gap-1 rounded-md border p-1 pl-2 hover:bg-gray-50"+ className="animate-fade-in flex justify-start items-start cursor-pointer flex-col gap-1 rounded-md border p-1 pl-2 hover:bg-accent"onClick={() => {layout.previewLeft(record.id, true);}}diff --git a/packages/ui/src/components/databases/calendars/calendar-view-settings.tsx b/packages/ui/src/components/databases/calendars/calendar-view-settings.tsxindex 5a3346c9..e1c7a7e4 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-settings.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-settings.tsx@@ -90,7 +90,7 @@ export const CalendarViewSettings = () => {key={field.id}className={cn('flex flex-row items-center justify-between gap-2 p-0.5',- 'cursor-pointer rounded-md hover:bg-gray-50'+ 'cursor-pointer rounded-md hover:bg-accent')}><div className="flex flex-row items-center gap-2">@@ -153,7 +153,7 @@ export const CalendarViewSettings = () => {<div className="flex flex-col gap-2 text-sm"><p className="my-1 font-semibold">Settings</p><div- className="flex cursor-pointer flex-row items-center gap-1 rounded-md p-0.5 hover:bg-gray-50"+ className="flex cursor-pointer flex-row items-center gap-1 rounded-md p-0.5 hover:bg-accent"onClick={() => {setOpenDelete(true);setOpen(false);diff --git a/packages/ui/src/components/databases/database-form.tsx b/packages/ui/src/components/databases/database-form.tsxindex 5c1b0fde..f3ad6355 100644--- a/packages/ui/src/components/databases/database-form.tsx+++ b/packages/ui/src/components/databases/database-form.tsx@@ -83,7 +83,7 @@ export const DatabaseForm = ({id={id}name={name}avatar={avatar}- className="h-6 w-6"+ className="size-6"/></Button></AvatarPopover>diff --git a/packages/ui/src/components/databases/database-views.tsx b/packages/ui/src/components/databases/database-views.tsxindex d0942b21..5bc22fdc 100644--- a/packages/ui/src/components/databases/database-views.tsx+++ b/packages/ui/src/components/databases/database-views.tsx@@ -1,8 +1,11 @@-import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';import { useEffect, useState } from 'react';import { View } from '@colanode/ui/components/databases/view';-import { ScrollBar } from '@colanode/ui/components/ui/scroll-area';+import {+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';import { useDatabase } from '@colanode/ui/contexts/database';import { DatabaseViewsContext } from '@colanode/ui/contexts/database-views';import { useWorkspace } from '@colanode/ui/contexts/workspace';@@ -42,16 +45,13 @@ export const DatabaseViews = ({ inline = false }: DatabaseViewsProps) => {inline,}}>- <div className="h-full w-full overflow-y-auto">- <ScrollAreaPrimitive.Root className="relative overflow-hidden">- <ScrollAreaPrimitive.Viewport className="group/database h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]">- {activeView && <View view={activeView} />}- </ScrollAreaPrimitive.Viewport>- <ScrollBar orientation="horizontal" />- <ScrollBar orientation="vertical" />- <ScrollAreaPrimitive.Corner />- </ScrollAreaPrimitive.Root>- </div>+ <ScrollArea className="relative overflow-hidden">+ <ScrollViewport className="group/database h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]">+ {activeView && <View view={activeView} />}+ </ScrollViewport>+ <ScrollBar orientation="horizontal" />+ <ScrollBar orientation="vertical" />+ </ScrollArea></DatabaseViewsContext.Provider>);};diff --git a/packages/ui/src/components/databases/fields/field-type-select.tsx b/packages/ui/src/components/databases/fields/field-type-select.tsxindex 016612e0..e078c74a 100644--- a/packages/ui/src/components/databases/fields/field-type-select.tsx+++ b/packages/ui/src/components/databases/fields/field-type-select.tsx@@ -17,6 +17,11 @@ import {PopoverContent,PopoverTrigger,} from '@colanode/ui/components/ui/popover';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { cn } from '@colanode/ui/lib/utils';interface FieldTypeOption {@@ -126,34 +131,41 @@ export const FieldTypeSelect = ({<Command className="min-h-min"><CommandInput placeholder="Search field types..." className="h-9" /><CommandEmpty>No field type found.</CommandEmpty>- <CommandList>- <CommandGroup className="h-min overflow-y-auto">- {filteredFieldTypes.map((fieldType) => (- <CommandItem- key={fieldType.type}- value={`${fieldType.type} - ${fieldType.name}`}- onSelect={() => {- onChange(fieldType.type);- setOpen(false);- }}- >- <div className="flex w-full flex-row items-center gap-2">- <FieldIcon- type={fieldType.type}- className="size-4 text-foreground"- />- <p>{fieldType.name}</p>- <Check- className={cn(- 'ml-auto size-4',- value === fieldType.type ? 'opacity-100' : 'opacity-0'- )}- />- </div>- </CommandItem>- ))}- </CommandGroup>- </CommandList>+ <ScrollArea className="h-80">+ <ScrollViewport>+ <CommandList className="max-h-none overflow-hidden">+ <CommandGroup className="h-min">+ {filteredFieldTypes.map((fieldType) => (+ <CommandItem+ key={fieldType.type}+ value={`${fieldType.type} - ${fieldType.name}`}+ onSelect={() => {+ onChange(fieldType.type);+ setOpen(false);+ }}+ >+ <div className="flex w-full flex-row items-center gap-2">+ <FieldIcon+ type={fieldType.type}+ className="size-4 text-foreground"+ />+ <p>{fieldType.name}</p>+ <Check+ className={cn(+ 'ml-auto size-4',+ value === fieldType.type+ ? 'opacity-100'+ : 'opacity-0'+ )}+ />+ </div>+ </CommandItem>+ ))}+ </CommandGroup>+ </CommandList>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></Command></PopoverContent></Popover>diff --git a/packages/ui/src/components/databases/fields/select-option-settings-popover.tsx b/packages/ui/src/components/databases/fields/select-option-settings-popover.tsxindex e0bf583f..9328f493 100644--- a/packages/ui/src/components/databases/fields/select-option-settings-popover.tsx+++ b/packages/ui/src/components/databases/fields/select-option-settings-popover.tsx@@ -59,7 +59,7 @@ export const SelectOptionSettingsPopover = ({return (<divkey={color.value}- className="flex cursor-pointer flex-row items-center gap-2 rounded-md p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 rounded-md p-1 hover:bg-accent"onClick={() => {database.updateSelectOption(fieldId, {...option,@@ -74,7 +74,7 @@ export const SelectOptionSettingsPopover = ({})}<Separator className="my-1" /><div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-md"onClick={() => {setOpenDeleteDialog(true);setOpenSetttingsPopover(false);diff --git a/packages/ui/src/components/databases/search/view-boolean-field-filter.tsx b/packages/ui/src/components/databases/search/view-boolean-field-filter.tsxindex d72f0886..e192ab68 100644--- a/packages/ui/src/components/databases/search/view-boolean-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-boolean-field-filter.tsx@@ -69,7 +69,7 @@ export const ViewBooleanFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx b/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsxindex 12d3fcf5..e6791c96 100644--- a/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx@@ -117,7 +117,7 @@ export const ViewCollaboratorFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsx b/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsxindex ea7fe2b1..26995e54 100644--- a/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsx+++ b/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsx@@ -73,7 +73,7 @@ export const ViewCreatedAtFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx b/packages/ui/src/components/databases/search/view-created-by-field-filter.tsxindex e6032afd..1f8f08df 100644--- a/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx@@ -109,7 +109,7 @@ export const ViewCreatedByFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-date-field-filter.tsx b/packages/ui/src/components/databases/search/view-date-field-filter.tsxindex 40b41a88..53b96230 100644--- a/packages/ui/src/components/databases/search/view-date-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-date-field-filter.tsx@@ -79,7 +79,7 @@ export const ViewDateFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-email-field-filter.tsx b/packages/ui/src/components/databases/search/view-email-field-filter.tsxindex bee62466..54e397a0 100644--- a/packages/ui/src/components/databases/search/view-email-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-email-field-filter.tsx@@ -78,7 +78,7 @@ export const ViewEmailFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-filter-button.tsx b/packages/ui/src/components/databases/search/view-filter-button.tsxindex 4da1b7cc..fa8398c3 100644--- a/packages/ui/src/components/databases/search/view-filter-button.tsx+++ b/packages/ui/src/components/databases/search/view-filter-button.tsx@@ -9,7 +9,7 @@ export const ViewFilterButton = () => {if (view.filters.length > 0) {return (<button- className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50"+ className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-accent"onClick={() => view.openSearchBar()}><Filter className="size-4" />@@ -19,7 +19,7 @@ export const ViewFilterButton = () => {return (<ViewFilterAddPopover>- <button className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50">+ <button className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-accent"><Filter className="size-4" /></button></ViewFilterAddPopover>diff --git a/packages/ui/src/components/databases/search/view-filters.tsx b/packages/ui/src/components/databases/search/view-filters.tsxindex a3a057e1..ecf56ef7 100644--- a/packages/ui/src/components/databases/search/view-filters.tsx+++ b/packages/ui/src/components/databases/search/view-filters.tsx@@ -175,7 +175,7 @@ export const ViewFilters = () => {}})}<ViewFilterAddPopover>- <button className="flex cursor-pointer flex-row items-center gap-1 rounded-lg p-1 text-sm text-muted-foreground hover:bg-gray-50">+ <button className="flex cursor-pointer flex-row items-center gap-1 rounded-lg p-1 text-sm text-muted-foreground hover:bg-accent"><Plus className="size-4" />Add filter</button>diff --git a/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsx b/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsxindex 68195f41..838e5a01 100644--- a/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsx@@ -82,7 +82,7 @@ export const ViewMultiSelectFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-name-field-filter.tsx b/packages/ui/src/components/databases/search/view-name-field-filter.tsxindex 6bd2fbd9..03e5f448 100644--- a/packages/ui/src/components/databases/search/view-name-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-name-field-filter.tsx@@ -72,7 +72,7 @@ export const ViewNameFieldFilter = ({ filter }: ViewNameFieldFilterProps) => {</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-number-field-filter.tsx b/packages/ui/src/components/databases/search/view-number-field-filter.tsxindex 2b2d4920..a9d72c43 100644--- a/packages/ui/src/components/databases/search/view-number-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-number-field-filter.tsx@@ -78,7 +78,7 @@ export const ViewNumberFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-phone-field-filter.tsx b/packages/ui/src/components/databases/search/view-phone-field-filter.tsxindex 5c356fe9..48b4d820 100644--- a/packages/ui/src/components/databases/search/view-phone-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-phone-field-filter.tsx@@ -78,7 +78,7 @@ export const ViewPhoneFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-relation-field-filter.tsx b/packages/ui/src/components/databases/search/view-relation-field-filter.tsxindex a0370721..166fa5e0 100644--- a/packages/ui/src/components/databases/search/view-relation-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-relation-field-filter.tsx@@ -115,7 +115,7 @@ export const ViewRelationFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-select-field-filter.tsx b/packages/ui/src/components/databases/search/view-select-field-filter.tsxindex f4bcdeb3..aee7d46f 100644--- a/packages/ui/src/components/databases/search/view-select-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-select-field-filter.tsx@@ -82,7 +82,7 @@ export const ViewSelectFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-sort-button.tsx b/packages/ui/src/components/databases/search/view-sort-button.tsxindex 8e6816e7..5db8eede 100644--- a/packages/ui/src/components/databases/search/view-sort-button.tsx+++ b/packages/ui/src/components/databases/search/view-sort-button.tsx@@ -9,7 +9,7 @@ export const ViewSortButton = () => {if (view.sorts.length > 0) {return (<button- className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50"+ className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-accent"onClick={() => view.openSearchBar()}><ArrowDownAz className="size-4" />@@ -19,7 +19,7 @@ export const ViewSortButton = () => {return (<ViewSortAddPopover>- <button className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50">+ <button className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-accent"><ArrowDownAz className="size-4" /></button></ViewSortAddPopover>diff --git a/packages/ui/src/components/databases/search/view-sort-field-row.tsx b/packages/ui/src/components/databases/search/view-sort-field-row.tsxindex 3cccf264..0d3d7753 100644--- a/packages/ui/src/components/databases/search/view-sort-field-row.tsx+++ b/packages/ui/src/components/databases/search/view-sort-field-row.tsx@@ -27,7 +27,7 @@ export const ViewSortFieldRow = ({ sort, field }: ViewSortFieldRowProps) => {</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{sort.direction === 'asc' ? 'Ascending' : 'Descending'}</p><ChevronDown className="h-4 w-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-sort-name-row.tsx b/packages/ui/src/components/databases/search/view-sort-name-row.tsxindex 73567bbc..d6143214 100644--- a/packages/ui/src/components/databases/search/view-sort-name-row.tsx+++ b/packages/ui/src/components/databases/search/view-sort-name-row.tsx@@ -27,7 +27,7 @@ export const ViewSortNameRow = ({ sort }: ViewSortNameRowProps) => {</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{sort.direction === 'asc' ? 'Ascending' : 'Descending'}</p><ChevronDown className="h-4 w-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-sorts.tsx b/packages/ui/src/components/databases/search/view-sorts.tsxindex 07636f37..abc51d94 100644--- a/packages/ui/src/components/databases/search/view-sorts.tsx+++ b/packages/ui/src/components/databases/search/view-sorts.tsx@@ -52,7 +52,7 @@ export const ViewSorts = () => {return <ViewSortFieldRow key={sort.id} sort={sort} field={field} />;})}<ViewSortAddPopover>- <button className="flex cursor-pointer flex-row items-center gap-1 rounded-lg p-1 text-sm text-muted-foreground hover:bg-gray-50">+ <button className="flex cursor-pointer flex-row items-center gap-1 rounded-lg p-1 text-sm text-muted-foreground hover:bg-accent"><Plus className="size-4" />Add sort</button>diff --git a/packages/ui/src/components/databases/search/view-text-field-filter.tsx b/packages/ui/src/components/databases/search/view-text-field-filter.tsxindex a4560923..04035ee1 100644--- a/packages/ui/src/components/databases/search/view-text-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-text-field-filter.tsx@@ -75,7 +75,7 @@ export const ViewTextFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsx b/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsxindex c3bfc888..8ee4b905 100644--- a/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsx@@ -77,7 +77,7 @@ export const ViewUpdatedAtFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx b/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsxindex b780c887..31dd5ff9 100644--- a/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx@@ -114,7 +114,7 @@ export const ViewUpdatedByFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/search/view-url-field-filter.tsx b/packages/ui/src/components/databases/search/view-url-field-filter.tsxindex b4dbd08b..7739645e 100644--- a/packages/ui/src/components/databases/search/view-url-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-url-field-filter.tsx@@ -75,7 +75,7 @@ export const ViewUrlFieldFilter = ({</div><DropdownMenu><DropdownMenuTrigger asChild>- <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-accent"><p>{operator.label}</p><ChevronDown className="size-4 text-muted-foreground" /></div>diff --git a/packages/ui/src/components/databases/tables/table-view-field-header.tsx b/packages/ui/src/components/databases/tables/table-view-field-header.tsxindex 80b45acf..e2765c69 100644--- a/packages/ui/src/components/databases/tables/table-view-field-header.tsx+++ b/packages/ui/src/components/databases/tables/table-view-field-header.tsx@@ -87,7 +87,7 @@ export const TableViewFieldHeader = ({topRight: false,}}handleClasses={{- right: 'opacity-0 hover:opacity-100 bg-blue-300',+ right: 'opacity-0 hover:opacity-100 bg-blue-300 dark:bg-blue-900',}}handleStyles={{right: {@@ -104,9 +104,9 @@ export const TableViewFieldHeader = ({<PopoverTrigger asChild><divclassName={cn(- 'flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-gray-50',+ 'flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-accent',dropMonitor.isOver && dropMonitor.canDrop- ? 'border-r-2 border-blue-300'+ ? 'border-r-2 border-blue-300 dark:border-blue-900': 'border-r')}ref={dragDropRef as React.LegacyRef<HTMLDivElement>}@@ -121,7 +121,7 @@ export const TableViewFieldHeader = ({{canSort && (<Fragment><div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.initFieldSort(viewField.field.id, 'asc');setOpenPopover(false);@@ -132,7 +132,7 @@ export const TableViewFieldHeader = ({</div><div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.initFieldSort(viewField.field.id, 'desc');setOpenPopover(false);@@ -145,7 +145,7 @@ export const TableViewFieldHeader = ({)}{canFilter && (<div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.initFieldFilter(viewField.field.id);setOpenPopover(false);@@ -158,7 +158,7 @@ export const TableViewFieldHeader = ({<Separator />{database.canEdit && (<div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.setFieldDisplay(viewField.field.id, false);}}@@ -169,7 +169,7 @@ export const TableViewFieldHeader = ({)}{database.canEdit && (<div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {setShowDeleteDialog(true);}}diff --git a/packages/ui/src/components/databases/tables/table-view-name-cell.tsx b/packages/ui/src/components/databases/tables/table-view-name-cell.tsxindex 7554e519..f86977ba 100644--- a/packages/ui/src/components/databases/tables/table-view-name-cell.tsx+++ b/packages/ui/src/components/databases/tables/table-view-name-cell.tsx@@ -108,7 +108,7 @@ export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {</div><buttontype="button"- className="absolute right-2 flex h-6 cursor-pointer flex-row items-center gap-1 rounded-md border bg-white p-1 text-sm text-muted-foreground opacity-0 hover:bg-gray-50 group-hover:opacity-100"+ className="absolute right-2 flex h-6 cursor-pointer flex-row items-center gap-1 rounded-md border p-1 text-sm text-muted-foreground opacity-0 hover:bg-accent group-hover:opacity-100"onClick={() => {layout.previewLeft(record.id, true);}}diff --git a/packages/ui/src/components/databases/tables/table-view-name-header.tsx b/packages/ui/src/components/databases/tables/table-view-name-header.tsxindex 51eb070b..fca3f819 100644--- a/packages/ui/src/components/databases/tables/table-view-name-header.tsx+++ b/packages/ui/src/components/databases/tables/table-view-name-header.tsx@@ -55,7 +55,7 @@ export const TableViewNameHeader = () => {topRight: false,}}handleClasses={{- right: 'opacity-0 hover:opacity-100 bg-blue-300',+ right: 'opacity-0 hover:opacity-100 bg-blue-300 dark:bg-blue-900',}}handleStyles={{right: {@@ -72,9 +72,9 @@ export const TableViewNameHeader = () => {<PopoverTrigger asChild><divclassName={cn(- 'flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-gray-50',+ 'flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-accent',dropMonitor.isOver && dropMonitor.canDrop- ? 'border-r-2 border-blue-300'+ ? 'border-r-2 border-blue-300 dark:border-blue-900': 'border-r')}ref={dropDivRef as React.Ref<HTMLDivElement>}@@ -98,7 +98,7 @@ export const TableViewNameHeader = () => {{database.canEdit && (<Fragment><div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.initFieldSort(SpecialId.Name, 'asc');setOpenPopover(false);@@ -109,7 +109,7 @@ export const TableViewNameHeader = () => {</div><div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.initFieldSort(SpecialId.Name, 'desc');setOpenPopover(false);@@ -121,7 +121,7 @@ export const TableViewNameHeader = () => {</Fragment>)}<div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent rounded-sm"onClick={() => {view.initFieldFilter(SpecialId.Name);setOpenPopover(false);diff --git a/packages/ui/src/components/databases/tables/table-view-record-create-row.tsx b/packages/ui/src/components/databases/tables/table-view-record-create-row.tsxindex 4680008a..cf5e1699 100644--- a/packages/ui/src/components/databases/tables/table-view-record-create-row.tsx+++ b/packages/ui/src/components/databases/tables/table-view-record-create-row.tsx@@ -14,7 +14,7 @@ export const TableViewRecordCreateRow = () => {return (<buttontype="button"- className="animate-fade-in flex h-8 w-full cursor-pointer flex-row items-center gap-1 border-b pl-2 text-muted-foreground hover:bg-gray-50"+ className="animate-fade-in flex h-8 w-full cursor-pointer flex-row items-center gap-1 border-b pl-2 text-muted-foreground hover:bg-accent"onClick={() => view.createRecord()}><Plus className="size-4" />diff --git a/packages/ui/src/components/databases/tables/table-view-settings.tsx b/packages/ui/src/components/databases/tables/table-view-settings.tsxindex 4749271d..3367d251 100644--- a/packages/ui/src/components/databases/tables/table-view-settings.tsx+++ b/packages/ui/src/components/databases/tables/table-view-settings.tsx@@ -90,7 +90,7 @@ export const TableViewSettings = () => {key={field.id}className={cn('flex flex-row items-center justify-between gap-2 p-0.5',- 'cursor-pointer rounded-md hover:bg-gray-50'+ 'cursor-pointer rounded-md hover:bg-accent')}><div className="flex flex-row items-center gap-2">@@ -153,7 +153,7 @@ export const TableViewSettings = () => {<div className="flex flex-col gap-2 text-sm"><p className="my-1 font-semibold">Settings</p><div- className="flex cursor-pointer flex-row items-center gap-1 rounded-md p-0.5 hover:bg-gray-50"+ className="flex cursor-pointer flex-row items-center gap-1 rounded-md p-0.5 hover:bg-accent"onClick={() => {setOpenDelete(true);setOpen(false);diff --git a/packages/ui/src/components/databases/view-create-dialog.tsx b/packages/ui/src/components/databases/view-create-dialog.tsxindex e0c6686c..bd507828 100644--- a/packages/ui/src/components/databases/view-create-dialog.tsx+++ b/packages/ui/src/components/databases/view-create-dialog.tsx@@ -161,9 +161,9 @@ export const ViewCreateDialog = ({key={viewType.name}className={cn('flex cursor-pointer flex-col items-center gap-2 rounded-md border p-3 text-muted-foreground',- 'hover:border-gray-500 hover:bg-gray-50 cursor-pointer',+ 'hover:bg-accent cursor-pointer',viewType.type === field.value- ? 'border-gray-500 text-primary'+ ? 'border-foreground text-foreground': '')}onClick={() => {diff --git a/packages/ui/src/components/databases/view-fullscreen-button.tsx b/packages/ui/src/components/databases/view-fullscreen-button.tsxindex 214738e6..58fc7094 100644--- a/packages/ui/src/components/databases/view-fullscreen-button.tsx+++ b/packages/ui/src/components/databases/view-fullscreen-button.tsx@@ -15,7 +15,7 @@ export const ViewFullscreenButton = () => {return (<button- className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50"+ className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-accent"onClick={() => layout.previewLeft(database.id, true)}><Fullscreen className="size-4" />diff --git a/packages/ui/src/components/databases/view-settings-button.tsx b/packages/ui/src/components/databases/view-settings-button.tsxindex 0cdf1d5e..bfff4b78 100644--- a/packages/ui/src/components/databases/view-settings-button.tsx+++ b/packages/ui/src/components/databases/view-settings-button.tsx@@ -2,7 +2,7 @@ import { Settings } from 'lucide-react';export const ViewSettingsButton = () => {return (- <div className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50">+ <div className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-accent"><Settings className="size-4" /></div>);diff --git a/packages/ui/src/components/databases/view-tab.tsx b/packages/ui/src/components/databases/view-tab.tsxindex c6b5d47b..450c215b 100644--- a/packages/ui/src/components/databases/view-tab.tsx+++ b/packages/ui/src/components/databases/view-tab.tsx@@ -14,7 +14,7 @@ export const ViewTab = ({ view, isActive, onClick }: ViewTabProps) => {role="presentation"className={cn('inline-flex cursor-pointer flex-row items-center gap-1 border-b-2 p-1 pl-0 text-sm',- isActive ? 'border-gray-500' : 'border-transparent'+ isActive ? 'border-border' : 'border-transparent')}onClick={() => onClick()}onKeyDown={() => onClick()}diff --git a/packages/ui/src/components/documents/document-editor.tsx b/packages/ui/src/components/documents/document-editor.tsxindex fd62750d..be75d521 100644--- a/packages/ui/src/components/documents/document-editor.tsx+++ b/packages/ui/src/components/documents/document-editor.tsx@@ -250,7 +250,7 @@ export const DocumentEditor = ({editorProps: {attributes: {class:- 'prose-lg prose-stone dark:prose-invert prose-headings:font-title font-default focus:outline-none max-w-full',+ 'prose-lg prose-stone dark:prose-invert prose-headings:font-title font-default focus:outline-none max-w-full text-foreground',spellCheck: 'false',},handleKeyDown: (_, event) => {diff --git a/packages/ui/src/components/emojis/emoji-browser.tsx b/packages/ui/src/components/emojis/emoji-browser.tsxindex 6a761a83..690d0fe1 100644--- a/packages/ui/src/components/emojis/emoji-browser.tsx+++ b/packages/ui/src/components/emojis/emoji-browser.tsx@@ -4,6 +4,11 @@ import { useMemo, useRef } from 'react';import { EmojiPickerRowData } from '@colanode/client/types';import { EmojiBrowserCategory } from '@colanode/ui/components/emojis/emoji-browser-category';import { EmojiBrowserItems } from '@colanode/ui/components/emojis/emoji-browser-items';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';const EMOJIS_PER_ROW = 10;@@ -39,7 +44,7 @@ export const EmojiBrowser = () => {return rows;}, [categories]);- const parentRef = useRef(null);+ const parentRef = useRef<HTMLDivElement>(null);const virtualizer = useVirtualizer({count: rowDataArray.length,@@ -48,45 +53,42 @@ export const EmojiBrowser = () => {});return (- <div- ref={parentRef}- style={{- height: `100%`,- overflow: 'auto',- }}- >- <div- style={{- height: `${virtualizer.getTotalSize()}px`,- width: '100%',- position: 'relative',- }}- >- {virtualizer.getVirtualItems().map((virtualItem) => {- const row = rowDataArray[virtualItem.index]!;- const style: React.CSSProperties = {- position: 'absolute',- top: 0,- left: 0,+ <ScrollArea className="h-full overflow-auto">+ <ScrollViewport ref={parentRef}>+ <div+ style={{+ height: `${virtualizer.getTotalSize()}px`,width: '100%',- height: `${virtualItem.size}px`,- transform: `translateY(${virtualItem.start}px)`,- };+ position: 'relative',+ }}+ >+ {virtualizer.getVirtualItems().map((virtualItem) => {+ const row = rowDataArray[virtualItem.index]!;+ const style: React.CSSProperties = {+ position: 'absolute',+ top: 0,+ left: 0,+ width: '100%',+ height: `${virtualItem.size}px`,+ transform: `translateY(${virtualItem.start}px)`,+ };- if (row.type === 'category') {- return (- <EmojiBrowserCategory- row={row}- style={style}- key={row.category}- />- );- }+ if (row.type === 'category') {+ return (+ <EmojiBrowserCategory+ row={row}+ style={style}+ key={row.category}+ />+ );+ }- const key = `${row.category}-${row.page}`;- return <EmojiBrowserItems row={row} style={style} key={key} />;- })}- </div>- </div>+ const key = `${row.category}-${row.page}`;+ return <EmojiBrowserItems row={row} style={style} key={key} />;+ })}+ </div>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea>);};diff --git a/packages/ui/src/components/emojis/emoji-element.tsx b/packages/ui/src/components/emojis/emoji-element.tsxindex 06914765..209be1fd 100644--- a/packages/ui/src/components/emojis/emoji-element.tsx+++ b/packages/ui/src/components/emojis/emoji-element.tsx@@ -1,4 +1,8 @@+import { ShieldQuestionMark } from 'lucide-react';+import { useApp } from '@colanode/ui/contexts/app';+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';+import { cn } from '@colanode/ui/lib/utils';interface EmojiElementProps {id: string;@@ -6,23 +10,52 @@ interface EmojiElementProps {onClick?: () => void;}-export const EmojiElement = ({ id, className, onClick }: EmojiElementProps) => {- const app = useApp();-- if (app.type === 'web') {- return (- <svg className={className} onClick={onClick}>+const EmojiElementWeb = ({ id, className, onClick }: EmojiElementProps) => {+ return (+ <div className={cn('emoji-element', className)} onClick={onClick}>+ <svg><use href={`/assets/emojis.svg#${id}`} /></svg>+ </div>+ );+};++const EmojiElementDesktop = ({ id, className, onClick }: EmojiElementProps) => {+ const svgQuery = useLiveQuery({+ type: 'emoji.svg.get',+ id,+ });++ if (svgQuery.isLoading) {+ return null;+ }++ const svg = svgQuery.data;+ if (!svg) {+ return (+ <div className={cn('emoji-element', className)} onClick={onClick}>+ <ShieldQuestionMark />+ </div>);}return (- <img- src={`local://emojis/${id}`}- className={className}+ <div+ className={cn('emoji-element', className)}onClick={onClick}- alt={id}+ dangerouslySetInnerHTML={{ __html: svg }}/>);};++export const EmojiElement = ({ id, className, onClick }: EmojiElementProps) => {+ const app = useApp();++ if (app.type === 'web') {+ return <EmojiElementWeb id={id} className={className} onClick={onClick} />;+ }++ return (+ <EmojiElementDesktop id={id} className={className} onClick={onClick} />+ );+};diff --git a/packages/ui/src/components/emojis/emoji-picker-item.tsx b/packages/ui/src/components/emojis/emoji-picker-item.tsxindex 13220473..80142779 100644--- a/packages/ui/src/components/emojis/emoji-picker-item.tsx+++ b/packages/ui/src/components/emojis/emoji-picker-item.tsx@@ -18,7 +18,7 @@ export const EmojiPickerItem = ({ emoji }: EmojiPickerItemProps) => {return (<button- className="p-1 ring-gray-100 transition-colors duration-100 ease-in-out hover:bg-gray-100 focus:border-gray-100 focus:outline-none focus:ring"+ className="p-1 ring-border transition-colors duration-100 ease-in-out hover:bg-accent focus:border-border focus:outline-none focus:ring cursor-pointer"onClick={() => onEmojiClick(emoji)}><EmojiElement className="h-5 w-5" id={id} />diff --git a/packages/ui/src/components/emojis/emoji-picker.tsx b/packages/ui/src/components/emojis/emoji-picker.tsxindex 4e12508c..e93b1780 100644--- a/packages/ui/src/components/emojis/emoji-picker.tsx+++ b/packages/ui/src/components/emojis/emoji-picker.tsx@@ -4,6 +4,7 @@ import { Emoji } from '@colanode/client/types';import { EmojiBrowser } from '@colanode/ui/components/emojis/emoji-browser';import { EmojiSearch } from '@colanode/ui/components/emojis/emoji-search';import { EmojiSkinToneSelector } from '@colanode/ui/components/emojis/emoji-skin-tone-selector';+import { Input } from '@colanode/ui/components/ui/input';import { EmojiPickerContext } from '@colanode/ui/contexts/emoji-picker';interface EmojiPickerProps {@@ -17,19 +18,18 @@ export const EmojiPicker = ({ onPick }: EmojiPickerProps) => {return (<div className="flex flex-col gap-1 p-1"><div className="flex flex-row items-center gap-1">- <input+ <Inputtype="text"- placeholder="Search..."+ placeholder="Search emojis..."value={query}onChange={(e) => setQuery(e.target.value)}- className="w-full rounded-md bg-gray-100 p-2 text-xs focus:outline-none"/><EmojiSkinToneSelectorskinTone={skinTone}onSkinToneChange={setSkinTone}/></div>- <div className="h-[280px] min-h-[280px] overflow-auto w-[330px] min-w-[330px]">+ <div className="h-[280px] min-h-[280px] w-[330px] min-w-[330px]"><EmojiPickerContext.Providervalue={{skinTone,diff --git a/packages/ui/src/components/emojis/emoji-search.tsx b/packages/ui/src/components/emojis/emoji-search.tsxindex 6cc00216..ed0648eb 100644--- a/packages/ui/src/components/emojis/emoji-search.tsx+++ b/packages/ui/src/components/emojis/emoji-search.tsx@@ -1,4 +1,9 @@import { EmojiPickerItem } from '@colanode/ui/components/emojis/emoji-picker-item';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';interface EmojiSearchProps {@@ -15,13 +20,18 @@ export const EmojiSearch = ({ query }: EmojiSearchProps) => {const emojis = emojiSearchQuery.data ?? [];return (- <div className="grid w-full min-w-full grid-cols-10 gap-1">- <div className="col-span-full flex items-center py-1 pl-1 text-sm text-muted-foreground">- <p>Search results for "{query}"</p>- </div>- {emojis.map((emoji) => (- <EmojiPickerItem key={emoji.id} emoji={emoji} />- ))}- </div>+ <ScrollArea className="h-full overflow-auto">+ <ScrollViewport>+ <div className="grid w-full min-w-full grid-cols-10 gap-1">+ <div className="col-span-full flex items-center py-1 pl-1 text-sm text-muted-foreground">+ <p>Search results for "{query}"</p>+ </div>+ {emojis.map((emoji) => (+ <EmojiPickerItem key={emoji.id} emoji={emoji} />+ ))}+ </div>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea>);};diff --git a/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx b/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsxindex 4cce5e52..cf352f57 100644--- a/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx+++ b/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx@@ -1,6 +1,7 @@import { useState } from 'react';import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';+import { Button } from '@colanode/ui/components/ui/button';import {Popover,PopoverContent,@@ -38,28 +39,24 @@ export const EmojiSkinToneSelector = ({return (<Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild>- <button- className={`flex h-[32px] w-6 items-center justify-center p-1 hover:bg-gray-50 ${- open && 'bg-gray-100'- }`}- >+ <Button size="icon" variant="outline" className="p-2"><EmojiElementid={emoji.skins[skinTone || 0]?.id ?? ''}className="h-full w-full"/>- </button>+ </Button></PopoverTrigger>- <PopoverContent className="p-2 w-50">+ <PopoverContent className="flex flex-row gap-1 p-1 w-60">{emoji.skins.map((skin, idx) => (- <button- key={`skin-selector-${skin}`}- className={`h-6 w-6 p-1 hover:bg-gray-100 ${- idx === skinTone && 'bg-gray-100'- }`}+ <Button+ key={`skin-selector-${skin.id}`}+ size="icon"+ variant="ghost"onClick={() => handleSkinToneSelection(idx)}+ className="size-8 p-1"><EmojiElement id={skin.id} className="h-full w-full" />- </button>+ </Button>))}</PopoverContent></Popover>diff --git a/packages/ui/src/components/files/file-block.tsx b/packages/ui/src/components/files/file-block.tsxindex 599ccd6c..2f6cfb52 100644--- a/packages/ui/src/components/files/file-block.tsx+++ b/packages/ui/src/components/files/file-block.tsx@@ -31,7 +31,7 @@ export const FileBlock = ({ id }: FileBlockProps) => {if (canPreview) {return (<div- className="flex h-72 max-h-72 max-w-128 w-full cursor-pointer overflow-hidden rounded-md p-2 hover:bg-gray-100"+ className="flex h-72 max-h-72 max-w-128 w-full cursor-pointer overflow-hidden rounded-md p-2 hover:bg-muted/50"onClick={() => {layout.previewLeft(id, true);}}@@ -43,7 +43,7 @@ export const FileBlock = ({ id }: FileBlockProps) => {return (<div- className="flex flex-row gap-4 items-center w-full cursor-pointer overflow-hidden rounded-md p-2 pl-0 hover:bg-gray-100"+ className="flex flex-row gap-4 items-center w-full cursor-pointer overflow-hidden rounded-md p-2 pl-0 hover:bg-accent"onClick={() => {layout.previewLeft(id, true);}}@@ -51,7 +51,9 @@ export const FileBlock = ({ id }: FileBlockProps) => {<FileIcon mimeType={file.attributes.mimeType} className="size-10" /><div className="flex flex-col gap-1"><div className="text-sm font-medium">{file.attributes.name}</div>- <div className="text-xs text-gray-500">{file.attributes.mimeType}</div>+ <div className="text-xs text-muted-foreground">+ {file.attributes.mimeType}+ </div></div></div>);diff --git a/packages/ui/src/components/files/file-body.tsx b/packages/ui/src/components/files/file-body.tsxindex bb2e7a53..0cbb1b42 100644--- a/packages/ui/src/components/files/file-body.tsx+++ b/packages/ui/src/components/files/file-body.tsx@@ -27,7 +27,7 @@ export const FileBody = ({ file }: FileBodyProps) => {)}</div></div>- <div className="h-full w-72 min-w-72 overflow-hidden border-l border-gray-100 p-2 pl-3">+ <div className="h-full w-72 min-w-72 overflow-hidden border-l border-border p-2 pl-3"><FileSidebar file={file} /></div></div>diff --git a/packages/ui/src/components/folders/folder-body.tsx b/packages/ui/src/components/folders/folder-body.tsxindex b20fb401..9335f311 100644--- a/packages/ui/src/components/folders/folder-body.tsx+++ b/packages/ui/src/components/folders/folder-body.tsx@@ -22,7 +22,11 @@ import {DropdownMenuTrigger,} from '@colanode/ui/components/ui/dropdown-menu';import { Dropzone } from '@colanode/ui/components/ui/dropzone';-import { ScrollArea } from '@colanode/ui/components/ui/scroll-area';+import {+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { openFileDialog } from '@colanode/ui/lib/files';@@ -141,7 +145,11 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {</div></div><ScrollArea className="flex-grow">- <FolderFiles id={folder.id} name="Folder" layout={layout} />+ <ScrollViewport>+ <FolderFiles id={folder.id} name="Folder" layout={layout} />+ <ScrollBar orientation="horizontal" />+ <ScrollBar orientation="vertical" />+ </ScrollViewport></ScrollArea></div></Dropzone>diff --git a/packages/ui/src/components/folders/folder-form.tsx b/packages/ui/src/components/folders/folder-form.tsxindex 0d0f295e..182d59be 100644--- a/packages/ui/src/components/folders/folder-form.tsx+++ b/packages/ui/src/components/folders/folder-form.tsx@@ -83,7 +83,7 @@ export const FolderForm = ({id={id}name={name}avatar={avatar}- className="h-6 w-6"+ className="size-6"/></Button></AvatarPopover>diff --git a/packages/ui/src/components/folders/grids/grid-item.tsx b/packages/ui/src/components/folders/grids/grid-item.tsxindex 0503f803..bb865b3c 100644--- a/packages/ui/src/components/folders/grids/grid-item.tsx+++ b/packages/ui/src/components/folders/grids/grid-item.tsx@@ -19,7 +19,7 @@ export const GridItem = ({ id, children }: GridItemProps) => {ref={ref}className={cn('flex cursor-pointer select-none flex-col items-center gap-2 p-2',- selected ? 'bg-blue-100' : 'hover:bg-blue-50'+ selected ? 'bg-accent' : 'hover:bg-accent')}onClick={(event) => folder.onClick(event, id)}onDoubleClick={(event) => folder.onDoubleClick(event, id)}diff --git a/packages/ui/src/components/icons/icon-browser.tsx b/packages/ui/src/components/icons/icon-browser.tsxindex 3460fe11..1ada3160 100644--- a/packages/ui/src/components/icons/icon-browser.tsx+++ b/packages/ui/src/components/icons/icon-browser.tsx@@ -4,6 +4,11 @@ import { useMemo, useRef } from 'react';import { IconPickerRowData } from '@colanode/client/types';import { IconBrowserCategory } from '@colanode/ui/components/icons/icon-browser-category';import { IconBrowserItems } from '@colanode/ui/components/icons/icon-browser-items';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';const ICONS_PER_ROW = 10;@@ -39,7 +44,7 @@ export const IconBrowser = () => {return rows;}, [categories]);- const parentRef = useRef(null);+ const parentRef = useRef<HTMLDivElement>(null);const virtualizer = useVirtualizer({count: rowDataArray.length,@@ -48,41 +53,42 @@ export const IconBrowser = () => {});return (- <div- ref={parentRef}- style={{- height: `100%`,- overflow: 'auto',- }}- >- <div- style={{- height: `${virtualizer.getTotalSize()}px`,- width: '100%',- position: 'relative',- }}- >- {virtualizer.getVirtualItems().map((virtualItem) => {- const row = rowDataArray[virtualItem.index]!;- const style: React.CSSProperties = {- position: 'absolute',- top: 0,- left: 0,+ <ScrollArea className="h-full overflow-auto">+ <ScrollViewport ref={parentRef}>+ <div+ style={{+ height: `${virtualizer.getTotalSize()}px`,width: '100%',- height: `${virtualItem.size}px`,- transform: `translateY(${virtualItem.start}px)`,- };+ position: 'relative',+ }}+ >+ {virtualizer.getVirtualItems().map((virtualItem) => {+ const row = rowDataArray[virtualItem.index]!;+ const style: React.CSSProperties = {+ position: 'absolute',+ top: 0,+ left: 0,+ width: '100%',+ height: `${virtualItem.size}px`,+ transform: `translateY(${virtualItem.start}px)`,+ };- if (row.type === 'category') {- return (- <IconBrowserCategory key={row.category} row={row} style={style} />- );- }+ if (row.type === 'category') {+ return (+ <IconBrowserCategory+ key={row.category}+ row={row}+ style={style}+ />+ );+ }- const key = `${row.category}-${row.page}`;- return <IconBrowserItems key={key} row={row} style={style} />;- })}- </div>- </div>+ const key = `${row.category}-${row.page}`;+ return <IconBrowserItems key={key} row={row} style={style} />;+ })}+ </div>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea>);};diff --git a/packages/ui/src/components/icons/icon-element.tsx b/packages/ui/src/components/icons/icon-element.tsxindex 04aa8840..16208ab0 100644--- a/packages/ui/src/components/icons/icon-element.tsx+++ b/packages/ui/src/components/icons/icon-element.tsx@@ -1,20 +1,57 @@+import { ShieldQuestionMark } from 'lucide-react';+import { useApp } from '@colanode/ui/contexts/app';+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';+import { cn } from '@colanode/ui/lib/utils';interface IconElementProps {id: string;className?: string;}+const IconElementWeb = ({ id, className }: IconElementProps) => {+ return (+ <div className={cn('icon-element', className)}>+ <svg>+ <use href={`/assets/icons.svg#${id}`} />+ </svg>+ </div>+ );+};++const IconElementDesktop = ({ id, className }: IconElementProps) => {+ const svgQuery = useLiveQuery({+ type: 'icon.svg.get',+ id,+ });++ if (svgQuery.isLoading) {+ return null;+ }++ const svg = svgQuery.data;+ if (!svg) {+ return (+ <div className={cn('icon-element', className)}>+ <ShieldQuestionMark />+ </div>+ );+ }++ return (+ <div+ className={cn('icon-element', className)}+ dangerouslySetInnerHTML={{ __html: svg }}+ />+ );+};+export const IconElement = ({ id, className }: IconElementProps) => {const app = useApp();if (app.type === 'web') {- return (- <svg className={className}>- <use href={`/assets/icons.svg#${id}`} />- </svg>- );+ return <IconElementWeb id={id} className={className} />;}- return <img src={`local://icons/${id}`} className={className} />;+ return <IconElementDesktop id={id} className={className} />;};diff --git a/packages/ui/src/components/icons/icon-picker-item.tsx b/packages/ui/src/components/icons/icon-picker-item.tsxindex 3f8b2657..25bff014 100644--- a/packages/ui/src/components/icons/icon-picker-item.tsx+++ b/packages/ui/src/components/icons/icon-picker-item.tsx@@ -11,7 +11,7 @@ export const IconPickerItem = ({ icon }: IconPickerItemProps) => {return (<button- className="p-1 ring-gray-100 transition-colors duration-100 ease-in-out hover:bg-gray-100 focus:border-gray-100 focus:outline-none focus:ring"+ className="p-1 ring-border transition-colors duration-100 ease-in-out hover:bg-accent focus:border-border focus:outline-none focus:ring cursor-pointer"onClick={() => onIconClick(icon)}><IconElement className="h-5 w-5" id={icon.id} />diff --git a/packages/ui/src/components/icons/icon-picker.tsx b/packages/ui/src/components/icons/icon-picker.tsxindex c632e22e..5c9658fb 100644--- a/packages/ui/src/components/icons/icon-picker.tsx+++ b/packages/ui/src/components/icons/icon-picker.tsx@@ -3,6 +3,7 @@ import { useState } from 'react';import { Icon } from '@colanode/client/types';import { IconBrowser } from '@colanode/ui/components/icons/icon-browser';import { IconSearch } from '@colanode/ui/components/icons/icon-search';+import { Input } from '@colanode/ui/components/ui/input';import { IconPickerContext } from '@colanode/ui/contexts/icon-picker';interface IconPickerProps {@@ -15,14 +16,13 @@ export const IconPicker = ({ onPick }: IconPickerProps) => {return (<IconPickerContext.Provider value={{ onPick }}><div className="flex flex-col gap-1 p-1">- <input+ <Inputtype="text"- placeholder="Search..."+ placeholder="Search icons..."value={query}onChange={(e) => setQuery(e.target.value)}- className="w-full rounded-md bg-gray-100 p-2 text-xs focus:outline-none"/>- <div className="h-[280px] min-h-[280px] overflow-auto w-[330px] min-w-[330px]">+ <div className="h-[280px] min-h-[280px] w-[330px] min-w-[330px]">{query.length > 2 ? <IconSearch query={query} /> : <IconBrowser />}</div></div>diff --git a/packages/ui/src/components/icons/icon-search.tsx b/packages/ui/src/components/icons/icon-search.tsxindex b7a681b4..dbae8267 100644--- a/packages/ui/src/components/icons/icon-search.tsx+++ b/packages/ui/src/components/icons/icon-search.tsx@@ -1,4 +1,9 @@import { IconPickerItem } from '@colanode/ui/components/icons/icon-picker-item';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';interface IconSearchProps {@@ -15,13 +20,18 @@ export const IconSearch = ({ query }: IconSearchProps) => {const icons = iconSearchQuery.data ?? [];return (- <div className="grid w-full min-w-full grid-cols-10 gap-1">- <div className="col-span-full flex items-center py-1 pl-1 text-sm text-muted-foreground">- <p>Search results for "{query}"</p>- </div>- {icons.map((icon) => (- <IconPickerItem key={icon.id} icon={icon} />- ))}- </div>+ <ScrollArea className="h-full overflow-auto">+ <ScrollViewport>+ <div className="grid w-full min-w-full grid-cols-10 gap-1">+ <div className="col-span-full flex items-center py-1 pl-1 text-sm text-muted-foreground">+ <p>Search results for "{query}"</p>+ </div>+ {icons.map((icon) => (+ <IconPickerItem key={icon.id} icon={icon} />+ ))}+ </div>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea>);};diff --git a/packages/ui/src/components/layouts/containers/container-blank.tsx b/packages/ui/src/components/layouts/containers/container-blank.tsxindex 16a2aa29..aee6074b 100644--- a/packages/ui/src/components/layouts/containers/container-blank.tsx+++ b/packages/ui/src/components/layouts/containers/container-blank.tsx@@ -1,6 +1,6 @@export const ContainerBlank = () => {return (- <div className="h-full w-full bg-white flex flex-col gap-1">+ <div className="h-full w-full flex flex-col gap-1"><div className="h-10 app-drag-region"></div><div className="flex-grow flex items-center justify-center"><p className="text-sm text-muted-foreground">diff --git a/packages/ui/src/components/layouts/containers/container-tab-content.tsx b/packages/ui/src/components/layouts/containers/container-tab-content.tsxindex c9f2c7cb..a0875ad5 100644--- a/packages/ui/src/components/layouts/containers/container-tab-content.tsx+++ b/packages/ui/src/components/layouts/containers/container-tab-content.tsx@@ -4,6 +4,7 @@ import { ContainerTab, SpecialContainerTabPath } from '@colanode/client/types';import { getIdType, IdType } from '@colanode/core';import { AccountLogout } from '@colanode/ui/components/accounts/account-logout';import { AccountSettings } from '@colanode/ui/components/accounts/account-settings';+import { AppAppearanceSettings } from '@colanode/ui/components/app/app-appearance-settings';import { ChannelContainer } from '@colanode/ui/components/channels/channel-container';import { ChatContainer } from '@colanode/ui/components/chats/chat-container';import { DatabaseContainer } from '@colanode/ui/components/databases/database-container';@@ -53,6 +54,10 @@ const getContainerTabContentBody = (tab: ContainerTab) => {return <WorkspaceDownloads />;}+ if (tab.path === SpecialContainerTabPath.AppAppearance) {+ return <AppAppearanceSettings />;+ }+return match(getIdType(tab.path)).with(IdType.Space, () => <SpaceContainer spaceId={tab.path} />).with(IdType.Channel, () => <ChannelContainer channelId={tab.path} />)diff --git a/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx b/packages/ui/src/components/layouts/containers/container-tab-trigger.tsxindex cec9b490..1c9ebf59 100644--- a/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx+++ b/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx@@ -7,6 +7,7 @@ import { ContainerTab, SpecialContainerTabPath } from '@colanode/client/types';import { getIdType, IdType } from '@colanode/core';import { AccountLogoutTab } from '@colanode/ui/components/accounts/account-logout-tab';import { AccountSettingsTab } from '@colanode/ui/components/accounts/account-settings-tab';+import { AppAppearanceSettingsTab } from '@colanode/ui/components/app/app-appearance-settings-tab';import { ChannelContainerTab } from '@colanode/ui/components/channels/channel-container-tab';import { ChatContainerTab } from '@colanode/ui/components/chats/chat-container-tab';import { DatabaseContainerTab } from '@colanode/ui/components/databases/database-container-tab';@@ -60,6 +61,10 @@ const getContainerTabTriggerContent = (tab: ContainerTab) => {return <WorkspaceDownloadsTab />;}+ if (tab.path === SpecialContainerTabPath.AppAppearance) {+ return <AppAppearanceSettingsTab />;+ }+return match(getIdType(tab.path)).with(IdType.Space, () => <SpaceContainerTab spaceId={tab.path} />).with(IdType.Channel, () => (@@ -151,7 +156,7 @@ export const ContainerTabTrigger = ({className="opacity-0 group-hover/tab:opacity-100 group-data-[state=active]/tab:opacity-100 transition-opacity duration-200 flex-shrink-0 cursor-pointer"onClick={() => onClose()}>- <X className="size-4 text-muted-foreground hover:text-primary" />+ <X className="size-4 text-muted-foreground hover:text-foreground" /></div></TabsTrigger>);diff --git a/packages/ui/src/components/layouts/containers/container-tabs.tsx b/packages/ui/src/components/layouts/containers/container-tabs.tsxindex 54de09ae..492f7675 100644--- a/packages/ui/src/components/layouts/containers/container-tabs.tsx+++ b/packages/ui/src/components/layouts/containers/container-tabs.tsx@@ -4,7 +4,11 @@ import { useDrop } from 'react-dnd';import { ContainerTab } from '@colanode/client/types';import { ContainerTabContent } from '@colanode/ui/components/layouts/containers/container-tab-content';import { ContainerTabTrigger } from '@colanode/ui/components/layouts/containers/container-tab-trigger';-import { ScrollArea, ScrollBar } from '@colanode/ui/components/ui/scroll-area';+import {+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';import { Tabs, TabsList } from '@colanode/ui/components/ui/tabs';import { cn } from '@colanode/ui/lib/utils';@@ -50,27 +54,29 @@ export const ContainerTabs = ({className="h-full min-h-full w-full min-w-full max-h-full max-w-full flex flex-col overflow-hidden"><ScrollArea className="h-10 min-h-10 w-full">- <TabsList className="h-10 bg-slate-50 w-full justify-start p-0 app-drag-region">- {tabs.map((tab) => (- <ContainerTabTrigger- key={tab.path}- tab={tab}- onClose={() => onClose(tab.path)}- onOpen={() => onOpen(tab.path)}- onMove={(before) => onMove(tab.path, before)}+ <ScrollViewport>+ <TabsList className="h-10 w-full justify-start p-0 app-drag-region rounded-none">+ {tabs.map((tab) => (+ <ContainerTabTrigger+ key={tab.path}+ tab={tab}+ onClose={() => onClose(tab.path)}+ onOpen={() => onOpen(tab.path)}+ onMove={(before) => onMove(tab.path, before)}+ />+ ))}+ <div+ ref={dragDropRef as React.LegacyRef<HTMLDivElement>}+ className={cn(+ 'h-full w-10',+ dropMonitor.isOver &&+ dropMonitor.canDrop &&+ 'border-l-2 border-blue-300'+ )}/>- ))}- <div- ref={dragDropRef as React.LegacyRef<HTMLDivElement>}- className={cn(- 'h-full w-10',- dropMonitor.isOver &&- dropMonitor.canDrop &&- 'border-l-2 border-blue-300'- )}- />- </TabsList>- <ScrollBar orientation="horizontal" />+ </TabsList>+ <ScrollBar orientation="horizontal" className="z-10" />+ </ScrollViewport></ScrollArea><div className="flex-grow overflow-hidden">{tabs.map((tab) => (diff --git a/packages/ui/src/components/layouts/layout.tsx b/packages/ui/src/components/layouts/layout.tsxindex 25195862..f2229a6c 100644--- a/packages/ui/src/components/layouts/layout.tsx+++ b/packages/ui/src/components/layouts/layout.tsx@@ -62,11 +62,11 @@ export const Layout = () => {: rightContainerMetadata.tabs.find((t) => t.active)?.path,}}>- <div className="w-screen min-w-screen h-screen min-h-screen flex flex-row">+ <div className="w-screen min-w-screen h-screen min-h-screen flex flex-row bg-background"><Resizableas="aside"size={{ width: sidebarMetadata.width, height: '100vh' }}- className="border-r border-gray-200"+ className="border-r border-sidebar-border"minWidth={200}maxWidth={500}enable={{@@ -99,7 +99,7 @@ export const Layout = () => {</Resizable>{shouldDisplayLeft && (- <div className="h-full max-h-screen w-full flex-grow overflow-hidden bg-white">+ <div className="h-full max-h-screen w-full flex-grow overflow-hidden"><ContainerTabstabs={leftContainerMetadata.tabs}onFocus={() => {@@ -115,7 +115,7 @@ export const Layout = () => {{shouldDisplayLeft && shouldDisplayRight && (<Resizableas="div"- className="h-full max-h-full min-h-full overflow-hidden border-l border-gray-200 bg-white"+ className="h-full max-h-full min-h-full overflow-hidden"size={{ width: rightContainerMetadata.width, height: '100%' }}minWidth={percentToNumber(windowSize.width, 20)}maxWidth={percentToNumber(windowSize.width, 50)}diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsxindex 7aeeb81b..1a1763f7 100644--- a/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx+++ b/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx@@ -28,9 +28,8 @@ export const SidebarChats = () => {<buttonkey={item.id}className={cn(- 'px-2 flex w-full items-center gap-2 overflow-hidden rounded-md text-left text-sm hover:bg-sidebar-accent hover:text-sidebar-accent-foreground h-7 cursor-pointer',- layout.activeTab === item.id &&- 'bg-sidebar-accent text-sidebar-accent-foreground font-medium'+ 'px-2 flex w-full items-center gap-2 overflow-hidden rounded-md text-left text-sm h-7 cursor-pointer text-foreground hover:bg-muted',+ layout.activeTab === item.id && 'bg-muted font-medium')}onClick={() => {layout.preview(item.id);diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsxindex 3d366721..6f53c693 100644--- a/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx+++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx@@ -22,16 +22,16 @@ export const SidebarMenuIcon = ({return (<divclassName={cn(- 'w-10 h-10 flex items-center justify-center cursor-pointer hover:bg-gray-200 rounded-md relative',+ 'w-10 h-10 flex items-center justify-center cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-800 rounded-md relative',className,- isActive ? 'bg-gray-200' : ''+ isActive ? 'bg-gray-200 dark:bg-gray-800' : '')}onClick={onClick}><IconclassName={cn('size-5',- isActive ? 'text-primary' : 'text-muted-foreground'+ isActive ? 'text-foreground' : 'text-muted-foreground')}/>{unreadBadge && (diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsxindex 9229d776..1737493b 100644--- a/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx+++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx@@ -41,7 +41,7 @@ export const SidebarMenu = ({ value, onChange }: SidebarMenuProps) => {const pendingUploadsCount = pendingUploads.length;return (- <div className="flex flex-col h-full w-[65px] min-w-[65px] items-center bg-slate-100">+ <div className="flex flex-col h-full w-[65px] min-w-[65px] items-center">{showMacOsPlaceholder ? (<div className="w-full h-8 flex gap-[8px] px-[6px] py-[7px]"><div className="w-3 h-3 bg-gray-400 rounded-full"></div>diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-settings-item.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-settings-item.tsxindex 5df03e8d..4cb64e45 100644--- a/packages/ui/src/components/layouts/sidebars/sidebar-settings-item.tsx+++ b/packages/ui/src/components/layouts/sidebars/sidebar-settings-item.tsx@@ -25,7 +25,8 @@ export const SidebarSettingsItem = ({<divclassName={cn('text-sm flex h-7 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground cursor-pointer',- isActive && 'font-semibold'+ isActive &&+ 'bg-sidebar-accent text-sidebar-accent-foreground font-medium')}onClick={() => {layout.previewLeft(path);diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsxindex 78785f04..aa5937eb 100644--- a/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx+++ b/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx@@ -2,6 +2,7 @@ import {Cylinder,Download,LogOut,+ Palette,Settings,Upload,Users,@@ -76,6 +77,14 @@ export const SidebarSettings = () => {path={SpecialContainerTabPath.AccountSettings}/></div>+ <div className="flex w-full min-w-0 flex-col gap-1">+ <SidebarHeader title="App settings" />+ <SidebarSettingsItem+ title="Appearance"+ icon={Palette}+ path={SpecialContainerTabPath.AppAppearance}+ />+ </div><div className="flex w-full min-w-0 flex-col gap-1"><Separator className="my-2" /><SidebarSettingsItemdiff --git a/packages/ui/src/components/layouts/sidebars/sidebar.tsx b/packages/ui/src/components/layouts/sidebars/sidebar.tsxindex 57e987bd..09cf4cf4 100644--- a/packages/ui/src/components/layouts/sidebars/sidebar.tsx+++ b/packages/ui/src/components/layouts/sidebars/sidebar.tsx@@ -11,9 +11,9 @@ interface SidebarProps {export const Sidebar = ({ menu, onMenuChange }: SidebarProps) => {return (- <div className="flex h-screen min-h-screen max-h-screen w-full min-w-full flex-row bg-slate-50">+ <div className="flex h-screen min-h-screen max-h-screen w-full min-w-full flex-row bg-sidebar"><SidebarMenu value={menu} onChange={onMenuChange} />- <div className="min-h-0 flex-grow overflow-auto">+ <div className="min-h-0 flex-grow overflow-auto border-l border-sidebar-border">{menu === 'spaces' && <SidebarSpaces />}{menu === 'chats' && <SidebarChats />}{menu === 'settings' && <SidebarSettings />}diff --git a/packages/ui/src/components/messages/conversation.tsx b/packages/ui/src/components/messages/conversation.tsxindex 2bf256a1..894c3c07 100644--- a/packages/ui/src/components/messages/conversation.tsx+++ b/packages/ui/src/components/messages/conversation.tsx@@ -7,7 +7,11 @@ import {MessageCreateRefProps,} from '@colanode/ui/components/messages/message-create';import { MessageList } from '@colanode/ui/components/messages/message-list';-import { ScrollArea } from '@colanode/ui/components/ui/scroll-area';+import {+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';import { ConversationContext } from '@colanode/ui/contexts/conversation';import { useWorkspace } from '@colanode/ui/contexts/workspace';@@ -103,18 +107,21 @@ export const Conversation = ({onScroll={handleScroll}className="flex-grow overflow-y-auto">- <div ref={containerRef}>- <MessageList />- </div>- <InView- className="h-4"- rootMargin="20px"- onChange={(inView) => {- bottomVisibleRef.current = inView;- }}- >- <div ref={bottomRef} className="h-4"></div>- </InView>+ <ScrollViewport>+ <div ref={containerRef}>+ <MessageList />+ </div>+ <InView+ className="h-4"+ rootMargin="20px"+ onChange={(inView) => {+ bottomVisibleRef.current = inView;+ }}+ >+ <div ref={bottomRef} className="h-4"></div>+ </InView>+ <ScrollBar orientation="vertical" />+ </ScrollViewport></ScrollArea><MessageCreate ref={messageCreateRef} /></div>diff --git a/packages/ui/src/components/messages/message-actions.tsx b/packages/ui/src/components/messages/message-actions.tsxindex 192a43dd..6ba13653 100644--- a/packages/ui/src/components/messages/message-actions.tsx+++ b/packages/ui/src/components/messages/message-actions.tsx@@ -6,7 +6,6 @@ import { LocalMessageNode } from '@colanode/client/types';import { MessageDeleteButton } from '@colanode/ui/components/messages/message-delete-button';import { MessageQuickReaction } from '@colanode/ui/components/messages/message-quick-reaction';import { MessageReactionCreatePopover } from '@colanode/ui/components/messages/message-reaction-create-popover';-import { Separator } from '@colanode/ui/components/ui/separator';import { useConversation } from '@colanode/ui/contexts/conversation';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { useMutation } from '@colanode/ui/hooks/use-mutation';@@ -14,7 +13,7 @@ import { defaultEmojis } from '@colanode/ui/lib/assets';const MessageAction = ({ children }: { children: React.ReactNode }) => {return (- <li className="flex h-8 w-7 cursor-pointer items-center justify-center hover:bg-gray-200">+ <li className="flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-input">{children}</li>);@@ -56,7 +55,7 @@ export const MessageActions = ({ message }: MessageActionsProps) => {);return (- <ul className="invisible absolute -top-2 right-1 z-10 flex flex-row items-center bg-gray-100 text-muted-foreground shadow group-hover:visible">+ <ul className="invisible absolute -top-5 right-1 z-10 flex flex-row items-center rounded-md bg-muted p-0.5 text-muted-foreground shadow-md group-hover:visible"><MessageAction><MessageQuickReactionemoji={defaultEmojis.like}@@ -75,7 +74,7 @@ export const MessageActions = ({ message }: MessageActionsProps) => {onClick={handleReactionClick}/></MessageAction>- <Separator orientation="vertical" className="h-6 w-[2px] mx-1" />+ <div className="mx-1 h-6 w-[1px] bg-border" />{canReplyInThread && (<MessageAction><MessagesSquare className="size-4 cursor-pointer" />diff --git a/packages/ui/src/components/messages/message-author-name.tsx b/packages/ui/src/components/messages/message-author-name.tsxindex 09f7d910..e243fce7 100644--- a/packages/ui/src/components/messages/message-author-name.tsx+++ b/packages/ui/src/components/messages/message-author-name.tsx@@ -26,5 +26,9 @@ export const MessageAuthorName = ({}const user = userGetQuery.data;- return <span className={cn('font-medium', className)}>{user.name}</span>;+ return (+ <span className={cn('font-medium text-foreground', className)}>+ {user.name}+ </span>+ );};diff --git a/packages/ui/src/components/messages/message-create.tsx b/packages/ui/src/components/messages/message-create.tsxindex 4d2a9fe0..2bc31b07 100644--- a/packages/ui/src/components/messages/message-create.tsx+++ b/packages/ui/src/components/messages/message-create.tsx@@ -124,11 +124,12 @@ export const MessageCreate = forwardRef<MessageCreateRefProps>((_, ref) => {onCancel={() => setReplyTo(null)}/>)}- <div className="flex min-h-0 flex-row items-center rounded bg-gray-100 p-2 pl-0">+ <div className="flex min-h-0 flex-row items-center rounded bg-muted p-2 pl-0"><div className="flex w-10 items-center justify-center"><DropdownMenu><DropdownMenuTriggerdisabled={isPending || !conversation.canCreateMessage}+ className="cursor-pointer hover:bg-accent"><span><Plus size={20} />diff --git a/packages/ui/src/components/messages/message-list.tsx b/packages/ui/src/components/messages/message-list.tsxindex 403cf1e5..1a6c4f68 100644--- a/packages/ui/src/components/messages/message-list.tsx+++ b/packages/ui/src/components/messages/message-list.tsx@@ -77,11 +77,11 @@ export const MessageList = () => {<Fragment key={message.id}>{showDate && (<div className="relative flex items-center py-1">- <div className="flex-grow border-t border-gray-100" />+ <div className="flex-grow border-t border-muted" /><span className="mx-4 flex-shrink text-xs text-muted-foreground">{currentMessageDate.toDateString()}</span>- <div className="flex-grow border-t border-gray-100" />+ <div className="flex-grow border-t border-muted" /></div>)}<Message message={message} previousMessage={previousMessage} />diff --git a/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx b/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsxindex 85c80339..56b8aeb6 100644--- a/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx+++ b/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx@@ -47,11 +47,11 @@ export const MessageReactionCountTooltipContent = ({.filter((result) => result.data !== null).map((result) => result.data!.customName ?? result.data!.name);- const emojiName = `:${emojiGetQuery.data?.code ?? reactionCount.reaction}:`;+ const emojiName = `:${emojiGetQuery.data?.code ?? emojiGetQuery.data?.name ?? reactionCount.reaction}:`;return (<div className="flex items-center gap-4">- <EmojiElement id={reactionCount.reaction} className="h-5 w-5" />+ <EmojiElement id={reactionCount.reaction} className="size-5" />{users.length === 1 && (<p><span className="font-semibold">{users[0]}</span>diff --git a/packages/ui/src/components/messages/message-reaction-count-tooltip.tsx b/packages/ui/src/components/messages/message-reaction-count-tooltip.tsxindex 17cc9578..eac7c836 100644--- a/packages/ui/src/components/messages/message-reaction-count-tooltip.tsx+++ b/packages/ui/src/components/messages/message-reaction-count-tooltip.tsx@@ -26,10 +26,7 @@ export const MessageReactionCountTooltip = ({return (<Tooltip><TooltipTrigger>{children}</TooltipTrigger>- <TooltipContent- className="bg-background text-primary p-2 shadow-md cursor-pointer"- onClick={onOpen}- >+ <TooltipContent className="p-2 shadow-md cursor-pointer" onClick={onOpen}><MessageReactionCountTooltipContentmessage={message}reactionCount={reactionCount}diff --git a/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx b/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsxindex 00951219..7aaa9034 100644--- a/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx+++ b/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx@@ -55,7 +55,7 @@ export const MessageReactionCountsDialogList = ({.map((result) => result.data!);return (- <div className="flex flex-col gap-2">+ <div className="flex flex-col gap-2 p-2">{users.map((user) => (<div key={user.id} className="flex items-center space-x-3"><Avatardiff --git a/packages/ui/src/components/messages/message-reaction-counts-dialog.tsx b/packages/ui/src/components/messages/message-reaction-counts-dialog.tsxindex b6ea61a6..800543ff 100644--- a/packages/ui/src/components/messages/message-reaction-counts-dialog.tsx+++ b/packages/ui/src/components/messages/message-reaction-counts-dialog.tsx@@ -42,14 +42,14 @@ export const MessageReactionCountsDialog = ({defaultValue={reactionCounts[0]!.reaction}className="flex flex-row gap-4">- <TabsList className="flex h-full max-h-full w-24 flex-col items-start justify-start gap-1 rounded-none border-r border-r-gray-100 bg-white pr-3">+ <TabsList>{reactionCounts.map((reactionCount) => (<TabsTriggerkey={`tab-trigger-${reactionCount.reaction}`}className="flex w-full flex-row items-center justify-start gap-2 p-2"value={reactionCount.reaction}>- <EmojiElement id={reactionCount.reaction} className="h-5 w-5" />+ <EmojiElement id={reactionCount.reaction} className="size-5" />{reactionCount.count}</TabsTrigger>))}diff --git a/packages/ui/src/components/messages/message-reaction-counts.tsx b/packages/ui/src/components/messages/message-reaction-counts.tsxindex a34d4948..7dbca891 100644--- a/packages/ui/src/components/messages/message-reaction-counts.tsx+++ b/packages/ui/src/components/messages/message-reaction-counts.tsx@@ -54,9 +54,8 @@ export const MessageReactionCounts = ({<divkey={reaction.reaction}className={cn(- 'rouded flex flex-row items-center gap-2 px-1 py-0.5 shadow',- 'cursor-pointer text-sm text-muted-foreground hover:text-foreground',- hasReacted ? 'bg-blue-100' : 'bg-gray-50'+ 'rouded flex flex-row items-center gap-2 p-1 shadow cursor-pointer text-sm text-muted-foreground hover:text-foreground bg-muted hover:bg-input',+ hasReacted && 'font-bold')}onClick={() => {if (isPending) {diff --git a/packages/ui/src/components/messages/message-reaction-create-popover.tsx b/packages/ui/src/components/messages/message-reaction-create-popover.tsxindex 59af9dba..a971a1a6 100644--- a/packages/ui/src/components/messages/message-reaction-create-popover.tsx+++ b/packages/ui/src/components/messages/message-reaction-create-popover.tsx@@ -20,7 +20,7 @@ export const MessageReactionCreatePopover = ({return (<Popover open={open} onOpenChange={setOpen} modal={true}><PopoverTrigger>- <SmilePlus className="size-4" />+ <SmilePlus className="size-4 cursor-pointer" /></PopoverTrigger><PopoverContent className="w-max p-0" align="end"><EmojiPickerdiff --git a/packages/ui/src/components/messages/message-reply-banner.tsx b/packages/ui/src/components/messages/message-reply-banner.tsxindex 9f5b83e7..c1e3c484 100644--- a/packages/ui/src/components/messages/message-reply-banner.tsx+++ b/packages/ui/src/components/messages/message-reply-banner.tsx@@ -26,7 +26,7 @@ export const MessageReplyBanner = ({}return (- <div className="flex flex-row items-center justify-between rounded-t-lg border-b-2 bg-gray-100 p-2 text-foreground">+ <div className="flex flex-row items-center justify-between rounded-t-lg border-b-2 bg-muted p-2 text-foreground"><p className="text-sm">Replying to{' '}<span className="font-semibold">{userGetQuery.data.name}</span>diff --git a/packages/ui/src/components/messages/message.tsx b/packages/ui/src/components/messages/message.tsxindex c16a2e94..f64dc31b 100644--- a/packages/ui/src/components/messages/message.tsx+++ b/packages/ui/src/components/messages/message.tsx@@ -43,7 +43,7 @@ export const Message = ({ message, previousMessage }: MessageProps) => {<divid={`message-${message.id}`}key={`message-${message.id}`}- className={`group flex flex-row px-1 hover:bg-gray-50 ${+ className={`group flex flex-row px-1 rounded-sm hover:bg-accent ${displayAuthor ? 'mt-2 first:mt-0' : ''}`}>diff --git a/packages/ui/src/components/pages/page-body.tsx b/packages/ui/src/components/pages/page-body.tsxindex 0e050c06..bf1e4925 100644--- a/packages/ui/src/components/pages/page-body.tsx+++ b/packages/ui/src/components/pages/page-body.tsx@@ -1,9 +1,11 @@-import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';-import { LocalPageNode } from '@colanode/client/types';import { NodeRole, hasNodeRole } from '@colanode/core';import { Document } from '@colanode/ui/components/documents/document';-import { ScrollBar } from '@colanode/ui/components/ui/scroll-area';+import {+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';interface PageBodyProps {page: LocalPageNode;@@ -15,14 +17,13 @@ export const PageBody = ({ page, role }: PageBodyProps) => {return (<div className="h-full w-full overflow-y-auto">- <ScrollAreaPrimitive.Root className="relative overflow-hidden h-full">- <ScrollAreaPrimitive.Viewport className="h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]">+ <ScrollArea className="overflow-hidden h-full">+ <ScrollViewport className="h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]"><Document node={page} canEdit={canEdit} autoFocus="start" />- </ScrollAreaPrimitive.Viewport>+ </ScrollViewport><ScrollBar orientation="horizontal" /><ScrollBar orientation="vertical" />- <ScrollAreaPrimitive.Corner />- </ScrollAreaPrimitive.Root>+ </ScrollArea></div>);};diff --git a/packages/ui/src/components/pages/page-form.tsx b/packages/ui/src/components/pages/page-form.tsxindex d5b5e9f5..5da1b5b7 100644--- a/packages/ui/src/components/pages/page-form.tsx+++ b/packages/ui/src/components/pages/page-form.tsx@@ -83,7 +83,7 @@ export const PageForm = ({id={id}name={name}avatar={avatar}- className="h-6 w-6"+ className="size-6"/></Button></AvatarPopover>diff --git a/packages/ui/src/components/records/record-avatar.tsx b/packages/ui/src/components/records/record-avatar.tsxindex 50174134..d47ff62e 100644--- a/packages/ui/src/components/records/record-avatar.tsx+++ b/packages/ui/src/components/records/record-avatar.tsx@@ -51,7 +51,7 @@ export const RecordAvatar = () => {id={record.id}name={record.name}avatar={record.avatar}- className="h-6 w-6"+ className="size-6"/></Button></AvatarPopover>diff --git a/packages/ui/src/components/records/record-body.tsx b/packages/ui/src/components/records/record-body.tsxindex a0dedb77..32f282e0 100644--- a/packages/ui/src/components/records/record-body.tsx+++ b/packages/ui/src/components/records/record-body.tsx@@ -1,12 +1,14 @@-import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';-import { LocalRecordNode } from '@colanode/client/types';import { NodeRole, hasNodeRole } from '@colanode/core';import { Document } from '@colanode/ui/components/documents/document';import { RecordAttributes } from '@colanode/ui/components/records/record-attributes';import { RecordDatabase } from '@colanode/ui/components/records/record-database';import { RecordProvider } from '@colanode/ui/components/records/record-provider';-import { ScrollBar } from '@colanode/ui/components/ui/scroll-area';+import {+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';import { Separator } from '@colanode/ui/components/ui/separator';import { useWorkspace } from '@colanode/ui/contexts/workspace';@@ -23,18 +25,17 @@ export const RecordBody = ({ record, role }: RecordBodyProps) => {return (<RecordDatabase id={record.attributes.databaseId} role={role}><div className="h-full w-full overflow-y-auto">- <ScrollAreaPrimitive.Root className="relative overflow-hidden h-full">- <ScrollAreaPrimitive.Viewport className="h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]">+ <ScrollArea className="overflow-hidden h-full">+ <ScrollViewport className="h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]"><RecordProvider record={record} role={role}><RecordAttributes /></RecordProvider><Separator className="my-4 w-full" /><Document node={record} canEdit={canEdit} autoFocus={false} />- </ScrollAreaPrimitive.Viewport>+ </ScrollViewport><ScrollBar orientation="horizontal" /><ScrollBar orientation="vertical" />- <ScrollAreaPrimitive.Corner />- </ScrollAreaPrimitive.Root>+ </ScrollArea></div></RecordDatabase>);diff --git a/packages/ui/src/components/records/record-field.tsx b/packages/ui/src/components/records/record-field.tsxindex a71ac5d3..feeab01e 100644--- a/packages/ui/src/components/records/record-field.tsx+++ b/packages/ui/src/components/records/record-field.tsx@@ -25,7 +25,7 @@ export const RecordField = ({ field }: RecordFieldProps) => {<Fragment><Popover modal={true}><PopoverTrigger asChild>- <div className="flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-gray-50">+ <div className="flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-accent"><FieldIcon type={field.type} className="size-4" /><p>{field.name}</p></div>@@ -35,7 +35,7 @@ export const RecordField = ({ field }: RecordFieldProps) => {<Separator />{database.canEdit && (<div- className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-accent"onClick={() => {setShowDeleteDialog(true);}}diff --git a/packages/ui/src/components/records/record-search.tsx b/packages/ui/src/components/records/record-search.tsxindex 098b2278..c2efd4f7 100644--- a/packages/ui/src/components/records/record-search.tsx+++ b/packages/ui/src/components/records/record-search.tsx@@ -10,6 +10,11 @@ import {CommandItem,CommandList,} from '@colanode/ui/components/ui/command';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';@@ -45,29 +50,36 @@ export const RecordSearch = ({className="h-9"/><CommandEmpty>No record found.</CommandEmpty>- <CommandList>- <CommandGroup className="h-min">- {recordSearchQuery.data?.map((record) => (- <CommandItem- key={record.id}- onSelect={() => {- onSelect(record);- setQuery('');- }}- >- <div className="flex w-full flex-row items-center gap-2">- <Avatar- id={record.id}- name={record.attributes.name}- avatar={record.attributes.avatar}- className="size-4"- />- <p className="text-sm flex-grow">{record.attributes.name}</p>- </div>- </CommandItem>- ))}- </CommandGroup>- </CommandList>+ <ScrollArea className="h-80">+ <ScrollViewport>+ <CommandList className="max-h-none overflow-hidden">+ <CommandGroup className="h-min">+ {recordSearchQuery.data?.map((record) => (+ <CommandItem+ key={record.id}+ onSelect={() => {+ onSelect(record);+ setQuery('');+ }}+ >+ <div className="flex w-full flex-row items-center gap-2">+ <Avatar+ id={record.id}+ name={record.attributes.name}+ avatar={record.attributes.avatar}+ className="size-4"+ />+ <p className="text-sm flex-grow">+ {record.attributes.name}+ </p>+ </div>+ </CommandItem>+ ))}+ </CommandGroup>+ </CommandList>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></Command>);};diff --git a/packages/ui/src/components/servers/server-dropdown.tsx b/packages/ui/src/components/servers/server-dropdown.tsxindex e67de057..916d5265 100644--- a/packages/ui/src/components/servers/server-dropdown.tsx+++ b/packages/ui/src/components/servers/server-dropdown.tsx@@ -56,7 +56,7 @@ export const ServerDropdown = ({}}><DropdownMenuTrigger asChild>- <div className="flex w-full flex-grow flex-row items-center gap-3 rounded-md border border-input p-2 cursor-pointer hover:bg-gray-100">+ <div className="flex w-full flex-grow flex-row items-center gap-3 rounded-md border border-input p-2 cursor-pointer hover:bg-accent">{server ? (<ServerAvatarurl={server.avatar}@@ -92,7 +92,7 @@ export const ServerDropdown = ({onChange(server.domain);}}}- className="group/server flex w-full flex-grow flex-row items-center gap-3 rounded-md border-b border-input p-2 cursor-pointer hover:bg-gray-100"+ className="group/server flex w-full flex-grow flex-row items-center gap-3 rounded-md border-b border-input p-2 cursor-pointer hover:bg-accent"><div className="flex flex-grow items-center gap-3"><ServerAvatar@@ -108,7 +108,7 @@ export const ServerDropdown = ({</div></div><button- className="text-muted-foreground opacity-0 group-hover/server:opacity-100 hover:bg-gray-200 size-8 flex items-center justify-center rounded-md cursor-pointer"+ className="text-muted-foreground opacity-0 group-hover/server:opacity-100 hover:bg-accent size-8 flex items-center justify-center rounded-md cursor-pointer"onClick={(e) => {e.stopPropagation();e.preventDefault();diff --git a/packages/ui/src/components/servers/server-upgrade-required.tsx b/packages/ui/src/components/servers/server-upgrade-required.tsxindex 589b3e59..e4190d1e 100644--- a/packages/ui/src/components/servers/server-upgrade-required.tsx+++ b/packages/ui/src/components/servers/server-upgrade-required.tsx@@ -8,16 +8,16 @@ export const ServerUpgradeRequired = () => {return (<div className="flex h-full w-full items-center justify-center"><div className="flex flex-col items-center gap-8 text-center w-128">- <CircleFadingArrowUp className="h-10 w-10 text-gray-800" />- <h2 className="text-4xl text-gray-800">Server upgrade required</h2>- <p className="text-sm text-gray-500">+ <CircleFadingArrowUp className="h-10 w-10 text-foreground" />+ <h2 className="text-4xl text-foreground">Server upgrade required</h2>+ <p className="text-sm text-muted-foreground">The Colanode server{' '}<span className="font-semibold">{server.name}</span> with domain{' '}<span className="font-semibold">{server.domain}</span> is running anoutdated version and cannot serve this workspace. Please ask youradministrator to upgrade it to the latest release.</p>- <p className="text-sm text-gray-500">+ <p className="text-sm text-muted-foreground">Check the{' '}<ahref="https://github.com/colanode/colanode"diff --git a/packages/ui/src/components/spaces/space-avatar.tsx b/packages/ui/src/components/spaces/space-avatar.tsxdeleted file mode 100644index c175fd13..00000000--- a/packages/ui/src/components/spaces/space-avatar.tsx+++ /dev/null@@ -1,48 +0,0 @@-import { LocalSpaceNode } from '@colanode/client/types';-import { Avatar } from '@colanode/ui/components/avatars/avatar';-import { AvatarPopover } from '@colanode/ui/components/avatars/avatar-popover';-import { Button } from '@colanode/ui/components/ui/button';--interface SpaceAvatarProps {- space: LocalSpaceNode;- readonly: boolean;- onUpdate: (avatar: string) => void;-}--export const SpaceAvatar = ({- space,- readonly,- onUpdate,-}: SpaceAvatarProps) => {- if (readonly) {- return (- <Button type="button" variant="outline" size="icon">- <Avatar- id={space.id}- name={space.attributes.name}- avatar={space.attributes.avatar}- className="h-6 w-6"- />- </Button>- );- }-- return (- <AvatarPopover- onPick={(avatar) => {- if (avatar === space.attributes.avatar) return;-- onUpdate(avatar);- }}- >- <Button type="button" variant="outline" size="icon">- <Avatar- id={space.id}- name={space.attributes.name}- avatar={space.attributes.avatar}- className="h-6 w-6"- />- </Button>- </AvatarPopover>- );-};diff --git a/packages/ui/src/components/spaces/space-body.tsx b/packages/ui/src/components/spaces/space-body.tsxindex 40bd12d1..84d5d025 100644--- a/packages/ui/src/components/spaces/space-body.tsx+++ b/packages/ui/src/components/spaces/space-body.tsx@@ -1,17 +1,20 @@-import { Info, Trash2, Users } from 'lucide-react';+import { toast } from 'sonner';import { LocalSpaceNode } from '@colanode/client/types';import { NodeRole, hasNodeRole } from '@colanode/core';import { NodeCollaborators } from '@colanode/ui/components/collaborators/node-collaborators';-import { SpaceDeleteForm } from '@colanode/ui/components/spaces/space-delete-form';-import { SpaceGeneralTab } from '@colanode/ui/components/spaces/space-general-tab';+import { SpaceDelete } from '@colanode/ui/components/spaces/space-delete';+import { SpaceForm } from '@colanode/ui/components/spaces/space-form';+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';import {- Tabs,- TabsContent,- TabsList,- TabsTrigger,-} from '@colanode/ui/components/ui/tabs';+ ScrollArea,+ ScrollBar,+ ScrollViewport,+} from '@colanode/ui/components/ui/scroll-area';+import { Separator } from '@colanode/ui/components/ui/separator';import { useLayout } from '@colanode/ui/contexts/layout';+import { useWorkspace } from '@colanode/ui/contexts/workspace';+import { useMutation } from '@colanode/ui/hooks/use-mutation';interface SpaceBodyProps {space: LocalSpaceNode;@@ -19,73 +22,89 @@ interface SpaceBodyProps {}export const SpaceBody = ({ space, role }: SpaceBodyProps) => {+ const workspace = useWorkspace();+ const { mutate, isPending } = useMutation();+const layout = useLayout();const canEdit = hasNodeRole(role, 'admin');const canDelete = hasNodeRole(role, 'admin');return (- <Tabs- defaultValue="general"- className="grid h-full max-h-full grid-cols-[200px_minmax(0,1fr)] overflow-hidden gap-4"- >- <TabsList className="flex w-full flex-col items-start justify-start gap-1 rounded-none bg-white">- <TabsTrigger- key={`tab-trigger-general`}- className="w-full justify-start p-2 hover:bg-gray-50 cursor-pointer"- value="general"- >- <Info className="mr-2 size-4" />- General- </TabsTrigger>- <TabsTrigger- key={`tab-trigger-collaborators`}- className="w-full justify-start p-2 hover:bg-gray-50 cursor-pointer"- value="collaborators"- >- <Users className="mr-2 size-4" />- Collaborators- </TabsTrigger>- {canDelete && (- <TabsTrigger- key={`tab-trigger-delete`}- className="w-full justify-start p-2 hover:bg-gray-50 cursor-pointer"- value="delete"- >- <Trash2 className="mr-2 size-4" />- Delete- </TabsTrigger>- )}- </TabsList>- <div className="overflow-auto pl-1 max-w-[50rem]">- <TabsContent- key="tab-content-info"- className="focus-visible:ring-0 focus-visible:ring-offset-0"- value="general"- >- <SpaceGeneralTab space={space} readonly={!canEdit} />- </TabsContent>- <TabsContent- key="tab-content-collaborators"- className="focus-visible:ring-0 focus-visible:ring-offset-0"- value="collaborators"- >- <NodeCollaborators node={space} nodes={[space]} role={role} />- </TabsContent>- {canDelete && (- <TabsContent- key="tab-content-delete"- className="focus-visible:ring-0 focus-visible:ring-offset-0"- value="delete"- >- <SpaceDeleteForm- id={space.id}- onDeleted={() => {- layout.close(space.id);- }}- />- </TabsContent>- )}- </div>- </Tabs>+ <Container>+ <ContainerBody>+ <ScrollArea className="relative overflow-hidden">+ <ScrollViewport className="h-full max-h-[calc(100vh-100px)] w-full overflow-y-auto rounded-[inherit]">+ <div className="max-w-4xl space-y-8 w-full pb-10">+ <div className="space-y-6">+ <div>+ <h2 className="text-2xl font-semibold tracking-tight">+ General+ </h2>+ <Separator className="mt-3" />+ </div>+ <SpaceForm+ values={{+ name: space.attributes.name,+ description: space.attributes.description ?? '',+ avatar: space.attributes.avatar ?? null,+ }}+ readOnly={!canEdit}+ onSubmit={(values) => {+ mutate({+ input: {+ type: 'space.update',+ accountId: workspace.accountId,+ workspaceId: workspace.id,+ spaceId: space.id,+ name: values.name,+ description: values.description,+ avatar: values.avatar,+ },+ onSuccess() {+ toast.success('Space updated');+ },+ onError(error) {+ toast.error(error.message);+ },+ });+ }}+ isSaving={isPending}+ saveText="Update"+ />+ </div>++ <div className="space-y-6">+ <div>+ <h2 className="text-2xl font-semibold tracking-tight">+ Collaborators+ </h2>+ <Separator className="mt-3" />+ </div>+ <NodeCollaborators node={space} nodes={[space]} role={role} />+ </div>++ {canDelete && (+ <div className="space-y-6">+ <div>+ <h2 className="text-2xl font-semibold tracking-tight">+ Danger Zone+ </h2>+ <Separator className="mt-3" />+ </div>+ <SpaceDelete+ id={space.id}+ onDeleted={() => {+ layout.close(space.id);+ }}+ />+ </div>+ )}+ </div>+ </ScrollViewport>+ <ScrollBar orientation="horizontal" />+ <ScrollBar orientation="vertical" />+ </ScrollArea>+ </ContainerBody>+ </Container>);};diff --git a/packages/ui/src/components/spaces/space-create-dialog.tsx b/packages/ui/src/components/spaces/space-create-dialog.tsxindex 7c4d611d..c525609d 100644--- a/packages/ui/src/components/spaces/space-create-dialog.tsx+++ b/packages/ui/src/components/spaces/space-create-dialog.tsx@@ -1,36 +1,16 @@-import { zodResolver } from '@hookform/resolvers/zod';-import { useForm } from 'react-hook-form';import { toast } from 'sonner';-import { z } from 'zod/v4';-import { Button } from '@colanode/ui/components/ui/button';+import { SpaceForm } from '@colanode/ui/components/spaces/space-form';import {Dialog,DialogContent,DialogDescription,- DialogFooter,DialogHeader,DialogTitle,} from '@colanode/ui/components/ui/dialog';-import {- Form,- FormControl,- FormField,- FormItem,- FormLabel,- FormMessage,-} from '@colanode/ui/components/ui/form';-import { Input } from '@colanode/ui/components/ui/input';-import { Spinner } from '@colanode/ui/components/ui/spinner';-import { Textarea } from '@colanode/ui/components/ui/textarea';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { useMutation } from '@colanode/ui/hooks/use-mutation';-const formSchema = z.object({- name: z.string().min(3, 'Name must be at least 3 characters long.'),- description: z.string(),-});-interface SpaceCreateDialogProps {open: boolean;onOpenChange: (open: boolean) => void;@@ -43,102 +23,48 @@ export const SpaceCreateDialog = ({const workspace = useWorkspace();const { mutate, isPending } = useMutation();- const form = useForm<z.infer<typeof formSchema>>({- resolver: zodResolver(formSchema),- defaultValues: {- name: '',- description: '',- },- });-- const handleCancel = () => {- form.reset();- onOpenChange(false);- };-- const handleSubmit = async (values: z.infer<typeof formSchema>) => {- if (isPending) {- return;- }-- if (values.name.length < 3) {- return;- }-- mutate({- input: {- type: 'space.create',- name: values.name,- description: values.description,- accountId: workspace.accountId,- workspaceId: workspace.id,- },- onSuccess() {- onOpenChange(false);- form.reset();- },- onError(error) {- toast.error(error.message);- },- });- };-return (<Dialog open={open} onOpenChange={onOpenChange}>- <DialogContent>+ <DialogContent className="w-xl max-w-xl min-w-xl"><DialogHeader><DialogTitle>Create space</DialogTitle><DialogDescription>Create a new space to collaborate with your peers</DialogDescription></DialogHeader>- <Form {...form}>- <form- className="flex flex-col"- onSubmit={form.handleSubmit(handleSubmit)}- >- <div className="flex-grow space-y-4 py-2 pb-4">- <FormField- control={form.control}- name="name"- render={({ field }) => (- <FormItem className="flex-1">- <FormLabel>Name *</FormLabel>- <FormControl>- <Input placeholder="Name" {...field} />- </FormControl>- <FormMessage />- </FormItem>- )}- />- <FormField- control={form.control}- name="description"- render={({ field }) => (- <FormItem>- <FormLabel>Description</FormLabel>- <FormControl>- <Textarea- placeholder="Write a short description about the workspace"- {...field}- />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>- <DialogFooter>- <Button type="button" variant="outline" onClick={handleCancel}>- Cancel- </Button>- <Button type="submit" disabled={isPending}>- {isPending && <Spinner className="mr-1" />}- Create- </Button>- </DialogFooter>- </form>- </Form>+ <SpaceForm+ onSubmit={(values) => {+ if (isPending) {+ return;+ }++ if (values.name.length < 3) {+ return;+ }++ mutate({+ input: {+ type: 'space.create',+ name: values.name,+ description: values.description,+ avatar: values.avatar,+ accountId: workspace.accountId,+ workspaceId: workspace.id,+ },+ onSuccess() {+ onOpenChange(false);+ },+ onError(error) {+ toast.error(error.message);+ },+ });+ }}+ isSaving={isPending}+ onCancel={() => {+ onOpenChange(false);+ }}+ saveText="Create"+ /></DialogContent></Dialog>);diff --git a/packages/ui/src/components/spaces/space-delete-form.tsx b/packages/ui/src/components/spaces/space-delete.tsxsimilarity index 75%rename from packages/ui/src/components/spaces/space-delete-form.tsxrename to packages/ui/src/components/spaces/space-delete.tsxindex f1268c11..0c7f5e92 100644--- a/packages/ui/src/components/spaces/space-delete-form.tsx+++ b/packages/ui/src/components/spaces/space-delete.tsx@@ -15,36 +15,37 @@ import { Spinner } from '@colanode/ui/components/ui/spinner';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { useMutation } from '@colanode/ui/hooks/use-mutation';-interface SpaceDeleteFormProps {+interface SpaceDeleteProps {id: string;onDeleted: () => void;}-export const SpaceDeleteForm = ({ id, onDeleted }: SpaceDeleteFormProps) => {+export const SpaceDelete = ({ id, onDeleted }: SpaceDeleteProps) => {const workspace = useWorkspace();const { mutate, isPending } = useMutation();const [showDeleteModal, setShowDeleteModal] = useState(false);return (- <div className="flex flex-col gap-4">- <h3 className="font-heading mb-px text-2xl font-semibold tracking-tight">- Delete space- </h3>- <p>Deleting a space is permanent and cannot be undone.</p>- <p>- All data associated with the space will be deleted, including messages,- pages, channels, databases, records, files and more.- </p>- <div>- <Button- variant="destructive"- onClick={() => {- setShowDeleteModal(true);- }}- >- Delete space- </Button>+ <>+ <div className="flex items-center justify-between gap-6">+ <div className="flex-1 space-y-2">+ <h3 className="font-semibold">Delete space</h3>+ <p className="text-sm text-muted-foreground">+ Once you delete a space, there is no going back. Please be certain.+ </p>+ </div>+ <div className="flex-shrink-0">+ <Button+ variant="destructive"+ onClick={() => {+ setShowDeleteModal(true);+ }}+ className="w-20"+ >+ Delete+ </Button>+ </div></div><AlertDialog open={showDeleteModal} onOpenChange={setShowDeleteModal}><AlertDialogContent>@@ -87,6 +88,6 @@ export const SpaceDeleteForm = ({ id, onDeleted }: SpaceDeleteFormProps) => {</AlertDialogFooter></AlertDialogContent></AlertDialog>- </div>+ </>);};diff --git a/packages/ui/src/components/spaces/space-description.tsx b/packages/ui/src/components/spaces/space-description.tsxdeleted file mode 100644index 19ff21b5..00000000--- a/packages/ui/src/components/spaces/space-description.tsx+++ /dev/null@@ -1,48 +0,0 @@-import { useEffect, useRef } from 'react';--import { LocalSpaceNode } from '@colanode/client/types';-import { SmartTextarea } from '@colanode/ui/components/ui/smart-textarea';--interface SpaceDescriptionProps {- space: LocalSpaceNode;- readonly: boolean;- onUpdate: (description: string) => void;-}--export const SpaceDescription = ({- space,- readonly,- onUpdate,-}: SpaceDescriptionProps) => {- const textareaRef = useRef<HTMLTextAreaElement>(null);-- useEffect(() => {- if (readonly) return;-- const timeoutId = setTimeout(() => {- textareaRef.current?.focus();- }, 0);-- return () => clearTimeout(timeoutId);- }, [readonly, textareaRef]);-- return (- <SmartTextarea- value={space.attributes.description ?? ''}- readOnly={readonly}- ref={textareaRef}- onChange={(value) => {- if (readonly) {- return;- }-- if (value === space.attributes.description) {- return;- }-- onUpdate(value);- }}- placeholder="No description"- />- );-};diff --git a/packages/ui/src/components/spaces/space-form.tsx b/packages/ui/src/components/spaces/space-form.tsxnew file mode 100644index 00000000..e7861627--- /dev/null+++ b/packages/ui/src/components/spaces/space-form.tsx@@ -0,0 +1,149 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { Edit } from 'lucide-react';+import { useRef } from 'react';+import { useForm } from 'react-hook-form';+import { z } from 'zod/v4';++import { generateId, IdType } from '@colanode/core';+import { Avatar } from '@colanode/ui/components/avatars/avatar';+import { AvatarPopover } from '@colanode/ui/components/avatars/avatar-popover';+import { Button } from '@colanode/ui/components/ui/button';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@colanode/ui/components/ui/form';+import { Input } from '@colanode/ui/components/ui/input';+import { Spinner } from '@colanode/ui/components/ui/spinner';+import { Textarea } from '@colanode/ui/components/ui/textarea';+import { cn } from '@colanode/ui/lib/utils';++const formSchema = z.object({+ name: z.string().min(3, 'Name must be at least 3 characters long.'),+ description: z.string(),+ avatar: z.string().optional().nullable(),+});++type formSchemaType = z.infer<typeof formSchema>;++interface SpaceFormProps {+ values?: formSchemaType;+ onSubmit: (values: formSchemaType) => void;+ isSaving: boolean;+ onCancel?: () => void;+ saveText: string;+ readOnly?: boolean;+}++export const SpaceForm = ({+ values,+ onSubmit,+ isSaving,+ onCancel,+ saveText,+ readOnly = false,+}: SpaceFormProps) => {+ const id = useRef(generateId(IdType.Space));++ const form = useForm<formSchemaType>({+ resolver: zodResolver(formSchema),+ defaultValues: {+ name: values?.name ?? '',+ description: values?.description ?? '',+ avatar: values?.avatar,+ },+ });++ const name = form.watch('name');+ const avatar = form.watch('avatar');++ return (+ <Form {...form}>+ <form className="flex flex-col" onSubmit={form.handleSubmit(onSubmit)}>+ <div className="flex flex-row gap-1">+ <AvatarPopover+ onPick={(avatar) => {+ form.setValue('avatar', avatar);+ }}+ >+ <div className="size-40 pt-3">+ <div className="group relative cursor-pointer">+ <Avatar+ id={id.current}+ name={name.length > 0 ? name : 'New space'}+ avatar={avatar}+ className="size-32"+ />+ <div+ className={cn(+ `absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-accent/70 group-hover:inline-flex`,+ readOnly && 'hidden group-hover:hidden'+ )}+ >+ <Edit className="size-5 text-foreground" />+ </div>+ </div>+ </div>+ </AvatarPopover>++ <div className="flex-grow space-y-4 py-2 pb-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem className="flex-1">+ <FormLabel>Name *</FormLabel>+ <FormControl>+ <Input readOnly={readOnly} placeholder="Name" {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <FormField+ control={form.control}+ name="description"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Description</FormLabel>+ <FormControl>+ <Textarea+ readOnly={readOnly}+ placeholder="Write a short description about the space"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ </div>+ {!readOnly && (+ <div className="flex flex-row justify-end gap-2">+ {onCancel && (+ <Button+ type="button"+ disabled={isSaving}+ variant="outline"+ onClick={() => {+ onCancel();+ }}+ >+ Cancel+ </Button>+ )}++ <Button type="submit" disabled={isSaving} className="w-20">+ {isSaving && <Spinner className="mr-1" />}+ {saveText}+ </Button>+ </div>+ )}+ </form>+ </Form>+ );+};diff --git a/packages/ui/src/components/spaces/space-general-tab.tsx b/packages/ui/src/components/spaces/space-general-tab.tsxdeleted file mode 100644index bd541512..00000000--- a/packages/ui/src/components/spaces/space-general-tab.tsx+++ /dev/null@@ -1,83 +0,0 @@-import { toast } from 'sonner';--import { LocalSpaceNode } from '@colanode/client/types';-import { SpaceAvatar } from '@colanode/ui/components/spaces/space-avatar';-import { SpaceDescription } from '@colanode/ui/components/spaces/space-description';-import { SpaceName } from '@colanode/ui/components/spaces/space-name';-import { useWorkspace } from '@colanode/ui/contexts/workspace';-import { useMutation } from '@colanode/ui/hooks/use-mutation';--interface SpaceGeneralTabProps {- space: LocalSpaceNode;- readonly: boolean;-}--export const SpaceGeneralTab = ({ space, readonly }: SpaceGeneralTabProps) => {- const workspace = useWorkspace();-- const { mutate, isPending } = useMutation();-- return (- <div className="flex flex-col gap-2">- <div className="flex flex-row gap-2">- <SpaceAvatar- space={space}- readonly={readonly || isPending}- onUpdate={(avatar) => {- mutate({- input: {- type: 'space.avatar.update',- spaceId: space.id,- avatar,- accountId: workspace.accountId,- workspaceId: workspace.id,- },- onError(error) {- toast.error(error.message);- },- });- }}- />- <SpaceName- space={space}- readonly={readonly || isPending}- onUpdate={(name) => {- mutate({- input: {- type: 'space.name.update',- spaceId: space.id,- name,- accountId: workspace.accountId,- workspaceId: workspace.id,- },- onError(error) {- toast.error(error.message);- },- });- }}- />- </div>- <div className="flex flex-col gap-2 mt-4">- <p className="text-sm font-medium">Description</p>- <SpaceDescription- space={space}- readonly={readonly || isPending}- onUpdate={(description) => {- mutate({- input: {- type: 'space.description.update',- spaceId: space.id,- description,- accountId: workspace.accountId,- workspaceId: workspace.id,- },- onError(error) {- toast.error(error.message);- },- });- }}- />- </div>- </div>- );-};diff --git a/packages/ui/src/components/spaces/space-name.tsx b/packages/ui/src/components/spaces/space-name.tsxdeleted file mode 100644index 5c9df261..00000000--- a/packages/ui/src/components/spaces/space-name.tsx+++ /dev/null@@ -1,45 +0,0 @@-import { useEffect, useRef } from 'react';--import { LocalSpaceNode } from '@colanode/client/types';-import { SmartTextInput } from '@colanode/ui/components/ui/smart-text-input';--interface SpaceNameProps {- space: LocalSpaceNode;- readonly: boolean;- onUpdate: (name: string) => void;-}--export const SpaceName = ({ space, readonly, onUpdate }: SpaceNameProps) => {- const inputRef = useRef<HTMLInputElement>(null);-- useEffect(() => {- if (readonly) return;-- const timeoutId = setTimeout(() => {- inputRef.current?.focus();- }, 0);-- return () => clearTimeout(timeoutId);- }, [readonly, inputRef]);-- return (- <SmartTextInput- value={space.attributes.name}- readOnly={readonly}- ref={inputRef}- onChange={(value) => {- if (readonly) {- return;- }-- if (value === space.attributes.name) {- return;- }-- onUpdate(value);- }}- className="font-heading border-0 pl-1 text-4xl font-bold shadow-none focus-visible:ring-0"- placeholder="Unnamed"- />- );-};diff --git a/packages/ui/src/components/spaces/space-sidebar-item.tsx b/packages/ui/src/components/spaces/space-sidebar-item.tsxindex fb0db2fa..75a78902 100644--- a/packages/ui/src/components/spaces/space-sidebar-item.tsx+++ b/packages/ui/src/components/spaces/space-sidebar-item.tsx@@ -80,7 +80,7 @@ export const SpaceSidebarItem = ({ space }: SpaceSidebarItemProps) => {><divclassName={cn(- 'flex w-full min-w-0 flex-row items-center hover:bg-sidebar-accent hover:text-sidebar-accent-foreground h-8',+ 'text-sm flex h-7 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground cursor-pointer',dropMonitor.isOver &&dropMonitor.canDrop &&'border-b-2 border-blue-300'diff --git a/packages/ui/src/components/ui/dropzone.tsx b/packages/ui/src/components/ui/dropzone.tsxindex b4987550..66898a88 100644--- a/packages/ui/src/components/ui/dropzone.tsx+++ b/packages/ui/src/components/ui/dropzone.tsx@@ -28,7 +28,7 @@ const Dropzone = ({ text, children, onDrop }: DropzoneProps) => {<div ref={dropRef as React.LegacyRef<HTMLDivElement>}>{isActive && (<div className="fixed bottom-0 left-0 right-0 top-0 z-50">- <div className="absolute inset-0 flex items-center justify-center bg-gray-500 opacity-50 transition-all duration-100 ease-in-out">+ <div className="absolute inset-0 flex items-center justify-center bg-muted opacity-50 transition-all duration-100 ease-in-out"><div className="flex flex-col items-center justify-center gap-2 opacity-100"><Upload className="size-8 text-white" /><p className="text-xl font-bold text-white">{text}</p>diff --git a/packages/ui/src/components/ui/scroll-area.tsx b/packages/ui/src/components/ui/scroll-area.tsxindex ee973400..e4e0323a 100644--- a/packages/ui/src/components/ui/scroll-area.tsx+++ b/packages/ui/src/components/ui/scroll-area.tsx@@ -14,18 +14,31 @@ function ScrollArea({className={cn('relative', className)}{...props}>- <ScrollAreaPrimitive.Viewport- data-slot="scroll-area-viewport"- className="focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1"- >- {children}- </ScrollAreaPrimitive.Viewport>- <ScrollBar />+ {children}<ScrollAreaPrimitive.Corner /></ScrollAreaPrimitive.Root>);}+function ScrollViewport({+ className,+ children,+ ...props+}: React.ComponentProps<typeof ScrollAreaPrimitive.Viewport>) {+ return (+ <ScrollAreaPrimitive.Viewport+ data-slot="scroll-area-viewport"+ className={cn(+ 'focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1',+ className+ )}+ {...props}+ >+ {children}+ </ScrollAreaPrimitive.Viewport>+ );+}+function ScrollBar({className,orientation = 'vertical',@@ -53,4 +66,4 @@ function ScrollBar({);}-export { ScrollArea, ScrollBar };+export { ScrollArea, ScrollViewport, ScrollBar };diff --git a/packages/ui/src/components/ui/sonner.tsx b/packages/ui/src/components/ui/sonner.tsxindex f8d1ef92..7df80607 100644--- a/packages/ui/src/components/ui/sonner.tsx+++ b/packages/ui/src/components/ui/sonner.tsx@@ -1,9 +1,13 @@import { Toaster as Sonner, ToasterProps } from 'sonner';+import { useTheme } from '@colanode/ui/contexts/theme';+const Toaster = ({ ...props }: ToasterProps) => {+ const theme = useTheme();+return (<Sonner- theme="light"+ theme={theme.value}className="toaster group"style={{diff --git a/packages/ui/src/components/ui/tabs.tsx b/packages/ui/src/components/ui/tabs.tsxindex be4c9897..5334a936 100644--- a/packages/ui/src/components/ui/tabs.tsx+++ b/packages/ui/src/components/ui/tabs.tsx@@ -40,7 +40,7 @@ function TabsTrigger({<TabsPrimitive.Triggerdata-slot="tabs-trigger"className={cn(- "data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",+ "data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",className)}{...props}diff --git a/packages/ui/src/components/users/user-search.tsx b/packages/ui/src/components/users/user-search.tsxindex cc71f943..841994d1 100644--- a/packages/ui/src/components/users/user-search.tsx+++ b/packages/ui/src/components/users/user-search.tsx@@ -10,6 +10,11 @@ import {CommandItem,CommandList,} from '@colanode/ui/components/ui/command';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { useWorkspace } from '@colanode/ui/contexts/workspace';import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';@@ -39,32 +44,39 @@ export const UserSearch = ({ exclude, onSelect }: UserSearchProps) => {className="h-9"/><CommandEmpty>No user found.</CommandEmpty>- <CommandList>- <CommandGroup className="h-min">- {userSearchQuery.data?.map((user) => (- <CommandItem- key={user.id}- onSelect={() => {- onSelect(user);- setQuery('');- }}- >- <div className="flex w-full flex-row items-center gap-2">- <Avatar- id={user.id}- name={user.name}- avatar={user.avatar}- className="h-7 w-7"- />- <div className="flex flex-grow flex-col">- <p className="text-sm">{user.name}</p>- <p className="text-xs text-muted-foreground">{user.email}</p>- </div>- </div>- </CommandItem>- ))}- </CommandGroup>- </CommandList>+ <ScrollArea className="h-80">+ <ScrollViewport>+ <CommandList className="max-h-none overflow-hidden">+ <CommandGroup className="h-min">+ {userSearchQuery.data?.map((user) => (+ <CommandItem+ key={user.id}+ onSelect={() => {+ onSelect(user);+ setQuery('');+ }}+ >+ <div className="flex w-full flex-row items-center gap-2">+ <Avatar+ id={user.id}+ name={user.name}+ avatar={user.avatar}+ className="h-7 w-7"+ />+ <div className="flex flex-grow flex-col">+ <p className="text-sm">{user.name}</p>+ <p className="text-xs text-muted-foreground">+ {user.email}+ </p>+ </div>+ </div>+ </CommandItem>+ ))}+ </CommandGroup>+ </CommandList>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></Command>);};diff --git a/packages/ui/src/components/workspaces/downloads/workspace-download-file.tsx b/packages/ui/src/components/workspaces/downloads/workspace-download-file.tsxindex 4eac9b1b..95da4c22 100644--- a/packages/ui/src/components/workspaces/downloads/workspace-download-file.tsx+++ b/packages/ui/src/components/workspaces/downloads/workspace-download-file.tsx@@ -60,7 +60,7 @@ export const WorkspaceDownloadFile = ({<Tooltip><TooltipTrigger asChild><p- className="text-xs text-muted-foreground flex items-center gap-2 cursor-pointer hover:text-primary"+ className="text-xs text-muted-foreground flex items-center gap-2 cursor-pointer hover:text-foreground"onClick={(e) => {e.stopPropagation();window.colanode.showItemInFolder(download.path);diff --git a/packages/ui/src/components/workspaces/storage/storage-stats.tsx b/packages/ui/src/components/workspaces/storage/storage-stats.tsxindex 91ea5fd2..16f3bd6a 100644--- a/packages/ui/src/components/workspaces/storage/storage-stats.tsx+++ b/packages/ui/src/components/workspaces/storage/storage-stats.tsx@@ -69,7 +69,7 @@ export const StorageStats = ({({usedPercentage}%) used</span></div>- <div className="w-full h-3 bg-gray-200 rounded-full overflow-hidden flex">+ <div className="w-full h-3 bg-secondary rounded-full overflow-hidden flex">{subtypes.map((subtype) => {const storageUsed = BigInt(subtype.storageUsed);if (storageUsed === BigInt(0)) {@@ -102,7 +102,7 @@ export const StorageStats = ({})}{usedPercentage < 100 && (<div- className="bg-gray-200"+ className="bg-secondary"style={{ width: `${100 - usedPercentage}%` }}/>)}diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsxindex 864b28e6..bfba7144 100644--- a/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx@@ -37,7 +37,7 @@ const UserStorageProgressBar = ({({percentage.toFixed(1)}%)</span></div>- <div className="w-full h-2 bg-gray-200 rounded-full overflow-hidden">+ <div className="w-full h-2 bg-secondary rounded-full overflow-hidden"><divclassName={cn('h-full transition-all duration-300', getBarColor())}style={{ width: `${Math.min(percentage, 100)}%` }}diff --git a/packages/ui/src/components/workspaces/workspace-form.tsx b/packages/ui/src/components/workspaces/workspace-form.tsxindex f1c711de..a5536134 100644--- a/packages/ui/src/components/workspaces/workspace-form.tsx+++ b/packages/ui/src/components/workspaces/workspace-form.tsx@@ -114,7 +114,7 @@ export const WorkspaceForm = ({/><divclassName={cn(- `absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-gray-50 group-hover:inline-flex`,+ `absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-accent/70 group-hover:inline-flex`,isPending ? 'inline-flex' : 'hidden',readOnly && 'hidden group-hover:hidden')}diff --git a/packages/ui/src/components/workspaces/workspace-user-invite.tsx b/packages/ui/src/components/workspaces/workspace-user-invite.tsxindex 0193aa02..bf423103 100644--- a/packages/ui/src/components/workspaces/workspace-user-invite.tsx+++ b/packages/ui/src/components/workspaces/workspace-user-invite.tsx@@ -31,11 +31,11 @@ export const WorkspaceUserInvite = ({{emails.map((email) => (<pkey={email}- className="flex h-full flex-row items-center gap-1 border border-gray-200 bg-gray-100 p-0.5 px-1 text-primary shadow"+ className="flex h-full flex-row items-center gap-1 border border-border bg-accent p-0.5 px-1 text-foreground shadow"><span>{email}</span><X- className="size-3 text-muted-foreground cursor-pointer hover:text-primary"+ className="size-3 text-muted-foreground cursor-pointer hover:text-foreground"onClick={() => {setEmails((emails) => emails.filter((e) => e !== email));}}diff --git a/packages/ui/src/components/workspaces/workspace-user-role-dropdown.tsx b/packages/ui/src/components/workspaces/workspace-user-role-dropdown.tsxindex 90f96b7c..32de5e3b 100644--- a/packages/ui/src/components/workspaces/workspace-user-role-dropdown.tsx+++ b/packages/ui/src/components/workspaces/workspace-user-role-dropdown.tsx@@ -76,7 +76,7 @@ export const WorkspaceUserRoleDropdown = ({return (<DropdownMenu><DropdownMenuTrigger asChild>- <p className="flex cursor-pointer flex-row items-center p-1 text-sm text-muted-foreground hover:bg-gray-50">+ <p className="flex cursor-pointer flex-row items-center p-1 text-sm text-muted-foreground hover:bg-accent">{currentRole?.name}{isPending ? (<Spinner className="ml-2 size-4 text-muted-foreground" />diff --git a/packages/ui/src/contexts/theme.ts b/packages/ui/src/contexts/theme.tsnew file mode 100644index 00000000..f22d7c65--- /dev/null+++ b/packages/ui/src/contexts/theme.ts@@ -0,0 +1,12 @@+import { createContext, useContext } from 'react';++import { ThemeColor, ThemeMode } from '@colanode/client/types';++interface ThemeContext {+ mode: ThemeMode;+ color?: ThemeColor;+}++export const ThemeContext = createContext<ThemeContext>({} as ThemeContext);++export const useTheme = () => useContext(ThemeContext);diff --git a/packages/ui/src/editor/classes.tsx b/packages/ui/src/editor/classes.tsxindex 3e3bef83..dee52736 100644--- a/packages/ui/src/editor/classes.tsx+++ b/packages/ui/src/editor/classes.tsx@@ -11,7 +11,7 @@ export const defaultClasses = {codeBlockHeader:'flex flex-row items-center justify-between text-muted-foreground font-sans border-b pb-2 mb-2 text-xs',code: 'whitespace-pre-wrap rounded-md bg-muted px-[0.3em] py-[0.2em] font-mono text-sm',- blockquote: 'p-2 my-1 border-l-4 border-gray-300 bg-gray-50',+ blockquote: 'p-2 my-1 border-l-4 border-border bg-muted',taskList: 'not-prose pl-2',taskItem: 'flex items-start my-1',link: 'font-medium underline underline-offset-4 cursor-pointer',@@ -19,11 +19,11 @@ export const defaultClasses = {emoji: 'max-h-5 max-w-5 h-5 w-5 px-0.5 mb-1 inline-block',dropcursor: 'text-primary-foreground bg-blue-500',mention:- 'inline-flex flex-row items-center gap-1 rounded-md bg-blue-50 px-0.5 py-0',+ 'inline-flex flex-row items-center gap-1 rounded-md bg-muted px-0.5 py-0',table: 'w-full',tableRow: 'min-w-full',tableCellWrapper: 'border',tableCell: 'flex p-1 px-2 items-center',tableHeaderWrapper: 'border',- tableHeader: 'flex p-1 px-2 items-center font-semibold bg-gray-50',+ tableHeader: 'flex p-1 px-2 items-center font-semibold bg-muted',};diff --git a/packages/ui/src/editor/extensions/commander.tsx b/packages/ui/src/editor/extensions/commander.tsxindex 5675e2be..b443e4e8 100644--- a/packages/ui/src/editor/extensions/commander.tsx+++ b/packages/ui/src/editor/extensions/commander.tsx@@ -23,6 +23,11 @@ import {} from 'react';import { EditorCommand, EditorContext } from '@colanode/client/types';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { updateScrollView } from '@colanode/ui/lib/utils';interface CommanderOptions {@@ -119,14 +124,15 @@ const CommandList = ({setSelectedIndex(0);}, [items]);- const commandListContainer = useRef<HTMLDivElement>(null);+ const scrollContainer = useRef<HTMLDivElement>(null);+ const listContainer = useRef<HTMLDivElement>(null);useLayoutEffect(() => {- const container = commandListContainer?.current;-- const item = container?.children[selectedIndex] as HTMLElement;+ const item = listContainer?.current?.children[selectedIndex] as HTMLElement;- if (item && container) updateScrollView(container, item);+ if (item && scrollContainer?.current) {+ updateScrollView(scrollContainer.current, item);+ }}, [selectedIndex]);return items.length > 0 ? (@@ -134,27 +140,37 @@ const CommandList = ({<div ref={refs.setFloating} style={floatingStyles}><divid="slash-command"- ref={commandListContainer}- className="z-50 h-auto max-h-[330px] w-72 overflow-y-auto rounded-md border border-stone-200 bg-white px-1 py-2 shadow-md transition-all"+ className="z-50 min-w-[8rem] w-80 rounded-md border bg-popover text-popover-foreground p-1 shadow-md animate-in fade-in-0 zoom-in-95 slide-in-from-top-2 overflow-hidden">- {items.map((item: EditorCommand, index: number) => (- <button- type="button"- className={`flex w-full items-center space-x-2 rounded-md px-2 py-1 text-left text-sm text-stone-900 hover:bg-stone-100 ${- index === selectedIndex ? 'bg-stone-100 text-stone-900' : ''- }`}- key={item.key}- onClick={() => selectItem(index)}- >- <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>- <p className="font-medium">{item.name}</p>- <p className="text-xs text-stone-500">{item.description}</p>+ <ScrollArea className="h-80">+ <ScrollViewport ref={scrollContainer}>+ <div ref={listContainer}>+ {items.map((item: EditorCommand, index: number) => (+ <button+ type="button"+ className={`relative flex w-full cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm text-left outline-hidden select-none focus:bg-accent focus:text-accent-foreground hover:bg-accent hover:text-accent-foreground ${+ index === selectedIndex+ ? 'bg-accent text-accent-foreground'+ : ''+ }`}+ key={item.key}+ onClick={() => selectItem(index)}+ >+ <div className="flex size-10 min-w-10 items-center justify-center rounded-md border bg-background">+ <item.icon className="size-4 text-foreground" />+ </div>+ <div className="flex-1">+ <p className="font-medium">{item.name}</p>+ <p className="text-sm text-muted-foreground">+ {item.description}+ </p>+ </div>+ </button>+ ))}</div>- </button>- ))}+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></div></div></FloatingPortal>diff --git a/packages/ui/src/editor/extensions/mention.tsx b/packages/ui/src/editor/extensions/mention.tsxindex 198c50be..44c6441b 100644--- a/packages/ui/src/editor/extensions/mention.tsx+++ b/packages/ui/src/editor/extensions/mention.tsx@@ -25,6 +25,11 @@ import {import { EditorContext, User } from '@colanode/client/types';import { generateId, IdType } from '@colanode/core';import { Avatar } from '@colanode/ui/components/avatars/avatar';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { MentionNodeView } from '@colanode/ui/editor/views';import { updateScrollView } from '@colanode/ui/lib/utils';@@ -60,15 +65,13 @@ const CommandList = ({middleware: [offset(6), flip(), shift()],whileElementsMounted: autoUpdate,strategy: 'fixed',- });-- useLayoutEffect(() => {- if (props.clientRect) {- refs.setPositionReference({+ elements: {+ reference: {getBoundingClientRect: () => props.clientRect?.() || new DOMRect(),- });- }- }, [props.clientRect, refs]);+ contextElement: document.body,+ } as unknown as Element,+ },+ });const selectItem = useCallback((index: number) => {@@ -111,45 +114,58 @@ const CommandList = ({setSelectedIndex(0);}, [items]);- const commandListContainer = useRef<HTMLDivElement>(null);+ const scrollContainer = useRef<HTMLDivElement>(null);+ const listContainer = useRef<HTMLDivElement>(null);useLayoutEffect(() => {- const container = commandListContainer?.current;+ const item = listContainer?.current?.children[selectedIndex] as HTMLElement;- const item = container?.children[selectedIndex] as HTMLElement;-- if (item && container) updateScrollView(container, item);+ if (item && scrollContainer?.current) {+ updateScrollView(scrollContainer.current, item);+ }}, [selectedIndex]);return items.length > 0 ? (<FloatingPortal><div ref={refs.setFloating} style={floatingStyles}><div- id="slash-command"- ref={commandListContainer}- className="z-50 h-auto max-h-[330px] w-72 overflow-y-auto rounded-md border border-stone-200 bg-white px-1 py-2 shadow-md transition-all"+ id="mention-command"+ className="z-50 min-w-[8rem] w-80 rounded-md border bg-popover text-popover-foreground p-1 shadow-md animate-in fade-in-0 zoom-in-95 slide-in-from-top-2 overflow-hidden">- {items.map((item: User, index: number) => (- <button- type="button"- className={`flex w-full items-center space-x-2 rounded-md px-2 py-1 text-left text-sm text-stone-900 hover:bg-stone-100 ${- index === selectedIndex ? 'bg-stone-100 text-stone-900' : ''- }`}- key={item.id}- onClick={() => selectItem(index)}- >- <Avatar- id={item.id}- name={item.name}- avatar={item.avatar}- className="size-8"- />- <div>- <p className="font-medium">{item.name}</p>- <p className="text-xs text-stone-500">{item.email}</p>+ <ScrollArea className="h-80">+ <ScrollViewport ref={scrollContainer}>+ <div ref={listContainer}>+ {items.map((item: User, index: number) => (+ <button+ type="button"+ className={`relative flex w-full cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm text-left outline-hidden select-none focus:bg-accent focus:text-accent-foreground hover:bg-accent hover:text-accent-foreground ${+ index === selectedIndex+ ? 'bg-accent text-accent-foreground'+ : ''+ }`}+ key={item.id}+ onClick={() => selectItem(index)}+ >+ <div className="flex size-10 min-w-10 items-center justify-center rounded-md border bg-background">+ <Avatar+ id={item.id}+ name={item.name}+ avatar={item.avatar}+ className="size-8"+ />+ </div>+ <div className="flex-1">+ <p className="font-medium">{item.name}</p>+ <p className="text-sm text-muted-foreground">+ {item.email}+ </p>+ </div>+ </button>+ ))}</div>- </button>- ))}+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></div></div></FloatingPortal>diff --git a/packages/ui/src/editor/menus/action-menu.tsx b/packages/ui/src/editor/menus/action-menu.tsxindex 5026f278..431e2533 100644--- a/packages/ui/src/editor/menus/action-menu.tsx+++ b/packages/ui/src/editor/menus/action-menu.tsx@@ -154,7 +154,7 @@ export const ActionMenu = ({ editor }: ActionMenuProps) => {className="flex items-center text-muted-foreground p-1 mr-2"><Plus- className="size-4 cursor-pointer hover:text-primary"+ className="size-4 cursor-pointer hover:text-foreground"onClick={() => {if (menuState.pos === undefined || !menuState.domNode) {return;@@ -202,7 +202,7 @@ export const ActionMenu = ({ editor }: ActionMenuProps) => {view.current.dom.blur();}}>- <GripVertical className="size-4 cursor-pointer hover:text-primary" />+ <GripVertical className="size-4 cursor-pointer hover:text-foreground" /></div></div></FloatingPortal>diff --git a/packages/ui/src/editor/menus/color-button.tsx b/packages/ui/src/editor/menus/color-button.tsxindex 4c6d3374..f5569c34 100644--- a/packages/ui/src/editor/menus/color-button.tsx+++ b/packages/ui/src/editor/menus/color-button.tsx@@ -40,7 +40,7 @@ export const ColorButton = ({return (<Popover open={isOpen} onOpenChange={setIsOpen} modal={true}><PopoverTrigger>- <span className="flex size-8 items-center justify-center rounded-md cursor-pointer hover:bg-gray-100">+ <span className="flex size-8 items-center justify-center rounded-md cursor-pointer hover:bg-input"><Baseline className={cn('size-4', activeColor.textClass)} /></span></PopoverTrigger>@@ -62,9 +62,9 @@ export const ColorButton = ({}setIsOpen(false);}}- className="flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-sm hover:bg-gray-100 cursor-pointer"+ className="flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-sm hover:bg-input cursor-pointer">- <div className="relative inline-flex size-6 items-center justify-center overflow-hidden rounded bg-gray-50 shadow">+ <div className="relative inline-flex size-6 items-center justify-center overflow-hidden rounded bg-muted shadow"><span className={cn('font-medium', color.textClass)}>A</span></div><span>{color.name}</span>diff --git a/packages/ui/src/editor/menus/highlight-button.tsx b/packages/ui/src/editor/menus/highlight-button.tsxindex 5f4eb812..d7b84c4f 100644--- a/packages/ui/src/editor/menus/highlight-button.tsx+++ b/packages/ui/src/editor/menus/highlight-button.tsx@@ -42,7 +42,7 @@ export const HighlightButton = ({<PopoverTrigger><spanclassName={cn(- 'flex size-8 items-center justify-center rounded-md cursor-pointer',+ 'flex size-8 items-center justify-center rounded-md cursor-pointer hover:bg-input',activeHighlight.bgClass,activeHighlight.bgHoverClass)}@@ -68,11 +68,11 @@ export const HighlightButton = ({}setIsOpen(false);}}- className="flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-sm hover:bg-gray-100 cursor-pointer"+ className="flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-sm hover:bg-input cursor-pointer"><divclassName={cn(- 'relative inline-flex size-6 items-center justify-center overflow-hidden rounded bg-gray-50 shadow',+ 'relative inline-flex size-6 items-center justify-center overflow-hidden rounded bg-muted shadow',editorColor.bgClass)}>diff --git a/packages/ui/src/editor/menus/link-button.tsx b/packages/ui/src/editor/menus/link-button.tsxindex eaf4ec70..13f1b74a 100644--- a/packages/ui/src/editor/menus/link-button.tsx+++ b/packages/ui/src/editor/menus/link-button.tsx@@ -3,6 +3,7 @@ import { useEditorState } from '@tiptap/react';import { Check, Link, Trash2 } from 'lucide-react';import { isValidUrl } from '@colanode/core';+import { Button } from '@colanode/ui/components/ui/button';import { Input } from '@colanode/ui/components/ui/input';import {Popover,@@ -51,8 +52,8 @@ export const LinkButton = ({ editor, isOpen, setIsOpen }: LinkButtonProps) => {<PopoverTrigger><spanclassName={cn(- 'flex h-8 w-8 items-center justify-center rounded-md cursor-pointer hover:bg-gray-100',- state?.isActive ? 'bg-gray-100' : 'bg-white'+ 'flex h-8 w-8 items-center justify-center rounded-md cursor-pointer hover:bg-input',+ state?.isActive && 'bg-input')}><Link className="size-4" />@@ -61,7 +62,7 @@ export const LinkButton = ({ editor, isOpen, setIsOpen }: LinkButtonProps) => {<PopoverContent align="start" className="z-[9999] min-w-0 p-1"><form- className="flex flex-row items-center gap-1"+ className="flex flex-row items-center gap-2"onSubmit={(e) => {e.preventDefault();const input = e.currentTarget[0] as HTMLInputElement;@@ -79,9 +80,10 @@ export const LinkButton = ({ editor, isOpen, setIsOpen }: LinkButtonProps) => {defaultValue={state?.attributes.href || ''}/>{state?.attributes.href ? (- <button+ <Buttontype="button"- className="flex h-8 w-8 items-center justify-center rounded-md cursor-pointer hover:bg-gray-100"+ variant="outline"+ size="icon"onClick={(e) => {e.preventDefault();editor.chain().focus().unsetLink().run();@@ -89,14 +91,11 @@ export const LinkButton = ({ editor, isOpen, setIsOpen }: LinkButtonProps) => {}}><Trash2 className="size-4" />- </button>+ </Button>) : (- <button- type="submit"- className="flex h-8 w-8 items-center justify-center rounded-md cursor-pointer hover:bg-gray-100"- >+ <Button type="submit" variant="outline" size="icon"><Check className="size-4" />- </button>+ </Button>)}</form></PopoverContent>diff --git a/packages/ui/src/editor/menus/mark-button.tsx b/packages/ui/src/editor/menus/mark-button.tsxindex 22d96750..dcbccc94 100644--- a/packages/ui/src/editor/menus/mark-button.tsx+++ b/packages/ui/src/editor/menus/mark-button.tsx@@ -15,8 +15,8 @@ export const MarkButton = ({<buttontype="button"className={cn(- 'flex h-8 w-8 items-center justify-center rounded-md cursor-pointer hover:bg-gray-100',- isActive ? 'bg-gray-100' : 'bg-white'+ 'flex h-8 w-8 items-center justify-center rounded-md cursor-pointer hover:bg-input',+ isActive && 'bg-input')}onClick={onClick}>diff --git a/packages/ui/src/editor/menus/table-cell-context-menu.tsx b/packages/ui/src/editor/menus/table-cell-context-menu.tsxindex 69e03c4d..836b4244 100644--- a/packages/ui/src/editor/menus/table-cell-context-menu.tsx+++ b/packages/ui/src/editor/menus/table-cell-context-menu.tsx@@ -102,7 +102,7 @@ export const TableCellContextMenu = ({<div className="flex items-center gap-2"><divclassName={cn(- 'w-4 h-4 rounded border border-gray-300',+ 'w-4 h-4 rounded border border-border',color.bgClass)}/>diff --git a/packages/ui/src/editor/menus/table-cell-dropdown-menu.tsx b/packages/ui/src/editor/menus/table-cell-dropdown-menu.tsxindex 9bf545c5..1dfc1f4f 100644--- a/packages/ui/src/editor/menus/table-cell-dropdown-menu.tsx+++ b/packages/ui/src/editor/menus/table-cell-dropdown-menu.tsx@@ -41,7 +41,7 @@ export const TableCellDropdownMenu = ({<DropdownMenuTrigger asChild><buttonclassName={cn(- 'absolute top-1/2 -right-2 transform -translate-y-1/2 bg-white hover:bg-gray-100 py-1 cursor-pointer border border-gray-200 rounded z-10'+ 'absolute top-1/2 -right-2 transform -translate-y-1/2 bg-secondary py-1 cursor-pointer border border-border rounded z-10')}><EllipsisVertical className="size-3 text-muted-foreground" />@@ -106,7 +106,7 @@ export const TableCellDropdownMenu = ({<div className="flex items-center gap-2"><divclassName={cn(- 'w-4 h-4 rounded border border-gray-300',+ 'w-4 h-4 rounded border border-border',color.bgClass)}/>diff --git a/packages/ui/src/editor/menus/toolbar-menu.tsx b/packages/ui/src/editor/menus/toolbar-menu.tsxindex 34c74eec..12a1c858 100644--- a/packages/ui/src/editor/menus/toolbar-menu.tsx+++ b/packages/ui/src/editor/menus/toolbar-menu.tsx@@ -80,7 +80,7 @@ export const ToolbarMenu = (props: ToolbarMenuProps) => {return (<BubbleMenu{...bubbleMenuProps}- className="flex flex-row items-center gap-1 rounded border bg-white p-0.5 shadow-xl transition-transform duration-150 ease-out"+ className="flex flex-row items-center gap-1 rounded border border-border bg-muted p-0.5 shadow-xl transition-transform duration-150 ease-out"><LinkButtoneditor={props.editor}diff --git a/packages/ui/src/editor/views/code-block.tsx b/packages/ui/src/editor/views/code-block.tsxindex 93770d57..6d35311a 100644--- a/packages/ui/src/editor/views/code-block.tsx+++ b/packages/ui/src/editor/views/code-block.tsx@@ -18,6 +18,11 @@ import {PopoverContent,PopoverTrigger,} from '@colanode/ui/components/ui/popover';+import {+ ScrollArea,+ ScrollViewport,+ ScrollBar,+} from '@colanode/ui/components/ui/scroll-area';import { defaultClasses } from '@colanode/ui/editor/classes';import { languages } from '@colanode/ui/lib/lowlight';import { cn } from '@colanode/ui/lib/utils';@@ -45,36 +50,41 @@ export const CodeBlockNodeView = ({<p>{languageItem?.name ?? ' '}</p><ChevronDown className="size-4" /></PopoverTrigger>- <PopoverContent className="p-2">- <Command className="max-h-80">+ <PopoverContent className="p-2 overflow-hidden">+ <Command className="min-h-min"><CommandInput placeholder="Search language..." /><CommandEmpty>No languages found.</CommandEmpty>- <CommandList>- <CommandGroup className="overflow-auto">- {languages.map((languageItem) => (- <CommandItem- key={languageItem.code}- value={`${languageItem.code} - ${languageItem.name}`}- onSelect={() => {- updateAttributes({- language: languageItem.code,- });- setOpen(false);- }}- >- {languageItem.name}- <Check- className={cn(- 'ml-auto mr-2 size-4',- language === languageItem.code- ? 'opacity-100'- : 'opacity-0'- )}- />- </CommandItem>- ))}- </CommandGroup>- </CommandList>+ <ScrollArea className="h-80">+ <ScrollViewport>+ <CommandList className="max-h-none overflow-hidden">+ <CommandGroup className="h-min">+ {languages.map((languageItem) => (+ <CommandItem+ key={languageItem.code}+ value={`${languageItem.code} - ${languageItem.name}`}+ onSelect={() => {+ updateAttributes({+ language: languageItem.code,+ });+ setOpen(false);+ }}+ >+ {languageItem.name}+ <Check+ className={cn(+ 'ml-auto mr-2 size-4',+ language === languageItem.code+ ? 'opacity-100'+ : 'opacity-0'+ )}+ />+ </CommandItem>+ ))}+ </CommandGroup>+ </CommandList>+ </ScrollViewport>+ <ScrollBar orientation="vertical" />+ </ScrollArea></Command></PopoverContent></Popover>diff --git a/packages/ui/src/editor/views/database.tsx b/packages/ui/src/editor/views/database.tsxindex 9f0e1073..56b79ff6 100644--- a/packages/ui/src/editor/views/database.tsx+++ b/packages/ui/src/editor/views/database.tsx@@ -51,7 +51,7 @@ export const DatabaseNodeView = ({ node }: NodeViewProps) => {return (<NodeViewWrapperdata-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 flex h-10 w-full cursor-pointer flex-row items-center gap-1 rounded-md p-1 hover:bg-accent"onClick={() => {layout.previewLeft(id, true);}}diff --git a/packages/ui/src/editor/views/folder.tsx b/packages/ui/src/editor/views/folder.tsxindex 264c7236..ce81c342 100644--- a/packages/ui/src/editor/views/folder.tsx+++ b/packages/ui/src/editor/views/folder.tsx@@ -38,7 +38,7 @@ export const FolderNodeView = ({ node }: NodeViewProps) => {return (<NodeViewWrapperdata-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 flex h-10 w-full cursor-pointer flex-row items-center gap-1 rounded-md p-1 hover:bg-accent"onClick={() => {layout.previewLeft(id, true);}}diff --git a/packages/ui/src/editor/views/page.tsx b/packages/ui/src/editor/views/page.tsxindex 7084c60b..5b6a3908 100644--- a/packages/ui/src/editor/views/page.tsx+++ b/packages/ui/src/editor/views/page.tsx@@ -38,7 +38,7 @@ export const PageNodeView = ({ node }: NodeViewProps) => {return (<NodeViewWrapperdata-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 flex h-10 w-full cursor-pointer flex-row items-center gap-1 rounded-md p-1 hover:bg-accent"onClick={() => {layout.previewLeft(id, true);}}diff --git a/packages/ui/src/editor/views/table-cell.tsx b/packages/ui/src/editor/views/table-cell.tsxindex 7f2ffab3..943f2ffe 100644--- a/packages/ui/src/editor/views/table-cell.tsx+++ b/packages/ui/src/editor/views/table-cell.tsx@@ -40,7 +40,7 @@ export const TableCellNodeView = (props: NodeViewProps) => {className={cn(defaultClasses.tableCell,'relative',- isActive && 'outline outline-gray-400',+ isActive && 'outline outline-primary',backgroundColor?.bgClass,align === 'left' && 'justify-start',align === 'center' && 'justify-center',@@ -65,7 +65,7 @@ export const TableCellNodeView = (props: NodeViewProps) => {topRight: false,}}handleClasses={{- right: 'opacity-0 hover:opacity-100 bg-blue-300',+ right: 'opacity-0 hover:opacity-100 bg-blue-300 dark:bg-blue-900',}}handleStyles={{right: {diff --git a/packages/ui/src/editor/views/table-header.tsx b/packages/ui/src/editor/views/table-header.tsxindex 34d9c86e..f87faa9d 100644--- a/packages/ui/src/editor/views/table-header.tsx+++ b/packages/ui/src/editor/views/table-header.tsx@@ -40,7 +40,7 @@ export const TableHeaderNodeView = (props: NodeViewProps) => {className={cn(defaultClasses.tableHeader,'relative',- isActive && 'outline outline-gray-400',+ isActive && 'outline outline-primary',backgroundColor?.bgClass,align === 'left' && 'justify-start',align === 'center' && 'justify-center',@@ -65,7 +65,7 @@ export const TableHeaderNodeView = (props: NodeViewProps) => {topRight: false,}}handleClasses={{- right: 'opacity-0 hover:opacity-100 bg-blue-300',+ right: 'opacity-0 hover:opacity-100 bg-blue-300 dark:bg-blue-900',}}handleStyles={{right: {diff --git a/packages/ui/src/editor/views/table.tsx b/packages/ui/src/editor/views/table.tsxindex 98223fb0..7534aecf 100644--- a/packages/ui/src/editor/views/table.tsx+++ b/packages/ui/src/editor/views/table.tsx@@ -118,7 +118,7 @@ export const TableNodeView = ({ editor, getPos }: NodeViewProps) => {<Tooltip delayDuration={500}><TooltipTrigger asChild><button- className="w-4 h-full hover:bg-gray-50 cursor-pointer flex items-center justify-center rounded-sm transition-colors text-muted-foreground text-xs"+ className="w-4 h-full hover:bg-accent cursor-pointer flex items-center justify-center rounded-sm transition-colors text-muted-foreground text-xs"onClick={() => {if (focusTable()) {editor.chain().addColumnAfter().run();@@ -140,7 +140,7 @@ export const TableNodeView = ({ editor, getPos }: NodeViewProps) => {<Tooltip delayDuration={500}><TooltipTrigger asChild><button- className="h-4 w-full hover:bg-gray-50 cursor-pointer flex items-center justify-center rounded-sm transition-colors text-muted-foreground text-xs"+ className="h-4 w-full hover:bg-accent cursor-pointer flex items-center justify-center rounded-sm transition-colors text-muted-foreground text-xs"onClick={() => {if (focusTable()) {editor.chain().addRowAfter().run();diff --git a/packages/ui/src/editor/views/temp-file.tsx b/packages/ui/src/editor/views/temp-file.tsxindex 8f898e53..3a8f2294 100644--- a/packages/ui/src/editor/views/temp-file.tsx+++ b/packages/ui/src/editor/views/temp-file.tsx@@ -51,7 +51,7 @@ export const TempFileNodeView = ({ node, deleteNode }: NodeViewProps) => {return (<NodeViewWrapperdata-id={node.attrs.id}- className="flex max-h-72 w-full cursor-pointer overflow-hidden rounded-md p-2 hover:bg-gray-100"+ className="flex max-h-72 w-full cursor-pointer overflow-hidden rounded-md p-2 hover:bg-accent"><div className="group/temp-file relative"><buttondiff --git a/packages/ui/src/lib/databases.ts b/packages/ui/src/lib/databases.tsindex df741b46..ace8f6b5 100644--- a/packages/ui/src/lib/databases.ts+++ b/packages/ui/src/lib/databases.ts@@ -86,50 +86,50 @@ export const selectOptionColors: SelectOptionColor[] = [{label: 'Gray',value: 'gray',- class: 'bg-gray-200',- lightClass: 'bg-gray-50',+ class: 'bg-gray-200 dark:bg-gray-800',+ lightClass: 'bg-gray-50 dark:bg-gray-900',},{label: 'Orange',value: 'orange',- class: 'bg-orange-200',- lightClass: 'bg-orange-50',+ class: 'bg-orange-200 dark:bg-orange-800',+ lightClass: 'bg-orange-50 dark:bg-orange-900',},{label: 'Yellow',value: 'yellow',- class: 'bg-yellow-200',- lightClass: 'bg-yellow-50',+ class: 'bg-yellow-200 dark:bg-yellow-800',+ lightClass: 'bg-yellow-50 dark:bg-yellow-900',},{label: 'Green',value: 'green',- class: 'bg-green-200',- lightClass: 'bg-green-50',+ class: 'bg-green-200 dark:bg-green-800',+ lightClass: 'bg-green-50 dark:bg-green-900',},{label: 'Blue',value: 'blue',- class: 'bg-blue-200',- lightClass: 'bg-blue-50',+ class: 'bg-blue-200 dark:bg-blue-800',+ lightClass: 'bg-blue-50 dark:bg-blue-900',},{label: 'Purple',value: 'purple',- class: 'bg-purple-200',- lightClass: 'bg-purple-50',+ class: 'bg-purple-200 dark:bg-purple-800',+ lightClass: 'bg-purple-50 dark:bg-purple-900',},{label: 'Pink',value: 'pink',- class: 'bg-pink-200',- lightClass: 'bg-pink-50',+ class: 'bg-pink-200 dark:bg-pink-800',+ lightClass: 'bg-pink-50 dark:bg-pink-900',},{label: 'Red',value: 'red',- class: 'bg-red-200',- lightClass: 'bg-red-50',+ class: 'bg-red-200 dark:bg-red-800',+ lightClass: 'bg-red-50 dark:bg-red-900',},];diff --git a/packages/ui/src/lib/editor.ts b/packages/ui/src/lib/editor.tsindex 24a3ad4d..58126d88 100644--- a/packages/ui/src/lib/editor.ts+++ b/packages/ui/src/lib/editor.ts@@ -10,64 +10,64 @@ export const editorColors: EditorColorOption[] = [{name: 'Default',color: 'default',- textClass: 'text-black-600',+ textClass: 'text-foreground',bgClass: '',- bgHoverClass: 'hover:bg-gray-100',+ bgHoverClass: 'hover:bg-gray-100 dark:hover:bg-gray-800',},{name: 'Gray',color: 'gray',- textClass: 'text-gray-600',- bgClass: 'bg-gray-100',- bgHoverClass: 'hover:bg-gray-200',+ textClass: 'text-gray-600 dark:text-gray-400',+ bgClass: 'bg-gray-100 dark:bg-gray-800',+ bgHoverClass: 'hover:bg-gray-200 dark:hover:bg-gray-700',},{name: 'Orange',color: 'orange',- textClass: 'text-orange-600',- bgClass: 'bg-orange-200',- bgHoverClass: 'hover:bg-orange-300',+ textClass: 'text-orange-600 dark:text-orange-400',+ bgClass: 'bg-orange-200 dark:bg-orange-900',+ bgHoverClass: 'hover:bg-orange-300 dark:hover:bg-orange-800',},{name: 'Yellow',color: 'yellow',- textClass: 'text-yellow-600',- bgClass: 'bg-yellow-200',- bgHoverClass: 'hover:bg-yellow-300',+ textClass: 'text-yellow-600 dark:text-yellow-400',+ bgClass: 'bg-yellow-200 dark:bg-yellow-900',+ bgHoverClass: 'hover:bg-yellow-300 dark:hover:bg-yellow-800',},{name: 'Green',color: 'green',- textClass: 'text-green-600',- bgClass: 'bg-green-200',- bgHoverClass: 'hover:bg-green-300',+ textClass: 'text-green-600 dark:text-green-400',+ bgClass: 'bg-green-200 dark:bg-green-900',+ bgHoverClass: 'hover:bg-green-300 dark:hover:bg-green-800',},{name: 'Blue',color: 'blue',- textClass: 'text-blue-600',- bgClass: 'bg-blue-200',- bgHoverClass: 'hover:bg-blue-300',+ textClass: 'text-blue-600 dark:text-blue-400',+ bgClass: 'bg-blue-200 dark:bg-blue-900',+ bgHoverClass: 'hover:bg-blue-300 dark:hover:bg-blue-800',},{name: 'Purple',color: 'purple',- textClass: 'text-purple-600',- bgClass: 'bg-purple-200',- bgHoverClass: 'hover:bg-purple-300',+ textClass: 'text-purple-600 dark:text-purple-400',+ bgClass: 'bg-purple-200 dark:bg-purple-900',+ bgHoverClass: 'hover:bg-purple-300 dark:hover:bg-purple-800',},{name: 'Pink',color: 'pink',- textClass: 'text-pink-600',- bgClass: 'bg-pink-200',- bgHoverClass: 'hover:bg-pink-300',+ textClass: 'text-pink-600 dark:text-pink-400',+ bgClass: 'bg-pink-200 dark:bg-pink-900',+ bgHoverClass: 'hover:bg-pink-300 dark:hover:bg-pink-800',},{name: 'Red',color: 'red',- textClass: 'text-red-600',- bgClass: 'bg-red-200',- bgHoverClass: 'hover:bg-red-300',+ textClass: 'text-red-600 dark:text-red-400',+ bgClass: 'bg-red-200 dark:bg-red-900',+ bgHoverClass: 'hover:bg-red-300 dark:hover:bg-red-800',},];diff --git a/packages/ui/src/lib/themes.ts b/packages/ui/src/lib/themes.tsnew file mode 100644index 00000000..0865bcf2--- /dev/null+++ b/packages/ui/src/lib/themes.ts@@ -0,0 +1,395 @@+import { ThemeColor, ThemeMode } from '@colanode/client/types';++const baseVariables = {+ '--radius': '0.625rem',+};++const baseLightVariables = {+ '--background': 'oklch(1 0 0)',+ '--foreground': 'oklch(0.145 0 0)',+ '--card': 'oklch(1 0 0)',+ '--card-foreground': 'oklch(0.145 0 0)',+ '--popover': 'oklch(1 0 0)',+ '--popover-foreground': 'oklch(0.145 0 0)',+ '--primary': 'oklch(0.205 0 0)',+ '--primary-foreground': 'oklch(0.985 0 0)',+ '--secondary': 'oklch(0.97 0 0)',+ '--secondary-foreground': 'oklch(0.205 0 0)',+ '--muted': 'oklch(0.97 0 0)',+ '--muted-foreground': 'oklch(0.556 0 0)',+ '--accent': 'oklch(0.97 0 0)',+ '--accent-foreground': 'oklch(0.205 0 0)',+ '--destructive': 'oklch(0.577 0.245 27.325)',+ '--border': 'oklch(0.922 0 0)',+ '--input': 'oklch(0.922 0 0)',+ '--ring': 'oklch(0.708 0 0)',+ '--chart-1': 'oklch(0.646 0.222 41.116)',+ '--chart-2': 'oklch(0.6 0.118 184.704)',+ '--chart-3': 'oklch(0.398 0.07 227.392)',+ '--chart-4': 'oklch(0.828 0.189 84.429)',+ '--chart-5': 'oklch(0.769 0.188 70.08)',+ '--sidebar': 'oklch(0.985 0 0)',+ '--sidebar-foreground': 'oklch(0.145 0 0)',+ '--sidebar-primary': 'oklch(0.205 0 0)',+ '--sidebar-primary-foreground': 'oklch(0.985 0 0)',+ '--sidebar-accent': 'oklch(0.97 0 0)',+ '--sidebar-accent-foreground': 'oklch(0.205 0 0)',+ '--sidebar-border': 'oklch(0.922 0 0)',+ '--sidebar-ring': 'oklch(0.708 0 0)',+};++const baseDarkVariables = {+ '--background': 'oklch(0.145 0 0)',+ '--foreground': 'oklch(0.985 0 0)',+ '--card': 'oklch(0.205 0 0)',+ '--card-foreground': 'oklch(0.985 0 0)',+ '--popover': 'oklch(0.205 0 0)',+ '--popover-foreground': 'oklch(0.985 0 0)',+ '--primary': 'oklch(0.922 0 0)',+ '--primary-foreground': 'oklch(0.205 0 0)',+ '--secondary': 'oklch(0.269 0 0)',+ '--secondary-foreground': 'oklch(0.985 0 0)',+ '--muted': 'oklch(0.269 0 0)',+ '--muted-foreground': 'oklch(0.708 0 0)',+ '--accent': 'oklch(0.269 0 0)',+ '--accent-foreground': 'oklch(0.985 0 0)',+ '--destructive': 'oklch(0.704 0.191 22.216)',+ '--border': 'oklch(1 0 0 / 10%)',+ '--input': 'oklch(1 0 0 / 15%)',+ '--ring': 'oklch(0.556 0 0)',+ '--chart-1': 'oklch(0.488 0.243 264.376)',+ '--chart-2': 'oklch(0.696 0.17 162.48)',+ '--chart-3': 'oklch(0.769 0.188 70.08)',+ '--chart-4': 'oklch(0.627 0.265 303.9)',+ '--chart-5': 'oklch(0.645 0.246 16.439)',+ '--sidebar': 'oklch(0.205 0 0)',+ '--sidebar-foreground': 'oklch(0.985 0 0)',+ '--sidebar-primary': 'oklch(0.488 0.243 264.376)',+ '--sidebar-primary-foreground': 'oklch(0.985 0 0)',+ '--sidebar-accent': 'oklch(0.269 0 0)',+ '--sidebar-accent-foreground': 'oklch(0.985 0 0)',+ '--sidebar-border': 'oklch(1 0 0 / 10%)',+ '--sidebar-ring': 'oklch(0.556 0 0)',+};++const colorVariablesMap: Record<+ ThemeColor,+ Record<ThemeMode, Record<string, string>>+> = {+ red: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.637 0.237 25.331)',+ '--primary-foreground': 'oklch(0.971 0.013 17.38)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.637 0.237 25.331)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.637 0.237 25.331)',+ '--sidebar-primary-foreground': 'oklch(0.971 0.013 17.38)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.637 0.237 25.331)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.637 0.237 25.331)',+ '--primary-foreground': 'oklch(0.971 0.013 17.38)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.637 0.237 25.331)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.637 0.237 25.331)',+ '--sidebar-primary-foreground': 'oklch(0.971 0.013 17.38)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.637 0.237 25.331)',+ },+ },+ rose: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.645 0.246 16.439)',+ '--primary-foreground': 'oklch(0.969 0.015 12.422)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.645 0.246 16.439)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.645 0.246 16.439)',+ '--sidebar-primary-foreground': 'oklch(0.969 0.015 12.422)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.645 0.246 16.439)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.645 0.246 16.439)',+ '--primary-foreground': 'oklch(0.969 0.015 12.422)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.645 0.246 16.439)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.645 0.246 16.439)',+ '--sidebar-primary-foreground': 'oklch(0.969 0.015 12.422)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.645 0.246 16.439)',+ },+ },+ orange: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.705 0.213 47.604)',+ '--primary-foreground': 'oklch(0.98 0.016 73.684)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.705 0.213 47.604)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.705 0.213 47.604)',+ '--sidebar-primary-foreground': 'oklch(0.98 0.016 73.684)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.705 0.213 47.604)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.646 0.222 41.116)',+ '--primary-foreground': 'oklch(0.98 0.016 73.684)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.646 0.222 41.116)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.646 0.222 41.116)',+ '--sidebar-primary-foreground': 'oklch(0.98 0.016 73.684)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.646 0.222 41.116)',+ },+ },+ green: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.723 0.219 149.579)',+ '--primary-foreground': 'oklch(0.982 0.018 155.826)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.723 0.219 149.579)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.723 0.219 149.579)',+ '--sidebar-primary-foreground': 'oklch(0.982 0.018 155.826)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.723 0.219 149.579)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.696 0.17 162.48)',+ '--primary-foreground': 'oklch(0.393 0.095 152.535)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.527 0.154 150.069)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.696 0.17 162.48)',+ '--sidebar-primary-foreground': 'oklch(0.393 0.095 152.535)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.527 0.154 150.069)',+ },+ },+ blue: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.623 0.214 259.815)',+ '--primary-foreground': 'oklch(0.97 0.014 254.604)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.623 0.214 259.815)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.623 0.214 259.815)',+ '--sidebar-primary-foreground': 'oklch(0.97 0.014 254.604)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.623 0.214 259.815)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.546 0.245 262.881)',+ '--primary-foreground': 'oklch(0.379 0.146 265.522)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.488 0.243 264.376)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.546 0.245 262.881)',+ '--sidebar-primary-foreground': 'oklch(0.379 0.146 265.522)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.488 0.243 264.376)',+ },+ },+ yellow: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.795 0.184 86.047)',+ '--primary-foreground': 'oklch(0.421 0.095 57.708)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.795 0.184 86.047)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.795 0.184 86.047)',+ '--sidebar-primary-foreground': 'oklch(0.421 0.095 57.708)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.795 0.184 86.047)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.795 0.184 86.047)',+ '--primary-foreground': 'oklch(0.421 0.095 57.708)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.554 0.135 66.442)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.795 0.184 86.047)',+ '--sidebar-primary-foreground': 'oklch(0.421 0.095 57.708)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.554 0.135 66.442)',+ },+ },+ violet: {+ light: {+ '--foreground': 'oklch(0.141 0.005 285.823)',+ '--card-foreground': 'oklch(0.141 0.005 285.823)',+ '--popover-foreground': 'oklch(0.141 0.005 285.823)',+ '--primary': 'oklch(0.606 0.25 292.717)',+ '--primary-foreground': 'oklch(0.969 0.016 293.756)',+ '--secondary': 'oklch(0.967 0.001 286.375)',+ '--secondary-foreground': 'oklch(0.21 0.006 285.885)',+ '--muted': 'oklch(0.967 0.001 286.375)',+ '--muted-foreground': 'oklch(0.552 0.016 285.938)',+ '--accent': 'oklch(0.967 0.001 286.375)',+ '--accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--border': 'oklch(0.92 0.004 286.32)',+ '--input': 'oklch(0.92 0.004 286.32)',+ '--ring': 'oklch(0.606 0.25 292.717)',+ '--sidebar-foreground': 'oklch(0.141 0.005 285.823)',+ '--sidebar-primary': 'oklch(0.606 0.25 292.717)',+ '--sidebar-primary-foreground': 'oklch(0.969 0.016 293.756)',+ '--sidebar-accent': 'oklch(0.967 0.001 286.375)',+ '--sidebar-accent-foreground': 'oklch(0.21 0.006 285.885)',+ '--sidebar-border': 'oklch(0.92 0.004 286.32)',+ '--sidebar-ring': 'oklch(0.606 0.25 292.717)',+ },+ dark: {+ '--background': 'oklch(0.141 0.005 285.823)',+ '--card': 'oklch(0.21 0.006 285.885)',+ '--popover': 'oklch(0.21 0.006 285.885)',+ '--primary': 'oklch(0.541 0.281 293.009)',+ '--primary-foreground': 'oklch(0.969 0.016 293.756)',+ '--secondary': 'oklch(0.274 0.006 286.033)',+ '--muted': 'oklch(0.274 0.006 286.033)',+ '--muted-foreground': 'oklch(0.705 0.015 286.067)',+ '--accent': 'oklch(0.274 0.006 286.033)',+ '--ring': 'oklch(0.541 0.281 293.009)',+ '--sidebar': 'oklch(0.21 0.006 285.885)',+ '--sidebar-primary': 'oklch(0.541 0.281 293.009)',+ '--sidebar-primary-foreground': 'oklch(0.969 0.016 293.756)',+ '--sidebar-accent': 'oklch(0.274 0.006 286.033)',+ '--sidebar-ring': 'oklch(0.541 0.281 293.009)',+ },+ },+};++export const getThemeVariables = (+ mode: ThemeMode,+ color: ThemeColor | undefined+): Record<string, string> => {+ const colorVariables = color ? colorVariablesMap[color][mode] : {};++ return {+ ...baseVariables,+ ...(mode === 'light' ? baseLightVariables : baseDarkVariables),+ ...colorVariables,+ };+};++export const getSystemTheme = (): ThemeMode => {+ if (typeof window === 'undefined' || !window.matchMedia) {+ return 'light';+ }++ const isDark = window.matchMedia('(prefers-color-scheme: dark)')?.matches;+ return isDark ? 'dark' : 'light';+};diff --git a/packages/ui/src/styles/editor.css b/packages/ui/src/styles/editor.cssindex 7be51c70..17df0ac6 100644--- a/packages/ui/src/styles/editor.css+++ b/packages/ui/src/styles/editor.css@@ -34,23 +34,23 @@ ul[data-type='taskList'] li > label {ul[data-type='taskList'] li > label input[type='checkbox'] {-webkit-appearance: none;appearance: none;- background-color: rgb(255 255 255);+ background-color: var(--background);cursor: pointer;width: 1.2em;height: 1.2em;position: relative;top: 5px;- border: 2px solid rgb(28 25 23);+ border: 2px solid var(--border);margin: 0 0.3rem 0 0;display: grid;place-content: center;&:hover {- background-color: rgb(250 250 249);+ background-color: var(--muted);}&:active {- background-color: rgb(231 229 228);+ background-color: var(--accent);}&::before {diff --git a/packages/ui/src/styles/globals.css b/packages/ui/src/styles/globals.cssindex 5b7891c5..d33c76fa 100644--- a/packages/ui/src/styles/globals.css+++ b/packages/ui/src/styles/globals.css@@ -43,75 +43,6 @@--color-sidebar-ring: var(--sidebar-ring);}-:root {- --radius: 0.625rem;- --background: oklch(1 0 0);- --foreground: oklch(0.129 0.042 264.695);- --card: oklch(1 0 0);- --card-foreground: oklch(0.129 0.042 264.695);- --popover: oklch(1 0 0);- --popover-foreground: oklch(0.129 0.042 264.695);- --primary: oklch(0.208 0.042 265.755);- --primary-foreground: oklch(0.984 0.003 247.858);- --secondary: oklch(0.968 0.007 247.896);- --secondary-foreground: oklch(0.208 0.042 265.755);- --muted: oklch(0.968 0.007 247.896);- --muted-foreground: oklch(0.554 0.046 257.417);- --accent: oklch(0.968 0.007 247.896);- --accent-foreground: oklch(0.208 0.042 265.755);- --destructive: oklch(0.577 0.245 27.325);- --border: oklch(0.929 0.013 255.508);- --input: oklch(0.929 0.013 255.508);- --ring: oklch(0.704 0.04 256.788);- --chart-1: oklch(0.646 0.222 41.116);- --chart-2: oklch(0.6 0.118 184.704);- --chart-3: oklch(0.398 0.07 227.392);- --chart-4: oklch(0.828 0.189 84.429);- --chart-5: oklch(0.769 0.188 70.08);- --sidebar: oklch(0.984 0.003 247.858);- --sidebar-foreground: oklch(0.129 0.042 264.695);- --sidebar-primary: oklch(0.208 0.042 265.755);- --sidebar-primary-foreground: oklch(0.984 0.003 247.858);- --sidebar-accent: oklch(0.968 0.007 247.896);- --sidebar-accent-foreground: oklch(0.208 0.042 265.755);- --sidebar-border: oklch(0.929 0.013 255.508);- --sidebar-ring: oklch(0.704 0.04 256.788);-}--.dark {- --background: oklch(0.129 0.042 264.695);- --foreground: oklch(0.984 0.003 247.858);- --card: oklch(0.208 0.042 265.755);- --card-foreground: oklch(0.984 0.003 247.858);- --popover: oklch(0.208 0.042 265.755);- --popover-foreground: oklch(0.984 0.003 247.858);- --primary: oklch(0.929 0.013 255.508);- --primary-foreground: oklch(0.208 0.042 265.755);- --secondary: oklch(0.279 0.041 260.031);- --secondary-foreground: oklch(0.984 0.003 247.858);- --muted: oklch(0.279 0.041 260.031);- --muted-foreground: oklch(0.704 0.04 256.788);- --accent: oklch(0.279 0.041 260.031);- --accent-foreground: oklch(0.984 0.003 247.858);- --destructive: oklch(0.704 0.191 22.216);- --border: oklch(1 0 0 / 10%);- --input: oklch(1 0 0 / 15%);- --ring: oklch(0.551 0.027 264.364);- --chart-1: oklch(0.488 0.243 264.376);- --chart-2: oklch(0.696 0.17 162.48);- --chart-3: oklch(0.769 0.188 70.08);- --chart-4: oklch(0.627 0.265 303.9);- --chart-5: oklch(0.645 0.246 16.439);- --sidebar: oklch(0.208 0.042 265.755);- --sidebar-foreground: oklch(0.984 0.003 247.858);- --sidebar-primary: oklch(0.488 0.243 264.376);- --sidebar-primary-foreground: oklch(0.984 0.003 247.858);- --sidebar-accent: oklch(0.279 0.041 260.031);- --sidebar-accent-foreground: oklch(0.984 0.003 247.858);- --sidebar-border: oklch(1 0 0 / 10%);- --sidebar-ring: oklch(0.551 0.027 264.364);-}-@layer base {* {@apply border-border outline-ring/50;@@ -121,22 +52,6 @@}}-/* @layer base {- * {- @apply border-border;- }- body {- @apply bg-background text-foreground;- }- *:focus {- outline: none;- }-- *:focus-visible {- outline: none;- }-} */-.cm-editor.cm-focused {outline: none;}@@ -148,3 +63,13 @@.app-no-drag-region {-webkit-app-region: no-drag;}++.emoji-element svg {+ width: 100%;+ height: 100%;+}++.icon-element svg {+ width: 100%;+ height: 100%;+}