@git-diff-view/react 0.0.31 → 0.0.33

package/dist/css/diff-view-pure.css

@@ -50,9 +50,6 @@
 .diff-tailwindcss-wrapper .top-0 {
   top: 0px;
 }
-.diff-tailwindcss-wrapper .top-\[1px\] {
-  top: 1px;
-}
 .diff-tailwindcss-wrapper .top-\[50\%\] {
   top: 50%;
 }

package/dist/css/diff-view.css

@@ -105,7 +105,7 @@
   --tw-contain-paint:  ;
   --tw-contain-style:  ;
 }/*
-! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.18 | MIT License | https://tailwindcss.com
 *//*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
 2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
@@ -556,9 +556,6 @@ video {
 .diff-tailwindcss-wrapper .top-0 {
   top: 0px;
 }
-.diff-tailwindcss-wrapper .top-\[1px\] {
-  top: 1px;
-}
 .diff-tailwindcss-wrapper .top-\[50\%\] {
   top: 50%;
 }

package/dist/esm/index.mjs

@@ -186,6 +186,35 @@ const syncScroll = (left, right) => {
         right.onscroll = null;
     };
 };
+const getElementRoot = (element) => {
+    if (element) {
+        const root = element.getRootNode();
+        if (root instanceof ShadowRoot) {
+            return root;
+        }
+        return element.ownerDocument;
+    }
+    return document;
+};
+const getDiffIdFromElement = (element) => {
+    if (element) {
+        if (typeof element.closest === "function") {
+            const diffRoot = element.closest('[data-component="git-diff-view"]');
+            const ele = diffRoot.querySelector(".diff-view-wrapper");
+            return ele.getAttribute("id");
+        }
+        else {
+            let el = element;
+            while (el) {
+                if (el.getAttribute && el.getAttribute("data-component") === "git-diff-view") {
+                    const ele = el.querySelector(".diff-view-wrapper");
+                    return ele.getAttribute("id");
+                }
+                el = el.parentElement;
+            }
+        }
+    }
+};
 
 const diffFontSizeName = "--diff-font-size--";
 const diffAsideWidthName = "--diff-aside-width--";
@@ -271,6 +300,7 @@ const DiffSplitAddWidget = ({ side, className, lineNumber, onWidgetClick, onOpen
             (className ? " " + className : ""), style: {
             width: `calc(var(${diffFontSizeName}) * 1.4)`,
             height: `calc(var(${diffFontSizeName}) * 1.4)`,
+            top: `calc(var(${diffFontSizeName}) * 0.1)`,
         } },
         React.createElement("button", { className: "diff-add-widget z-[1] flex h-full w-full origin-center cursor-pointer items-center justify-center rounded-md text-[1.2em]", style: {
                 color: `var(${addWidgetColorName})`,
@@ -281,9 +311,10 @@ const DiffSplitAddWidget = ({ side, className, lineNumber, onWidgetClick, onOpen
             } }, "+")));
 };
 const DiffUnifiedAddWidget = ({ lineNumber, side, onWidgetClick, onOpenAddWidget, }) => {
-    return (React.createElement("div", { className: "diff-add-widget-wrapper invisible absolute left-[100%] top-[1px] translate-x-[-50%] select-none transition-transform hover:scale-110 group-hover:visible", style: {
+    return (React.createElement("div", { className: "diff-add-widget-wrapper invisible absolute left-[100%] translate-x-[-50%] select-none transition-transform hover:scale-110 group-hover:visible", style: {
             width: `calc(var(${diffFontSizeName}) * 1.4)`,
             height: `calc(var(${diffFontSizeName}) * 1.4)`,
+            top: `calc(var(${diffFontSizeName}) * 0.1)`,
         } },
         React.createElement("button", { className: "diff-add-widget z-[1] flex h-full w-full origin-center cursor-pointer items-center justify-center rounded-md text-[1.2em]", style: {
                 color: `var(${addWidgetColorName})`,
@@ -519,10 +550,15 @@ const DiffSplitContentLine$1 = ({ index, diffFile, lineNumber, side, enableAddWi
 const useDomWidth = ({ selector, enable }) => {
     const [width, setWidth] = useState(0);
     const { useDiffContext } = useDiffViewContext();
-    const { id, mounted } = useDiffContext.useShallowStableSelector((s) => ({ id: s.id, mounted: s.mounted }));
+    const { id, mounted, dom } = useDiffContext.useShallowStableSelector((s) => ({
+        id: s.id,
+        mounted: s.mounted,
+        dom: s.dom,
+    }));
     useEffect(() => {
         if (enable) {
-            const container = document.querySelector(`#diff-root${id}`);
+            const rootDocument = getElementRoot(dom);
+            const container = rootDocument.querySelector(`#diff-root${id}`);
             const wrapper = container === null || container === void 0 ? void 0 : container.querySelector(selector);
             if (!wrapper)
                 return;
@@ -555,16 +591,21 @@ const useDomWidth = ({ selector, enable }) => {
             typedWrapper.setAttribute("data-observe", "height");
             return () => cleanCb();
         }
-    }, [selector, enable, id, mounted]);
+    }, [selector, enable, id, mounted, dom]);
     return width;
 };
 
 const useSyncHeight = ({ selector, wrapper, side, enable, }) => {
     const { useDiffContext } = useDiffViewContext();
-    const { id, mounted } = useDiffContext.useShallowStableSelector((s) => ({ id: s.id, mounted: s.mounted }));
+    const { id, mounted, dom } = useDiffContext.useShallowStableSelector((s) => ({
+        id: s.id,
+        mounted: s.mounted,
+        dom: s.dom,
+    }));
     useEffect(() => {
         if (enable) {
-            const container = document.querySelector(`#diff-root${id}`);
+            const rootDocument = getElementRoot(dom);
+            const container = rootDocument.querySelector(`#diff-root${id}`);
             const elements = Array.from((container === null || container === void 0 ? void 0 : container.querySelectorAll(selector)) || []);
             const wrappers = wrapper ? Array.from((container === null || container === void 0 ? void 0 : container.querySelectorAll(wrapper)) || []) : elements;
             if (elements.length === 2 && wrappers.length === 2) {
@@ -609,7 +650,7 @@ const useSyncHeight = ({ selector, wrapper, side, enable, }) => {
                 return () => cleanCb();
             }
         }
-    }, [selector, enable, side, id, wrapper, mounted]);
+    }, [selector, enable, side, id, wrapper, mounted, dom]);
 };
 
 const InternalDiffSplitExtendLine$1 = ({ index, diffFile, oldLineExtend, newLineExtend, side, lineNumber, }) => {
@@ -900,6 +941,10 @@ const DiffSplitViewNormal = memo(({ diffFile }) => {
             removeAllSelection();
             return;
         }
+        const id = getDiffIdFromElement(ele);
+        if (id && id !== `diff-root${diffFile.getId()}`) {
+            return;
+        }
         while (ele && ele instanceof HTMLElement) {
             const state = ele.getAttribute("data-state");
             const side = ele.getAttribute("data-side");
@@ -1239,6 +1284,10 @@ const DiffSplitViewWrap = memo(({ diffFile }) => {
             removeAllSelection();
             return;
         }
+        const id = getDiffIdFromElement(ele);
+        if (id && id !== `diff-root${diffFile.getId()}`) {
+            return;
+        }
         while (ele && ele instanceof HTMLElement) {
             const state = ele.getAttribute("data-state");
             const side = ele.getAttribute("data-side");
@@ -1298,6 +1347,8 @@ DiffSplitViewWrap.displayName = "DiffSplitViewWrap";
 const createDiffConfigStore = (props, diffFileId) => {
     return createStore(() => {
         var _a, _b;
+        const dom = ref();
+        const setDom = (_dom) => (dom.value = _dom);
         const id = ref(diffFileId);
         const setId = (_id) => (id.value = _id);
         const mode = ref(props.diffViewMode);
@@ -1350,6 +1401,8 @@ const createDiffConfigStore = (props, diffFileId) => {
         return {
             id,
             setId,
+            dom,
+            setDom,
             mode,
             setMode,
             mounted,
@@ -1505,20 +1558,21 @@ const DiffUnifiedContentLine = ({ index, diffFile, lineNumber, enableWrap, enabl
     return (React.createElement(_DiffUnifiedLine, { index: index, diffFile: diffFile, lineNumber: lineNumber, enableWrap: enableWrap, enableHighlight: enableHighlight, enableAddWidget: enableAddWidget }));
 };
 
-const InternalDiffUnifiedExtendLine = ({ index, diffFile, lineNumber, oldLineExtend, newLineExtend, }) => {
+const InternalDiffUnifiedExtendLine = ({ index, diffFile, lineNumber, enableWrap, oldLineExtend, newLineExtend, }) => {
     const { useDiffContext } = useDiffViewContext();
     const renderExtendLine = useDiffContext.useShallowStableSelector((s) => s.renderExtendLine);
     const unifiedItem = diffFile.getUnifiedLine(index);
+    // TODO use css variable to get width
     const width = useDomWidth({
         selector: ".unified-diff-table-wrapper",
-        enable: typeof renderExtendLine === "function",
+        enable: typeof renderExtendLine === "function" && !enableWrap,
     });
     if (!renderExtendLine)
         return null;
     return (React.createElement("tr", { "data-line": `${lineNumber}-extend`, "data-state": "extend", className: "diff-line diff-line-extend" },
         React.createElement("td", { className: "diff-line-extend-content p-0 align-top", colSpan: 2 },
             React.createElement("div", { className: "diff-line-extend-wrapper sticky left-0 z-[1]", style: { width } },
-                width > 0 &&
+                (enableWrap ? true : width > 0) &&
                     (oldLineExtend === null || oldLineExtend === void 0 ? void 0 : oldLineExtend.data) !== undefined &&
                     (oldLineExtend === null || oldLineExtend === void 0 ? void 0 : oldLineExtend.data) !== null &&
                     (renderExtendLine === null || renderExtendLine === void 0 ? void 0 : renderExtendLine({
@@ -1528,7 +1582,7 @@ const InternalDiffUnifiedExtendLine = ({ index, diffFile, lineNumber, oldLineExt
                         data: oldLineExtend.data,
                         onUpdate: diffFile.notifyAll,
                     })),
-                width > 0 &&
+                (enableWrap ? true : width > 0) &&
                     (newLineExtend === null || newLineExtend === void 0 ? void 0 : newLineExtend.data) !== undefined &&
                     (newLineExtend === null || newLineExtend === void 0 ? void 0 : newLineExtend.data) !== null &&
                     (renderExtendLine === null || renderExtendLine === void 0 ? void 0 : renderExtendLine({
@@ -1539,7 +1593,7 @@ const InternalDiffUnifiedExtendLine = ({ index, diffFile, lineNumber, oldLineExt
                         onUpdate: diffFile.notifyAll,
                     }))))));
 };
-const DiffUnifiedExtendLine = ({ index, diffFile, lineNumber, }) => {
+const DiffUnifiedExtendLine = ({ index, diffFile, lineNumber, enableWrap, }) => {
     const { useDiffContext } = useDiffViewContext();
     const unifiedItem = diffFile.getUnifiedLine(index);
     const { oldLineExtend, newLineExtend } = useDiffContext(useCallback((s) => {
@@ -1552,7 +1606,7 @@ const DiffUnifiedExtendLine = ({ index, diffFile, lineNumber, }) => {
     const hasExtend = (oldLineExtend === null || oldLineExtend === void 0 ? void 0 : oldLineExtend.data) || (newLineExtend === null || newLineExtend === void 0 ? void 0 : newLineExtend.data);
     if (!hasExtend || !unifiedItem || unifiedItem.isHidden)
         return null;
-    return (React.createElement(InternalDiffUnifiedExtendLine, { index: index, diffFile: diffFile, lineNumber: lineNumber, oldLineExtend: oldLineExtend, newLineExtend: newLineExtend }));
+    return (React.createElement(InternalDiffUnifiedExtendLine, { index: index, diffFile: diffFile, lineNumber: lineNumber, enableWrap: enableWrap, oldLineExtend: oldLineExtend, newLineExtend: newLineExtend }));
 };
 
 const InternalDiffUnifiedHunkLine = ({ index, diffFile, lineNumber, }) => {
@@ -1600,7 +1654,7 @@ const DiffUnifiedHunkLine = ({ index, diffFile, lineNumber, }) => {
     return React.createElement(InternalDiffUnifiedHunkLine, { index: index, diffFile: diffFile, lineNumber: lineNumber });
 };
 
-const InternalDiffUnifiedWidgetLine = ({ index, diffFile, lineNumber, }) => {
+const InternalDiffUnifiedWidgetLine = ({ index, diffFile, lineNumber, enableWrap, }) => {
     const { useWidget } = useDiffWidgetContext();
     const setWidget = useWidget.getReadonlyState().setWidget;
     const unifiedItem = diffFile.getUnifiedLine(index);
@@ -1614,21 +1668,21 @@ const InternalDiffUnifiedWidgetLine = ({ index, diffFile, lineNumber, }) => {
     const renderWidgetLine = useDiffContext.useShallowStableSelector((s) => s.renderWidgetLine);
     const width = useDomWidth({
         selector: ".unified-diff-table-wrapper",
-        enable: typeof renderWidgetLine === "function",
+        enable: typeof renderWidgetLine === "function" && !enableWrap,
     });
     if (!renderWidgetLine)
         return null;
     return (React.createElement("tr", { "data-line": `${lineNumber}-widget`, "data-state": "widget", className: "diff-line diff-line-widget" },
         React.createElement("td", { className: "diff-line-widget-content p-0", colSpan: 2 },
             React.createElement("div", { className: "diff-line-widget-wrapper sticky left-0 z-[1]", style: { width } },
-                width > 0 &&
+                (enableWrap ? true : width > 0) &&
                     oldWidget &&
                     (renderWidgetLine === null || renderWidgetLine === void 0 ? void 0 : renderWidgetLine({ diffFile, side: SplitSide.old, lineNumber: unifiedItem.oldLineNumber, onClose })),
-                width > 0 &&
+                (enableWrap ? true : width > 0) &&
                     newWidget &&
                     (renderWidgetLine === null || renderWidgetLine === void 0 ? void 0 : renderWidgetLine({ diffFile, side: SplitSide.new, lineNumber: unifiedItem.newLineNumber, onClose }))))));
 };
-const DiffUnifiedWidgetLine = ({ index, diffFile, lineNumber, }) => {
+const DiffUnifiedWidgetLine = ({ index, diffFile, lineNumber, enableWrap, }) => {
     const { useWidget } = useDiffWidgetContext();
     const currentIsShow = useWidget.useShallowSelector(React.useCallback((s) => {
         const widgetLineNumber = s.widgetLineNumber;
@@ -1641,7 +1695,7 @@ const DiffUnifiedWidgetLine = ({ index, diffFile, lineNumber, }) => {
     }, [diffFile, index]), (p, c) => p === c);
     if (!currentIsShow)
         return null;
-    return React.createElement(InternalDiffUnifiedWidgetLine, { index: index, diffFile: diffFile, lineNumber: lineNumber });
+    return (React.createElement(InternalDiffUnifiedWidgetLine, { index: index, diffFile: diffFile, lineNumber: lineNumber, enableWrap: enableWrap }));
 };
 
 /* eslint-disable @typescript-eslint/ban-ts-comment */
