kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-13 17:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ks

Browse Source
This commit is contained in:
Manav Rathi
2025-03-06 12:14:17 +05:30
parent 7eaedfe138
commit c8dc9c9f46
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/packages/gallery/components/viewer/FileViewer.tsx
View File

@@ -938,7 +938,10 @@ const Shortcuts: React.FC<ModalVisibilityProps> = ({ open, onClose }) => (
<Shortcut action="Previous, Next" shortcut="←, →" /> <Shortcut action="Previous, Next" shortcut="←, →" />
<Shortcut action="Zoom" shortcut="Mouse scroll, Pinch" /> <Shortcut action="Zoom" shortcut="Mouse scroll, Pinch" />
<Shortcut action="Zoom preset" shortcut="Z, Tap inside image" /> <Shortcut action="Zoom preset" shortcut="Z, Tap inside image" />
<Shortcut action="Toggle controls" shortcut="Tap outside image" /> <Shortcut
action="Toggle controls"
shortcut="H, Tap outside image"
/>
<Shortcut action="Pan" shortcut="W / A / S / D, Drag" /> <Shortcut action="Pan" shortcut="W / A / S / D, Drag" />
<Shortcut action="Toggle favorite" shortcut="L" /> <Shortcut action="Toggle favorite" shortcut="L" />
<Shortcut action="View info" shortcut="I" /> <Shortcut action="View info" shortcut="I" />

30
web/packages/gallery/components/viewer/photoswipe.ts
View File

@@ -303,7 +303,7 @@ export class FileViewerPhotoSwipe {
* Apart from a date, this can also be: * Apart from a date, this can also be:
* *
* - "already-hidden" if controls have already been hidden, say by a * - "already-hidden" if controls have already been hidden, say by a
* bgClickAction. * bgClickAction or our keyboard shortcut.
* *
* - "auto-hidden" if controls were hidden by us because of inactivity. * - "auto-hidden" if controls were hidden by us because of inactivity.
*/ */
@@ -316,6 +316,8 @@ export class FileViewerPhotoSwipe {
pswp.element.classList.add("pswp--ui-visible"); pswp.element.classList.add("pswp--ui-visible");
const hideUIControls = () => const hideUIControls = () =>
pswp.element.classList.remove("pswp--ui-visible"); pswp.element.classList.remove("pswp--ui-visible");
const toggleUIControls = () =>
pswp.element.classList.toggle("pswp--ui-visible");
// Return true if the current keyboard focus is on any of the UI // Return true if the current keyboard focus is on any of the UI
// controls (e.g. as a result of user tabbing through them). // controls (e.g. as a result of user tabbing through them).
@@ -324,9 +326,9 @@ export class FileViewerPhotoSwipe {
if (fv && !fv.classList.contains("pswp")) { if (fv && !fv.classList.contains("pswp")) {
return true; return true;
} }
// TODO(PS): Commented during testing return false;
// return false; // TODO(PS): Remove me
return true; // return true;
}; };
// Provide data about slides to PhotoSwipe via callbacks // Provide data about slides to PhotoSwipe via callbacks
@@ -800,6 +802,9 @@ export class FileViewerPhotoSwipe {
case "d": case "d":
cb = panner(lkey); cb = panner(lkey);
break; break;
case "h":
cb = toggleUIControls;
break;
case "l": case "l":
cb = handleToggleFavoriteIfEnabled; cb = handleToggleFavoriteIfEnabled;
break; break;
@@ -816,6 +821,11 @@ export class FileViewerPhotoSwipe {
} }
cb?.(); cb?.();
// Undo auto hide when the user presses tab to move focus.
if (key == "Tab") {
if (lastActivityDate == "auto-hidden") showUIControls();
}
}); });
// Let our data source know that we're about to open. // Let our data source know that we're about to open.
@@ -828,15 +838,17 @@ export class FileViewerPhotoSwipe {
autoHideCheckIntervalID = setInterval(() => { autoHideCheckIntervalID = setInterval(() => {
if (lastActivityDate == "already-hidden") return; if (lastActivityDate == "already-hidden") return;
if (lastActivityDate == "auto-hidden") return; if (lastActivityDate == "auto-hidden") return;
if (Date.now() - lastActivityDate.getTime() > 5000 /* ~5s */) { if (Date.now() - lastActivityDate.getTime() > 9000 /* ~10s */) {
if (areUIControlsVisible() && !isFocusedOnUIControl()) { if (areUIControlsVisible()) {
hideUIControls(); if (!isFocusedOnUIControl()) {
lastActivityDate = "auto-hidden"; hideUIControls();
lastActivityDate = "auto-hidden";
}
} else { } else {
lastActivityDate = "already-hidden"; lastActivityDate = "already-hidden";
} }
} }
}, 1500); }, 3000);
} }
/** /**