From 005a6718f4e2a96bfd660f2033e26def097a7d29 Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Fri, 6 Jan 2023 15:16:24 +0100 Subject: [PATCH] feat: keyboard navigation --- package.json | 2 +- src/index.js | 18 ++- src/renderer/src/App.svelte | 58 ++++---- src/renderer/src/lib/Home/Cards.svelte | 12 +- src/renderer/src/lib/Home/Gallery.svelte | 22 ++-- src/renderer/src/lib/Home/Search.svelte | 124 ++++++++++-------- src/renderer/src/lib/Home/Section.svelte | 6 +- src/renderer/src/lib/RSSView.svelte | 12 +- src/renderer/src/lib/Sidebar.svelte | 4 + .../src/lib/ViewAnime/Controls.svelte | 10 +- .../src/lib/ViewAnime/ViewAnime.svelte | 27 +++- .../src/lib/ViewAnime/ViewTrailer.svelte | 28 ++-- src/renderer/src/modules/util.js | 6 + 13 files changed, 197 insertions(+), 132 deletions(-) diff --git a/package.json b/package.json index 3d5f61b..6bb44e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "3.5.4", + "version": "3.5.5", "author": "ThaUnknown_ ", "description": "Stream anime torrents, real-time with no waiting for downloads.", "main": "src/index.js", diff --git a/src/index.js b/src/index.js index 0e6c5ff..dfabe28 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,19 @@ const { Client } = require('discord-rpc') const log = require('electron-log') const { autoUpdater } = require('electron-updater') +const flags = [ + ['enable-gpu-rasterization'], + ['enable-zero-copy'], + ['ignore-gpu-blocklist'], + ['enable-hardware-overlays', 'single-fullscreen,single-on-top,underlay'], + ['enable-features', 'EnableDrDc,CanvasOopRasterization,BackForwardCache:TimeToLiveInBackForwardCacheInSeconds/300/should_ignore_blocklists/true/enable_same_site/true,ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes,UseSkiaRenderer,WebAssemblyLazyCompilationEnableDrDc,CanvasOopRasterization,BackForwardCache:TimeToLiveInBackForwardCacheInSeconds/300/should_ignore_blocklists/true/enable_same_site/true,ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes,UseSkiaRenderer,WebAssemblyLazyCompilation'], + ['force_high_performance_gpu'], + ['disable-features', 'Vulkan'] +] +for (const [flag, value] of flags) { + app.commandLine.appendSwitch(flag, value) +} + if (process.defaultApp) { if (process.argv.length >= 2) { app.setAsDefaultProtocolClient('miru', process.execPath, [path.resolve(process.argv[1])]) @@ -255,12 +268,7 @@ discord.on('ready', async () => { discord.subscribe('ACTIVITY_JOIN') discord.subscribe('ACTIVITY_SPECTATE') }) -discord.on('ACTIVITY_JOIN_REQUEST', console.log) -discord.on('ACTIVITY_SPECTATE', console.log) discord.on('ACTIVITY_JOIN', (args) => { - console.log('ACTIVITY_JOIN') - console.log(args) - console.log('------') BrowserWindow.getAllWindows()[0]?.send('w2glink', args.secret) }) diff --git a/src/renderer/src/App.svelte b/src/renderer/src/App.svelte index a14fbc8..e617886 100644 --- a/src/renderer/src/App.svelte +++ b/src/renderer/src/App.svelte @@ -1,36 +1,37 @@ @@ -39,7 +40,10 @@ setContext('trailer', writable(null))
-
($sidebar = !$sidebar)} /> +
($sidebar = !$sidebar)} on:keydown={wrapEnter(() => ($sidebar = !$sidebar))} + tabindex='0' + role='button' /> @@ -82,6 +86,10 @@ setContext('trailer', writable(null)) filter: invert(0.84); padding-top: 2rem; } + :global(*:focus-visible){ + outline: none; + box-shadow: var(--dm-button-primary-box-shadow-focus) !important; + } :global(.root) { animation: 0.3s ease 0s 1 root-load-in; diff --git a/src/renderer/src/lib/Home/Cards.svelte b/src/renderer/src/lib/Home/Cards.svelte index 6ff68e6..23da233 100644 --- a/src/renderer/src/lib/Home/Cards.svelte +++ b/src/renderer/src/lib/Home/Cards.svelte @@ -1,5 +1,5 @@ {#await cards} @@ -27,7 +28,7 @@ {#if typeof card === 'string'}
{card}
{:else if !card.media} -
+
@@ -38,7 +39,12 @@
{:else} -
viewMedia(card.media))} style:--color={card.media.coverImage.color || '#1890ff'} title={card.parseObject?.file_name}> +
viewMedia(card.media))} + on:keydown={wrapEnter(card.onclick || (() => viewMedia(card.media)))} + tabindex={tabable ? 0 : null} role='button' + style:--color={card.media.coverImage.color || '#1890ff'} + title={card.parseObject?.file_name}>
cover diff --git a/src/renderer/src/lib/Home/Gallery.svelte b/src/renderer/src/lib/Home/Gallery.svelte index 0723fd2..a4e6c9d 100644 --- a/src/renderer/src/lib/Home/Gallery.svelte +++ b/src/renderer/src/lib/Home/Gallery.svelte @@ -1,20 +1,20 @@
{#each media as cards, i (i)} - + {/each}
diff --git a/src/renderer/src/lib/Home/Search.svelte b/src/renderer/src/lib/Home/Search.svelte index 7da6520..a810b95 100644 --- a/src/renderer/src/lib/Home/Search.svelte +++ b/src/renderer/src/lib/Home/Search.svelte @@ -72,7 +72,7 @@ bind:this={searchTextInput} autofocus type='search' - class='form-control bg-dark border-left-0 shadow-none text-capitalize' + class='form-control bg-dark border-left-0 text-capitalize' autocomplete='off' bind:value={search.search} data-option='search' @@ -84,27 +84,29 @@
theater_comedy
Genre
- +
+ +
@@ -112,14 +114,14 @@ Season
- - + {#each Array(new Date().getFullYear() - 1940 + 2) as _, i} {@const year = new Date().getFullYear() + 2 - i} @@ -133,54 +135,64 @@
monitor
Format
- +
+ +
live_tv
Status
- +
+ +
sort
Sort
- +
+ +
- +
+ +
- +
+ +
@@ -200,7 +212,7 @@ .bg-dark::-webkit-inner-spin-button { filter: invert(0.942); } - :global(input:invalid) { + input:not(:focus):invalid { box-shadow: 0 0 0 0.2rem var(--danger-color) !important; } select.form-control:invalid { diff --git a/src/renderer/src/lib/Home/Section.svelte b/src/renderer/src/lib/Home/Section.svelte index d897806..9abce4a 100644 --- a/src/renderer/src/lib/Home/Section.svelte +++ b/src/renderer/src/lib/Home/Section.svelte @@ -1,10 +1,14 @@ - +
{opts.title}
View More
 diff --git a/src/renderer/src/lib/RSSView.svelte b/src/renderer/src/lib/RSSView.svelte index 2d0b59f..db827b8 100644 --- a/src/renderer/src/lib/RSSView.svelte +++ b/src/renderer/src/lib/RSSView.svelte @@ -1,5 +1,5 @@ -