Minor adjustments

Author: alex-rawlings-yyc

src/__tests__/components/controls/ViewOptionsDropdown.test.tsx

@@ -126,8 +126,7 @@ describe('ViewOptionsDropdown', () => {
       render(<ViewOptionsDropdown {...DEFAULT_PROPS} continuousScroll />);
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      expect(checkboxes[0]).toBeChecked();
+      expect(screen.getByRole('checkbox', { name: /continuousScroll/i })).toBeChecked();
     });
 
     it('calls onContinuousScrollChange when toggled', async () => {
@@ -141,8 +140,7 @@ describe('ViewOptionsDropdown', () => {
       );
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      await userEvent.click(checkboxes[0]);
+      await userEvent.click(screen.getByRole('checkbox', { name: /continuousScroll/i }));
 
       expect(onContinuousScrollChange).toHaveBeenCalledWith(true);
     });
@@ -203,8 +201,7 @@ describe('ViewOptionsDropdown', () => {
       render(<ViewOptionsDropdown {...DEFAULT_PROPS} hideInactiveLinkButtons />);
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      expect(checkboxes[3]).toBeChecked();
+      expect(screen.getByRole('checkbox', { name: /hideInactiveLinkButtons/i })).toBeChecked();
     });
 
     it('calls onHideInactiveLinkButtonsChange when toggled', async () => {
@@ -218,8 +215,7 @@ describe('ViewOptionsDropdown', () => {
       );
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      await userEvent.click(checkboxes[3]);
+      await userEvent.click(screen.getByRole('checkbox', { name: /hideInactiveLinkButtons/i }));
 
       expect(onHideInactiveLinkButtonsChange).toHaveBeenCalledWith(true);
     });
@@ -230,8 +226,7 @@ describe('ViewOptionsDropdown', () => {
       render(<ViewOptionsDropdown {...DEFAULT_PROPS} simplifyPhrases />);
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      expect(checkboxes[4]).toBeChecked();
+      expect(screen.getByRole('checkbox', { name: /simplifyPhrases/i })).toBeChecked();
     });
 
     it('calls onSimplifyPhrasesChange when toggled', async () => {
@@ -245,8 +240,7 @@ describe('ViewOptionsDropdown', () => {
       );
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      await userEvent.click(checkboxes[4]);
+      await userEvent.click(screen.getByRole('checkbox', { name: /simplifyPhrases/i }));
 
       expect(onSimplifyPhrasesChange).toHaveBeenCalledWith(true);
     });
@@ -257,8 +251,7 @@ describe('ViewOptionsDropdown', () => {
       render(<ViewOptionsDropdown {...DEFAULT_PROPS} chapterLabelInVerse />);
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      expect(checkboxes[5]).toBeChecked();
+      expect(screen.getByRole('checkbox', { name: /chapterLabelInVerse/i })).toBeChecked();
     });
 
     it('calls onChapterLabelInVerseChange when toggled', async () => {
@@ -272,8 +265,7 @@ describe('ViewOptionsDropdown', () => {
       );
       await userEvent.click(screen.getByTestId('view-options-button'));
 
-      const checkboxes = screen.getAllByRole('checkbox');
-      await userEvent.click(checkboxes[5]);
+      await userEvent.click(screen.getByRole('checkbox', { name: /chapterLabelInVerse/i }));
 
       expect(onChapterLabelInVerseChange).toHaveBeenCalledWith(true);
     });

src/__tests__/main.test.ts

@@ -271,12 +271,22 @@ describe('main', () => {
       );
     });
 
-    it('adds all registrations to the activation context', async () => {
+    it('adds every created registration to the activation context for disposal', async () => {
       const context = createTestActivationContext();
 
       await activate(context);
 
-      expect(context.registrations.unsubscribers.size).toBe(24);
+      // Every registration produced during activation must be handed to the context so the platform
+      // disposes it on deactivation: the WebView provider, one per command and validator, plus the
+      // two WebView lifecycle subscriptions. Deriving the count from the mock calls keeps this
+      // resilient when commands or validators are added or removed.
+      const expectedRegistrationCount =
+        __mockRegisterWebViewProvider.mock.calls.length +
+        __mockRegisterCommand.mock.calls.length +
+        __mockRegisterValidator.mock.calls.length +
+        __mockOnDidOpenWebView.mock.calls.length +
+        __mockOnDidCloseWebView.mock.calls.length;
+      expect(context.registrations.unsubscribers.size).toBe(expectedRegistrationCount);
     });
 
     it('logs activation start and finish', async () => {

src/components/SegmentView.tsx

@@ -110,8 +110,7 @@ type SegmentViewProps = Readonly<{
  * @param props.wordTokenByRef - Word token ref → token lookup; used to resolve focus context.
  * @param props.viewOptions - Bundled display toggles; `chapterLabelInVerse` sets the verse label,
  *   the rest pass through to the phrase strip context.
- * @returns A button (baseline-text mode) or div (token-chip mode) containing a verse label and
- *   segment content
+ * @returns A div containing a verse label and the segment content (baseline text or token chips)
  */
 export function SegmentView({
   displayMode,