temp

Author: john-traas

src/components/text-editor/prosemirror-adapter/menu/menu-commands.ts

@@ -1,5 +1,11 @@
 import { toggleMark, setBlockType, wrapIn, lift } from 'prosemirror-commands';
-import { Schema, MarkType, NodeType, Attrs } from 'prosemirror-model';
+import {
+    Schema,
+    MarkType,
+    NodeType,
+    Attrs,
+    ResolvedPos,
+} from 'prosemirror-model';
 import { findWrapping, liftTarget } from 'prosemirror-transform';
 import {
     Command,
@@ -137,7 +143,7 @@ const createToggleMarkCommand = (
 const getAttributes = (
     markName: string,
     link: EditorTextLink,
-): Attrs | null => {
+): Attrs | undefined => {
     if (markName === EditorMenuTypes.Link && link.href) {
         return {
             href: link.href,
@@ -152,6 +158,13 @@ export const isExternalLink = (url: string): boolean => {
     return !url.startsWith(window.location.origin);
 };
 
+const checkForActiveWrap = (
+    $from: ResolvedPos,
+    nodeType: NodeType,
+): boolean => {
+    return $from.depth > 0 && $from.node($from.depth - 1).type === nodeType;
+};
+
 /**
  * Toggles or wraps a node type based on the selection and parameters.
  * - Toggles to paragraph if the selection is of the specified type.
@@ -175,7 +188,7 @@ const toggleNodeType = (
     return (state, dispatch) => {
         const { $from, $to } = state.selection;
 
-        const hasActiveWrap = $from.node($from.depth - 1).type === nodeType;
+        const hasActiveWrap = checkForActiveWrap($from, nodeType);
 
         if (
             state.selection instanceof TextSelection &&

src/components/text-editor/test-setup/command-tester.ts

@@ -38,7 +38,7 @@ export function getCommandResult(
         (tr) => {
             transaction = tr;
         },
-        null,
+        undefined,
     );
 
     if (!commandResult) {
@@ -77,9 +77,7 @@ function verifyDocumentIncludes(
     if (Array.isArray(expectedContent)) {
         // Check that all strings in the array are contained in the doc content
         for (const content of expectedContent) {
-            expect(doc.textContent).toContain(
-                content,
-            );
+            expect(doc.textContent).toContain(content);
         }
     } else {
         expect(doc.textContent).toContain(expectedContent);
@@ -99,8 +97,8 @@ function verifyDocumentSize(
 /**
  * Verifies the content of the document against expected values
  *
- * @param state The editor state containing the document to verify
- * @param expected The expected values to verify against
+ * @param state - The editor state containing the document to verify
+ * @param expected - The expected values to verify against
  */
 function verifyDocumentContent(
     state: EditorState,
@@ -114,7 +112,7 @@ function verifyDocumentContent(
         verifyExactDocumentContent(state.doc, expected.docContentAfter);
     }
 
-    if (expected.includesContent) {
+    if ('includesContent' in expected) {
         verifyDocumentIncludes(state.doc, expected.includesContent);
     }
 
@@ -126,13 +124,13 @@ function verifyDocumentContent(
 /**
  * Tests a ProseMirror command and verifies its result
  *
- * @param command The ProseMirror command to test
- * @param state The editor state to apply the command to
- * @param expected An object containing expected values to verify
- * @param expected.shouldApply Whether the command should be applicable to the state
- * @param expected.docContentAfter Optional expected document content after applying command
- * @param expected.docSizeAfter Optional expected document size after applying command
- * @param expected.includesContent Optional content to check if it exists in the document content
+ * @param command - The ProseMirror command to test
+ * @param state - The editor state to apply the command to
+ * @param expected - An object containing expected values to verify:
+ *  - `shouldApply`: whether the command should be applicable
+ *  - `docContentAfter?`: expected document content after applying
+ *  - `docSizeAfter?`: expected document size after applying
+ *  = `includesContent?`: content that should exist in the document
  * @returns The result of applying the command for further assertions if needed
  */
 export function testCommand(
@@ -164,9 +162,9 @@ export function testCommand(
  * @param command - The command to test
  * @param state - The editor state to apply the command to
  * @param expected - Expected results after command execution
- * @param expected.shouldApply - Whether the command should be applicable to the state
- * @param expected.docContentAfter - Optional expected document content after applying command
- * @param expected.docSizeAfter - Optional expected document size after applying command
+ *  - `shouldApply`: Whether the command should be applicable
+ *  - `docContentAfter?`: Expected document content after applying
+ *  - `docSizeAfter?`: Expected document size after applying
  * @returns An extended result containing the command result and the created view
  */
 export function testCommandWithView(

src/components/text-editor/test-setup/content-generator.ts

@@ -10,9 +10,13 @@ import { EditorState } from 'prosemirror-state';
  * @param schema - Optional schema to use (defaults to createTestSchema())
  * @returns An EditorState with the specified text content
  */
-export function createDocWithText(text: string = '', schema?: Schema): EditorState {
+export function createDocWithText(
+    text: string = '',
+    schema?: Schema,
+): EditorState {
     const editorSchema = schema || createTestSchema();
     const content = text ? `<p>${text}</p>` : '<p></p>';
+
     return createEditorState(content, editorSchema);
 }
 
@@ -40,7 +44,7 @@ export function createDocWithHTML(html: string, schema?: Schema): EditorState {
 export function createDocWithFormattedText(
     text: string,
     marks: MarkSpec[],
-    schema?: Schema
+    schema?: Schema,
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 
@@ -62,7 +66,7 @@ export function createDocWithFormattedText(
 function createTextNodeWithMarks(
     text: string,
     marks: MarkSpec[],
-    schema: Schema
+    schema: Schema,
 ): Node {
     const appliedMarks: Mark[] = marks.map((markSpec) => {
         const markType = schema.marks[markSpec.type];
@@ -87,7 +91,7 @@ function createTextNodeWithMarks(
  */
 export function createDocWithBulletList(
     items: string[],
-    schema?: Schema
+    schema?: Schema,
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 
@@ -100,7 +104,7 @@ export function createDocWithBulletList(
 
     const bulletList = editorSchema.nodes.bullet_list.create(
         null,
-        Fragment.from(listItems)
+        Fragment.from(listItems),
     );
 
     const doc = editorSchema.nodes.doc.createAndFill(null, bulletList);
@@ -119,14 +123,14 @@ export function createDocWithBulletList(
 export function createDocWithHeading(
     text: string,
     level: number = 1,
-    schema?: Schema
+    schema?: Schema,
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 
     const textNode = editorSchema.text(text);
     const heading = editorSchema.nodes.heading.create(
         { level: level },
-        textNode
+        textNode,
     );
 
     const doc = editorSchema.nodes.doc.createAndFill(null, heading);
@@ -143,7 +147,7 @@ export function createDocWithHeading(
  */
 export function createDocWithBlockquote(
     text: string,
-    schema?: Schema
+    schema?: Schema,
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 
@@ -165,7 +169,7 @@ export function createDocWithBlockquote(
  */
 export function createDocWithCodeBlock(
     code: string,
-    schema?: Schema
+    schema?: Schema,
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 

src/components/text-editor/test-setup/editor-state-builder.spec.ts

@@ -36,7 +36,7 @@ describe('Editor State Utilities', () => {
 
             if (node) {
                 const hasStrongMark = node.marks.some(
-                    (m) => m.type.name === 'strong'
+                    (m) => m.type.name === 'strong',
                 );
                 expect(hasStrongMark).toBe(true);
             }

src/components/text-editor/test-setup/editor-state-builder.ts

@@ -14,7 +14,7 @@ import { createTestSchema } from './schema-builder';
 export function createEditorState(
     content?: string,
     schema?: Schema,
-    plugins: Plugin[] = []
+    plugins: Plugin[] = [],
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 
@@ -43,7 +43,7 @@ export function createEditorStateWithSelection(
     from: number,
     to: number,
     schema?: Schema,
-    plugins: Plugin[] = []
+    plugins: Plugin[] = [],
 ): EditorState {
     const editorSchema = schema || createTestSchema();
 
@@ -69,7 +69,7 @@ export function createEditorStateWithSelection(
 export function setTextSelection(
     state: EditorState,
     from: number,
-    to: number = from
+    to: number = from,
 ): EditorState {
     const selection = TextSelection.create(state.doc, from, to);
 

src/components/text-editor/test-setup/editor-view-builder.spec.ts

@@ -140,7 +140,7 @@ describe('Editor View Utilities', () => {
             const result = createEditorView(
                 undefined,
                 undefined,
-                customContainer
+                customContainer,
             );
             view = result.view;
             container = result.container;
@@ -173,9 +173,6 @@ describe('Editor View Utilities', () => {
         });
 
         it('should create mock DOM if none exists', () => {
-            const originalWindow = global.window;
-            const originalDocument = global.document;
-
             try {
                 global.window = undefined;
                 global.document = undefined;
@@ -197,8 +194,6 @@ describe('Editor View Utilities', () => {
         });
 
         it('should not modify existing DOM environment', () => {
-            const originalWindow = global.window;
-            const originalDocument = global.document;
             let cleanup: () => void;
 
             try {
@@ -216,6 +211,7 @@ describe('Editor View Utilities', () => {
                 if (cleanup) {
                     cleanup();
                 }
+
                 global.window = originalWindow;
                 global.document = originalDocument;
             }

src/components/text-editor/test-setup/editor-view-builder.ts

@@ -14,7 +14,7 @@ import { createTestSchema } from './schema-builder';
 export function createEditorView(
     state?: EditorState,
     dispatchSpy?: jest.Mock,
-    parentElement?: HTMLElement
+    parentElement?: HTMLElement,
 ): { view: EditorView; container: HTMLElement } {
     const container = parentElement || document.createElement('div');
     if (!parentElement) {
@@ -77,7 +77,7 @@ export function createDispatchSpy(autoUpdate = true): jest.Mock {
  */
 export function cleanupEditorView(
     view: EditorView,
-    container?: HTMLElement
+    container?: HTMLElement,
 ): void {
     view.destroy();
 

src/components/text-editor/test-setup/event-simulator.spec.ts

@@ -101,7 +101,7 @@ describe('Event Simulation Utilities', () => {
             const event = dispatchEventSpy.mock.calls[0][0] as any;
             const clipboardData = event.clipboardData;
             expect(clipboardData.getData('text/html')).toBe(
-                '<p>Formatted <strong>content</strong></p>'
+                '<p>Formatted <strong>content</strong></p>',
             );
 
             dispatchEventSpy.mockRestore();
@@ -148,7 +148,7 @@ describe('Event Simulation Utilities', () => {
             expect(dispatchEventSpy).toHaveBeenCalledTimes(5);
 
             const eventTypes = dispatchEventSpy.mock.calls.map(
-                (call) => call[0].type
+                (call) => call[0].type,
             );
             expect(eventTypes).toEqual([
                 'mousedown',
@@ -184,7 +184,7 @@ describe('Event Simulation Utilities', () => {
                 'Dragged text',
             );
             expect(dragstart.dataTransfer.getData('text/html')).toBe(
-                '<p>Dragged HTML</p>'
+                '<p>Dragged HTML</p>',
             );
 
             dispatchEventSpy.mockRestore();