feat(note_list): display files full-width on mobile

apps/client/src/services/content_renderer.ts

@@ -8,6 +8,7 @@ import FAttachment from "../entities/fattachment.js";
 import FNote from "../entities/fnote.js";
 import imageContextMenuService from "../menus/image_context_menu.js";
 import { t } from "../services/i18n.js";
+import { renderReactWidget, renderReactWidgetAtElement } from "../widgets/react/react_utils";
 import renderText from "./content_renderer_text.js";
 import renderDoc from "./doc_renderer.js";
 import { loadElkIfNeeded, postprocessMermaidSvg } from "./mermaid.js";
@@ -212,15 +213,16 @@ async function renderFile(entity: FNote | FAttachment, type: string, $renderedCo
 
         $content.append($audioPreview);
     } else if (type === "video") {
-        const $videoPreview = $("<video controls></video>")
-            .attr("src", openService.getUrlForDownload(`api/${entityType}/${entityId}/open-partial`))
-            .attr("type", entity.mime)
-            .css("width", "100%");
+        const url = openService.getUrlForDownload(`api/${entityType}/${entityId}/open-partial`);
+        const mime = entity.mime;
 
-        $content.append($videoPreview);
+        const VideoPreviewContent = (await import("../widgets/type_widgets/file/Video")).VideoPreviewContent;
+        const $viewer = renderReactWidget(null, h(VideoPreviewContent, { url, mime }));
+
+        $content.append($viewer);
     }
 
