@tuturuuu/ui 0.30.2 → 0.31.0

package/src/hooks/use-notifications.ts

@@ -11,7 +11,6 @@ import {
   type SupabaseClient,
 } from '@tuturuuu/supabase/next/realtime-browser';
 import { useEffect } from 'react';
-
 export type NotificationType =
   | 'task_assigned'
   | 'task_updated'
@@ -44,13 +43,11 @@ export type NotificationType =
   | 'time_tracking_request_approved'
   | 'time_tracking_request_rejected'
   | 'time_tracking_request_needs_info';
-
 export interface NotificationActor {
   id: string;
   display_name: string | null;
   avatar_url: string | null;
 }
-
 export interface Notification {
   id: string;
   ws_id: string | null; // Can be null for user-scoped notifications
@@ -66,14 +63,12 @@ export interface Notification {
   created_by: string | null;
   actor: NotificationActor | null;
 }
-
 interface NotificationsPage {
   notifications: Notification[];
   count: number;
   limit: number;
   offset: number;
 }
-
 interface UseNotificationsOptions {
   cacheScope?: string;
   wsId?: string;
@@ -83,22 +78,18 @@ interface UseNotificationsOptions {
   readOnly?: boolean;
   type?: NotificationType;
 }
-
 interface NotificationSubscriptionEntry {
   channel: RealtimeChannel;
   queryClientRefs: Map<QueryClient, number>;
   subscriberCount: number;
   supabase: SupabaseClient;
 }
-
 export const UNREAD_COUNT_STALE_TIME_MS = 5 * 60 * 1000;
 export const UNREAD_COUNT_FALLBACK_INTERVAL_MS = 15 * 60 * 1000;
-
 const notificationSubscriptionRegistry = new Map<
   string,
   NotificationSubscriptionEntry
 >();
-
 function invalidateNotificationQueries(
   queryClientRefs: Map<QueryClient, number>
 ) {
@@ -109,7 +100,6 @@ function invalidateNotificationQueries(
     });
   }
 }
-
 function addNotificationQueryClientRef(
   entry: NotificationSubscriptionEntry,
   queryClient: QueryClient
@@ -120,22 +110,18 @@ function addNotificationQueryClientRef(
     (entry.queryClientRefs.get(queryClient) ?? 0) + 1
   );
 }
-
 function releaseNotificationQueryClientRef(
   entry: NotificationSubscriptionEntry,
   queryClient: QueryClient
 ) {
   entry.subscriberCount -= 1;
-
   const currentRefCount = entry.queryClientRefs.get(queryClient) ?? 0;
-
   if (currentRefCount <= 1) {
     entry.queryClientRefs.delete(queryClient);
   } else {
     entry.queryClientRefs.set(queryClient, currentRefCount - 1);
   }
 }
