@scm-manager/ui-components 3.10.4-20250824-132529 → 4.0.0-REACT18-20250824-143504

package/src/repos/changesets/SingleChangeset.tsx

@@ -37,7 +37,6 @@ type Props = {
 const FixedSizedAvatar = styled.div`
   width: 35px;
   height: 35px;
-  overflow: hidden;
 `;
 
 const FullWidthDiv = styled.div`

package/src/repos/diff/DiffFileTree.tsx

@@ -18,19 +18,12 @@ import React, { FC } from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import classNames from "classnames";
-import { FileChangeType, FileTree } from "@scm-manager/ui-types";
+import { FileTree } from "@scm-manager/ui-types";
 import { FileDiffContent, StackedSpan, StyledIcon } from "./styledElements";
-import { FileTreeNodeWrapper } from "../DiffTypes";
 
-type Props = {
-  tree: FileTree;
-  currentFile: string;
-  setCurrentFile: (path: string) => void;
-  gap?: number;
-  FileTreeNodeWrapper?: FileTreeNodeWrapper;
-};
+type Props = { tree: FileTree; currentFile: string; setCurrentFile: (path: string) => void; gap?: number };
 
-const DiffFileTree: FC<Props> = ({ tree, currentFile, setCurrentFile, gap = 15, FileTreeNodeWrapper }) => {
+const DiffFileTree: FC<Props> = ({ tree, currentFile, setCurrentFile, gap = 15 }) => {
   return (
     <FileDiffContent gap={gap}>
       {Object.keys(tree.children).map((key) => (
@@ -40,7 +33,6 @@ const DiffFileTree: FC<Props> = ({ tree, currentFile, setCurrentFile, gap = 15,
           parentPath=""
           currentFile={currentFile}
           setCurrentFile={setCurrentFile}
-          FileTreeNodeWrapper={FileTreeNodeWrapper}
         />
       ))}
     </FileDiffContent>
@@ -49,13 +41,9 @@ const DiffFileTree: FC<Props> = ({ tree, currentFile, setCurrentFile, gap = 15,
 
 export default DiffFileTree;
 
-type NodeProps = {
-  node: FileTree;
-  parentPath: string;
-  currentFile: string;
-  setCurrentFile: (path: string) => void;
-  FileTreeNodeWrapper?: FileTreeNodeWrapper;
-};
+type ChangeType = "add" | "modify" | "delete" | "rename" | "copy";
+
+type NodeProps = { node: FileTree; parentPath: string; currentFile: string; setCurrentFile: (path: string) => void };
 
 const addPath = (parentPath: string, path: string) => {
   if ("" === parentPath) {
@@ -64,31 +52,16 @@ const addPath = (parentPath: string, path: string) => {
   return parentPath + "/" + path;
 };
 
-const TreeNode: FC<NodeProps> = ({ node, parentPath, currentFile, setCurrentFile, FileTreeNodeWrapper }) => {
+const TreeNode: FC<NodeProps> = ({ node, parentPath, currentFile, setCurrentFile }) => {
   const [t] = useTranslation("repos");
 
-  FileTreeNodeWrapper = FileTreeNodeWrapper || (({ children }) => <>{children}</>);
-
-  const label = <div className="ml-1">{node.nodeName}</div>;
-  const icon = <StyledIcon alt={t("diff.showContent")}>folder</StyledIcon>;
   return (
     <li>
       {Object.keys(node.children).length > 0 ? (
         <ul className="py-1 pl-3">
           <li className="is-flex has-text-grey">
-            <FileTreeNodeWrapper
-              path={addPath(parentPath, node.nodeName)}
-              isFile={false}
-              isCurrentFile={false}
-              name={node.nodeName}
-              iconName={"folder"}
-              iconColor={"grey"}
-              originalIcon={icon}
-              originalLabel={label}
-            >
-              {icon}
-              {label}
-            </FileTreeNodeWrapper>
+            <StyledIcon alt={t("diff.showContent")}>folder</StyledIcon>
+            <div className="ml-1">{node.nodeName}</div>
           </li>
           {Object.keys(node.children).map((key) => (
             <TreeNode
@@ -97,25 +70,23 @@ const TreeNode: FC<NodeProps> = ({ node, parentPath, currentFile, setCurrentFile
               parentPath={addPath(parentPath, node.nodeName)}
               currentFile={currentFile}
               setCurrentFile={setCurrentFile}
-              FileTreeNodeWrapper={FileTreeNodeWrapper}
             />
           ))}
         </ul>
       ) : (
         <TreeFile
-          changeType={node.changeType.toLowerCase() as FileChangeType}
+          changeType={node.changeType.toLowerCase() as ChangeType}
           path={node.nodeName}
           parentPath={parentPath}
           currentFile={currentFile}
           setCurrentFile={setCurrentFile}
-          FileTreeNodeWrapper={FileTreeNodeWrapper}
         />
       )}
     </li>
   );
 };
 
-const getColor = (changeType: FileChangeType) => {
+const getColor = (changeType: ChangeType) => {
   switch (changeType) {
     case "add":
       return "success";
@@ -128,7 +99,7 @@ const getColor = (changeType: FileChangeType) => {
   }
 };
 
-const getIcon = (changeType: FileChangeType) => {
+const getIcon = (changeType: ChangeType) => {
   switch (changeType) {
     case "add":
     case "copy":
@@ -142,22 +113,14 @@ const getIcon = (changeType: FileChangeType) => {
 };
 
 type FileProps = {
-  changeType: FileChangeType;
+  changeType: ChangeType;
   path: string;
   parentPath: string;
   currentFile: string;
   setCurrentFile: (path: string) => void;
-  FileTreeNodeWrapper: FileTreeNodeWrapper;
 };
 
-const TreeFile: FC<FileProps> = ({
-  changeType,
-  path,
-  parentPath,
-  currentFile,
-  setCurrentFile,
-  FileTreeNodeWrapper,
-}) => {
+const TreeFile: FC<FileProps> = ({ changeType, path, parentPath, currentFile, setCurrentFile }) => {
   const [t] = useTranslation("repos");
   const completePath = addPath(parentPath, path);
 
@@ -165,50 +128,35 @@ const TreeFile: FC<FileProps> = ({
     return currentFile === completePath;
   };
 
-  const iconName = getIcon(changeType);
-
-  const icon = (
-    <StackedSpan className="fa-stack">
-      <StyledIcon
-        className={classNames("fa-stack-2x", `has-text-${getColor(changeType)}`)}
-        key={completePath + "file"}
-        type="fas"
-        alt={t("diff.showContent")}
-      >
-        file
-      </StyledIcon>
-      <StyledIcon
-        className={classNames("fa-stack-1x", "is-relative", "has-text-secondary-least")}
-        isSmaller={iconName === "circle"}
-        key={changeType}
-        alt={t(`diff.changes.${changeType}`)}
-      >
-        {iconName}
-      </StyledIcon>
-    </StackedSpan>
-  );
-  const label = <div className={classNames("ml-1", isCurrentFile() ? "has-text-weight-bold" : "")}>{path}</div>;
-
   return (
     <Link
       className="is-flex py-1 pl-3 has-cursor-pointer"
       onClick={() => setCurrentFile(completePath)}
       to={`#diff-${encodeURIComponent(completePath)}`}
     >
-      <FileTreeNodeWrapper
-        name={path}
-        path={completePath}
-        changeType={changeType}
-        isFile={true}
-        iconName={iconName}
-        iconColor={getColor(changeType)}
-        originalIcon={icon}
-        originalLabel={label}
-        isCurrentFile={isCurrentFile()}
-      >
-        {icon}
-        {label}
-      </FileTreeNodeWrapper>
+      <StackedSpan className="fa-stack">
+        <StyledIcon
+          className={classNames("fa-stack-2x", `has-text-${getColor(changeType)}`)}
+          key={completePath + "file"}
+          type={isCurrentFile() ? "fas" : "far"}
+          alt={t("diff.showContent")}
+        >
+          file
+        </StyledIcon>
+        <StyledIcon
+          className={classNames(
+            "fa-stack-1x",
+            "is-relative",
+            isCurrentFile() ? "has-text-secondary-least" : `has-text-${getColor(changeType)}`
+          )}
+          issmaller={getIcon(changeType) === "circle" ? "true" : "false"}
+          key={changeType}
+          alt={t(`diff.changes.${changeType}`)}
+        >
+          {getIcon(changeType)}
+        </StyledIcon>
+      </StackedSpan>
+      <div className="ml-1">{path}</div>
     </Link>
   );
 };