@@ -1694,6 +1748,10 @@ const DiffUnifiedView = memo(({ diffFile }) => {
             removeAllSelection();
             return;
         }
+        const id = getDiffIdFromElement(ele);
+        if (id && id !== `diff-root${diffFile.getId()}`) {
+            return;
+        }
         while (ele && ele instanceof HTMLElement) {
             const state = ele.getAttribute("data-state");
             if (state) {
@@ -1738,8 +1796,8 @@ const DiffUnifiedView = memo(({ diffFile }) => {
                         lines.map((item) => (React.createElement(Fragment, { key: item.index },
                             React.createElement(DiffUnifiedHunkLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile }),
                             React.createElement(DiffUnifiedContentLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile, enableWrap: enableWrap, enableHighlight: enableHighlight, enableAddWidget: enableAddWidget }),
-                            React.createElement(DiffUnifiedWidgetLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile }),
-                            React.createElement(DiffUnifiedExtendLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile })))),
+                            React.createElement(DiffUnifiedWidgetLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile, enableWrap: enableWrap }),
+                            React.createElement(DiffUnifiedExtendLine, { index: item.index, lineNumber: item.lineNumber, diffFile: diffFile, enableWrap: enableWrap })))),
                         React.createElement(DiffUnifiedHunkLine, { index: diffFile.unifiedLineLength, lineNumber: diffFile.unifiedLineLength, diffFile: diffFile })))))));
 });
 DiffUnifiedView.displayName = "DiffUnifiedView";
