@bbki.ng/site 5.0.4 → 5.0.5

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @bbki.ng/site
 
+## 5.0.5
+
 ## 5.0.4
 
 ## 5.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "type": "module",

package/src/blog/components/article/index.tsx

@@ -20,7 +20,6 @@ export type ArticlePageProps = {
 export const ArticlePage = (props: ArticlePageProps) => {
   const { tags: tagNames, title, description, headless } = props;
   const navgation = useNavigate();
-  const loading = useSafeArticleLoading(0.2, 5);
   // const defaultTag = { children: "目录", to: "/blog" };
   const allTags = tagNames
     ? tagNames.map((t) => ({ children: t, to: `${ROUTES.TAGS}/${t}` }))
@@ -41,7 +40,7 @@ export const ArticlePage = (props: ArticlePageProps) => {
         date={props.date}
         description={description}
         className={`${props.className} mb-128`}
-        loading={loading}
+        loading={false}
       >
         <article className={articleCls}>{props.children}</article>
         <div className="relative left-[-4px]">

package/src/blog/components/article_ctx_menu/index.tsx

@@ -44,7 +44,7 @@ export const ArticleCtxMenu = (props: { children: ReactElement }) => {
   return (
     <ContextMenu>
       <ContextMenuTrigger>{props.children}</ContextMenuTrigger>
-      <ContextMenuContent className="w-lg">
+      <ContextMenuContent>
         <ContextMenuItem
           onClick={() => {
             confirm("确认删除？", doDel);

package/src/blog/hooks/use_font_loading.ts

@@ -3,7 +3,7 @@ import { changeFont } from "@/utils";
 import { FontType } from "@/types/font";
 
 export const useFontLoading = () => {
-  const [isFontLoading, setIsFontLoading] = useState(true);
+  const [isFontLoading, setIsFontLoading] = useState(false);
 
   const handleFontLoading = () => {
     setIsFontLoading(true);
@@ -13,9 +13,9 @@ export const useFontLoading = () => {
   };
 
   const handleFontLoadingDone = () => {
-    setTimeout(() => {
-      setIsFontLoading(false);
-    }, 500);
+    setIsFontLoading(false);
+    // setTimeout(() => {
+    // }, 500);
   };
 
   const handleFontLoadingError = () => {

package/src/blog/pages/extensions/txt/index.tsx

@@ -5,7 +5,6 @@ import { usePosts } from "@/hooks/use_posts";
 import { CenterLinkList } from "@/components";
 import { useAuthed } from "@/hooks/use_authed";
 import { useFile2Post } from "@/hooks/use_file_to_post";
-import { useSafeArticleLoading } from "@/hooks/use_safe_loading";
 import { useClipboardToPost } from "@/hooks/use_clipboard_to_post";
 import { useLocation } from "react-router-dom";
 import {
@@ -21,8 +20,6 @@ type TxtProps = {
 const Posts = (props: TxtProps) => {
   const { titleList, isLoading, isError } = usePosts();
 
-  const isGlobalLoading = useSafeArticleLoading(0.2, 5);
-
   useBlogScrollRestoration();
 
   const { gotoTop } = useBlogScroll();
@@ -40,7 +37,7 @@ const Posts = (props: TxtProps) => {
   return (
     <CenterLinkList
       links={props.articleList || links}
-      loading={isGlobalLoading}
+      loading={isLoading}
       footer={
         <Button onClick={gotoTop} className="mt-128">
           <svg

package/src/blog/hooks/use_safe_loading.ts

@@ -1,29 +0,0 @@
-import React, { useContext, useEffect } from "react";
-import { GlobalLoadingContext } from "@/context/global_loading_state_provider";
-
-export const useSafeArticleLoading = (safeSec: number, timeOutSec: number) => {
-  const { isLoading, isFontLoading } = useContext(GlobalLoadingContext);
-  const [isArticleLoading, setIsArticleLoading] = React.useState(true);
-  const [isTimeout, setIsTimeout] = React.useState(false);
-
-  useEffect(() => {
-    const id = setTimeout(() => {
-      setIsArticleLoading(false);
-    }, safeSec * 1000);
-
-    const timeoutId = setTimeout(() => {
-      setIsTimeout(true);
-    }, timeOutSec * 1000);
-
-    return () => {
-      clearTimeout(id);
-      clearTimeout(timeoutId);
-    };
-  }, []);
-
-  if (isTimeout) {
-    return false;
-  }
-
-  return isFontLoading || isArticleLoading;
-};