merge dev

Author: 7w1

.changeset/fix-blockquote-md.md

@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fixed blockquotes needing a double backslash to escape and require a space after the `>` in order to form a blockquote.

.changeset/fix-jump-to-events.md

@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fixed jumpting to arbitrary events (e.g. reactions, edits, pins, leaves/joins).

.changeset/fix-latex-codeblock.md

@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix latex in codeblocks getting parsed.

.changeset/fix-tweak-favoriting-behavior.md

@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fixed tweak automatic favoriting behavior when entering/leaving the catalog.

src/app/components/url-preview/TweakPreviewUrlCard.tsx

@@ -198,7 +198,6 @@ export function TweakPreviewUrlCard({ url }: { url: string }) {
         const nextEnabled = enabledTweakFullUrls.filter((u) => u !== url);
         patchSettings({
           themeRemoteEnabledTweakFullUrls: nextEnabled,
-          themeRemoteTweakFavorites: pruneTweakFavorites(tweakFavorites, nextEnabled),
         });
       }
     },

src/app/features/room/RoomTimeline.tsx

@@ -45,6 +45,7 @@ import {
   factoryRenderLinkifyWithMention,
 } from '$plugins/react-custom-html-parser';
 import { today, yesterday, timeDayMonthYear } from '$utils/time';
+import { unwrapRelationJumpTarget } from '$utils/room';
 import { useMemberEventParser } from '$hooks/useMemberEventParser';
 import { usePowerLevelsContext } from '$hooks/usePowerLevels';
 import { useRoomCreators } from '$hooks/useRoomCreators';
@@ -77,8 +78,11 @@ import {
 } from '$utils/timeline';
 import { useTimelineSync } from '$hooks/timeline/useTimelineSync';
 import { useTimelineActions } from '$hooks/timeline/useTimelineActions';
-import type { ProcessedEvent } from '$hooks/timeline/useProcessedTimeline';
-import { useProcessedTimeline } from '$hooks/timeline/useProcessedTimeline';
+import {
+  useProcessedTimeline,
+  getProcessedRowIndexForRawTimelineIndex,
+  type ProcessedEvent,
+} from '$hooks/timeline/useProcessedTimeline';
 import { useTimelineEventRenderer } from '$hooks/timeline/useTimelineEventRenderer';
 import * as css from './RoomTimeline.css';
 
@@ -494,19 +498,40 @@ export function RoomTimeline({
     setOpenThread: setOpenThread as unknown as (threadId: string | undefined) => void,
     handleEdit,
     handleOpenEvent: (id) => {
-      const evtTimeline = getEventTimeline(room, id);
+      const anchorId = unwrapRelationJumpTarget(room, id);
+      let evtTimeline = getEventTimeline(room, anchorId);
+      let resolvedForIndex = anchorId;
+      if (!evtTimeline && anchorId !== id) {
+        evtTimeline = getEventTimeline(room, id);
+        resolvedForIndex = id;
+      }
       const absoluteIndex = evtTimeline
-        ? getEventIdAbsoluteIndex(timelineSync.timeline.linkedTimelines, evtTimeline, id)
+        ? getEventIdAbsoluteIndex(
+            timelineSync.timeline.linkedTimelines,
+            evtTimeline,
+            resolvedForIndex
+          )
         : undefined;
 
       if (typeof absoluteIndex === 'number') {
-        const processedIndex = getRawIndexToProcessedIndex(absoluteIndex);
+        let processedIndex = getRawIndexToProcessedIndex(absoluteIndex);
+        let focusRawIndex = absoluteIndex;
+        if (processedIndex === undefined) {
+          const nearest = getProcessedRowIndexForRawTimelineIndex(
+            processedEventsRef.current,
+            absoluteIndex
+          );
+          if (nearest) {
+            processedIndex = nearest.rowIndex;
+            focusRawIndex = nearest.focusRawIndex;
+          }
+        }
         if (vListRef.current && processedIndex !== undefined) {
           vListRef.current.scrollToIndex(processedIndex, { align: 'center' });
         }
-        timelineSync.setFocusItem({ index: absoluteIndex, scrollTo: false, highlight: true });
+        timelineSync.setFocusItem({ index: focusRawIndex, scrollTo: false, highlight: true });
       } else {
-        timelineSync.loadEventTimeline(id);
+        timelineSync.loadEventTimeline(anchorId);
       }
     },
   });