package/src/repos/diff/styledElements.tsx

@@ -138,9 +138,10 @@ export const StackedSpan = styled.span`
   font-size: 0.5em;
 `;
 
-export const StyledIcon = styled(Icon)<{ isSmaller?: boolean }>`
-  ${({ isSmaller }) =>
-    isSmaller &&
+// Intentionally written as "issmaller" in order to count as a custom DOM attribute.
+export const StyledIcon = styled(Icon)<{ issmaller?: string }>`
+  ${({ issmaller: issmaller }) =>
+    issmaller == "true" &&
     `
       font-size: 0.5em;
       margin-top: 0.05rem;

package/src/repos/index.ts

@@ -35,9 +35,9 @@ export * from "./changesets";
 export { default as Diff } from "./Diff";
 export { default as DiffFile } from "./DiffFile";
 export { default as DiffButton } from "./DiffButton";
-export { FileControlFactory } from "./DiffTypes";
-export { default as LoadingDiff, WhitespaceMode } from "./LoadingDiff";
-export { DefaultCollapsed, DefaultCollapsedFunction } from "./defaultCollapsed";
+export { type FileControlFactory } from "./DiffTypes";
+export { default as LoadingDiff, type WhitespaceMode } from "./LoadingDiff";
+export { type DefaultCollapsed, type DefaultCollapsedFunction } from "./defaultCollapsed";
 export { default as RepositoryAvatar } from "./RepositoryAvatar";
 export { default as RepositoryEntry } from "./RepositoryEntry";
 export { default as RepositoryFlag } from "./RepositoryFlag";
@@ -48,18 +48,18 @@ export { default as RepositoryFlags } from "./RepositoryFlags";
 export { default as DiffDropDown } from "./DiffDropDown";
 export { default as DiffStatistics } from "./DiffStatistics";
 export { default as LayoutRadioButtons } from "./LayoutRadioButtons";
-export { LayoutMode, useLayoutState } from "./diffLayout";
+export { type LayoutMode, useLayoutState } from "./diffLayout";
 
 export {
-  File,
-  FileChangeType,
-  Hunk,
-  Change,
-  ChangeType,
-  BaseContext,
-  AnnotationFactory,
-  AnnotationFactoryContext,
-  DiffEventHandler,
-  DiffEventContext,
-  DiffObjectProps,
+  type File,
+  type FileChangeType,
+  type Hunk,
+  type Change,
+  type ChangeType,
+  type BaseContext,
+  type AnnotationFactory,
+  type AnnotationFactoryContext,
+  type DiffEventHandler,
+  type DiffEventContext,
+  type DiffObjectProps,
 };

package/src/search/Hit.tsx

@@ -14,7 +14,7 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
-import React, { FC } from "react";
+import React, { FC, ReactNode } from "react";
 import { Hit as HitType } from "@scm-manager/ui-types";
 import classNames from "classnames";
 
@@ -24,9 +24,10 @@ export type HitProps = {
 
 type Props = {
   className?: string;
+  children?: ReactNode;
 };
 
-type SearchResultType = FC & {
+type SearchResultType = FC<{ children?: ReactNode }> & {
   Title: FC<Props>;
   Left: FC<Props>;
   Content: FC<Props>;

package/src/search/TextHitField.stories.tsx

@@ -14,49 +14,137 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
+// import React from "react";
+// import { storiesOf } from "@storybook/react";
+// import { bashHit, filenameXmlHit, javaHit, markdownHit, pullRequestHit } from "../__resources__/SearchHit";
+// import TextHitField from "./TextHitField";
+//
+// storiesOf("TextHitField", module)
+//   .add("Default", () => (
+//     <pre>
+//       <TextHitField hit={javaHit} field={"content"} />
+//     </pre>
+//   ))
+//   .add("Java SyntaxHighlighting", () => (
+//     <pre>
+//       <TextHitField hit={javaHit} field={"content"} syntaxHighlightingLanguage="java" />
+//     </pre>
+//   ))
+//   .add("Bash SyntaxHighlighting", () => (
+//     <pre>
+//       <TextHitField hit={bashHit} field={"content"} syntaxHighlightingLanguage="bash" />
+//     </pre>
+//   ))
+//   .add("Markdown SyntaxHighlighting", () => (
+//     <pre>
+//       <TextHitField hit={markdownHit} field={"content"} syntaxHighlightingLanguage="markdown" />
+//     </pre>
+//   ))
+//   .add("Unknown SyntaxHighlighting", () => (
+//     <pre>
+//       <TextHitField hit={bashHit} field={"content"} syntaxHighlightingLanguage="__unknown__" />
+//     </pre>
+//   ))
+//   .add("Non Content Search", () => (
+//     <pre>
+//       <TextHitField hit={filenameXmlHit} field={"content"} syntaxHighlightingLanguage="xml" />
+//     </pre>
+//   ))
+//   .add("Truncate", () => (
+//     <pre>
+//       <TextHitField hit={pullRequestHit} field={"description"} truncateValueAt={128} />
+//     </pre>
+//   ))
+//   .add("Truncate Keep Whole Line", () => (
+//     <pre>
+//       <TextHitField hit={filenameXmlHit} field={"content"} syntaxHighlightingLanguage="xml" truncateValueAt={1024} />
+//     </pre>
+//   ));
+
 import React from "react";
-import { storiesOf } from "@storybook/react";
-import { bashHit, filenameXmlHit, javaHit, markdownHit, pullRequestHit } from "../__resources__/SearchHit";
+import type { Meta, StoryObj } from "@storybook/react";
+
 import TextHitField from "./TextHitField";
+import { bashHit, filenameXmlHit, javaHit, markdownHit, pullRequestHit } from "../__resources__/SearchHit";
+
+// --- Storybook Metadata ---
+
+const meta: Meta<typeof TextHitField> = {
+  title: "Global/TextHitField",
+  component: TextHitField,
+  // The <pre> tag is now a decorator, applied to all stories in this file
+  decorators: [(Story) => <pre>{Story()}</pre>],
+  tags: ["autodocs"],
+};
+
+export default meta;
+
+// --- Story Definitions ---
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    hit: javaHit,
+    field: "content",
+  },
+};
+
+export const JavaSyntaxHighlighting: Story = {
+  name: "Java Syntax Highlighting",
+  args: {
+    ...Default.args,
+    syntaxHighlightingLanguage: "java",
+  },
+};
+
+export const BashSyntaxHighlighting: Story = {
+  name: "Bash Syntax Highlighting",
+  args: {
+    hit: bashHit,
+    field: "content",
+    syntaxHighlightingLanguage: "bash",
+  },
+};
+
+export const MarkdownSyntaxHighlighting: Story = {
+  name: "Markdown Syntax Highlighting",
+  args: {
+    hit: markdownHit,
+    field: "content",
+    syntaxHighlightingLanguage: "markdown",
+  },
+};
+
+export const UnknownSyntaxHighlighting: Story = {
+  name: "Unknown Syntax Highlighting",
+  args: {
+    ...BashSyntaxHighlighting.args,
+    syntaxHighlightingLanguage: "__unknown__",
+  },
+};
+
+export const NonContentSearch: Story = {
+  name: "Non-Content Search",
+  args: {
+    hit: filenameXmlHit,
+    field: "content",
+    syntaxHighlightingLanguage: "xml",
+  },
+};
+
+export const Truncate: Story = {
+  args: {
+    hit: pullRequestHit,
+    field: "description",
+    truncateValueAt: 128,
+  },
+};
 
-storiesOf("TextHitField", module)
-  .add("Default", () => (
-    <pre>
-      <TextHitField hit={javaHit} field={"content"} />
-    </pre>
-  ))
-  .add("Java SyntaxHighlighting", () => (
-    <pre>
-      <TextHitField hit={javaHit} field={"content"} syntaxHighlightingLanguage="java" />
-    </pre>
-  ))
-  .add("Bash SyntaxHighlighting", () => (
-    <pre>
-      <TextHitField hit={bashHit} field={"content"} syntaxHighlightingLanguage="bash" />
-    </pre>
-  ))
-  .add("Markdown SyntaxHighlighting", () => (
-    <pre>
-      <TextHitField hit={markdownHit} field={"content"} syntaxHighlightingLanguage="markdown" />
-    </pre>
-  ))
-  .add("Unknown SyntaxHighlighting", () => (
-    <pre>
-      <TextHitField hit={bashHit} field={"content"} syntaxHighlightingLanguage="__unknown__" />
-    </pre>
-  ))
-  .add("Non Content Search", () => (
-    <pre>
-      <TextHitField hit={filenameXmlHit} field={"content"} syntaxHighlightingLanguage="xml" />
-    </pre>
-  ))
-  .add("Truncate", () => (
-    <pre>
-      <TextHitField hit={pullRequestHit} field={"description"} truncateValueAt={128} />
-    </pre>
-  ))
-  .add("Truncate Keep Whole Line", () => (
-    <pre>
-      <TextHitField hit={filenameXmlHit} field={"content"} syntaxHighlightingLanguage="xml" truncateValueAt={1024} />
-    </pre>
-  ));
+export const TruncateKeepWholeLine: Story = {
+  name: "Truncate (Keep Whole Line)",
+  args: {
+    ...NonContentSearch.args,
+    truncateValueAt: 1024,
+  },
+};

package/src/search/TextHitField.tsx

@@ -14,13 +14,13 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
-import React, { FC, Fragment } from "react";
+import React, { FC, Fragment, ReactNode } from "react";
 import { HighlightedHitField, Hit } from "@scm-manager/ui-types";
 import HighlightedFragment from "./HighlightedFragment";
 import { isHighlightedHitField } from "./fields";
 import { SyntaxHighlighter } from "@scm-manager/ui-syntaxhighlighting";
 
-const MarkerWrapper: FC = ({ children }) => <mark>{children}</mark>;
+const MarkerWrapper: FC<{ children?: ReactNode }> = ({ children }) => <mark>{children}</mark>;
 
 const MARKER_CONFIG = {
   start: "<|[[--",
@@ -73,6 +73,7 @@ type Props = {
   field: string;
   truncateValueAt?: number;
   syntaxHighlightingLanguage?: string;
+  children?: ReactNode;
 };
 
 function truncate(value: string, truncateValueAt = 0, syntaxHighlightingLanguage?: string): string {

package/src/search/index.ts

@@ -15,5 +15,5 @@
  */
 
 export * from "./fields";
-export { default as Hit, HitProps } from "./Hit";
+export { default as Hit, type HitProps } from "./Hit";
 export { default as TextHitField } from "./TextHitField";

package/src/storyshots.test.ts

@@ -14,66 +14,72 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
-import path from "path";
-import initStoryshots, { snapshotWithOptions } from "@storybook/addon-storyshots";
-import { act, create, ReactTestRenderer } from "react-test-renderer";
-import { StoryContext } from "@storybook/react";
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const createNodeMock = (element: any) => {
-  if (element.type === "tr") {
-    return {
-      // eslint-disable-next-line @typescript-eslint/no-empty-function
-      querySelector: () => {},
-    };
-  }
-};
-
-async function wait(delay: number) {
-  return act(
-    () =>
-      new Promise((resolve) => {
-        setTimeout(resolve, delay);
-      })
-  );
-}
-
-async function runAsyncTest(story: StoryContext) {
-  const storyElement = story.render();
-  let renderer: ReactTestRenderer | undefined;
-  act(() => {
-    renderer = create(storyElement);
+describe("Temporary test to be removed", () => {
+  it("true", () => {
+    expect(true).toBe(true);
   });
-
-  // For Flow's benefit
-  if (!renderer) {
-    return;
-  }
-
-  // Let one render cycle pass before rendering snapshot
-  await wait(0);
-  expect(renderer).toMatchSnapshot();
-
-  renderer.unmount();
-}
-
-const syncTest = snapshotWithOptions({
-  // @ts-ignore types seems not to match
-  createNodeMock,
 });
 
-initStoryshots({
-  asyncJest: true,
-  framework: "react",
-  configPath: path.resolve(__dirname, "..", ".storybook"),
-  test: ({ story, context, done, ...rest }) => {
-    if (story.parameters?.storyshots?.async) {
-      runAsyncTest(story).then(done);
-    } else {
-      syncTest({ story, context, ...rest });
-      if (done) {
-        done();
-      }
-    }
-  },
-});
+// import path from "path";
+// import initStoryshots, { snapshotWithOptions } from "@storybook/addon-storyshots";
+// import { act, create, ReactTestRenderer } from "react-test-renderer";
+// import { StoryContext } from "@storybook/react";
+//
+// // eslint-disable-next-line @typescript-eslint/no-explicit-any
+// const createNodeMock = (element: any) => {
+//   if (element.type === "tr") {
+//     return {
+//       // eslint-disable-next-line @typescript-eslint/no-empty-function
+//       querySelector: () => {},
+//     };
+//   }
+// };
+//
+// async function wait(delay: number) {
+//   return act(
+//     () =>
+//       new Promise((resolve) => {
+//         setTimeout(resolve, delay);
+//       })
+//   );
+// }
+//
+// async function runAsyncTest(story: StoryContext) {
+//   const storyElement = story.render();
+//   let renderer: ReactTestRenderer | undefined;
+//   act(() => {
+//     renderer = create(storyElement);
+//   });
+//
+//   // For Flow's benefit
+//   if (!renderer) {
+//     return;
+//   }
+//
+//   // Let one render cycle pass before rendering snapshot
+//   await wait(0);
+//   expect(renderer).toMatchSnapshot();
+//
+//   renderer.unmount();
+// }
+//
+// const syncTest = snapshotWithOptions({
+//   // @ts-ignore types seems not to match
+//   createNodeMock,
+// });
+//
+// initStoryshots({
+//   asyncJest: true,
+//   framework: "react",
+//   configPath: path.resolve(__dirname, "..", ".storybook"),
+//   test: ({ story, context, done, ...rest }) => {
+//     if (story.parameters?.storyshots?.async) {
+//       runAsyncTest(story).then(done);
+//     } else {
+//       syncTest({ story, context, ...rest });
+//       if (done) {
+//         done();
+//       }
+//     }
+//   },
+// });