Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Decouple galleries from scenes (#1057)

Browse Source
This commit is contained in:
InfiniteTF
2021-02-01 21:56:54 +01:00
committed by GitHub
parent 86bfb64a0d
commit 4fd022a93b
54 changed files with 952 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ui/v2.5/src/components/Scenes/SceneCard.tsx
View File

@@ -66,9 +66,9 @@ export const ScenePreview: React.FC<IScenePreviewProps> = ({
interface ISceneCardProps {
scene: GQL.SlimSceneDataFragment;
selecting?: boolean;
selected: boolean | undefined;
zoomIndex: number;
onSelectedChanged: (selected: boolean, shiftKey: boolean) => void;
selected?: boolean | undefined;
zoomIndex?: number;
onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
}
export const SceneCard: React.FC<ISceneCardProps> = (
@@ -257,17 +257,20 @@ export const SceneCard: React.FC<ISceneCardProps> = (
}
function maybeRenderGallery() {
if (props.scene.gallery) {
return (
<div>
<Link to={`/galleries/${props.scene.gallery.id}`}>
<Button className="minimal">
<Icon icon="image" />
</Button>
</Link>
</div>
);
}
if (props.scene.galleries.length <= 0) return;
const popoverContent = props.scene.galleries.map((gallery) => (
<TagLink key={gallery.id} gallery={gallery} />
));
return (
<HoverPopover placement="bottom" content={popoverContent}>
<Button className="minimal">
<Icon icon="image" />
<span>{props.scene.galleries.length}</span>
</Button>
</HoverPopover>
);
}
function maybeRenderOrganized() {
@@ -289,7 +292,7 @@ export const SceneCard: React.FC<ISceneCardProps> = (
props.scene.movies.length > 0 ||
props.scene.scene_markers.length > 0 ||
props.scene?.o_counter ||
props.scene.gallery ||
props.scene.galleries.length > 0 ||
props.scene.organized
) {
return (
@@ -314,7 +317,7 @@ export const SceneCard: React.FC<ISceneCardProps> = (
) {
const { shiftKey } = event;
if (props.selecting) {
if (props.selecting && props.onSelectedChanged) {
props.onSelectedChanged(!props.selected, shiftKey);
event.preventDefault();
}
@@ -331,7 +334,7 @@ export const SceneCard: React.FC<ISceneCardProps> = (
const ev = event;
const shiftKey = false;
if (props.selecting && !props.selected) {
if (props.selecting && props.onSelectedChanged && !props.selected) {
props.onSelectedChanged(true, shiftKey);
}
@@ -354,7 +357,7 @@ export const SceneCard: React.FC<ISceneCardProps> = (
type="checkbox"
className="scene-card-check"
checked={props.selected}
onChange={() => props.onSelectedChanged(!props.selected, shiftKey)}
onChange={() => props.onSelectedChanged?.(!props.selected, shiftKey)}
onClick={(event: React.MouseEvent<HTMLInputElement, MouseEvent>) => {
// eslint-disable-next-line prefer-destructuring
shiftKey = event.shiftKey;