Minor adjustments

Author: alex-rawlings-yyc

src/__tests__/store/analysisSlice.test.ts

@@ -10,9 +10,9 @@ import type {
 } from 'interlinearizer';
 import { createAnalysisStore } from '../../store';
 import { makePhraseLink } from '../test-helpers';
+import { emptyAnalysis } from '../../types/empty-factories';
 import {
   createPhrase,
-  defaultAnalysis,
   defaultState,
   deletePhrase,
   mergePhrases,
@@ -49,7 +49,7 @@ function makeApprovedLink(ta: TokenAnalysis): TokenAnalysisLink {
  */
 function makeAnalysis(ta: TokenAnalysis): TextAnalysis {
   return {
-    ...defaultAnalysis,
+    ...emptyAnalysis(),
     tokenAnalyses: [ta],
     tokenAnalysisLinks: [makeApprovedLink(ta)],
   };
@@ -67,7 +67,7 @@ describe('setAnalysis', () => {
 
   it('does not mutate analysisLanguage', () => {
     const store = createAnalysisStore({ analysis: { ...defaultState, analysisLanguage: 'fr' } });
-    store.dispatch(setAnalysis(defaultAnalysis));
+    store.dispatch(setAnalysis(emptyAnalysis()));
     expect(store.getState().analysis.analysisLanguage).toBe('fr');
   });
 });
@@ -82,7 +82,7 @@ describe('writeGloss', () => {
     };
     const store = createAnalysisStore({
       analysis: {
-        analysis: { ...defaultAnalysis, tokenAnalysisLinks: [orphanLink] },
+        analysis: { ...emptyAnalysis(), tokenAnalysisLinks: [orphanLink] },
         analysisLanguage: 'und',
       },
     });
@@ -102,7 +102,7 @@ describe('writeGloss', () => {
     };
     const store = createAnalysisStore({
       analysis: {
-        analysis: { ...defaultAnalysis, tokenAnalysisLinks: [orphanLink] },
+        analysis: { ...emptyAnalysis(), tokenAnalysisLinks: [orphanLink] },
         analysisLanguage: 'und',
       },
     });
@@ -159,7 +159,7 @@ describe('selectApprovedGloss', () => {
  */
 function makeAnalysisWithPhrase(link: PhraseAnalysisLink): TextAnalysis {
   return {
-    ...defaultAnalysis,
+    ...emptyAnalysis(),
     phraseAnalyses: [{ id: link.analysisId, surfaceText: 'phrase' }],
     phraseAnalysisLinks: [link],
   };
@@ -288,7 +288,7 @@ describe('deletePhrase', () => {
     const store = createAnalysisStore({
       analysis: {
         analysis: {
-          ...defaultAnalysis,
+          ...emptyAnalysis(),
           phraseAnalyses: [
             { id: 'phrase-1', surfaceText: 'A' },
             { id: 'phrase-2', surfaceText: 'B' },
@@ -316,7 +316,7 @@ describe('mergePhrases', () => {
     const store = createAnalysisStore({
       analysis: {
         analysis: {
-          ...defaultAnalysis,
+          ...emptyAnalysis(),
           phraseAnalyses: [
             { id: 'phrase-1', surfaceText: 'A' },
             { id: 'phrase-2', surfaceText: 'B' },
@@ -377,7 +377,7 @@ describe('mergePhrases', () => {
     const store = createAnalysisStore({
       analysis: {
         analysis: {
-          ...defaultAnalysis,
+          ...emptyAnalysis(),
           phraseAnalyses: [{ id: 'phrase-1', surfaceText: 'A' }],
           phraseAnalysisLinks: [phrase],
         },
@@ -436,7 +436,7 @@ describe('selectPhraseLinks', () => {
       status: 'suggested',
     };
     const analysis: TextAnalysis = {
-      ...defaultAnalysis,
+      ...emptyAnalysis(),
       phraseAnalyses: [
         { id: 'phrase-1', surfaceText: 'A' },
         { id: 'phrase-2', surfaceText: 'B' },

src/components/AnalysisStore.tsx

@@ -5,7 +5,6 @@ import type { ReactNode } from 'react';
 import { Provider as ReduxProvider, useDispatch, useSelector, useStore } from 'react-redux';
 import {
   createPhrase,
-  defaultAnalysis,
   deletePhrase,
   mergePhrases,
   selectAnalysis,
@@ -18,6 +17,7 @@ import {
   writePhraseGloss,
 } from '../store/analysisSlice';
 import { createAnalysisStore, type AnalysisDispatch, type AnalysisRootState } from '../store';
+import { emptyAnalysis } from '../types/empty-factories';
 
 // #region Internal context
 
@@ -86,7 +86,7 @@ export function AnalysisStoreProvider({
   const storeRef = useRef<ReturnType<typeof createAnalysisStore> | undefined>(undefined);
   if (!storeRef.current) {
     storeRef.current = createAnalysisStore({
-      analysis: { analysis: initialAnalysis ?? defaultAnalysis, analysisLanguage },
+      analysis: { analysis: initialAnalysis ?? emptyAnalysis(), analysisLanguage },
     });
   }
   const store = storeRef.current;

src/components/InterlinearNavContext.tsx

@@ -131,9 +131,10 @@ export interface InterlinearNav {
    */
   reportSettled: () => void;
   /**
-   * Aborts an in-flight cross-book fade and reveals the content immediately. Called by the loader
-   * when the new book fails to load, so the error is shown rather than left hidden behind a curtain
-   * that will never receive a settle.
+   * Aborts an in-flight cross-book fade and reveals the content without waiting for a settle (the
+   * reveal still animates through the wrapper's opacity transition). Called by the loader when the
+   * new book fails to load, so the error is shown rather than left hidden behind a curtain that
+   * will never receive a settle.
    */
   cancelFade: () => void;
 }

src/store/analysisSlice.ts

@@ -79,12 +79,9 @@ interface WritePhraseGlossPayload {
 
 // #region Default state
 
-/** Empty `TextAnalysis` used when no `initialAnalysis` is provided to the store. */
-export const defaultAnalysis: TextAnalysis = emptyAnalysis();
-
 /** Default `AnalysisState` used as the Redux initial state. */
 export const defaultState: AnalysisState = {
-  analysis: { ...defaultAnalysis },
+  analysis: emptyAnalysis(),
   analysisLanguage: 'und',
 };