-    if (entityType === "notes" && "noteId" in entity) {
+    if (entityType === "notes" && "noteId" in entity && type !== "video") {
         // TODO: we should make this available also for attachments, but there's a problem with "Open externally" support
         //       in attachment list
         const $downloadButton = $(`

apps/client/src/translations/en/translation.json

@@ -1042,6 +1042,7 @@
     "pause": "Pause (Space)",
     "back-10s": "Back 10s (Left arrow key)",
     "forward-30s": "Forward 30s",
+    "volume": "Volume",
     "mute": "Mute (M)",
     "unmute": "Unmute (M)",
     "playback-speed": "Playback speed",
@@ -1054,7 +1055,8 @@
     "exit-fullscreen": "Exit fullscreen",
     "unsupported-format": "Media preview is not available for this file format:\n{{mime}}",
     "zoom-to-fit": "Zoom to fill",
-    "zoom-reset": "Reset zoom to fill"
+    "zoom-reset": "Reset zoom to fill",
+    "more-options": "More options"
   },
   "protected_session": {
     "enter_password_instruction": "Showing protected note requires entering your password:",

apps/client/src/widgets/collections/legacy/ListOrGridView.css

@@ -12,6 +12,11 @@
         display: flex;
         flex-wrap: wrap;
         gap: 10px;
+
+        body.mobile & {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+        }
     }
 
     .note-list-bottom-pager {
@@ -269,8 +274,9 @@
     overflow: hidden;
     user-select: none;
 
-    body.mobile & {
-        flex-basis: 150px;
+    body.mobile &.mobile-full-width {
+        grid-column-start: 1;
+        grid-column-end: 3;
     }
 
     &:hover {

apps/client/src/widgets/collections/legacy/ListOrGridView.tsx

@@ -1,25 +1,25 @@
 import "./ListOrGridView.css";
-import { Card, CardFrame, CardSection } from "../../react/Card";
 
+import { clsx } from "clsx";
+import { ComponentChildren, TargetedMouseEvent } from "preact";
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";
+import { JSX } from "preact/jsx-runtime";
 
 import FNote from "../../../entities/fnote";
+import linkContextMenuService from "../../../menus/link_context_menu";
 import attribute_renderer from "../../../services/attribute_renderer";
 import content_renderer from "../../../services/content_renderer";
 import { t } from "../../../services/i18n";
 import link from "../../../services/link";
 import CollectionProperties from "../../note_bars/CollectionProperties";
+import ActionButton from "../../react/ActionButton";
+import { Card, CardFrame, CardSection } from "../../react/Card";
 import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean, useNoteProperty } from "../../react/hooks";
 import Icon from "../../react/Icon";
 import NoteLink from "../../react/NoteLink";
 import { ViewModeProps } from "../interface";
-import { Pager, usePagination, PaginationContext } from "../Pagination";
+import { Pager, PaginationContext,usePagination } from "../Pagination";
 import { filterChildNotes, useFilteredNoteIds } from "./utils";
-import { JSX } from "preact/jsx-runtime";
-import { clsx } from "clsx";
-import ActionButton from "../../react/ActionButton";
-import linkContextMenuService from "../../../menus/link_context_menu";
-import { ComponentChildren, TargetedMouseEvent } from "preact";
 
 const contentSizeObserver = new ResizeObserver(onContentResized);
 
@@ -53,13 +53,13 @@ export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
         <div className={clsx("note-list-container use-tn-links", {"search-results": (noteType === "search")})}>
             {pageNotes?.map(childNote => (
                 <GridNoteCard key={childNote.noteId}
-                                note={childNote}
-                                parentNote={note}
-                                highlightedTokens={highlightedTokens}
-                                includeArchived={includeArchived} />
+                    note={childNote}
+                    parentNote={note}
+                    highlightedTokens={highlightedTokens}
+                    includeArchived={includeArchived} />
             ))}
         </div>
-    </NoteList>
+    </NoteList>;
 }
 
 interface NoteListProps {
@@ -82,13 +82,13 @@ function NoteList(props: NoteListProps) {
 
         {props.noteIds.length > 0 && <div className="note-list-wrapper">
             {!hasCollectionProperties && <Pager {...props.pagination} />}
-            
+
             {props.children}
 
             <Pager className="note-list-bottom-pager" {...props.pagination} />
         </div>}
 
-    </div>
+    </div>;
 }
 
 function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expandDepth, includeArchived }: {
@@ -106,25 +106,25 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
     // Reset expand state if switching to another note, or if user manually toggled expansion state.
     useEffect(() => setExpanded(currentLevel <= expandDepth), [ note, currentLevel, expandDepth ]);
 
-    let subSections: JSX.Element | undefined = undefined;
+    let subSections: JSX.Element | undefined;
     if (isExpanded) {
         subSections = <>
             <CardSection className="note-content-preview">
                 <NoteContent note={note}
-                             highlightedTokens={highlightedTokens}
-                             noChildrenList
-                             includeArchivedNotes={includeArchived} />
+                    highlightedTokens={highlightedTokens}
+                    noChildrenList
+                    includeArchivedNotes={includeArchived} />
             </CardSection>
 
             <NoteChildren note={note}
-                          parentNote={parentNote}
-                          highlightedTokens={highlightedTokens}
-                          currentLevel={currentLevel}
-                          expandDepth={expandDepth}
-                          includeArchived={includeArchived} />
-        </>
+                parentNote={parentNote}
+                highlightedTokens={highlightedTokens}
+                currentLevel={currentLevel}
+                expandDepth={expandDepth}
+                includeArchived={includeArchived} />
+        </>;
     }
-    
+
     return (
         <CardSection
             className={clsx("nested-note-list-item", "no-tooltip-preview", note.getColorClass(), {
@@ -137,14 +137,14 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
             data-note-id={note.noteId}
         >
             <h5>
-                <span className={`note-expander ${isExpanded ? "bx bx-chevron-down" : "bx bx-chevron-right"}`} 
-                      onClick={() => setExpanded(!isExpanded)}/>
+                <span className={`note-expander ${isExpanded ? "bx bx-chevron-down" : "bx bx-chevron-right"}`}
+                    onClick={() => setExpanded(!isExpanded)}/>
                 <Icon className="note-icon" icon={note.getIcon()} />
                 <NoteLink className="note-book-title"
-                          notePath={notePath}
-                          noPreview
-                          showNotePath={parentNote.type === "search"}
-                          highlightedTokens={highlightedTokens} />
+                    notePath={notePath}
+                    noPreview
+                    showNotePath={parentNote.type === "search"}
+                    highlightedTokens={highlightedTokens} />
                 <NoteAttributes note={note} />
                 <NoteMenuButton notePath={notePath} />
             </h5>
@@ -164,27 +164,28 @@ function GridNoteCard(props: GridNoteCardProps) {
 
     return (
         <CardFrame className={clsx("note-book-card", "no-tooltip-preview", "block-link", props.note.getColorClass(), {
-                "archived": props.note.isArchived
-             })}
-             data-href={`#${notePath}`}
-             data-note-id={props.note.noteId}
-             onClick={(e) => link.goToLink(e)}
+            "archived": props.note.isArchived,
+            "mobile-full-width": props.note.type === "file"
+        })}
+        data-href={`#${notePath}`}
+        data-note-id={props.note.noteId}
+        onClick={(e) => link.goToLink(e)}
         >
             <h5 className={clsx("note-book-header")}>
                 <Icon className="note-icon" icon={props.note.getIcon()} />
                 <NoteLink className="note-book-title"
