diff --git a/ui/v2.5/graphql/data/scene-slim.graphql b/ui/v2.5/graphql/data/scene-slim.graphql
index 09db76bb7a9..c24eb9752b7 100644
--- a/ui/v2.5/graphql/data/scene-slim.graphql
+++ b/ui/v2.5/graphql/data/scene-slim.graphql
@@ -75,6 +75,7 @@ fragment SlimSceneData on Scene {
performers {
id
name
+ disambiguation
gender
favorite
image_path
diff --git a/ui/v2.5/src/components/Performers/PerformerSelect.tsx b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
index f42d22e1886..588687bf02b 100644
--- a/ui/v2.5/src/components/Performers/PerformerSelect.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
@@ -125,7 +125,14 @@ export const PerformerSelect: React.FC<
thisOptionProps = {
...optionProps,
- children: object.name,
+ children: (
+ <>
+ {object.name}
+ {object.disambiguation && (
+ {` (${object.disambiguation})`}
+ )}
+ >
+ ),
};
return ;
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index 55b11e07758..bee52636ada 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -221,6 +221,7 @@
.performer-select {
.performer-disambiguation {
+ color: initial;
white-space: pre;
}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 6b08dffd022..3b65e20c44f 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -29,6 +29,10 @@
margin: 5px;
}
+.performer-tag-container .performer-disambiguation {
+ color: initial;
+}
+
.performer-tag.image,
.movie-tag.image {
background-position: center;
diff --git a/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx b/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
index 0f98f732b63..577faca8b0d 100644
--- a/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
+++ b/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
@@ -9,7 +9,10 @@ import { Icon } from "./Icon";
import { PerformerLink } from "./TagLink";
interface IProps {
- performers: Partial[];
+ performers: Pick<
+ GQL.Performer,
+ "id" | "name" | "image_path" | "disambiguation" | "gender"
+ >[];
}
export const PerformerPopoverButton: React.FC = ({ performers }) => {
diff --git a/ui/v2.5/src/components/Shared/TagLink.tsx b/ui/v2.5/src/components/Shared/TagLink.tsx
index 738290cecfa..e97d0a957b3 100644
--- a/ui/v2.5/src/components/Shared/TagLink.tsx
+++ b/ui/v2.5/src/components/Shared/TagLink.tsx
@@ -37,7 +37,7 @@ const CommonLinkComponent: React.FC = ({
};
interface IPerformerLinkProps {
- performer: INamedObject;
+ performer: INamedObject & { disambiguation?: string | null };
linkType?: "scene" | "gallery" | "image";
className?: string;
}
@@ -63,7 +63,10 @@ export const PerformerLink: React.FC = ({
return (
- {title}
+ {title}
+ {performer.disambiguation && (
+ {` (${performer.disambiguation})`}
+ )}
);
};