-
 function createNotificationSubscriptionEntry(
   userId: string,
   queryClient: QueryClient
@@ -144,7 +130,6 @@ function createNotificationSubscriptionEntry(
   const supabase = createRealtimeClient();
   const invalidateQueries = () =>
     invalidateNotificationQueries(queryClientRefs);
-
   const channel = supabase
     .channel(`notifications-${userId}`)
     .on(
@@ -178,7 +163,6 @@ function createNotificationSubscriptionEntry(
       invalidateQueries
     )
     .subscribe();
-
   return {
     channel,
     queryClientRefs,
@@ -186,22 +170,18 @@ function createNotificationSubscriptionEntry(
     supabase,
   } satisfies NotificationSubscriptionEntry;
 }
-
 export function dedupeNotifications(
   notifications: Notification[]
 ): Notification[] {
   const seen = new Set<string>();
-
   return notifications.filter((notification) => {
     if (seen.has(notification.id)) {
       return false;
     }
-
     seen.add(notification.id);
     return true;
   });
 }
-
 /**
  * Hook to fetch notifications with pagination
  * @param wsId - If provided, filters to specific workspace. If omitted, fetches all notifications across all workspaces.
@@ -268,6 +248,7 @@ export function useInfiniteNotifications({
   readOnly = false,
   pageSize = 20,
   enabled = true,
+  refetchInterval,
 }: {
   cacheScope?: string;
   wsId?: string;
@@ -275,6 +256,7 @@ export function useInfiniteNotifications({
   readOnly?: boolean;
   pageSize?: number;
   enabled?: boolean;
+  refetchInterval?: number;
 }) {
   return useInfiniteQuery({
     queryKey: [
@@ -306,6 +288,8 @@ export function useInfiniteNotifications({
     },
     initialPageParam: 0,
     enabled,
+    refetchInterval,
+    refetchIntervalInBackground: false,
     getNextPageParam: (lastPage) => {
       const nextOffset = lastPage.offset + lastPage.limit;
       return nextOffset < lastPage.count ? nextOffset : undefined;
@@ -321,7 +305,7 @@ export function useInfiniteNotifications({
  */
 export function useUnreadCount(
   wsId?: string,
-  options?: { cacheScope?: string; enabled?: boolean }
+  options?: { cacheScope?: string; enabled?: boolean; refetchInterval?: number }
 ) {
   return useQuery({
     queryKey: [
@@ -340,14 +324,15 @@ export function useUnreadCount(
         throw new Error('Failed to fetch unread count');
       }
 
-      const data = await response.json();
-      return data.count as number;
+      const data = (await response.json()) as { count: number };
+      return data.count;
     },
     enabled: options?.enabled ?? true,
     staleTime: UNREAD_COUNT_STALE_TIME_MS,
     // Realtime invalidation is the primary update path. Keep a low-frequency
     // refresh as a safety net for disconnected or suspended browser sessions.
-    refetchInterval: UNREAD_COUNT_FALLBACK_INTERVAL_MS,
+    refetchInterval:
+      options?.refetchInterval ?? UNREAD_COUNT_FALLBACK_INTERVAL_MS,
     refetchIntervalInBackground: false,
     refetchOnReconnect: true,
     refetchOnWindowFocus: true,

package/src/hooks/use-open-initial-calendar-event.ts

@@ -0,0 +1,27 @@
+import type { CalendarEvent } from '@tuturuuu/types/primitives/calendar-event';
+import { useEffect, useRef } from 'react';
+
+export function useOpenInitialCalendarEvent({
+  events,
+  initialEventId,
+  onOpen,
+}: {
+  events: CalendarEvent[];
+  initialEventId?: string;
+  onOpen: (eventId: string) => void;
+}) {
+  const openedEventIdRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    if (
+      !initialEventId ||
+      openedEventIdRef.current === initialEventId ||
+      !events.some((event) => event.id === initialEventId)
+    ) {
+      return;
+    }
+
+    onOpen(initialEventId);
+    openedEventIdRef.current = initialEventId;
+  }, [events, initialEventId, onOpen]);
+}

package/src/hooks/use-settings-dialog-shortcut.test.tsx

@@ -0,0 +1,41 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { useSettingsDialogShortcut } from './use-settings-dialog-shortcut';
+
+function Shell({ onOpen }: { onOpen: () => void }) {
+  useSettingsDialogShortcut({ enabled: true, onOpen });
+  return (
+    <div contentEditable suppressContentEditableWarning>
+      <span>Editor content</span>
+    </div>
+  );
+}
+describe('shared app settings shortcut', () => {
+  it('supports both platforms without stealing editor, composition, or modified commands', () => {
+    const onOpen = vi.fn();
+    render(<Shell onOpen={onOpen} />);
+    fireEvent.keyDown(window, { key: ',', ctrlKey: true });
+    fireEvent.keyDown(window, { key: ',', metaKey: true });
+    expect(onOpen).toHaveBeenCalledTimes(2);
+    fireEvent.keyDown(screen.getByText('Editor content'), {
+      key: ',',
+      ctrlKey: true,
+    });
+    for (const options of [
+      { isComposing: true },
+      { repeat: true },
+      { shiftKey: true },
+      { altKey: true },
+    ]) {
+      fireEvent.keyDown(window, { key: ',', ctrlKey: true, ...options });
+    }
+    const event = new KeyboardEvent('keydown', {
+      key: ',',
+      ctrlKey: true,
+      cancelable: true,
+    });
+    event.preventDefault();
+    fireEvent(window, event);
+    expect(onOpen).toHaveBeenCalledTimes(2);
+  });
+});

package/src/hooks/use-settings-dialog-shortcut.ts

@@ -1,5 +1,10 @@
 'use client';
 
+import {
+  isEditableShortcutTarget,
+  isShortcutEventIgnored,
+} from '@tuturuuu/utils/keyboard-shortcuts';
+
 import { useEffect } from 'react';
 
 interface UseSettingsDialogShortcutOptions {
@@ -7,23 +12,15 @@ interface UseSettingsDialogShortcutOptions {
   onOpen: () => void;
 }
 
-function isEditableShortcutTarget(target: EventTarget | null) {
-  if (!(target instanceof HTMLElement)) return false;
-
-  const tagName = target.tagName.toLowerCase();
-
+function isSettingsDialogShortcut(event: KeyboardEvent) {
   return (
-    target.isContentEditable ||
-    tagName === 'input' ||
-    tagName === 'textarea' ||
-    tagName === 'select'
+    (event.metaKey || event.ctrlKey) &&
+    !event.altKey &&
+    !event.shiftKey &&
+    event.key === ','
   );
 }
 
-function isSettingsDialogShortcut(event: KeyboardEvent) {
-  return (event.metaKey || event.ctrlKey) && !event.altKey && event.key === ',';
-}
-
 /**
  * Opens the app settings dialog on Cmd/Ctrl+, — the platform-wide convention.
  * Ignores the shortcut while typing in editable fields and when another handler
@@ -38,7 +35,8 @@ export function useSettingsDialogShortcut({
     if (!enabled) return;
 
     const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.defaultPrevented || !isSettingsDialogShortcut(event)) return;
+      if (isShortcutEventIgnored(event) || !isSettingsDialogShortcut(event))
+        return;
       if (isEditableShortcutTarget(event.target)) return;
 
       event.preventDefault();

package/src/hooks/use-workspace-presence.ts

@@ -56,24 +56,6 @@ function createPresenceSessionId(): string {
     return crypto.randomUUID();
   }
 
-  // Fallback to Node.js crypto if available
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const nodeCrypto = require('node:crypto') as
-      | { randomUUID?: () => string; randomBytes: (size: number) => Buffer }
-      | undefined;
-
-    if (nodeCrypto?.randomUUID) {
-      return nodeCrypto.randomUUID();
-    }
-
-    if (typeof nodeCrypto?.randomBytes === 'function') {
-      return nodeCrypto.randomBytes(16).toString('hex');
-    }
-  } catch {
-    // Ignore and fall through to final fallback
-  }
-
   // Final fallback using Web Crypto getRandomValues if available
   if (
     typeof crypto !== 'undefined' &&

package/src/lib/tasks-app-url.test.ts

@@ -0,0 +1,25 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { getTaskApiUrl, getTasksAppUrl } from './tasks-app-url';
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+  vi.unstubAllEnvs();
+});
+
+describe('Calendar task API routing', () => {
+  it.each(['calendar.tuturuuu.com', 'calendar.tuturuuu.localhost'])(
+    'uses the local authenticated proxy on %s',
+    (hostname) => {
+      vi.stubGlobal('window', {
+        location: { hostname, protocol: 'https:', port: '' },
+      });
+      vi.stubEnv('NEXT_PUBLIC_TASKS_APP_URL', 'https://tasks.tuturuuu.com');
+      expect(getTaskApiUrl('/api/v1/workspaces/ws/tasks/journal')).toBe(
+        '/api/v1/workspaces/ws/tasks/journal'
+      );
+      expect(getTasksAppUrl('/personal/tasks')).toBe(
+        'https://tasks.tuturuuu.com/personal/tasks'
+      );
+    }
+  );
+});

package/src/lib/tasks-app-url.ts

@@ -81,5 +81,13 @@ export function getTasksAppUrl(path: string) {
 }
 
 export function getTaskApiUrl(path: string) {
+  if (
+    typeof window !== 'undefined' &&
+    ['calendar.tuturuuu.com', 'calendar.tuturuuu.localhost'].includes(
+      window.location.hostname.toLowerCase()
+    )
+  ) {
+    return path.startsWith('/') ? path : `/${path}`;
+  }
   return getTasksAppUrl(path);
 }