chore: stash updates

src/common/hook/useMessageFeed.js

@@ -1,7 +1,8 @@
 import { useEffect, useState, useRef } from "react";
 import { useSelector } from "react-redux";
 const getFeedWithPagination = (config) => {
-  const { pageNumber = 1, pageSize = 20, mids = [] } = config || {};
+  const { pageNumber = 1, pageSize = 10, mids = [], isLast = false } =
+    config || {};
   const shadowMids = mids.slice(0);
 
   if (shadowMids.length == 0)
@@ -12,30 +13,27 @@ const getFeedWithPagination = (config) => {
       ids: [],
     };
   shadowMids.sort((a, b) => {
-    return Number(b) - Number(a);
+    return Number(a) - Number(b);
   });
   console.log("message pagination", shadowMids);
   const pageCount = Math.ceil(shadowMids.length / pageSize);
+  const computedPageNumber = isLast ? pageCount : pageNumber;
   const ids = shadowMids.slice(
-    (pageNumber - 1) * pageSize,
-    pageNumber * pageSize
+    (computedPageNumber - 1) * pageSize,
+    computedPageNumber * pageSize
   );
-  const info = {
-    isFirst: pageNumber == 1,
-    isLast: pageNumber == pageCount,
+  return {
     pageCount,
     pageSize,
-    pageNumber,
+    pageNumber: computedPageNumber,
     ids,
   };
-  console.log("get page Info", info);
-  return info;
 };
 export default function useMessageFeed({ context = "channel", id = null }) {
   const listRef = useRef([]);
   const pageRef = useRef(null);
   const [hasMore, setHasMore] = useState(true);
-  // const [appends, setAppends] = useState([]);
+  const [appends, setAppends] = useState([]);
   const [items, setItems] = useState([]);
   const { mids, messageData } = useSelector((store) => {
     return {
@@ -51,72 +49,46 @@ export default function useMessageFeed({ context = "channel", id = null }) {
     pageRef.current = [];
     setItems([]);
     setHasMore(true);
-    // setAppends([]);
+    setAppends([]);
   }, [context, id]);
-  // useEffect(() => {
-  //   if (appends.length) {
-  //     const feedsWrapperEle = document.querySelector(
-  //       `#RUSTCHAT_FEED_${context}_${id}`
-  //     );
-  //     if (feedsWrapperEle) {
-  //       feedsWrapperEle.scrollTop = feedsWrapperEle.scrollHeight;
-  //     }
-  //   }
-  // }, [appends, context, id]);
   useEffect(() => {
-    const container = document.querySelector("#ScrollFeedWrapper");
-    const handler = (e) => {
-      e.preventDefault();
-      var n = 0;
-      if ("deltaY" in e) n = 1 === e.deltaMode ? 20 * -e.deltaY : -e.deltaY;
-      else if ("wheelDeltaY" in e) n = (e.wheelDeltaY / 120) * 20;
-      else if ("wheelDelta" in e) n = (e.wheelDelta / 120) * 20;
-      else {
-        // if (!("detail"in e))
-        //     return void a.v(e, "invalid wheel event: ");
-        n = (-e.detail / 3) * 20;
+    if (appends.length) {
+      const feedsWrapperEle = document.querySelector(
+        `#RUSTCHAT_FEED_${context}_${id}`
+      );
+      if (feedsWrapperEle) {
+        feedsWrapperEle.scrollTop = feedsWrapperEle.scrollHeight;
       }
-      container.scrollTop += n;
-    };
-    if (container) {
-      container.addEventListener("wheel", handler);
     }
-    return () => {
-      if (container) {
-        container.removeEventListener("wheel", handler);
-      }
-    };
-  }, []);
-
+  }, [appends, context, id]);
   useEffect(() => {
     if (listRef.current.length == 0) {
       //   初次
-      const pageInfo = getFeedWithPagination({ mids });
-      console.log("pull down 2", pageInfo);
+      const pageInfo = getFeedWithPagination({ mids, isLast: true });
+      console.log("pull up 2", pageInfo);
       pageRef.current = pageInfo;
       listRef.current = pageInfo.ids;
       setItems(listRef.current);
       console.log("message pageInfo", mids, pageInfo);
     } else {
       //   追加
-      const lastMid = listRef.current[0];
+      const lastMid = listRef.current.slice(-1);
       const sorteds = mids.slice(0).sort((a, b) => {
-        return Number(b) - Number(a);
+        return Number(a) - Number(b);
       });
-      const prepends = sorteds.filter((s) => s > lastMid);
-      if (prepends.length) {
-        setItems((prevs) => [...prepends, ...prevs]);
+      const appends = sorteds.filter((s) => s > lastMid);
+      if (appends.length) {
+        setAppends(appends);
       }
-      console.log("prepends", prepends, items);
+      console.log("appends", appends);
     }
   }, [mids]);
-  const pullDown = () => {
-    // 向下加载
+  const pullUp = () => {
     const currPageInfo = pageRef.current;
-    console.log("pull down", currPageInfo);
-    // 最后一页
-    if (currPageInfo && currPageInfo.isLast) {
-      setHasMore(true);
+    console.log("pull up", currPageInfo);
+    // 第一页
+    if (currPageInfo && currPageInfo.pageNumber == 1) {
+      setHasMore(false);
       return;
     }
     let pageInfo = null;
@@ -124,28 +96,32 @@ export default function useMessageFeed({ context = "channel", id = null }) {
       // 初始化
       pageInfo = getFeedWithPagination({
         mids,
+        isLast: true,
       });
     } else {
-      const nextPageNumber = currPageInfo.pageNumber + 1;
+      const prevPageNumber = currPageInfo.pageNumber - 1;
       pageInfo = getFeedWithPagination({
         mids,
-        pageNumber: nextPageNumber,
+        pageNumber: prevPageNumber,
       });
     }
     pageRef.current = pageInfo;
-    listRef.current = [...listRef.current, ...pageInfo.ids];
+    listRef.current = [...pageInfo.ids, ...listRef.current];
     setTimeout(() => {
       setItems(listRef.current);
       console.log("pull up", currPageInfo, listRef.current);
-      setHasMore(!pageInfo.isLast);
-    }, 1000);
+      setHasMore(pageInfo.pageNumber !== 1);
+    }, 800);
+  };
+  const pullDown = () => {
+    // 向下加载
   };
 
   return {
     mids,
-    // appends,
+    appends,
     hasMore,
-    // pullUp,
+    pullUp,
     pullDown,
     list: items,
   };