Skip to content

Build your personal knowledge base with Trilium Notes

feat(media): draw the play mode and speed lists as menus

Elian Doran4c877bc49227
diff --git a/apps/client/src/widgets/type_widgets/file/MediaPlayer.css b/apps/client/src/widgets/type_widgets/file/MediaPlayer.css
index 30e89f8d04..7fd34dbe66 100644
--- a/apps/client/src/widgets/type_widgets/file/MediaPlayer.css
+++ b/apps/client/src/widgets/type_widgets/file/MediaPlayer.css
@@ -83,19 +83,6 @@
}
}
-.play-mode-dropdown {
- .dropdown-item {
- display: flex;
- align-items: center;
- gap: 0.6em;
- }
-
- /* Pushes the checkmark of the current mode to the trailing edge of the item. */
- .play-mode-check {
- margin-left: auto;
- }
-}
-
.audio-preview-wrapper {
width: 100%;
height: 100%;
diff --git a/apps/client/src/widgets/type_widgets/file/MediaPlayer.spec.tsx b/apps/client/src/widgets/type_widgets/file/MediaPlayer.spec.tsx
index 7afb62f34e..7b39dcdf6b 100644
--- a/apps/client/src/widgets/type_widgets/file/MediaPlayer.spec.tsx
+++ b/apps/client/src/widgets/type_widgets/file/MediaPlayer.spec.tsx
@@ -264,7 +264,9 @@ describe("PlaybackSpeed", () => {
openDropdown();
expect(items().map(el => el.textContent)).toEqual([ "0.5x", "1x", "1.25x", "1.5x", "2x" ]);
- expect(items().find(el => el.classList.contains("active"))?.textContent).toBe("1.5x");
+ const checked = items().filter(el => el.getAttribute("aria-checked") === "true");
+ expect(checked.map(el => el.textContent)).toEqual([ "1.5x" ]);
+ expect(checked[0].querySelector(".bx-check")).not.toBeNull();
expect(container.querySelector(".media-speed-label")?.textContent).toBe("1.5x");
});
@@ -278,6 +280,7 @@ describe("PlaybackSpeed", () => {
click(items().find(el => el.textContent === "2x"));
expect(media.playbackRate).toBe(2);
expect(container.querySelector(".media-speed-label")?.textContent).toBe("2x");
+ expect(document.querySelector("[role=menu]")).toBeNull();
act(() => {
media.playbackRate = 0.5;
@@ -329,14 +332,16 @@ describe("PlayModeButton", () => {
act(() => render(<PlayModeButton mode="loop" onSelectMode={onSelectMode} />, container));
openDropdown();
- const items = Array.from(document.querySelectorAll(".dropdown-item"));
+ const items = Array.from(document.querySelectorAll("[role=menu] [role=menuitem]"));
expect(items).toHaveLength(3);
- const active = items.find(el => el.classList.contains("active"));
- expect(active?.querySelector(".bx-repeat")).not.toBeNull();
- expect(active?.querySelector(".play-mode-check")).not.toBeNull();
+ // The mode's own icon stays, and the tick goes at the end of its row.
+ const ticked = items.filter(el => el.querySelector(".menu-trailing-icon.bx-check"));
+ expect(ticked).toHaveLength(1);
+ expect(ticked[0].querySelector(".bx-repeat")).not.toBeNull();
click(items[2]);
expect(onSelectMode).toHaveBeenCalledWith("next");
+ expect(document.querySelector("[role=menu]")).toBeNull();
});
});
diff --git a/apps/client/src/widgets/type_widgets/file/MediaPlayer.tsx b/apps/client/src/widgets/type_widgets/file/MediaPlayer.tsx
index b63631250b..deac90e882 100644
--- a/apps/client/src/widgets/type_widgets/file/MediaPlayer.tsx
+++ b/apps/client/src/widgets/type_widgets/file/MediaPlayer.tsx
@@ -16,6 +16,7 @@ import { isMobile } from "../../../services/utils";
import { logError } from "../../../services/ws";
import ActionButton from "../../react/ActionButton";
import Dropdown from "../../react/Dropdown";
+import { FormListItem } from "../../react/FormList";
import { useContextualShortcutHints, useTriliumEvent, useTriliumEvents } from "../../react/hooks";
import Icon from "../../react/Icon";
import { getParentFromNotePath } from "../../react/sibling_navigation";
@@ -589,7 +590,6 @@ export function useMediaPlayMode(noteContext: NoteContext | undefined, mediaRef:
export function PlayModeButton({ mode, onSelectMode }: { mode: MediaPlayMode, onSelectMode: (mode: MediaPlayMode) => void }) {
return (
<Dropdown
- panel
iconAction
hideToggleArrow
className="play-mode-dropdown"
@@ -597,17 +597,14 @@ export function PlayModeButton({ mode, onSelectMode }: { mode: MediaPlayMode, on
title={t("media.play-mode-title", { mode: t(MEDIA_PLAY_MODE_LABEL_KEYS[mode]) })}
>
{MEDIA_PLAY_MODES.map((candidate) => (
- <li key={candidate}>
- <button
- type="button"
- class={`dropdown-item ${candidate === mode ? "active" : ""}`}
- onClick={() => onSelectMode(candidate)}
- >
- <Icon icon={MEDIA_PLAY_MODE_ICONS[candidate]} />
- <span class="play-mode-name">{t(MEDIA_PLAY_MODE_LABEL_KEYS[candidate])}</span>
- {candidate === mode && <Icon icon="bx bx-check" className="play-mode-check" />}
- </button>
- </li>
+ <FormListItem
+ key={candidate}
+ icon={MEDIA_PLAY_MODE_ICONS[candidate]}
+ trailingIcon={candidate === mode ? "bx bx-check" : undefined}
+ onClick={() => onSelectMode(candidate)}
+ >
+ {t(MEDIA_PLAY_MODE_LABEL_KEYS[candidate])}
+ </FormListItem>
))}
</Dropdown>
);
@@ -638,7 +635,6 @@ export function PlaybackSpeed({ mediaRef }: { mediaRef: RefObject<HTMLVideoEleme
return (
<Dropdown
- panel
iconAction
hideToggleArrow
buttonClassName="speed-dropdown"
@@ -649,14 +645,14 @@ export function PlaybackSpeed({ mediaRef }: { mediaRef: RefObject<HTMLVideoEleme
title={t("media.playback-speed")}
>
{PLAYBACK_SPEEDS.map((rate) => (
- <li key={rate}>
- <button
- class={`dropdown-item ${rate === speed ? "active" : ""}`}
- onClick={() => selectSpeed(rate)}
- >
- {rate}x
- </button>
- </li>
+ <FormListItem
+ key={rate}
+ checkable
+ checked={rate === speed}
+ onClick={() => selectSpeed(rate)}
+ >
+ {rate}x
+ </FormListItem>
))}
</Dropdown>
);