Merge branch 'main' of https://gitea.easonabc.eu.org/eason/novel-tran…

…slate

components/novel/NovelList.tsx

@@ -1,7 +1,6 @@
 import { Partial } from "$fresh/runtime.ts";
 import { Article, State as ArticleState } from "../../entity/article.ts";
 import StartButton from "../../islands/StartButton.tsx";
-import ScrollView from "../../islands/ScrollView.tsx";
 
 function extractNumber(str: string): number[] {
   const digitPattern = /[０-９0-9〇一二三四五六七八九]+/g;
@@ -78,7 +77,7 @@ function longestIncreasingSubsequence(sec: number[]): number[] {
 }
 
 export default function NovelList(
-  { articles, focus }: { articles: Article[]; focus?: boolean },
+  { articles }: { articles: Article[] },
 ) {
   articles.sort((a, b) => (a.index as number) - (b.index as number));
 
@@ -88,7 +87,7 @@ export default function NovelList(
   const addIndex = longestIncreasingSubsequence(numberSeq).length * 1.5 <
     Math.max(numberSeq.length, articles.length);
 
-  const list = articles.map((article, sec) => {
+  const list = articles.map((article) => {
     let state;
     switch (article.state as ArticleState) {
       case "unfetch":
@@ -108,7 +107,6 @@ export default function NovelList(
         key={`frag-novel-list-${index}`}
         class="block p-3 rounded-lg bg-blue-500 hover:bg-blue-600 dark:bg-slate-200 text-white dark:text-black shadow transition duration-300"
       >
-        {(sec === 0 && focus) && <ScrollView />}
         <div class="flex justify-between items-center tracking-tight text-2xl px-2 overflow-hidden">
           <a
             href={"/article/" + article.id}
@@ -134,4 +132,3 @@ export default function NovelList(
     </ul>
   );
 }
-// flex justify-between items-center font-semibold tracking-tight text-2xl mb-2

components/novel/NovelLoad.tsx

@@ -7,13 +7,22 @@ export default function NovelLoad({ page, novelId }: {
   return (
     <Partial name="novel-load">
       <div class="mt-6 text-center">
-        <a
+        <noscript>
+          <a
+            href={`/novel/${novelId}/${page + 1}`}
+            f-partial={`/partial/novel/${novelId}/${page + 1}`}
+            class="text-xl px-12 py-3 bg-blue-500 hover:bg-blue-600 dark:bg-slate-200 disabled:hidden text-white dark:text-black font-semibold rounded-lg shadow transition duration-300"
+          >
+            Load More
+          </a>
+        </noscript>
+        <button
           href={`/novel/${novelId}/${page + 1}`}
           f-partial={`/partial/novel/${novelId}/${page + 1}`}
-          class="text-xl px-12 py-3 bg-blue-500 hover:bg-blue-600 dark:bg-slate-200 disabled:hidden text-white dark:text-black font-semibold rounded-lg shadow transition duration-300"
+          class="jsonly text-xl px-12 py-3 bg-blue-500 hover:bg-blue-600 dark:bg-slate-200 disabled:hidden text-white dark:text-black font-semibold rounded-lg shadow transition duration-300"
         >
           Load More
-        </a>
+        </button>
       </div>
     </Partial>
   );

deno.json

@@ -5,7 +5,7 @@
     "cli": "echo \"import '\\$fresh/src/dev/cli.ts'\" | deno run --unstable -A -",
     "manifest": "deno task cli manifest $(pwd)",
     "start": "deno run -A --unstable-ffi --watch=static/,routes/ dev.ts",
-    "build": "deno run -A dev.ts build",
+    "build": "deno run -A --unstable-ffi dev.ts build",
     "preview": "deno run -A main.ts",
     "update": "deno run -A -r https://fresh.deno.dev/update .",
     "test": "deno test -A"

fresh.gen.ts

@@ -13,7 +13,6 @@ import * as $novel_id_page_ from "./routes/novel/[id]/[[page]].tsx";
 import * as $partial_novel_id_page_ from "./routes/partial/novel/[id]/[page].tsx";
 import * as $unsupported from "./routes/unsupported.tsx";
 import * as $HistoryEntry from "./islands/HistoryEntry.tsx";
-import * as $ScrollView from "./islands/ScrollView.tsx";
 import * as $StartButton from "./islands/StartButton.tsx";
 import type { Manifest } from "$fresh/server.ts";
 
@@ -32,7 +31,6 @@ const manifest = {
   },
   islands: {
     "./islands/HistoryEntry.tsx": $HistoryEntry,
-    "./islands/ScrollView.tsx": $ScrollView,
     "./islands/StartButton.tsx": $StartButton,
   },
   baseUrl: import.meta.url,

routes/partial/novel/[id]/[page].tsx

@@ -24,7 +24,7 @@ export default async function NovelPage(_: Request, ctx: RouteContext) {
 
   return (
     <>
-      <NovelList articles={articles} focus />
+      <NovelList articles={articles} />
       {(articles.length < pageSize)
         ? <Partial name="novel-load" />
         : <NovelLoad novelId={novelId} page={pageNumber} />}