Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
class: className,
style: styleProp,
portalProps,
overlayProps,
children,
showCloseButton = true,
fullScreenOnMobile = true,
Expand All @@ -35,6 +36,8 @@
...restProps
}: WithoutChildrenOrChild<DialogPrimitive.ContentProps> & {
portalProps?: WithoutChildrenOrChild<ComponentProps<typeof DialogPortal>>;
/** For a dialog that drives its own backdrop, such as a gesture-tracked open. */
overlayProps?: ComponentProps<typeof Dialog.Overlay>;
children: Snippet;
showCloseButton?: boolean;
fullScreenOnMobile?: boolean;
Expand Down Expand Up @@ -264,7 +267,7 @@
</script>

<DialogPortal {...portalProps}>
<Dialog.Overlay />
<Dialog.Overlay {...overlayProps} />
<!--
preventOverflowTextSelection is off: bits-ui's selection lock rewrites
user-select on <body> and the content on pointerup, and WKWebView collapses
Expand Down
16 changes: 13 additions & 3 deletions apps/staged/src/lib/features/notes/NoteModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@
import '../../shared/markdown/diagramStyles.css';
import { extractMarkdownDiagramFences } from '../../shared/markdown/diagramFormats';
import MediaViewerModal from '../../shared/markdown/MediaViewerModal.svelte';
import { getMarkdownMediaFromEvent, type MarkdownMedia } from '../../shared/markdown/mediaViewer';
import {
getMarkdownMediaFromEvent,
getMarkdownMediaImageFromEvent,
} from '../../shared/markdown/mediaViewer';
import { mediaPinchOpen, type OpenMarkdownMedia } from '../../shared/markdown/mediaPinch';
import {
collectStagedMediaImageIds,
resolveStagedMediaUrl,
Expand Down Expand Up @@ -370,7 +374,7 @@
})
: null
);
let mediaViewer = $state<MarkdownMedia | null>(null);
let mediaViewer = $state<OpenMarkdownMedia | null>(null);
let diagramViewerSvg = $state<string | null>(null);

// Search state
Expand Down Expand Up @@ -732,10 +736,13 @@
if (!media) return false;
event.preventDefault();
event.stopPropagation();
mediaViewer = media;
mediaViewer = { ...media, originImage: getMarkdownMediaImageFromEvent(event.target) };
return true;
}

// Pinch-out on an inline image opens it too, following the fingers.
const openMediaOnPinch = mediaPinchOpen((media) => (mediaViewer = media));

function openDiagramViewerFromEvent(event: MouseEvent | KeyboardEvent): boolean {
const svgMarkup = getMarkdownDiagramSvgMarkup(event.target);
if (!svgMarkup) return false;
Expand Down Expand Up @@ -957,6 +964,7 @@
class:ends-pane={!showBottomBar}
bind:this={contentEl}
onclick={handleContentClick}
{@attach openMediaOnPinch}
onkeydown={handleContentKeydown}
>
{#if hasNoteContent}
Expand Down Expand Up @@ -1096,6 +1104,8 @@
open={true}
src={resolveStagedMediaUrl(mediaViewer.id, mediaViewer.ext)}
title={mediaViewer.alt}
originImage={mediaViewer.originImage}
gesture={mediaViewer.gesture}
onClose={() => (mediaViewer = null)}
/>
{/if}
Expand Down
16 changes: 13 additions & 3 deletions apps/staged/src/lib/features/sessions/SessionChatPane.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,11 @@
fencedDiagramMarkdown,
} from '../../shared/markdown/diagramFormats';
import MediaViewerModal from '../../shared/markdown/MediaViewerModal.svelte';
import { getMarkdownMediaFromEvent, type MarkdownMedia } from '../../shared/markdown/mediaViewer';
import {
getMarkdownMediaFromEvent,
getMarkdownMediaImageFromEvent,
} from '../../shared/markdown/mediaViewer';
import { mediaPinchOpen, type OpenMarkdownMedia } from '../../shared/markdown/mediaPinch';
import { resolveStagedMediaUrl } from '../../shared/markdown/mediaUrl';
import '../../shared/markdown/mediaStyles.css';
import { pageVideos } from '../../shared/markdown/pageVideos';
Expand Down Expand Up @@ -809,7 +813,7 @@
// See the loader effect below: the chat never waits blank on this, so the cap is loose.
const SESSION_PIKCHR_LOAD_TIMEOUT_MS = 60_000;
let pikchrRendererLoadFailed = $derived(pikchrRendererLoadFailedKey === pikchrRendererLoadKey);
let mediaViewer = $state<MarkdownMedia | null>(null);
let mediaViewer = $state<OpenMarkdownMedia | null>(null);
let diagramViewerSvg = $state<string | null>(null);
let metadataFollowupConfig = $derived.by(() =>
latestAcpConfigDiscoveryFromMetadata(session?.provider, acpMetadataMessages)
Expand Down Expand Up @@ -2695,10 +2699,13 @@
if (!media) return false;
event.preventDefault();
event.stopPropagation();
mediaViewer = media;
mediaViewer = { ...media, originImage: getMarkdownMediaImageFromEvent(event.target) };
return true;
}

// Pinch-out on an inline image opens it too, following the fingers.
const openMediaOnPinch = mediaPinchOpen((media) => (mediaViewer = media));

function openDiagramViewerFromEvent(event: MouseEvent | KeyboardEvent): boolean {
const svgMarkup = getMarkdownDiagramSvgMarkup(event.target);
if (!svgMarkup) return false;
Expand Down Expand Up @@ -3417,6 +3424,7 @@
bind:this={messagesEl}
onscroll={handleScroll}
onclick={handleContentClick}
{@attach openMediaOnPinch}
onkeydown={handleContentKeydown}
>
{#if session?.pipeline}
Expand Down Expand Up @@ -4023,6 +4031,8 @@
open={true}
src={resolveStagedMediaUrl(mediaViewer.id, mediaViewer.ext)}
title={mediaViewer.alt}
originImage={mediaViewer.originImage}
gesture={mediaViewer.gesture}
onClose={() => (mediaViewer = null)}
/>
{/if}
Expand Down
Loading