src/app/features/room/ThreadDrawer.tsx

@@ -23,7 +23,12 @@ import {
   makeMentionCustomProps,
   renderMatrixMention,
 } from '$plugins/react-custom-html-parser';
-import { getEditedEvent, getMemberDisplayName, reactionOrEditEvent } from '$utils/room';
+import {
+  getEditedEvent,
+  getMemberDisplayName,
+  reactionOrEditEvent,
+  unwrapRelationJumpTarget,
+} from '$utils/room';
 import { getMxIdLocalPart, toggleReaction } from '$utils/matrix';
 import { useMatrixClient } from '$hooks/useMatrixClient';
 import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
@@ -49,8 +54,11 @@ import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
 import { useGetMemberPowerTag } from '$hooks/useMemberPowerTag';
 import { useMemberEventParser } from '$hooks/useMemberEventParser';
 import { useMessageEdit } from '$hooks/useMessageEdit';
-import type { ProcessedEvent } from '$hooks/timeline/useProcessedTimeline';
-import { useProcessedTimeline } from '$hooks/timeline/useProcessedTimeline';
+import {
+  useProcessedTimeline,
+  getProcessedRowIndexForRawTimelineIndex,
+  type ProcessedEvent,
+} from '$hooks/timeline/useProcessedTimeline';
 import { useTimelineEventRenderer } from '$hooks/timeline/useTimelineEventRenderer';
 import { RoomInput } from './RoomInput';
 import { RoomViewFollowing, RoomViewFollowingPlaceholder } from './RoomViewFollowing';
@@ -627,18 +635,32 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
     (evt) => {
       const targetId = evt.currentTarget.getAttribute('data-event-id');
       if (!targetId) return;
-      const isRoot = targetId === threadRootId;
-      const isInReplies = processedEventsRef.current.some((e) => e.id === targetId);
+      let anchorId = unwrapRelationJumpTarget(room, targetId);
+      const threadLive = thread?.timelineSet.getLiveTimeline();
+      const threadEvents = threadLive?.getEvents();
+      const rawIndex = threadEvents?.findIndex((e) => e.getId() === anchorId) ?? -1;
+      if (rawIndex >= 0) {
+        const nearest = getProcessedRowIndexForRawTimelineIndex(
+          processedEventsRef.current,
+          rawIndex
+        );
+        if (nearest) {
+          const rowEv = processedEventsRef.current[nearest.rowIndex];
+          if (rowEv) anchorId = rowEv.id;
+        }
+      }
+      const isRoot = anchorId === threadRootId;
+      const isInReplies = processedEventsRef.current.some((e) => e.id === anchorId);
       if (!isRoot && !isInReplies) return;
-      setJumpToEventId(targetId);
+      setJumpToEventId(anchorId);
       setTimeout(() => setJumpToEventId(undefined), 2500);
       const el = drawerRef.current;
       if (el) {
-        const target = el.querySelector(`[data-message-id="${targetId}"]`);
+        const target = el.querySelector(`[data-message-id="${anchorId}"]`);
         target?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
       }
     },
-    [threadRootId]
+    [threadRootId, room, thread]
   );
 
   // Map jumpToEventId to a focusItem index for useTimelineEventRenderer highlighting

src/app/features/settings/cosmetics/ThemeCatalogSettings.tsx

