From d4264cbe4eb0274aa5a6d9fe5a43a414e2cd3f59 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 1 Feb 2024 09:07:01 -0800 Subject: [PATCH] Fix scrolling and wrapping in the markdown preview renderer (#7234) Release Notes: - N/A --- crates/markdown_preview/src/markdown_preview_view.rs | 5 ++++- crates/markdown_preview/src/markdown_renderer.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs index 475a9fbaa3..f9e121e7ee 100644 --- a/crates/markdown_preview/src/markdown_preview_view.rs +++ b/crates/markdown_preview/src/markdown_preview_view.rs @@ -114,13 +114,16 @@ impl Render for MarkdownPreviewView { .key_context("MarkdownPreview") .track_focus(&self.focus_handle) .id("MarkdownPreview") - .overflow_scroll() + .overflow_y_scroll() + .overflow_x_hidden() .size_full() .bg(cx.theme().colors().editor_background) .p_4() .children(render_markdown(&self.contents, &self.languages, cx)); div().flex_1().child( + // FIXME: This shouldn't be necessary + // but the overflow_scroll above doesn't seem to work without it canvas(move |bounds, cx| { rendered_markdown.into_any().draw( bounds.origin, diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs index 7b020a6d30..60fab49478 100644 --- a/crates/markdown_preview/src/markdown_renderer.rs +++ b/crates/markdown_preview/src/markdown_renderer.rs @@ -174,7 +174,7 @@ where } let element = self.render_md_from_range(source_range.clone(), cx); - let paragraph = h_flex().mb_3().child(element); + let paragraph = div().mb_3().child(element); self.finished.push(paragraph); }