-                          notePath={notePath}
-                          noPreview
-                          showNotePath={props.parentNote.type === "search"}
-                          highlightedTokens={props.highlightedTokens}
+                    notePath={notePath}
+                    noPreview
+                    showNotePath={props.parentNote.type === "search"}
+                    highlightedTokens={props.highlightedTokens}
                 />
                 {!props.note.isOptions() && <NoteMenuButton notePath={notePath} />}
-                
+
             </h5>
             <NoteContent note={props.note}
-                         trim
-                         highlightedTokens={props.highlightedTokens}
-                         includeArchivedNotes={props.includeArchived}
+                trim
+                highlightedTokens={props.highlightedTokens}
+                includeArchivedNotes={props.includeArchived}
             />
         </CardFrame>
     );
@@ -222,7 +223,7 @@ export function NoteContent({ note, trim, noChildrenList, highlightedTokens, inc
 
         return () => {
             contentSizeObserver.unobserve(contentElement);
-        }
+        };
     }, []);
 
     useEffect(() => {
@@ -281,13 +282,13 @@ function NoteChildren({ note, parentNote, highlightedTokens, currentLevel, expan
 function NoteMenuButton(props: {notePath: string}) {
     const openMenu = useCallback((e: TargetedMouseEvent<HTMLElement>) => {
         linkContextMenuService.openContextMenu(props.notePath, e);
-        e.stopPropagation()
+        e.stopPropagation();
     }, [props.notePath]);
 
     return  <ActionButton className="note-book-item-menu"
-                          icon="bx bx-dots-vertical-rounded" text=""
-                          onClick={openMenu} 
-            />
+        icon="bx bx-dots-vertical-rounded" text=""
+        onClick={openMenu}
+    />;
 }
 
 function getNotePath(parentNote: FNote, childNote: FNote) {
@@ -315,7 +316,7 @@ function useExpansionDepth(note: FNote) {
 
 function onContentResized(entries: ResizeObserverEntry[], observer: ResizeObserver): void {
     for (const contentElement of entries) {
-        const isOverflowing = ((contentElement.target.scrollHeight > contentElement.target.clientHeight))
+        const isOverflowing = ((contentElement.target.scrollHeight > contentElement.target.clientHeight));
         contentElement.target.classList.toggle("note-book-content-overflowing", isOverflowing);
     }
-}
+}

apps/client/src/widgets/type_widgets/file/MediaPlayer.css

@@ -50,13 +50,21 @@
         }
     }
 
-    .media-volume-row {
+    .media-volume-dropdown-content {
         display: flex;
         align-items: center;
         gap: 0.25em;
+        padding: 0.5em;
+
+        .volume-mute-btn {
+            padding: 0.25em;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
 
         .media-volume-slider {
-            width: 80px;
+            width: 100px;
             cursor: pointer;
         }
     }

apps/client/src/widgets/type_widgets/file/MediaPlayer.tsx

@@ -102,30 +102,47 @@ export function VolumeControl({ mediaRef }: { mediaRef: RefObject<HTMLVideoEleme
         }
     };
 
-    const toggleMute = () => {
+    const toggleMute = (e: MouseEvent) => {
+        e.stopPropagation();
         const media = mediaRef.current;
         if (!media) return;
         media.muted = !media.muted;
         setMuted(media.muted);
     };
 
+    const volumeIcon = muted || volume === 0
+        ? "bx bx-volume-mute"
+        : volume < 0.5
+            ? "bx bx-volume-low"
+            : "bx bx-volume-full";
+
     return (
-        <div class="media-volume-row">
-            <ActionButton
-                icon={muted || volume === 0 ? "bx bx-volume-mute" : volume < 0.5 ? "bx bx-volume-low" : "bx bx-volume-full"}
-                text={muted ? t("media.unmute") : t("media.mute")}
-                onClick={toggleMute}
-            />
-            <input
-                type="range"
-                class="media-volume-slider"
-                min={0}
-                max={1}
-                step={0.05}
-                value={muted ? 0 : volume}
-                onInput={onVolumeChange}
-            />
-        </div>
+        <Dropdown
+            iconAction
+            hideToggleArrow
+            buttonClassName="volume-dropdown"
+            text={<Icon icon={volumeIcon} />}
+            title={t("media.volume")}
+        >
+            <li class="media-volume-dropdown-content">
+                <button
+                    class="dropdown-item volume-mute-btn"
+                    onClick={toggleMute}
+                    title={muted ? t("media.unmute") : t("media.mute")}
+                >
+                    <Icon icon={volumeIcon} />
+                </button>
+                <input
+                    type="range"
+                    class="media-volume-slider"
+                    min={0}
+                    max={1}
+                    step={0.05}
+                    value={muted ? 0 : volume}
+                    onInput={onVolumeChange}
+                />
+            </li>
+        </Dropdown>
     );
 }
 

apps/client/src/widgets/type_widgets/file/Video.css

@@ -1,8 +1,8 @@
-.note-detail-file > .video-preview-wrapper {
+.video-preview-wrapper {
     width: 100%;
     height: 100%;
     position: relative;
-    background-color: black;    
+    background-color: black;
 
     .video-preview {
         background-color: black;

apps/client/src/widgets/type_widgets/file/Video.tsx

@@ -7,19 +7,29 @@ import FNote from "../../../entities/fnote";
 import { t } from "../../../services/i18n";
 import { getUrlForDownload } from "../../../services/open";
 import ActionButton from "../../react/ActionButton";
+import Dropdown from "../../react/Dropdown";
+import { FormListHeader, FormListItem } from "../../react/FormList";
+import Icon from "../../react/Icon";
 import NoItems from "../../react/NoItems";
-import { LoopButton, PlaybackSpeed, PlayPauseButton, SeekBar, SkipButton, VolumeControl } from "./MediaPlayer";
+import { PlayPauseButton, SeekBar, SkipButton, VolumeControl } from "./MediaPlayer";
 
 const AUTO_HIDE_DELAY = 3000;
 
 export default function VideoPreview({ note }: { note: FNote }) {
+    return <VideoPreviewContent
+        url={getUrlForDownload(`api/notes/${note.noteId}/open-partial`)}
+        mime={note.mime}
+    />;
+}
+
+export function VideoPreviewContent({ url, mime }: { url: string, mime: string }) {
     const wrapperRef = useRef<HTMLDivElement>(null);
     const videoRef = useRef<HTMLVideoElement>(null);
     const [playing, setPlaying] = useState(false);
     const [error, setError] = useState(false);
     const { visible: controlsVisible, onMouseMove, flash: flashControls } = useAutoHideControls(videoRef, playing);
 
-    useEffect(() => setError(false), [note.noteId]);
+    useEffect(() => setError(false), [ url ]);
     const onError = useCallback(() => setError(true), []);
 
     const togglePlayback = useCallback(() => {
@@ -33,6 +43,7 @@ export default function VideoPreview({ note }: { note: FNote }) {
     }, []);
 
     const onVideoClick = useCallback((e: MouseEvent) => {
+        e.stopPropagation();
         if ((e.target as HTMLElement).closest(".media-preview-controls")) return;
         togglePlayback();
     }, [togglePlayback]);
@@ -40,7 +51,7 @@ export default function VideoPreview({ note }: { note: FNote }) {
     const onKeyDown = useKeyboardShortcuts(videoRef, wrapperRef, togglePlayback, flashControls);
 
     if (error) {
-        return <NoItems icon="bx bx-video-off" text={t("media.unsupported-format", { mime: note.mime.replace("/", "-") })} />;
+        return <NoItems icon="bx bx-video-off" text={t("media.unsupported-format", { mime: mime.replace("/", "-") })} />;
     }
 
     return (
@@ -48,8 +59,8 @@ export default function VideoPreview({ note }: { note: FNote }) {
             <video
                 ref={videoRef}
                 class="video-preview"
-                src={getUrlForDownload(`api/notes/${note.noteId}/open-partial`)}
-                datatype={note?.mime}
+                src={url}
+                datatype={mime}
                 onPlay={() => setPlaying(true)}
                 onPause={() => setPlaying(false)}
                 onError={onError}
@@ -59,19 +70,17 @@ export default function VideoPreview({ note }: { note: FNote }) {
                 <SeekBar mediaRef={videoRef} />
                 <div class="media-buttons-row">
                     <div className="left">
-                        <PlaybackSpeed mediaRef={videoRef} />
-                        <RotateButton videoRef={videoRef} />
+                        <OverflowMenu videoRef={videoRef} />
                     </div>
                     <div className="center">
                         <div className="spacer" />
                         <SkipButton mediaRef={videoRef} seconds={-10} icon="bx bx-rewind" text={t("media.back-10s")} />
                         <PlayPauseButton playing={playing} togglePlayback={togglePlayback} />
                         <SkipButton mediaRef={videoRef} seconds={30} icon="bx bx-fast-forward" text={t("media.forward-30s")} />
-                        <LoopButton mediaRef={videoRef} />
+                        <div className="spacer" />
                     </div>
                     <div className="right">
                         <VolumeControl mediaRef={videoRef} />
-                        <ZoomToFitButton videoRef={videoRef} />
                         <PictureInPictureButton videoRef={videoRef} />
                         <FullscreenButton targetRef={wrapperRef} />
                     </div>
@@ -171,8 +180,49 @@ function useAutoHideControls(videoRef: RefObject<HTMLVideoElement>, playing: boo
     return { visible, onMouseMove, flash: onMouseMove };
 }
 
-function RotateButton({ videoRef }: { videoRef: RefObject<HTMLVideoElement> }) {
+const PLAYBACK_SPEEDS = [0.5, 1, 1.25, 1.5, 2];
+
+function OverflowMenu({ videoRef }: { videoRef: RefObject<HTMLVideoElement> }) {
+    const [speed, setSpeed] = useState(() => videoRef.current?.playbackRate ?? 1);
+    const [loop, setLoop] = useState(() => videoRef.current?.loop ?? false);
     const [rotation, setRotation] = useState(0);
+    const [fitted, setFitted] = useState(false);
+
+    // Sync playback rate
+    useEffect(() => {
+        const video = videoRef.current;
+        if (!video) return;
+
+        setSpeed(video.playbackRate);
+        const onRateChange = () => setSpeed(video.playbackRate);
+        video.addEventListener("ratechange", onRateChange);
+        return () => video.removeEventListener("ratechange", onRateChange);
+    }, [videoRef]);
+
+    // Sync loop state
+    useEffect(() => {
+        const video = videoRef.current;
+        if (!video) return;
+        setLoop(video.loop);
+
+        const observer = new MutationObserver(() => setLoop(video.loop));
+        observer.observe(video, { attributes: true, attributeFilter: ["loop"] });
+        return () => observer.disconnect();
+    }, [videoRef]);
+
+    const selectSpeed = (rate: number) => {
+        const video = videoRef.current;
+        if (!video) return;
+        video.playbackRate = rate;
+        setSpeed(rate);
+    };
+
+    const toggleLoop = () => {
+        const video = videoRef.current;
+        if (!video) return;
+        video.loop = !video.loop;
+        setLoop(video.loop);
+    };
 
     const rotate = () => {
         const video = videoRef.current;
@@ -182,7 +232,6 @@ function RotateButton({ videoRef }: { videoRef: RefObject<HTMLVideoElement> }) {
 
         const isSideways = next === 90 || next === 270;
         if (isSideways) {
-            // Scale down so the rotated video fits within its container.
             const container = video.parentElement;
             if (container) {
                 const ratio = container.clientWidth / container.clientHeight;
@@ -195,19 +244,7 @@ function RotateButton({ videoRef }: { videoRef: RefObject<HTMLVideoElement> }) {
         }
     };
 
-    return (
-        <ActionButton
-            icon="bx bx-rotate-right"
-            text={t("media.rotate")}
-            onClick={rotate}
-        />
-    );
-}
-
-function ZoomToFitButton({ videoRef }: { videoRef: RefObject<HTMLVideoElement> }) {
-    const [fitted, setFitted] = useState(false);
-
-    const toggle = () => {
+    const toggleFit = () => {
         const video = videoRef.current;
         if (!video) return;
         const next = !fitted;
@@ -216,12 +253,50 @@ function ZoomToFitButton({ videoRef }: { videoRef: RefObject<HTMLVideoElement> }
     };
 
     return (
-        <ActionButton
-            className={fitted ? "active" : ""}
-            icon={fitted ? "bx bx-collapse" : "bx bx-expand"}
-            text={fitted ? t("media.zoom-reset") : t("media.zoom-to-fit")}
-            onClick={toggle}
-        />
+        <Dropdown
+            iconAction
+            hideToggleArrow
+            noSelectButtonStyle
+            noDropdownListStyle
+            mobileBackdrop
+            buttonClassName="overflow-menu-dropdown"
+            dropdownContainerClassName="mobile-bottom-menu"
+            text={<Icon icon="bx bx-dots-horizontal-rounded" />}
+            title={t("media.more-options")}
+        >
+            <FormListHeader text={t("media.playback-speed")} />
+            {PLAYBACK_SPEEDS.map((rate) => (
+                <FormListItem
+                    key={rate}
+                    icon={rate === speed ? "bx bx-check" : "bx bx-empty"}
+                    active={rate === speed}
+                    onClick={() => selectSpeed(rate)}
+                >
+                    {rate}x
+                </FormListItem>
+            ))}
+            <li class="dropdown-divider" />
+            <FormListItem
+                icon="bx bx-rotate-right"
+                onClick={rotate}
+            >
+                {t("media.rotate")}
+            </FormListItem>
+            <FormListItem
+                icon={loop ? "bx bx-check" : "bx bx-repeat"}
+                active={loop}
+                onClick={toggleLoop}
+            >
+                {loop ? t("media.disable-loop") : t("media.loop")}
+            </FormListItem>
+            <FormListItem
+                icon={fitted ? "bx bx-collapse" : "bx bx-expand"}
+                active={fitted}
+                onClick={toggleFit}
+            >
+                {fitted ? t("media.zoom-reset") : t("media.zoom-to-fit")}
+            </FormListItem>
+        </Dropdown>
     );
 }