Merge 6a2db5f27c into 3245613a88

web/src/pages/Archived.tsx

@@ -31,11 +31,17 @@ const Archived = observer(() => {
       listSort={(memos: Memo[]) =>
         memos
           .filter((memo) => memo.state === State.ARCHIVED)
-          .sort((a, b) =>
+          .sort((a, b) => {
-            viewStore.state.orderByTimeAsc
+            if (a.pinned && !b.pinned) {
+              return -1;
+            }
+            if (!a.pinned && b.pinned) {
+              return 1;
+            }
+            return viewStore.state.orderByTimeAsc
               ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
-              : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
+              : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
-          )
+          })
       }
       state={State.ARCHIVED}
       orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}

web/src/pages/Explore.tsx

@@ -20,11 +20,17 @@ const Explore = observer(() => {
           listSort={(memos: Memo[]) =>
             memos
               .filter((memo) => memo.state === State.NORMAL)
-              .sort((a, b) =>
+              .sort((a, b) => {
-                viewStore.state.orderByTimeAsc
+                if (a.pinned && !b.pinned) {
+                  return -1;
+                }
+                if (!a.pinned && b.pinned) {
+                  return 1;
+                }
+                return viewStore.state.orderByTimeAsc
                   ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
-                  : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
+                  : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
-              )
+              })
           }
           orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
         />

web/src/pages/Home.tsx

@@ -60,11 +60,17 @@ const Home = observer(() => {
         listSort={(memos: Memo[]) =>
           memos
             .filter((memo) => memo.state === State.NORMAL)
-            .sort((a, b) =>
+            .sort((a, b) => {
-              viewStore.state.orderByTimeAsc
+              if (a.pinned && !b.pinned) {
+                return -1;
+              }
+              if (!a.pinned && b.pinned) {
+                return 1;
+              }
+              return viewStore.state.orderByTimeAsc
                 ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
-                : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
+                : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
-            )
+            })
         }
         orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
         filter={memoFilter}

web/src/pages/UserProfile.tsx

@@ -95,11 +95,17 @@ const UserProfile = observer(() => {
                 listSort={(memos: Memo[]) =>
                   memos
                     .filter((memo) => memo.state === State.NORMAL)
-                    .sort((a, b) =>
+                    .sort((a, b) => {
-                      viewStore.state.orderByTimeAsc
+                      if (a.pinned && !b.pinned) {
+                        return -1;
+                      }
+                      if (!a.pinned && b.pinned) {
+                        return 1;
+                      }
+                      return viewStore.state.orderByTimeAsc
                         ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
-                        : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
+                        : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
-                    )
+                    })
                 }
                 orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
                 filter={memoFilter}

web/src/store/memo.ts

@@ -21,7 +21,15 @@ class LocalState {
   }
 
   get memos() {
-    return Object.values(this.memoMapByName);
+    return Object.values(this.memoMapByName).sort((a, b) => {
+      if (a.pinned && !b.pinned) {
+        return -1;
+      }
+      if (!a.pinned && b.pinned) {
+        return 1;
+      }
+      return 0;
+    });
   }
 
   get size() {

web/vite.config.mts

@@ -13,11 +13,11 @@ if (process.env.DEV_PROXY_SERVER && process.env.DEV_PROXY_SERVER.length > 0) {
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
-    react(),
-    tailwindcss(),
     codeInspectorPlugin({
       bundler: "vite",
     }),
+    react(),
+    tailwindcss(),
   ],
   server: {
     host: "0.0.0.0",