update

Author: MrWangJustToDo

packages/react/index.d.ts

@@ -1215,34 +1215,12 @@ declare function ReactDiffView<T>(props: DiffViewProps_2<T> & {
 }): JSX.Element;
 export declare const DiffView: typeof ReactDiffView;
 export declare const version: string;
-/**
- * Extended data item with fromLine support for multi-line comments
- */
-export interface MultiSelectExtendDataItem<T = unknown> {
-	data: T;
-	/**
-	 * Starting line number for multi-line selection
-	 * If not provided, defaults to the key (end line number)
-	 */
-	fromLine?: number;
-}
-/**
- * Extended data format for multi-select diff view
- */
-export type MultiSelectExtendData<T = unknown> = {
-	oldFile?: Record<string, MultiSelectExtendDataItem<T>>;
-	newFile?: Record<string, MultiSelectExtendDataItem<T>>;
-};
-export interface DiffViewWithMultiSelectProps<T = unknown> extends Omit<DiffViewProps<T>, "extendData" | "renderExtendLine" | "renderWidgetLine" | "onAddWidgetClick"> {
+export interface DiffViewWithMultiSelectProps<T = unknown> extends Omit<DiffViewProps<T>, "renderWidgetLine" | "onAddWidgetClick"> {
 	/**
 	 * Enable multi-select feature
 	 * @default true
 	 */
 	enableMultiSelect?: boolean;
-	/**
-	 * Extended data with fromLine support for multi-line comments
-	 */
-	extendData?: MultiSelectExtendData<T>;
 	/**
 	 * Callback when multi-line selection is complete
 	 * Use this to open a comment dialog or handle the selection
@@ -1269,14 +1247,6 @@ export interface DiffViewWithMultiSelectProps<T = unknown> extends Omit<DiffView
 		diffFile: DiffFile;
 		onClose: () => void;
 	}) => ReactNode;
-	renderExtendLine?: (props: {
-		lineNumber: number;
-		fromLineNumber: number;
-		side: SplitSide;
-		data: T;
-		diffFile: DiffFile;
-		onUpdate: () => void;
-	}) => ReactNode;
 }
 export interface DiffViewWithMultiSelectRef {
 	getDiffFileInstance: () => DiffFile | null;

packages/react/src/components/DiffViewWithMultiSelect.tsx

@@ -18,41 +18,16 @@ import type {
 import type { DiffViewProps } from "./DiffView";
 import type { ForwardedRef, ReactNode } from "react";
 
-/**
- * Extended data item with fromLine support for multi-line comments
- */
-export interface MultiSelectExtendDataItem<T = unknown> {
-  data: T;
-  /**
-   * Starting line number for multi-line selection
-   * If not provided, defaults to the key (end line number)
-   */
-  fromLine?: number;
-}
-
-/**
- * Extended data format for multi-select diff view
- */
-export type MultiSelectExtendData<T = unknown> = {
-  oldFile?: Record<string, MultiSelectExtendDataItem<T>>;
-  newFile?: Record<string, MultiSelectExtendDataItem<T>>;
-};
-
 export interface DiffViewWithMultiSelectProps<T = unknown> extends Omit<
   DiffViewProps<T>,
-  "extendData" | "renderExtendLine" | "renderWidgetLine" | "onAddWidgetClick"
+  "renderWidgetLine" | "onAddWidgetClick"
 > {
   /**
    * Enable multi-select feature
    * @default true
    */
   enableMultiSelect?: boolean;
 
-  /**
-   * Extended data with fromLine support for multi-line comments
-   */
-  extendData?: MultiSelectExtendData<T>;
-
   /**
    * Callback when multi-line selection is complete
    * Use this to open a comment dialog or handle the selection
@@ -79,15 +54,6 @@ export interface DiffViewWithMultiSelectProps<T = unknown> extends Omit<
     diffFile: DiffFile;
     onClose: () => void;
   }) => ReactNode;
-
-  renderExtendLine?: (props: {
-    lineNumber: number;
-    fromLineNumber: number;
-    side: SplitSide;
-    data: T;
-    diffFile: DiffFile;
-    onUpdate: () => void;
-  }) => ReactNode;
 }
 
 export interface DiffViewWithMultiSelectRef {
@@ -112,7 +78,6 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(
     onMultiSelectChange,
     scopeMultiSelectToHunk,
     renderWidgetLine,
-    renderExtendLine,
     onAddWidgetClick,
     diffViewMode = DiffModeEnum.SplitGitHub,
     ...restProps
@@ -226,38 +191,6 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(
     return result;
   }, [extendData]);
 
-  const internalRenderExtendLine = useCallback(
-    ({
-      lineNumber,
-      side,
-      data,
-      diffFile,
-      onUpdate,
-    }: {
-      lineNumber: number;
-      side: SplitSide;
-      data: T;
-      diffFile: DiffFile;
-      onUpdate: () => void;
-    }) => {
-      if (!renderExtendLine) return null;
-
-      const sideKey = side === SplitSide.old ? "oldFile" : "newFile";
-      const extendItem = extendData?.[sideKey]?.[lineNumber];
-      const fromLineNumber = extendItem?.fromLine ?? lineNumber;
-
-      return renderExtendLine({
-        lineNumber,
-        fromLineNumber,
-        side,
-        data,
-        diffFile,
-        onUpdate,
-      });
-    },
-    [renderExtendLine, extendData]
-  );
-
   const internalRenderWidgetLine = useCallback(
     ({
       lineNumber,
@@ -369,7 +302,6 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(
           }
         }}
         renderWidgetLine={renderWidgetLine ? internalRenderWidgetLine : undefined}
-        renderExtendLine={renderExtendLine ? internalRenderExtendLine : undefined}
       />
     </div>
   );

packages/solid/src/components/DiffViewWithMultiSelect.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
 import { SplitSide, createDiffMultiSelectManager, multiSelectClassNames } from "@git-diff-view/core";
 import { DiffModeEnum } from "@git-diff-view/utils";
-import { type JSXElement, type JSX, createSignal, createEffect, createMemo, onCleanup, on } from "solid-js";
+import { type JSXElement, type JSX, createSignal, createEffect, onCleanup, on } from "solid-js";
 
 import { DiffView } from "./DiffView";
 
@@ -19,36 +19,13 @@ import type {
 
 type MultiResult = ReturnType<typeof extendDataToPreselectedLines>;
 
-/**
- * Extended data item with fromLine support for multi-line comments
- */
-export interface MultiSelectExtendDataItem<T = unknown> {
-  data: T;
-  /**
-   * Starting line number for multi-line selection
-   * If not provided, defaults to the key (end line number)
-   */
-  fromLine?: number;
-}
-
-/**
- * Extended data format for multi-select diff view
- */
-export type MultiSelectExtendData<T = unknown> = {
-  oldFile?: Record<string, MultiSelectExtendDataItem<T>>;
-  newFile?: Record<string, MultiSelectExtendDataItem<T>>;
-};
-
 export type DiffViewWithMultiSelectProps<T> = {
   data?: {
     oldFile?: { fileName?: string | null; fileLang?: DiffHighlighterLang | string | null; content?: string | null };
     newFile?: { fileName?: string | null; fileLang?: DiffHighlighterLang | string | null; content?: string | null };
     hunks: string[];
   };
-  /**
-   * Extended data with fromLine support for multi-line comments
-   */
-  extendData?: MultiSelectExtendData<T>;
+  extendData?: { oldFile?: Record<string, { data: T }>; newFile?: Record<string, { data: T }> };
   initialWidgetState?: { side: SplitSide; lineNumber: number };
   diffFile?: DiffFile;
   class?: string;
@@ -96,11 +73,9 @@ export type DiffViewWithMultiSelectProps<T> = {
     side,
     data,
     lineNumber,
-    fromLineNumber,
     onUpdate,
   }: {
     lineNumber: number;
-    fromLineNumber: number;
     side: SplitSide;
     data: T;
     diffFile: DiffFile;
@@ -194,32 +169,6 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(props: DiffViewWithM
     });
   });
 
-  const convertedExtendData = createMemo(() => {
-    const extendData = props.extendData;
-    if (!extendData) return undefined;
-
-    const result: {
-      oldFile?: Record<string, { data: T } | undefined>;
-      newFile?: Record<string, { data: T } | undefined>;
-    } = {};
-
-    if (extendData.oldFile) {
-      result.oldFile = {};
-      for (const [key, value] of Object.entries(extendData.oldFile)) {
-        result.oldFile[key] = { data: value.data };
-      }
-    }
-
-    if (extendData.newFile) {
-      result.newFile = {};
-      for (const [key, value] of Object.entries(extendData.newFile)) {
-        result.newFile[key] = { data: value.data };
-      }
-    }
-
-    return result;
-  });
-
   const handleAddWidgetClick = (lineNum: number, side: SplitSide) => {
     managerRef?.clearSelection();
     const multiResult = multiResultRef;
@@ -326,38 +275,6 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(props: DiffViewWithM
     };
   };
 
-  const getInternalRenderExtendLine = () => {
-    const renderExtendLine = props.renderExtendLine;
-    if (!renderExtendLine) return undefined;
-
-    return ({
-      lineNumber,
-      side,
-      data,
-      diffFile,
-      onUpdate,
-    }: {
-      lineNumber: number;
-      side: SplitSide;
-      data: T;
-      diffFile: DiffFile;
-      onUpdate: () => void;
-    }) => {
-      const sideKey = side === SplitSide.old ? "oldFile" : "newFile";
-      const extendItem = props.extendData?.[sideKey]?.[lineNumber];
-      const fromLineNumber = extendItem?.fromLine ?? lineNumber;
-
-      return renderExtendLine({
-        lineNumber,
-        fromLineNumber,
-        side,
-        data,
-        diffFile,
-        onUpdate,
-      });
-    };
-  };
-
   return (
     <div ref={setContainerRef} class="diff-multiselect-wrapper">
       <DiffView
@@ -373,11 +290,11 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(props: DiffViewWithM
         diffViewHighlight={props.diffViewHighlight}
         diffViewAddWidget={props.diffViewAddWidget}
         initialWidgetState={props.initialWidgetState}
-        extendData={convertedExtendData()}
+        extendData={props.extendData}
         onAddWidgetClick={handleAddWidgetClick}
         onDiffFileCreated={setInnerDiffFile}
         renderWidgetLine={getInternalRenderWidgetLine()}
-        renderExtendLine={getInternalRenderExtendLine()}
+        renderExtendLine={props.renderExtendLine}
       />
     </div>
   );