Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-31 12:43:38 +01:00
Code Issues Projects Releases Wiki Activity

Add disambiguation to performer link and performer select values (#4541)

Browse source 
* Add disambiguation to PerformerLink
* Add disambiguation to performer select values
This commit is contained in:
WithoutPants 2024-02-12 14:03:45 +11:00 committed by GitHub
parent a4bbdcfbae
commit 235c9c90c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ui/v2.5/graphql/data/scene-slim.graphql
View file

@ -75,6 +75,7 @@ fragment SlimSceneData on Scene {
performers {
id
name
disambiguation
gender
favorite
image_path

9
ui/v2.5/src/components/Performers/PerformerSelect.tsx
View file

@ -125,7 +125,14 @@ export const PerformerSelect: React.FC<
thisOptionProps = {
...optionProps,
children: object.name,
children: (
<>
<span>{object.name}</span>
{object.disambiguation && (
<span className="performer-disambiguation">{` (${object.disambiguation})`}</span>
)}
</>
),
};
return <reactSelectComponents.MultiValueLabel {...thisOptionProps} />;

1
ui/v2.5/src/components/Performers/styles.scss
View file

@ -221,6 +221,7 @@
.performer-select {
.performer-disambiguation {
color: initial;
white-space: pre;
}

4
ui/v2.5/src/components/Scenes/styles.scss
View file

@ -29,6 +29,10 @@
margin: 5px;
}
.performer-tag-container .performer-disambiguation {
color: initial;
}
.performer-tag.image,
.movie-tag.image {
background-position: center;

5
ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
View file

@ -9,7 +9,10 @@ import { Icon } from "./Icon";
import { PerformerLink } from "./TagLink";
interface IProps {
performers: Partial<GQL.PerformerDataFragment>[];
performers: Pick<
GQL.Performer,
"id" | "name" | "image_path" | "disambiguation" | "gender"
>[];
}
export const PerformerPopoverButton: React.FC<IProps> = ({ performers }) => {

7
ui/v2.5/src/components/Shared/TagLink.tsx
View file

@ -37,7 +37,7 @@ const CommonLinkComponent: React.FC<ICommonLinkProps> = ({
};
interface IPerformerLinkProps {
performer: INamedObject;
performer: INamedObject & { disambiguation?: string | null };
linkType?: "scene" | "gallery" | "image";
className?: string;
}
@ -63,7 +63,10 @@ export const PerformerLink: React.FC<IPerformerLinkProps> = ({
return (
<CommonLinkComponent link={link} className={className}>
{title}
<span>{title}</span>
{performer.disambiguation && (
<span className="performer-disambiguation">{` (${performer.disambiguation})`}</span>
)}
</CommonLinkComponent>
);
};