diff --git a/js/desktop/src/components/link-preview-card.tsx b/js/desktop/src/components/link-preview-card.tsx index f5f1d98..5090f97 100644 --- a/js/desktop/src/components/link-preview-card.tsx +++ b/js/desktop/src/components/link-preview-card.tsx @@ -95,49 +95,17 @@ export function LinkPreviewCard({ metadata, compact }: LinkPreviewCardProps) { /** Shown when metadata couldn't be fetched — the link itself still works. */ export function LinkPreviewCardFallback({ url }: { url: string }) { - const handleOpen = (e: React.MouseEvent) => { - e.stopPropagation(); - platform.link.openExternal(url); - }; - - const handleCopy = (e: React.MouseEvent) => { - e.stopPropagation(); - navigator.clipboard.writeText(url); - }; - return ( -
-
-
- - {domainFromUrl(url)} -
-

{url}

-
- - -
-
-
+ ); } diff --git a/js/desktop/src/features/compose/attachment-strip.tsx b/js/desktop/src/features/compose/attachment-strip.tsx index 128d03d..4c8090b 100644 --- a/js/desktop/src/features/compose/attachment-strip.tsx +++ b/js/desktop/src/features/compose/attachment-strip.tsx @@ -115,34 +115,19 @@ function LinkPreviewThumbnail({ entry }: { entry: LinkPreviewEntry }) { ); } - if (!entry.metadata) { - return ( - - ); - } - + // Metadata fetch can fail; fall back to the bare URL so the link stays usable. const { metadata } = entry; + const domain = metadata?.domain ?? domainFromUrl(entry.url); + const title = metadata?.title ?? entry.url; return ( diff --git a/js/desktop/src/features/compose/markdown-editor.css b/js/desktop/src/features/compose/markdown-editor.css index 60de521..7227482 100644 --- a/js/desktop/src/features/compose/markdown-editor.css +++ b/js/desktop/src/features/compose/markdown-editor.css @@ -144,28 +144,11 @@ overflow-y: auto; } -.llink-crepe--fill .milkdown::-webkit-scrollbar { - width: 8px; -} - -.llink-crepe--fill .milkdown::-webkit-scrollbar-track { - background: transparent; -} - -.llink-crepe--fill .milkdown::-webkit-scrollbar-thumb { - border-radius: 9999px; - background: rgb(255 255 255 / 0.3); -} - -.llink-crepe--fill .milkdown::-webkit-scrollbar-thumb:hover { - background: rgb(255 255 255 / 0.5); -} - /* Pad the content (not the card) so the slash menu — which Crepe appends to - * .milkdown — can use the full card width/height before clipping. The 5.5rem - * gutters also fit the block drag handle (66px wide, offset 16px left of the - * block), which would otherwise clip against the card edge. */ + * .milkdown — can use the full card width/height before clipping. The shared + * layout variables (globals.css) keep the editor's content column identical + * to the posted card's, and the gutter fits the block drag handle. */ .llink-crepe--fill .milkdown .ProseMirror { min-height: 100%; - padding: 1.5rem 5.5rem; + padding: var(--message-card-padding) var(--message-editor-gutter); } diff --git a/js/desktop/src/features/compose/markdown-editor.tsx b/js/desktop/src/features/compose/markdown-editor.tsx index 85931c7..43b3e00 100644 --- a/js/desktop/src/features/compose/markdown-editor.tsx +++ b/js/desktop/src/features/compose/markdown-editor.tsx @@ -65,11 +65,14 @@ export function MarkdownEditor({ featureConfigs: { [Crepe.Feature.Placeholder]: { text: placeholder ?? '' }, // Images come from URLs only (e.g. pasted markdown) — there is no - // stable public upload URL, so the file uploader is hidden in CSS. + // stable public upload URL, so the file uploader is hidden in CSS and + // onUpload rejects in case a file ever reaches it anyway (the default + // would serialize an ephemeral blob: URL into the message). [Crepe.Feature.ImageBlock]: { blockUploadPlaceholderText: 'Paste an image link…', inlineUploadPlaceholderText: 'paste an image link', maxHeight: 420, + onUpload: () => Promise.reject(new Error('Image uploads disabled')), }, }, }); @@ -117,7 +120,11 @@ export function MarkdownEditor({ return (
); } diff --git a/js/desktop/src/features/compose/text-editor.tsx b/js/desktop/src/features/compose/text-editor.tsx index fd919ca..2d06f80 100644 --- a/js/desktop/src/features/compose/text-editor.tsx +++ b/js/desktop/src/features/compose/text-editor.tsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useCallback, useState } from 'react'; import { Paperclip } from 'lucide-react'; import { cn } from '@/lib/utils'; +import { getImmersiveTextStyle } from '@/lib/immersive-text'; import { hasMarkdownFormatting } from '@/lib/markdown'; import { metaKey } from '@/lib/platform'; import { useAllLinkMetadata } from '@/hooks/use-link-metadata'; @@ -36,12 +37,6 @@ interface TextEditorProps { const IMMERSIVE_CHAR_LIMIT = 120; -function getImmersiveTextStyle(length: number) { - if (length < 70) return { size: 'text-5xl', weight: 'font-semibold' }; - if (length < 130) return { size: 'text-3xl', weight: 'font-semibold' }; - return { size: 'text-2xl', weight: 'font-normal' }; -} - export function TextEditor({ textContent, onTextChange, @@ -65,10 +60,11 @@ export function TextEditor({ const attachmentCount = attachmentProps?.attachments.length ?? 0; const hasEnrichments = attachmentCount > 0 || linkPreviews.length > 0; const shouldCard = - textContent.length >= IMMERSIVE_CHAR_LIMIT || - hasEnrichments || - hasMarkdownFormatting(textContent); - if (shouldCard && !carded) setCarded(true); + !carded && + (textContent.length >= IMMERSIVE_CHAR_LIMIT || + hasEnrichments || + hasMarkdownFormatting(textContent)); + if (shouldCard) setCarded(true); const immersive = !carded; // Keep the immersive textarea focused with the caret at the end on mount. @@ -199,10 +195,7 @@ export function TextEditor({ {...dropZoneProps} onKeyDownCapture={handleKeyDown} > - {/* max-w-[50rem] minus the editor's 5.5rem gutters yields the same 624px - content column as the posted card (max-w-2xl minus p-6), so line - wrapping while editing matches the final render. */} -
+
{/* No padding here: the editor's own scroll box hosts the slash menu, so we pad inside the editor (ProseMirror) instead. That keeps the menu's clipping bounds the full card rather than the inset box. */} diff --git a/js/desktop/src/features/particles/text-particle-view.tsx b/js/desktop/src/features/particles/text-particle-view.tsx index 59dad06..95607fb 100644 --- a/js/desktop/src/features/particles/text-particle-view.tsx +++ b/js/desktop/src/features/particles/text-particle-view.tsx @@ -8,6 +8,7 @@ import { type LinkPreviewEntry, } from '@/hooks/use-link-metadata'; import { extractUrls } from '@/lib/link-metadata'; +import { getImmersiveTextStyle } from '@/lib/immersive-text'; import { hasMarkdownFormatting } from '@/lib/markdown'; import { LinkPreviewCard, @@ -53,12 +54,6 @@ function computeReadDuration( return Math.min(Math.max(base + extra, MIN_DURATION_S), MAX_DURATION_S); } -function getImmersiveTextStyle(length: number) { - if (length < 30) return { size: 'text-5xl', weight: 'font-semibold' }; - if (length < 70) return { size: 'text-3xl', weight: 'font-semibold' }; - return { size: 'text-2xl', weight: 'font-normal' }; -} - function LinkPreviews({ entries }: { entries: LinkPreviewEntry[] }) { return (
@@ -207,17 +202,7 @@ export function TextParticleView({ // Mode 3: card layout return (
-
+
{ - const files = Array.from(e.clipboardData?.files ?? []); - if (files.length > 0) { - e.preventDefault(); - e.stopPropagation(); - onFilesRef.current(files); - } + const data = e.clipboardData; + if (!data) return; + const files = Array.from(data.files); + if (files.length === 0 || data.types.includes('text/plain')) return; + e.preventDefault(); + e.stopPropagation(); + onFilesRef.current(files); }; window.addEventListener('paste', handlePaste, true); diff --git a/js/desktop/src/lib/immersive-text.ts b/js/desktop/src/lib/immersive-text.ts new file mode 100644 index 0000000..529ba1e --- /dev/null +++ b/js/desktop/src/lib/immersive-text.ts @@ -0,0 +1,7 @@ +/** Font scale for short messages shown as large centered text. Shared by the + * composer and the posted view so editing matches the final render. */ +export function getImmersiveTextStyle(length: number) { + if (length < 30) return { size: 'text-5xl', weight: 'font-semibold' }; + if (length < 70) return { size: 'text-3xl', weight: 'font-semibold' }; + return { size: 'text-2xl', weight: 'font-normal' }; +} diff --git a/js/desktop/src/styles/globals.css b/js/desktop/src/styles/globals.css index 9773c25..b63b917 100644 --- a/js/desktop/src/styles/globals.css +++ b/js/desktop/src/styles/globals.css @@ -151,6 +151,34 @@ background: oklch(1 0 0 / 35%); } +/* Message cards: more prominent scrollbar than the subtle global default. + The descendant form reaches scroll containers we don't own (Crepe's .milkdown). */ +.scrollbar-card::-webkit-scrollbar, +.scrollbar-card ::-webkit-scrollbar { + width: 8px; +} + +.scrollbar-card::-webkit-scrollbar-thumb, +.scrollbar-card ::-webkit-scrollbar-thumb { + background: oklch(1 0 0 / 30%); + border-radius: 9999px; +} + +.scrollbar-card::-webkit-scrollbar-thumb:hover, +.scrollbar-card ::-webkit-scrollbar-thumb:hover { + background: oklch(1 0 0 / 50%); +} + +/* Message layout: the compose editor and the posted card derive their widths + from one shared content column, so line wrapping while editing matches the + final render. The editor gutter additionally fits Crepe's block drag handle + (66px wide, offset 16px left of the block). */ +:root { + --message-content-width: 39rem; + --message-card-padding: 1.5rem; + --message-editor-gutter: 5.5rem; +} + /* Frameless window drag regions */ .drag-region { -webkit-app-region: drag;