feat: add toggle switch for displaying replies

package-lock.json

@@ -26,6 +26,7 @@
         "@radix-ui/react-select": "^2.1.2",
         "@radix-ui/react-separator": "^1.1.0",
         "@radix-ui/react-slot": "^1.1.0",
+        "@radix-ui/react-switch": "^1.1.1",
         "@radix-ui/react-toast": "^1.2.2",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.1",
@@ -2529,6 +2530,34 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-switch": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.1.tgz",
+      "integrity": "sha512-diPqDDoBcZPSicYoMWdWx+bCPuTRH4QSp9J+65IvtdS0Kuzt67bI6n32vCj8q6NZmYW/ah+2orOtMwcX5eQwIg==",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.0",
+        "@radix-ui/react-compose-refs": "1.1.0",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.0",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-use-previous": "1.1.0",
+        "@radix-ui/react-use-size": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-toast": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.2.tgz",

package.json

@@ -44,6 +44,7 @@
     "@radix-ui/react-select": "^2.1.2",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-toast": "^1.2.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",

src/renderer/src/components/NoteList/index.tsx

@@ -1,8 +1,10 @@
 import { Button } from '@renderer/components/ui/button'
+import { Switch } from '@renderer/components/ui/switch'
 import { useFetchRelayInfos } from '@renderer/hooks'
 import { isReplyNoteEvent } from '@renderer/lib/event'
 import { cn } from '@renderer/lib/utils'
 import { useNostr } from '@renderer/providers/NostrProvider'
+import { useScreenSize } from '@renderer/providers/ScreenSizeProvider'
 import client from '@renderer/services/client.service'
 import dayjs from 'dayjs'
 import { Event, Filter, kinds } from 'nostr-tools'
