@semiont/react-ui 0.4.6 → 0.4.9

package/src/components/resource/panels/__tests__/ReferenceEntry.test.tsx

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import React from 'react';
 import { screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { renderWithProviders, resetEventBusForTesting } from '../../../../test-utils';
+import { renderWithProviders } from '../../../../test-utils';
 import userEvent from '@testing-library/user-event';
 import type { components } from '@semiont/core';
 import type { RouteBuilder } from '../../../../contexts/RoutingContext';
@@ -86,7 +86,6 @@ describe('ReferenceEntry', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    resetEventBusForTesting();
     mockGetAnnotationExactText.mockReturnValue('referenced text');
     mockIsBodyResolved.mockReturnValue(false);
     mockGetBodySource.mockReturnValue(null);

package/src/components/resource/panels/__tests__/ReferencesPanel.test.tsx

@@ -4,7 +4,7 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import { ReferencesPanel } from '../ReferencesPanel';
-import { EventBusProvider, resetEventBusForTesting, useEventBus } from '../../../../contexts/EventBusContext';
+import { EventBusProvider, useEventBus } from '../../../../contexts/EventBusContext';
 
 // Composition-based event tracker
 interface TrackedEvent {
@@ -127,7 +127,6 @@ describe('ReferencesPanel Component', () => {
   };
 
   beforeEach(() => {
-    resetEventBusForTesting();
     vi.clearAllMocks();
   });
 

package/src/components/resource/panels/__tests__/ResourceInfoPanel.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { ResourceInfoPanel } from '../ResourceInfoPanel';
-import { EventBusProvider, resetEventBusForTesting, useEventBus } from '../../../../contexts/EventBusContext';
+import { EventBusProvider, useEventBus } from '../../../../contexts/EventBusContext';
 
 // Mock TranslationContext
 vi.mock('../../../../contexts/TranslationContext', () => ({
@@ -129,7 +129,6 @@ describe('ResourceInfoPanel Component', () => {
   };
 
   beforeEach(() => {
-    resetEventBusForTesting();
     vi.clearAllMocks();
   });
 

package/src/components/resource/panels/__tests__/TagEntry.test.tsx

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import React from 'react';
 import { screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { renderWithProviders, resetEventBusForTesting } from '../../../../test-utils';
+import { renderWithProviders } from '../../../../test-utils';
 import userEvent from '@testing-library/user-event';
 import type { components } from '@semiont/core';
 
@@ -73,7 +73,6 @@ describe('TagEntry', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    resetEventBusForTesting();
     mockGetAnnotationExactText.mockReturnValue('Tagged text content');
     mockGetTagCategory.mockReturnValue('Entity');
     mockGetTagSchemaId.mockReturnValue(null);

package/src/components/resource/panels/__tests__/TaggingPanel.test.tsx

@@ -5,7 +5,7 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import { TaggingPanel } from '../TaggingPanel';
-import { EventBusProvider, resetEventBusForTesting, useEventBus } from '../../../../contexts/EventBusContext';
+import { EventBusProvider, useEventBus } from '../../../../contexts/EventBusContext';
 import type { components } from '@semiont/core';
 
 type Annotation = components['schemas']['Annotation'];
@@ -203,7 +203,6 @@ describe('TaggingPanel Component', () => {
   };
 
   beforeEach(() => {
-    resetEventBusForTesting();
     vi.clearAllMocks();
 
     // Mock scrollIntoView for jsdom

package/src/components/settings/__tests__/SettingsPanel.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import React from 'react';
 import { screen, fireEvent } from '@testing-library/react';
-import { renderWithProviders, resetEventBusForTesting } from '../../../test-utils';
+import { renderWithProviders } from '../../../test-utils';
 import '@testing-library/jest-dom';
 import { SettingsPanel } from '../SettingsPanel';
 
@@ -36,7 +36,6 @@ describe('SettingsPanel', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    resetEventBusForTesting();
   });
 
   it('renders settings title', () => {

package/src/components/viewers/ImageViewer.tsx

@@ -1,16 +1,10 @@
-import type { ResourceId } from '@semiont/core';
-
 interface ImageViewerProps {
-  resourceUri: ResourceId;
+  imageUrl: string;
   mimeType: string;
   alt?: string;
 }
 
-export function ImageViewer({ resourceUri, alt = 'Resource image' }: ImageViewerProps) {
-  // Use Next.js API route proxy instead of direct backend call
-  // This allows us to add authentication headers which <img> tags can't send
-  const imageUrl = `/api/resources/${resourceUri}`;
-
+export function ImageViewer({ imageUrl, alt = 'Resource image' }: ImageViewerProps) {
   return (
     <div className="semiont-image-viewer">
       <img

package/src/components/viewers/__tests__/ImageViewer.test.tsx

@@ -4,19 +4,18 @@ import { screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { renderWithProviders } from '../../../test-utils';
 import { ImageViewer } from '../ImageViewer';
-import type { ResourceId } from '@semiont/core';
 
 describe('ImageViewer', () => {
   const defaultProps = {
-    resourceUri: 'abc-123' as ResourceId,
+    imageUrl: 'http://localhost:4000/resources/abc-123?token=tok',
     mimeType: 'image/png',
   };
 
-  it('should render an img element with correct src derived from URI', () => {
+  it('should render an img element with the provided src', () => {
     renderWithProviders(<ImageViewer {...defaultProps} />);
 
     const img = screen.getByRole('img');
-    expect(img).toHaveAttribute('src', '/api/resources/abc-123');
+    expect(img).toHaveAttribute('src', defaultProps.imageUrl);
   });
 
   it('should use default alt text when none provided', () => {
@@ -35,18 +34,6 @@ describe('ImageViewer', () => {
     expect(img).toHaveAttribute('alt', 'A beautiful diagram');
   });
 
-  it('should extract the last segment of the URI as resource ID', () => {
-    renderWithProviders(
-      <ImageViewer
-        resourceUri={'resource-xyz' as ResourceId}
-        mimeType="image/jpeg"
-      />
-    );
-
-    const img = screen.getByRole('img');
-    expect(img).toHaveAttribute('src', '/api/resources/resource-xyz');
-  });
-
   it('should render with correct class names', () => {
     const { container } = renderWithProviders(<ImageViewer {...defaultProps} />);
 

package/src/features/auth/__tests__/SignInForm.a11y.test.tsx

@@ -29,6 +29,8 @@ const mockTranslations = {
   welcomeBack: 'Welcome back to Semiont',
   signInPrompt: 'Sign in to your knowledge workspace',
   continueWithGoogle: 'Continue with Google',
+  backendUrlLabel: 'Backend URL',
+  backendUrlPlaceholder: 'https://your-semiont-server.com',
   emailLabel: 'Email',
   emailPlaceholder: 'your@email.com',
   passwordLabel: 'Password',
@@ -42,6 +44,7 @@ const mockTranslations = {
   signUpInstead: 'Sign Up Instead',
   errorEmailRequired: 'Email is required',
   errorPasswordRequired: 'Password is required',
+  errorBackendUrlRequired: 'Backend URL is required',
   tagline: 'make meaning',
 };
 
@@ -53,6 +56,7 @@ describe('SignInForm - Accessibility', () => {
       const { container } = render(
         <SignInForm
           onGoogleSignIn={onGoogleSignIn}
+          backendUrl="http://localhost:4000"
           Link={MockLink}
           translations={mockTranslations}
         />
@@ -200,6 +204,7 @@ describe('SignInForm - Accessibility', () => {
       render(
         <SignInForm
           onGoogleSignIn={onGoogleSignIn}
+          backendUrl="http://localhost:4000"
           Link={MockLink}
           translations={mockTranslations}
         />
@@ -257,6 +262,7 @@ describe('SignInForm - Accessibility', () => {
       render(
         <SignInForm
           onGoogleSignIn={onGoogleSignIn}
+          backendUrl="http://localhost:4000"
           Link={MockLink}
           translations={mockTranslations}
         />
@@ -374,6 +380,7 @@ describe('SignInForm - Accessibility', () => {
       render(
         <SignInForm
           onGoogleSignIn={onGoogleSignIn}
+          backendUrl="http://localhost:4000"
           Link={MockLink}
           translations={mockTranslations}
         />
@@ -391,6 +398,7 @@ describe('SignInForm - Accessibility', () => {
       const { container } = render(
         <SignInForm
           onGoogleSignIn={onGoogleSignIn}
+          backendUrl="http://localhost:4000"
           Link={MockLink}
           translations={mockTranslations}
         />

package/src/features/auth/auth.css

@@ -307,3 +307,65 @@
   white-space: nowrap;
   border-width: 0;
 }
+
+/* URL field with inline probe indicator */
+.semiont-form__input-row {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.semiont-form__input-row:focus-visible {
+  outline: 2px solid var(--semiont-focus-ring, #3b82f6);
+  outline-offset: 2px;
+}
+
+[data-theme="dark"] .semiont-form__input-row:focus-visible {
+  outline-color: var(--semiont-focus-ring, #60a5fa);
+}
+
+.semiont-form__input-row .semiont-input {
+  flex: 1;
+}
+
+.semiont-form__input-row .semiont-input:focus-visible {
+  outline: 2px solid var(--semiont-focus-ring, #3b82f6);
+  outline-offset: 2px;
+}
+
+[data-theme="dark"] .semiont-form__input-row .semiont-input:focus-visible {
+  outline-color: var(--semiont-focus-ring, #60a5fa);
+}
+
+.semiont-form__url-status {
+  flex-shrink: 0;
+  font-size: 1rem;
+  width: 1.25rem;
+  text-align: center;
+}
+
+.semiont-form__url-status--checking {
+  color: var(--semiont-text-muted, #888888);
+  animation: spin 1s linear infinite;
+  display: inline-block;
+}
+
+[data-theme="dark"] .semiont-form__url-status--checking {
+  color: var(--semiont-text-muted, #888888);
+}
+
+.semiont-form__url-status--ok {
+  color: var(--semiont-success, #22c55e);
+}
+
+[data-theme="dark"] .semiont-form__url-status--ok {
+  color: var(--semiont-success, #22c55e);
+}
+
+.semiont-form__url-status--error {
+  color: var(--semiont-error, #ef4444);
+}
+
+[data-theme="dark"] .semiont-form__url-status--error {
+  color: var(--semiont-error, #ef4444);
+}

package/src/features/auth/components/SignInForm.tsx

@@ -3,6 +3,9 @@
  *
  * Supports both Google OAuth and email/password credentials.
  * No Next.js dependencies - all data via props.
+ *
+ * When backendUrl is provided it is shown as a locked read-only field.
+ * When backendUrl is omitted the user must enter a backend URL to connect to.
  */
 
 import React from 'react';
@@ -11,14 +14,22 @@ import '../auth.css';
 
 export interface SignInFormProps {
   /**
-   * Callback when user clicks Google sign-in
+   * Callback when user clicks Google sign-in.
+   * Receives the backend URL (either the locked one or what the user typed).
+   */
+  onGoogleSignIn: (backendUrl: string) => Promise<void>;
+
+  /**
+   * Callback when user submits email/password credentials.
+   * Receives the backend URL along with email and password.
    */
-  onGoogleSignIn: () => Promise<void>;
+  onCredentialsSignIn?: ((backendUrl: string, email: string, password: string) => Promise<void>) | undefined;
 
   /**
-   * Callback when user submits email/password credentials
+   * Pre-filled backend URL. When provided the field is read-only (re-auth to known workspace).
+   * When omitted the user enters the URL themselves (new connection).
    */
-  onCredentialsSignIn?: ((email: string, password: string) => Promise<void>) | undefined;
+  backendUrl?: string;
 
   /**
    * Error message to display (if any)
@@ -48,6 +59,8 @@ export interface SignInFormProps {
     welcomeBack: string;
     signInPrompt: string;
     continueWithGoogle: string;
+    backendUrlLabel: string;
+    backendUrlPlaceholder: string;
     emailLabel: string;
     emailPlaceholder: string;
     passwordLabel: string;
@@ -59,6 +72,9 @@ export interface SignInFormProps {
     backToHome: string;
     learnMore: string;
     signUpInstead: string;
+    errorBackendUrlRequired: string;
+    errorBackendUrlInvalid: string;
+    errorBackendUrlUnreachable: string;
     errorEmailRequired: string;
     errorPasswordRequired: string;
     tagline: string;
@@ -91,43 +107,87 @@ function GoogleIcon() {
   );
 }
 
+type UrlProbeStatus = 'idle' | 'checking' | 'ok' | 'error';
+
+function normalizeUrlForProbe(raw: string): string | null {
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+  if (/^https?:\/\//i.test(trimmed)) return trimmed;
+  return `http://${trimmed}`;
+}
+
 /**
- * CredentialsAuthForm - Email/password form component
+ * CredentialsAuthForm - Backend URL + email/password form.
+ * When lockedBackendUrl is provided, the URL field is shown read-only.
  */
 function CredentialsAuthForm({
+  lockedBackendUrl,
   onSubmit,
   translations: t,
 }: {
-  onSubmit: (email: string, password: string) => Promise<void>;
+  lockedBackendUrl: string | undefined;
+  onSubmit: (backendUrl: string, email: string, password: string) => Promise<void>;
   translations: SignInFormProps['translations'];
 }) {
+  const [backendUrl, setBackendUrl] = React.useState(lockedBackendUrl ?? '');
   const [email, setEmail] = React.useState('');
   const [password, setPassword] = React.useState('');
   const [validationError, setValidationError] = React.useState<string | null>(null);
-  const [fieldErrors, setFieldErrors] = React.useState<{ email?: string; password?: string }>({});
+  const [fieldErrors, setFieldErrors] = React.useState<{ backendUrl?: string; email?: string; password?: string }>({});
+  const [urlProbeStatus, setUrlProbeStatus] = React.useState<UrlProbeStatus>('idle');
+
+  const probeUrl = async (raw: string) => {
+    const url = normalizeUrlForProbe(raw);
+    if (!url) return;
+    // Validate format
+    try { new URL(url); } catch {
+      setFieldErrors(prev => ({ ...prev, backendUrl: t.errorBackendUrlInvalid }));
+      setUrlProbeStatus('error');
+      return;
+    }
+    setUrlProbeStatus('checking');
+    try {
+      const res = await fetch(`${url}/api/health`, { signal: AbortSignal.timeout(5000) });
+      setUrlProbeStatus(res.ok ? 'ok' : 'error');
+      if (!res.ok) {
+        setFieldErrors(prev => ({ ...prev, backendUrl: t.errorBackendUrlUnreachable }));
+      }
+    } catch {
+      setUrlProbeStatus('error');
+      setFieldErrors(prev => ({ ...prev, backendUrl: t.errorBackendUrlUnreachable }));
+    }
+  };
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
-    const errors: { email?: string; password?: string } = {};
+    const errors: { backendUrl?: string; email?: string; password?: string } = {};
 
-    if (!email) {
-      errors.email = t.errorEmailRequired;
-    }
-    if (!password) {
-      errors.password = t.errorPasswordRequired;
-    }
+    if (!backendUrl.trim()) errors.backendUrl = t.errorBackendUrlRequired;
+    if (!email) errors.email = t.errorEmailRequired;
+    if (!password) errors.password = t.errorPasswordRequired;
 
     if (Object.keys(errors).length > 0) {
       setFieldErrors(errors);
-      setValidationError(Object.values(errors)[0]); // Set first error for screen readers
+      setValidationError(Object.values(errors)[0]);
       return;
     }
 
     setFieldErrors({});
     setValidationError(null);
-    await onSubmit(email, password);
+    await onSubmit(backendUrl.trim(), email, password);
   };
 
+  const probeIndicator = !lockedBackendUrl && urlProbeStatus !== 'idle' ? (
+    <span
+      className={`semiont-form__url-status semiont-form__url-status--${urlProbeStatus}`}
+      aria-live="polite"
+    >
+      {urlProbeStatus === 'checking' && '⟳'}
+      {urlProbeStatus === 'ok' && '✓'}
+      {urlProbeStatus === 'error' && '✗'}
+    </span>
+  ) : null;
+
   return (
     <>
       {validationError && (
@@ -137,6 +197,38 @@ function CredentialsAuthForm({
       )}
 
       <form onSubmit={handleSubmit} className="semiont-auth__form" noValidate>
+        <div className="semiont-form__field">
+          <label htmlFor="backend-url" className="semiont-form__label">
+            {t.backendUrlLabel}
+          </label>
+          <div className="semiont-form__input-row">
+            <input
+              id="backend-url"
+              type="url"
+              value={backendUrl}
+              onChange={(e) => {
+                if (lockedBackendUrl) return;
+                setBackendUrl(e.target.value);
+                setUrlProbeStatus('idle');
+                if (fieldErrors.backendUrl) setFieldErrors({ ...fieldErrors, backendUrl: undefined });
+              }}
+              onBlur={() => { if (!lockedBackendUrl) probeUrl(backendUrl); }}
+              readOnly={!!lockedBackendUrl}
+              placeholder={t.backendUrlPlaceholder}
+              className={`semiont-input${lockedBackendUrl ? ' semiont-input--readonly' : ''}`}
+              aria-invalid={!!fieldErrors.backendUrl}
+              aria-describedby={fieldErrors.backendUrl ? 'backend-url-error' : undefined}
+              required
+            />
+            {probeIndicator}
+          </div>
+          {fieldErrors.backendUrl && (
+            <span id="backend-url-error" className="semiont-form__error" role="alert">
+              {fieldErrors.backendUrl}
+            </span>
+          )}
+        </div>
+
         <div className="semiont-form__field">
           <label htmlFor="email" className="semiont-form__label">
             {t.emailLabel}
@@ -147,9 +239,7 @@ function CredentialsAuthForm({
             value={email}
             onChange={(e) => {
               setEmail(e.target.value);
-              if (fieldErrors.email) {
-                setFieldErrors({ ...fieldErrors, email: undefined });
-              }
+              if (fieldErrors.email) setFieldErrors({ ...fieldErrors, email: undefined });
             }}
             placeholder={t.emailPlaceholder}
             className="semiont-input"
@@ -163,6 +253,7 @@ function CredentialsAuthForm({
             </span>
           )}
         </div>
+
         <div className="semiont-form__field">
           <label htmlFor="password" className="semiont-form__label">
             {t.passwordLabel}
@@ -173,9 +264,7 @@ function CredentialsAuthForm({
             value={password}
             onChange={(e) => {
               setPassword(e.target.value);
-              if (fieldErrors.password) {
-                setFieldErrors({ ...fieldErrors, password: undefined });
-              }
+              if (fieldErrors.password) setFieldErrors({ ...fieldErrors, password: undefined });
             }}
             placeholder={t.passwordPlaceholder}
             className="semiont-input"
@@ -189,6 +278,7 @@ function CredentialsAuthForm({
             </span>
           )}
         </div>
+
         <button type="submit" className={`${buttonStyles.primary.base} semiont-button--full-width`}>
           {t.signInWithCredentials}
         </button>
@@ -203,17 +293,29 @@ function CredentialsAuthForm({
 }
 
 /**
- * SignInForm - Main sign-in component
+ * SignInForm - Main sign-in / connect component.
+ *
+ * When backendUrl is provided (re-auth to known workspace) the URL field is locked.
+ * When backendUrl is omitted (new connection) the user enters the URL themselves.
  */
 export function SignInForm({
   onGoogleSignIn,
   onCredentialsSignIn,
+  backendUrl,
   error,
   showCredentialsAuth = false,
   isLoading = false,
   Link,
   translations: t,
 }: SignInFormProps) {
+  const handleGoogleClick = () => {
+    // For Google auth we need the backend URL from the locked prop or we cannot proceed.
+    // The caller is responsible for ensuring backendUrl is set when Google sign-in is offered.
+    if (backendUrl) {
+      onGoogleSignIn(backendUrl);
+    }
+  };
+
   return (
     <main className="semiont-auth__main" role="main">
       <div className="semiont-auth__container">
@@ -245,12 +347,21 @@ export function SignInForm({
           <div className="semiont-auth__forms">
             {!isLoading ? (
               <>
-                {showCredentialsAuth && onCredentialsSignIn && <CredentialsAuthForm onSubmit={onCredentialsSignIn} translations={t} />}
+                {showCredentialsAuth && onCredentialsSignIn && (
+                  <CredentialsAuthForm
+                    lockedBackendUrl={backendUrl}
+                    onSubmit={onCredentialsSignIn}
+                    translations={t}
+                  />
+                )}
 
-                <button onClick={onGoogleSignIn} className={`${buttonStyles.primary.base} semiont-button--full-width`}>
-                  <GoogleIcon />
-                  {t.continueWithGoogle}
-                </button>
+                {/* Google sign-in only shown when a backend URL is known */}
+                {backendUrl && (
+                  <button onClick={handleGoogleClick} className={`${buttonStyles.primary.base} semiont-button--full-width`}>
+                    <GoogleIcon />
+                    {t.continueWithGoogle}
+                  </button>
+                )}
 
                 <div className="semiont-auth__info">
                   {showCredentialsAuth ? t.credentialsAuthEnabled : t.approvedDomainsOnly}
@@ -258,7 +369,6 @@ export function SignInForm({
               </>
             ) : (
               <div className="semiont-auth__loading" aria-busy="true" aria-live="polite">
-                {/* Placeholder to maintain consistent height while loading */}
                 <div style={{ height: '200px' }}></div>
               </div>
             )}

package/src/features/resource-compose/__tests__/ResourceComposePage.test.tsx

@@ -5,11 +5,11 @@
  * No Next.js mocking required - all dependencies passed as props!
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { ResourceComposePage } from '../components/ResourceComposePage';
 import type { ResourceComposePageProps, SaveResourceParams } from '../components/ResourceComposePage';
-import { EventBusProvider, resetEventBusForTesting } from '../../../contexts/EventBusContext';
+import { EventBusProvider } from '../../../contexts/EventBusContext';
 
 // Mock CodeMirrorRenderer to avoid CodeMirror dependencies
 vi.mock('../../../components/CodeMirrorRenderer', () => ({
@@ -78,10 +78,6 @@ const renderWithProviders = (ui: React.ReactElement) => {
 };
 
 describe('ResourceComposePage', () => {
-  beforeEach(() => {
-    resetEventBusForTesting();
-  });
-
   describe('Basic Rendering - New Resource Mode', () => {
     it('renders without crashing', () => {
       const props = createMockProps();

package/src/features/resource-discovery/__tests__/ResourceDiscoveryPage.test.tsx

@@ -9,7 +9,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { ResourceDiscoveryPage } from '../components/ResourceDiscoveryPage';
 import type { ResourceDiscoveryPageProps } from '../components/ResourceDiscoveryPage';
-import { EventBusProvider, resetEventBusForTesting } from '../../../contexts/EventBusContext';
+import { EventBusProvider } from '../../../contexts/EventBusContext';
 
 const createMockResource = (id: string, name: string, entityTypes: string[] = []) => ({
   '@context': 'https://www.w3.org/ns/anno.jsonld',
@@ -63,7 +63,6 @@ const renderWithProviders = (ui: React.ReactElement) => {
 
 describe('ResourceDiscoveryPage', () => {
   beforeEach(() => {
-    resetEventBusForTesting();
   });
 
   describe('Basic Rendering', () => {

package/src/features/resource-viewer/__tests__/AnnotationCreationPending.test.tsx

@@ -21,7 +21,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
 import { act } from 'react';
 import { useMarkFlow } from '../../../hooks/useMarkFlow';
-import { EventBusProvider, useEventBus, resetEventBusForTesting } from '../../../contexts/EventBusContext';
+import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { SemiontApiClient } from '@semiont/api-client';
@@ -107,7 +107,6 @@ describe('Annotation creation clears pendingAnnotation', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    resetEventBusForTesting();
     markAnnotationSpy = vi
       .spyOn(SemiontApiClient.prototype, 'markAnnotation')
       .mockResolvedValue({ annotationId: MOCK_ANNOTATION.id } as any);

package/src/features/resource-viewer/__tests__/AnnotationDeletionIntegration.test.tsx

@@ -27,7 +27,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, waitFor } from '@testing-library/react';
 import { act } from 'react';
 import { useMarkFlow } from '../../../hooks/useMarkFlow';
-import { EventBusProvider, useEventBus, resetEventBusForTesting } from '../../../contexts/EventBusContext';
+import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 
 // Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
 vi.mock('../../../components/Toast', () => ({
@@ -51,7 +51,6 @@ describe('Annotation Deletion - Feature Integration', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    resetEventBusForTesting();
 
     // Mock the deleteAnnotation method on SemiontApiClient prototype
     deleteAnnotationSpy = vi.fn().mockResolvedValue({ success: true });