@@ -1805,9 +1863,12 @@ const InternalDiffView = (props) => {
         onAddWidgetClick,
         onCreateUseWidgetHook,
     ]);
+    useEffect(() => {
+        useDiffContext.getReadonlyState().setDom(wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current);
+    }, [useDiffContext, wrapperRef]);
     const value = useMemo(() => ({ useDiffContext }), [useDiffContext]);
     return (React.createElement(DiffViewContext.Provider, { value: value },
-        React.createElement("div", { className: "diff-tailwindcss-wrapper", "data-component": "git-diff-view", "data-theme": diffFile._getTheme() || "light", "data-version": "0.0.31", "data-highlighter": diffFile._getHighlighterName(), ref: wrapperRef },
+        React.createElement("div", { className: "diff-tailwindcss-wrapper", "data-component": "git-diff-view", "data-theme": diffFile._getTheme() || "light", "data-version": "0.0.33", "data-highlighter": diffFile._getHighlighterName(), ref: wrapperRef },
             React.createElement("div", { className: "diff-style-root", style: {
                     // @ts-ignore
                     [diffFontSizeName]: diffViewFontSize + "px",
@@ -1886,7 +1947,7 @@ const DiffViewWithRef = (props, ref) => {
 const InnerDiffView = forwardRef(DiffViewWithRef);
 InnerDiffView.displayName = "DiffView";
 const DiffView = InnerDiffView;
-const version = "0.0.31";
+const version = "0.0.33";
 
 export { DiffModeEnum, DiffView, version };
 //# sourceMappingURL=index.mjs.map