@@ -27,6 +29,7 @@ export default function NoteList({
   const [until, setUntil] = useState<number>(() => dayjs().unix())
   const [hasMore, setHasMore] = useState<boolean>(true)
   const [initialized, setInitialized] = useState(false)
+  const [displayReplies, setDisplayReplies] = useState(false)
   const observer = useRef<IntersectionObserver | null>(null)
   const bottomRef = useRef<HTMLDivElement | null>(null)
   const noteFilter = useMemo(() => {
@@ -53,9 +56,8 @@ export default function NoteList({
           if (!areAlgoRelays) {
             events.sort((a, b) => b.created_at - a.created_at)
           }
-          const processedEvents = events.filter((e) => !isReplyNoteEvent(e))
+          if (events.length > 0) {
-          if (processedEvents.length > 0) {
+            setEvents((pre) => [...pre, ...events])
-            setEvents((pre) => [...pre, ...processedEvents])
           }
           if (events.length > 0) {
             setUntil(events[events.length - 1].created_at - 1)
@@ -66,10 +68,8 @@ export default function NoteList({
           setInitialized(true)
         },
         onNew: (event) => {
-          if (!isReplyNoteEvent(event)) {
           setNewEvents((oldEvents) => [event, ...oldEvents])
         }
-        }
       },
       signEvent
     )
@@ -119,9 +119,8 @@ export default function NoteList({
       return
     }
 
-    const processedEvents = sortedEvents.filter((e) => !isReplyNoteEvent(e))
+    if (sortedEvents.length > 0) {
-    if (processedEvents.length > 0) {
+      setEvents((oldEvents) => [...oldEvents, ...sortedEvents])
-      setEvents((oldEvents) => [...oldEvents, ...processedEvents])
     }
 
     setUntil(sortedEvents[sortedEvents.length - 1].created_at - 1)
@@ -133,7 +132,8 @@ export default function NoteList({
   }
 
   return (
-    <div className="space-y-2 sm:space-y-4">
+    <div className={cn('space-y-2 sm:space-y-4', className)}>
+      <DisplayRepliesSwitch displayReplies={displayReplies} setDisplayReplies={setDisplayReplies} />
       {newEvents.length > 0 && (
         <div className="flex justify-center w-full max-sm:mt-2">
           <Button size="lg" onClick={showNewEvents}>
@@ -141,8 +141,10 @@ export default function NoteList({
           </Button>
         </div>
       )}
-      <div className={cn('flex flex-col sm:gap-4', className)}>
+      <div className="flex flex-col sm:gap-4">
-        {events.map((event, i) => (
+        {events
+          .filter((event) => displayReplies || !isReplyNoteEvent(event))
+          .map((event, i) => (
             <NoteCard key={`${i}-${event.id}`} className="w-full" event={event} />
           ))}
       </div>
@@ -152,3 +154,47 @@ export default function NoteList({
     </div>
   )
 }
+
+function DisplayRepliesSwitch({
+  displayReplies,
+  setDisplayReplies
+}: {
+  displayReplies: boolean
+  setDisplayReplies: (value: boolean) => void
+}) {
+  const { t } = useTranslation()
+  const { isSmallScreen } = useScreenSize()
+
+  if (isSmallScreen) {
+    return (
+      <div>
+        <div className="flex">
+          <div
+            className={`w-1/2 text-center py-2 font-semibold ${displayReplies ? 'text-muted-foreground' : ''}`}
+            onClick={() => setDisplayReplies(false)}
+          >
+            {t('Notes')}
+          </div>
+          <div
+            className={`w-1/2 text-center py-2 font-semibold ${displayReplies ? '' : 'text-muted-foreground'}`}
+            onClick={() => setDisplayReplies(true)}
+          >
+            {t('Notes & Replies')}
+          </div>
+        </div>
+        <div
+          className={`w-1/2 px-4 transition-transform duration-500 ${displayReplies ? 'translate-x-full' : ''}`}
+        >
+          <div className="w-full h-1 bg-primary rounded-full" />
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="flex justify-end gap-2">
+      <div>{t('Display replies')}</div>
+      <Switch checked={displayReplies} onCheckedChange={setDisplayReplies} />
+    </div>
+  )
+}

src/renderer/src/components/ui/switch.tsx

@@ -0,0 +1,27 @@
+import * as React from "react"
+import * as SwitchPrimitives from "@radix-ui/react-switch"
+
+import { cn } from "@renderer/lib/utils"
+
+const Switch = React.forwardRef<
+  React.ElementRef<typeof SwitchPrimitives.Root>,
+  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
+>(({ className, ...props }, ref) => (
+  <SwitchPrimitives.Root
+    className={cn(
+      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
+      className
+    )}
+    {...props}
+    ref={ref}
+  >
+    <SwitchPrimitives.Thumb
+      className={cn(
+        "pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
+      )}
+    />
+  </SwitchPrimitives.Root>
+))
+Switch.displayName = SwitchPrimitives.Root.displayName
+
+export { Switch }

src/renderer/src/i18n/en.ts

@@ -69,6 +69,9 @@ export default {
       'The relays you are connected to do not support search',
     'supports search': 'supports search',
     'Show more...': 'Show more...',
-    'all users': 'all users'
+    'all users': 'all users',
+    'Display replies': 'Display replies',
+    Notes: 'Notes',
+    'Notes & Replies': 'Notes & Replies'
   }
 }

src/renderer/src/i18n/zh.ts

@@ -68,6 +68,9 @@ export default {
     'The relays you are connected to do not support search': '您连接的服务器不支持搜索',
     'supports search': '支持搜索',
     'Show more...': '查看更多...',
-    'all users': '所有用户'
+    'all users': '所有用户',
+    'Display replies': '显示回复',
+    Notes: '笔记',
+    'Notes & Replies': '笔记 & 回复'
   }
 }

src/renderer/src/layouts/PrimaryPageLayout/index.tsx

@@ -32,10 +32,10 @@ const PrimaryPageLayout = forwardRef(({ children }: { children?: React.ReactNode
     const handleScroll = () => {
       const scrollTop = scrollAreaRef.current?.scrollTop || 0
       const diff = scrollTop - lastScrollTop
-      if (diff > 20) {
+      if (diff > 50) {
         setVisible(false)
         setLastScrollTop(scrollTop)
-      } else if (diff < -20) {
+      } else if (diff < -50) {
         setVisible(true)
         setLastScrollTop(scrollTop)
       }

src/renderer/src/pages/secondary/ProfilePage/index.tsx

@@ -98,11 +98,12 @@ export default function ProfilePage({ id }: { id?: string }) {
           </SecondaryPageLink>
         </div>
       </div>
-      <Separator className="mt-4 sm:my-4" />
+      <Separator className="hidden sm:block mt-4 sm:my-4" />
       <NoteList
         key={pubkey}
         filter={{ authors: [pubkey] }}
         relayUrls={relayList.write.slice(0, 5).concat(currentRelayUrls)}
+        className="max-sm:mt-2"
       />
     </SecondaryPageLayout>
   )