@@ -1,4 +1,4 @@
-import { type ChangeEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
+import { type ChangeEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
 import { copyToClipboard, downloadTextFile } from '$utils/dom';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
@@ -214,6 +214,9 @@ export function ThemeCatalogSettings({
   const [browseOpen, setBrowseOpen] = useState(false);
   const [importModalOpen, setImportModalOpen] = useState(false);
 
+  const appearanceCatalogBrowseWasOpenRef = useRef(false);
+  const tweakFavoritesSnapshotAtAppearanceCatalogOpenRef = useRef<Set<string>>(new Set());
+
   useEffect(() => {
     if (isAppearanceMode) {
       onBrowseOpenChange?.(browseOpen);
@@ -248,6 +251,19 @@ export function ThemeCatalogSettings({
     'themeChatAutoPreviewAnyUrl'
   );
 
+  useEffect(() => {
+    if (!isAppearanceMode) {
+      appearanceCatalogBrowseWasOpenRef.current = false;
+      return;
+    }
+    if (browseOpen && !appearanceCatalogBrowseWasOpenRef.current) {
+      tweakFavoritesSnapshotAtAppearanceCatalogOpenRef.current = new Set(
+        tweakFavorites.map((f) => f.fullUrl.trim()).filter(Boolean)
+      );
+    }
+    appearanceCatalogBrowseWasOpenRef.current = browseOpen;
+  }, [browseOpen, isAppearanceMode, tweakFavorites]);
+
   const [themeSearch, setThemeSearch] = useState('');
   const [tweakSearch, setTweakSearch] = useState('');
   const [kindFilter, setKindFilter] = useState<'all' | 'light' | 'dark'>('all');
@@ -779,7 +795,15 @@ export function ThemeCatalogSettings({
   }, [patchSettings]);
 
   const setTweakApplied = useCallback(
-    async (fullUrl: string, apply: boolean, hint?: { displayName?: string; basename?: string }) => {
+    async (
+      fullUrl: string,
+      apply: boolean,
+      hint?: {
+        displayName?: string;
+        basename?: string;
+        pruneUnpinnedFavoriteOnDisable?: boolean;
+      }
+    ) => {
       const trimmed = fullUrl.trim();
       if (!trimmed) return;
 
@@ -811,10 +835,25 @@ export function ThemeCatalogSettings({
         });
       } else {
         const nextEnabled = enabledTweakFullUrls.filter((u) => u !== trimmed);
-        patchSettings({
-          themeRemoteEnabledTweakFullUrls: nextEnabled,
-          themeRemoteTweakFavorites: pruneTweakFavorites(tweakFavorites, nextEnabled),
-        });
+        if (hint?.pruneUnpinnedFavoriteOnDisable) {
+          const enabledSet = new Set(nextEnabled);
+          const inLibraryBeforeThisCatalogVisit =
+            tweakFavoritesSnapshotAtAppearanceCatalogOpenRef.current;
+          const nextTweakFavs = tweakFavorites.filter(
+            (f) =>
+              f.pinned === true ||
+              enabledSet.has(f.fullUrl) ||
+              inLibraryBeforeThisCatalogVisit.has(f.fullUrl.trim())
+          );
+          patchSettings({
+            themeRemoteEnabledTweakFullUrls: nextEnabled,
+            themeRemoteTweakFavorites: nextTweakFavs,
+          });
+        } else {
+          patchSettings({
+            themeRemoteEnabledTweakFullUrls: nextEnabled,
+          });
+        }
       }
     },
     [enabledTweakFullUrls, patchSettings, prefetchFull, pruneTweakFavorites, tweakFavorites]
@@ -1468,6 +1507,7 @@ export function ThemeCatalogSettings({
                             setTweakApplied(row.fullUrl, v, {
                               displayName: row.displayName,
                               basename: row.basename,
+                              pruneUnpinnedFavoriteOnDisable: true,
                             })
                           }
                         />

src/app/hooks/timeline/useProcessedTimeline.ts

@@ -39,6 +39,19 @@ export interface ProcessedEvent {
   willRenderDayDivider: boolean;
 }
 
+/** Raw timeline indices for skipped events (reactions, edits, …) have no row; walk backward to a visible one. */
+export function getProcessedRowIndexForRawTimelineIndex(
+  processedEvents: ProcessedEvent[],
+  startRawIndex: number
+): { rowIndex: number; focusRawIndex: number } | undefined {
+  if (startRawIndex < 0) return undefined;
+  for (let i = startRawIndex; i >= 0; i -= 1) {
+    const rowIndex = processedEvents.findIndex((e) => e.itemIndex === i);
+    if (rowIndex >= 0) return { rowIndex, focusRawIndex: i };
+  }
+  return undefined;
+}
+
 const MESSAGE_EVENT_TYPES = new Set([
   'm.room.message',
   'm.room.message.encrypted',