react-diff-viewer-continued 4.0.4 → 4.0.6

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [4.0.6](https://github.com/aeolun/react-diff-viewer-continued/compare/v4.0.5...v4.0.6) (2025-05-13)
+
+
+### Bug Fixes
+
+* allow non-string rendered contents ([a0ab52d](https://github.com/aeolun/react-diff-viewer-continued/commit/a0ab52d3d064297d1957c7fb65f9742f53a191a7))
+* fixup [#68](https://github.com/aeolun/react-diff-viewer-continued/issues/68) for non-string wordDiff.value ([3678e02](https://github.com/aeolun/react-diff-viewer-continued/commit/3678e020855f0fec8f15084291cb5adc54a2c009))
+
+## [4.0.5](https://github.com/aeolun/react-diff-viewer-continued/compare/v4.0.4...v4.0.5) (2025-01-31)
+
+
+### Bug Fixes
+
+* modify imports for proper esm resolution ([7fda63a](https://github.com/aeolun/react-diff-viewer-continued/commit/7fda63afae8bcd98547c8bdff569d02256821b2d))
+
 ## [4.0.4](https://github.com/aeolun/react-diff-viewer-continued/compare/v4.0.3...v4.0.4) (2025-01-28)
 
 

package/lib/cjs/src/index.d.ts

@@ -1,8 +1,8 @@
 import * as React from "react";
 import type { ReactElement } from "react";
 import type { Change } from "diff";
-import { type DiffInformation, DiffMethod, DiffType, type LineInformation } from "./compute-lines";
-import { type ReactDiffViewerStyles, type ReactDiffViewerStylesOverride } from "./styles";
+import { type DiffInformation, DiffMethod, DiffType, type LineInformation } from "./compute-lines.js";
+import { type ReactDiffViewerStyles, type ReactDiffViewerStylesOverride } from "./styles.js";
 export declare enum LineNumberPrefix {
     LEFT = "L",
     RIGHT = "R"

package/lib/cjs/src/index.js

@@ -41,12 +41,12 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const classnames_1 = __importDefault(require("classnames"));
 const React = __importStar(require("react"));
 const memoize_one_1 = __importDefault(require("memoize-one"));
-const compute_hidden_blocks_1 = require("./compute-hidden-blocks");
-const compute_lines_1 = require("./compute-lines");
-Object.defineProperty(exports, "DiffMethod", { enumerable: true, get: function () { return compute_lines_1.DiffMethod; } });
-const expand_1 = require("./expand");
-const styles_1 = __importDefault(require("./styles"));
-const fold_1 = require("./fold");
+const compute_hidden_blocks_js_1 = require("./compute-hidden-blocks.js");
+const compute_lines_js_1 = require("./compute-lines.js");
+Object.defineProperty(exports, "DiffMethod", { enumerable: true, get: function () { return compute_lines_js_1.DiffMethod; } });
+const expand_js_1 = require("./expand.js");
+const styles_js_1 = __importDefault(require("./styles.js"));
+const fold_js_1 = require("./fold.js");
 var LineNumberPrefix;
 (function (LineNumberPrefix) {
     LineNumberPrefix["LEFT"] = "L";
@@ -85,7 +85,7 @@ class DiffViewer extends React.Component {
          *
          * @param styles User supplied style overrides.
          */
-        this.computeStyles = (0, memoize_one_1.default)(styles_1.default);
+        this.computeStyles = (0, memoize_one_1.default)(styles_js_1.default);
         /**
          * Returns a function with clicked line number in the closure. Returns an no-op function when no
          * onLineNumberClick handler is supplied.
@@ -108,13 +108,14 @@ class DiffViewer extends React.Component {
             return diffArray.map((wordDiff, i) => {
                 const content = renderer
                     ? renderer(wordDiff.value)
-                    : wordDiff.value;
-                if (typeof content !== "string")
-                    return;
-                return wordDiff.type === compute_lines_1.DiffType.ADDED ? ((0, jsx_runtime_1.jsx)("ins", { className: (0, classnames_1.default)(this.styles.wordDiff, {
-                        [this.styles.wordAdded]: wordDiff.type === compute_lines_1.DiffType.ADDED,
-                    }), children: content }, i)) : wordDiff.type === compute_lines_1.DiffType.REMOVED ? ((0, jsx_runtime_1.jsx)("del", { className: (0, classnames_1.default)(this.styles.wordDiff, {
-                        [this.styles.wordRemoved]: wordDiff.type === compute_lines_1.DiffType.REMOVED,
+                    : (typeof wordDiff.value === 'string'
+                        ? wordDiff.value
+                        // If wordDiff.value is DiffInformation, we don't handle it, unclear why. See c0c99f5712.
+                        : undefined);
+                return wordDiff.type === compute_lines_js_1.DiffType.ADDED ? ((0, jsx_runtime_1.jsx)("ins", { className: (0, classnames_1.default)(this.styles.wordDiff, {
+                        [this.styles.wordAdded]: wordDiff.type === compute_lines_js_1.DiffType.ADDED,
+                    }), children: content }, i)) : wordDiff.type === compute_lines_js_1.DiffType.REMOVED ? ((0, jsx_runtime_1.jsx)("del", { className: (0, classnames_1.default)(this.styles.wordDiff, {
+                        [this.styles.wordRemoved]: wordDiff.type === compute_lines_js_1.DiffType.REMOVED,
                     }), children: content }, i)) : ((0, jsx_runtime_1.jsx)("span", { className: (0, classnames_1.default)(this.styles.wordDiff), children: content }, i));
             });
         };
@@ -136,9 +137,9 @@ class DiffViewer extends React.Component {
             const additionalLineNumberTemplate = `${additionalPrefix}-${additionalLineNumber}`;
             const highlightLine = this.props.highlightLines.includes(lineNumberTemplate) ||
                 this.props.highlightLines.includes(additionalLineNumberTemplate);
-            const added = type === compute_lines_1.DiffType.ADDED;
-            const removed = type === compute_lines_1.DiffType.REMOVED;
-            const changed = type === compute_lines_1.DiffType.CHANGED;
+            const added = type === compute_lines_js_1.DiffType.ADDED;
+            const removed = type === compute_lines_js_1.DiffType.REMOVED;
+            const changed = type === compute_lines_js_1.DiffType.CHANGED;
             let content;
             const hasWordDiff = Array.isArray(value);
             if (hasWordDiff) {
@@ -227,16 +228,16 @@ class DiffViewer extends React.Component {
          */
         this.renderInlineView = ({ left, right }, index) => {
             let content;
-            if (left.type === compute_lines_1.DiffType.REMOVED && right.type === compute_lines_1.DiffType.ADDED) {
+            if (left.type === compute_lines_js_1.DiffType.REMOVED && right.type === compute_lines_js_1.DiffType.ADDED) {
                 return ((0, jsx_runtime_1.jsxs)(React.Fragment, { children: [(0, jsx_runtime_1.jsx)("tr", { className: this.styles.line, children: this.renderLine(left.lineNumber, left.type, LineNumberPrefix.LEFT, left.value, null) }), (0, jsx_runtime_1.jsx)("tr", { className: this.styles.line, children: this.renderLine(null, right.type, LineNumberPrefix.RIGHT, right.value, right.lineNumber, LineNumberPrefix.RIGHT) })] }, index));
             }
-            if (left.type === compute_lines_1.DiffType.REMOVED) {
+            if (left.type === compute_lines_js_1.DiffType.REMOVED) {
                 content = this.renderLine(left.lineNumber, left.type, LineNumberPrefix.LEFT, left.value, null);
             }
-            if (left.type === compute_lines_1.DiffType.DEFAULT) {
+            if (left.type === compute_lines_js_1.DiffType.DEFAULT) {
                 content = this.renderLine(left.lineNumber, left.type, LineNumberPrefix.LEFT, left.value, right.lineNumber, LineNumberPrefix.RIGHT);
             }
-            if (right.type === compute_lines_1.DiffType.ADDED) {
+            if (right.type === compute_lines_js_1.DiffType.ADDED) {
                 content = this.renderLine(null, right.type, LineNumberPrefix.RIGHT, right.value, right.lineNumber);
             }
             return ((0, jsx_runtime_1.jsx)("tr", { className: this.styles.line, children: content }, index));
@@ -270,11 +271,11 @@ class DiffViewer extends React.Component {
          */
         this.renderDiff = () => {
             const { oldValue, newValue, splitView, disableWordDiff, compareMethod, linesOffset, } = this.props;
-            const { lineInformation, diffLines } = (0, compute_lines_1.computeLineInformation)(oldValue, newValue, disableWordDiff, compareMethod, linesOffset, this.props.alwaysShowLines);
+            const { lineInformation, diffLines } = (0, compute_lines_js_1.computeLineInformation)(oldValue, newValue, disableWordDiff, compareMethod, linesOffset, this.props.alwaysShowLines);
             const extraLines = this.props.extraLinesSurroundingDiff < 0
                 ? 0
                 : Math.round(this.props.extraLinesSurroundingDiff);
-            const { lineBlocks, blocks } = (0, compute_hidden_blocks_1.computeHiddenBlocks)(lineInformation, diffLines, extraLines);
+            const { lineBlocks, blocks } = (0, compute_hidden_blocks_js_1.computeHiddenBlocks)(lineInformation, diffLines, extraLines);
             const diffNodes = lineInformation.map((line, lineIndex) => {
                 if (this.props.showDiffOnly) {
                     const blockIndex = lineBlocks[lineIndex];
@@ -302,7 +303,7 @@ class DiffViewer extends React.Component {
         this.render = () => {
             const { oldValue, newValue, useDarkTheme, leftTitle, rightTitle, splitView, compareMethod, hideLineNumbers, nonce, } = this.props;
             if (typeof compareMethod === "string" &&
-                compareMethod !== compute_lines_1.DiffMethod.JSON) {
+                compareMethod !== compute_lines_js_1.DiffMethod.JSON) {
                 if (typeof oldValue !== "string" || typeof newValue !== "string") {
                     throw Error('"oldValue" and "newValue" should be strings');
                 }
@@ -322,16 +323,16 @@ class DiffViewer extends React.Component {
             let deletions = 0;
             let additions = 0;
             for (const l of nodes.lineInformation) {
-                if (l.left.type === compute_lines_1.DiffType.ADDED) {
+                if (l.left.type === compute_lines_js_1.DiffType.ADDED) {
                     additions++;
                 }
-                if (l.right.type === compute_lines_1.DiffType.ADDED) {
+                if (l.right.type === compute_lines_js_1.DiffType.ADDED) {
                     additions++;
                 }
-                if (l.left.type === compute_lines_1.DiffType.REMOVED) {
+                if (l.left.type === compute_lines_js_1.DiffType.REMOVED) {
                     deletions++;
                 }
-                if (l.right.type === compute_lines_1.DiffType.REMOVED) {
+                if (l.right.type === compute_lines_js_1.DiffType.REMOVED) {
                     deletions++;
                 }
             }
@@ -353,7 +354,7 @@ class DiffViewer extends React.Component {
                                             ? []
                                             : nodes.blocks.map((b) => b.index),
                                     });
-                                }, children: allExpanded ? (0, jsx_runtime_1.jsx)(fold_1.Fold, {}) : (0, jsx_runtime_1.jsx)(expand_1.Expand, {}) }), " ", totalChanges, (0, jsx_runtime_1.jsx)("div", { style: { display: "flex", gap: "1px" }, children: blocks }), this.props.summary ? (0, jsx_runtime_1.jsx)("span", { children: this.props.summary }) : null] }), (0, jsx_runtime_1.jsx)("table", { className: (0, classnames_1.default)(this.styles.diffContainer, {
+                                }, children: allExpanded ? (0, jsx_runtime_1.jsx)(fold_js_1.Fold, {}) : (0, jsx_runtime_1.jsx)(expand_js_1.Expand, {}) }), " ", totalChanges, (0, jsx_runtime_1.jsx)("div", { style: { display: "flex", gap: "1px" }, children: blocks }), this.props.summary ? (0, jsx_runtime_1.jsx)("span", { children: this.props.summary }) : null] }), (0, jsx_runtime_1.jsx)("table", { className: (0, classnames_1.default)(this.styles.diffContainer, {
                             [this.styles.splitView]: splitView,
                         }), onMouseUp: () => {
                             const elements = document.getElementsByClassName("right");
@@ -380,7 +381,7 @@ DiffViewer.defaultProps = {
     splitView: true,
     highlightLines: [],
     disableWordDiff: false,
-    compareMethod: compute_lines_1.DiffMethod.CHARS,
+    compareMethod: compute_lines_js_1.DiffMethod.CHARS,
     styles: {},
     hideLineNumbers: false,
     extraLinesSurroundingDiff: 3,

package/lib/esm/src/index.js

@@ -2,11 +2,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import cn from "classnames";
 import * as React from "react";
 import memoize from "memoize-one";
-import { computeHiddenBlocks } from "./compute-hidden-blocks";
-import { DiffMethod, DiffType, computeLineInformation, } from "./compute-lines";
-import { Expand } from "./expand";
-import computeStyles from "./styles";
-import { Fold } from "./fold";
+import { computeHiddenBlocks } from "./compute-hidden-blocks.js";
+import { DiffMethod, DiffType, computeLineInformation, } from "./compute-lines.js";
+import { Expand } from "./expand.js";
+import computeStyles from "./styles.js";
+import { Fold } from "./fold.js";
 export var LineNumberPrefix;
 (function (LineNumberPrefix) {
     LineNumberPrefix["LEFT"] = "L";
@@ -89,9 +89,10 @@ class DiffViewer extends React.Component {
         return diffArray.map((wordDiff, i) => {
             const content = renderer
                 ? renderer(wordDiff.value)
-                : wordDiff.value;
-            if (typeof content !== "string")
-                return;
+                : (typeof wordDiff.value === 'string'
+                    ? wordDiff.value
+                    // If wordDiff.value is DiffInformation, we don't handle it, unclear why. See c0c99f5712.
+                    : undefined);
             return wordDiff.type === DiffType.ADDED ? (_jsx("ins", { className: cn(this.styles.wordDiff, {
                     [this.styles.wordAdded]: wordDiff.type === DiffType.ADDED,
                 }), children: content }, i)) : wordDiff.type === DiffType.REMOVED ? (_jsx("del", { className: cn(this.styles.wordDiff, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-diff-viewer-continued",
-  "version": "4.0.4",
+  "version": "4.0.6",
   "private": false,
   "description": "Continuation of a simple and beautiful text diff viewer component made with diff and React",
   "keywords": [