Skip to content

WIP: add image and custom view rendering - #86

Draft
sirily11 wants to merge 1 commit into
microsoft:mainfrom
sirily11:feat/image-custom-view-rendering
Draft

WIP: add image and custom view rendering#86
sirily11 wants to merge 1 commit into
microsoft:mainfrom
sirily11:feat/image-custom-view-rendering

Conversation

@sirily11

Copy link
Copy Markdown

Summary

Validation

OSS readiness

  • No secrets, internal URLs, private identifiers, or product-only service names were added.
  • Public docs, fixtures, or notices were updated if behavior or dependencies changed.
  • Third-party dependency changes (adds, removes, version bumps) are intentional and reviewed.
  • Streaming/incomplete markdown behavior remains covered by fixtures or tests.

@sirily11
sirily11 requested review from a team and Copilot June 18, 2026 06:41
@microsoft-github-policy-service

Copy link
Copy Markdown

sirily11 please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds first-class rendering support for Markdown images and swift-markdown block directives, plus an app-provided SwiftUI hook (MarkdownCustomViewBuilder) to override rendering for those payloads. This extends the library’s renderable model (MarkdownRenderable) and updates conversion/rendering so these new elements flow through RenderableDocumentDocumentView.

Changes:

  • Introduces MarkdownImage / MarkdownCustomBlock models and adds .image / .customView cases to MarkdownRenderable, including paragraph splitting around inline images.
  • Adds MarkdownCustomViewBuilder to MarkdownRenderConfig and wires it into new MarkdownImageView / MarkdownCustomBlockView SwiftUI renderers.
  • Adds unit + snapshot tests and updates the sample app (fixtures + demo builder) to showcase custom rendering.

Reviewed changes

Copilot reviewed 25 out of 34 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
Tests/MarkdownTextTests/ImageAndCustomViewTests.swift Unit tests for image renderables, paragraph splitting, directive parsing, and config builders.
Tests/MarkdownTextTests/ImageAndCustomViewSnapshotTests.swift Snapshot coverage for custom view builder rendering of images and directives.
Sources/MarkdownText/UI/MarkdownImageView.swift New SwiftUI view to render .image (default rendering + custom builder hook).
Sources/MarkdownText/UI/MarkdownCustomBlockView.swift New SwiftUI view to render .customView with fallback to directive content.
Sources/MarkdownText/UI/BlockView.swift Wires .image and .customView into the main block rendering switch.
Sources/MarkdownText/Parser/MarkdownParserImpl.swift Adds swift-markdown ParseOptions toggling for block directives.
Sources/MarkdownText/Parser/MarkdownParser.swift Updates parse(text:config:) to enable directive parsing based on config.
Sources/MarkdownText/Parser/MarkdownParseOption.swift Adds parseBlockDirectives to parsing options.
Sources/MarkdownText/Models/RenderableDocument.swift Ensures .customView contributes fallback content to extracted attributed strings.
Sources/MarkdownText/Models/MarkdownRenderConfig+Builders.swift Updates builder methods to preserve citationConfig + customViewBuilder; adds new builder helpers.
Sources/MarkdownText/Models/MarkdownRenderConfig.swift Adds customViewBuilder to the public render config.
Sources/MarkdownText/Models/MarkdownRenderable.swift Adds .image / .customView cases and IDs.
Sources/MarkdownText/Models/MarkdownImage.swift New model representing parsed images.
Sources/MarkdownText/Models/MarkdownCustomView.swift New custom view payload types and type-erased builder.
Sources/MarkdownText/Inline/Markdown+InlineConvertible.swift Adds Markdown.Image inline conversion (fallback text) and MarkdownImage extraction.
Sources/MarkdownText/Block/UnorderedList+.swift Uses blockRenderables to allow list items to contain split paragraphs/images/directives.
Sources/MarkdownText/Block/Paragraph+.swift Splits paragraphs into multiple renderables when they contain inline images; refactors inline-appending helper.
Sources/MarkdownText/Block/OrderedList+.swift Uses blockRenderables for list item children.
Sources/MarkdownText/Block/Document+.swift Uses blockRenderables to support top-level images/directives in document conversion.
Sources/MarkdownText/Block/BlockDirective+.swift Converts parsed block directives into .customView renderables with fallback content.
Sources/MarkdownText/Block/BlockConvertible.swift Adds blockRenderables(...) to centralize paragraph/directive special-casing.
Examples/SwiftStreamingMarkdownSample/SwiftStreamingMarkdownSample/SampleMarkdownTheme.swift Passes demonstration custom view builder into render config.
Examples/SwiftStreamingMarkdownSample/SwiftStreamingMarkdownSample/Resources/Fixtures/kitchen-sink.md Updates fixture to include image + directive examples.
Examples/SwiftStreamingMarkdownSample/SwiftStreamingMarkdownSample/Resources/Assets.xcassets/StreamingMarkdownSample.imageset/streaming-markdown.svg Adds sample SVG asset for image rendering demo.
Examples/SwiftStreamingMarkdownSample/SwiftStreamingMarkdownSample/Resources/Assets.xcassets/StreamingMarkdownSample.imageset/Contents.json Asset catalog metadata for the sample SVG.
Examples/SwiftStreamingMarkdownSample/SwiftStreamingMarkdownSample/Demonstrations.swift Adds sample customViewBuilder + demo views for image/callout rendering.

Comment on lines +35 to +38
let parseOption = MarkdownParseOption(
speculativeRewrite: false,
parseBlockDirectives: config.customViewBuilder != nil
)
Comment on lines +22 to +42
@ViewBuilder
private var defaultImageView: some View {
if let uiImage {
renderedImage(Image(uiImage: uiImage))
} else if let remoteURL {
AsyncImage(url: remoteURL) { phase in
switch phase {
case .empty:
placeholder(systemImage: "photo", text: image.alternativeText)
case .success(let loadedImage):
renderedImage(loadedImage)
case .failure:
placeholder(systemImage: "exclamationmark.triangle", text: fallbackText)
@unknown default:
placeholder(systemImage: "photo", text: fallbackText)
}
}
} else {
placeholder(systemImage: "photo", text: fallbackText)
}
}
Comment on lines +6 to +9
import Foundation
import Markdown
import SwiftUI

Comment on lines +75 to +79
if let fileURL, let image = UIImage(contentsOfFile: fileURL.path) {
return image
}

return nil
@junyan72

Copy link
Copy Markdown
Contributor

sirily11 Thanks for contributing! Could you please create an issue to elaborate the ask and requirements? Thanks.

@sirily11

Copy link
Copy Markdown
Author

sirily11 Thanks for contributing! Could you please create an issue to elaborate the ask and requirements? Thanks.

Thanks. I have created one issue in the issues tab already

@sirily11
sirily11 marked this pull request as draft June 19, 2026 07:38
@ramonfsk

Ramon Ferreira (ramonfsk) commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

thanks for tackling this, sirily11 — image support is something I'd really like to see land, and this is a strong start.

a few notes from reading through, in case they're useful:

  1. macOS / AppKit build. MarkdownImageView imports UIKit and uses UIImage directly, so it won't compile on AppKit/macOS. The rest of the library stays cross-platform via the MDImage typealias (Sources/MarkdownText/Utilities/MDImage.swift) and #if canImport(UIKit) / #elseif canImport(AppKit) guards, and there's active macOS work in flight (the macOS BlockMathView, plus Add macOS support with dedicated NSTextView-based paragraph rendering #92 / Add AppKit paragraph rendering layer with full iOS parity #106) — so it'd be worth following that pattern here.

  2. remote loading by default. the default view falls through to AsyncImage for any http(s) source, so remote images are fetched automatically. since this library renders LLM-produced Markdown, auto-loading arbitrary URLs straight from the model output can be a privacy/security concern (tracking pixels, client-IP leakage, SSRF-style requests to internal hosts). It might be worth making remote loading opt-in (e.g. a config flag) rather than the default, and leaving network policy (caching, pinning, allowlisting) to the host app — curious how you and the maintainers see it.

  3. scope / sequencing. this PR bundles image rendering together with the more general custom-view-builder + block-directive support. since images are already on the roadmap while the custom-view direction is still being discussed in Feature request: Image rendering support and custom view support #89, would it make sense to land the image part as a focused, self-contained change first? It would also clear most of the current merge conflicts — the MarkdownRenderConfig / MarkdownRenderConfig+Builders conflicts come entirely from the customViewBuilder addition, leaving just Block/Paragraph+.swift.

happy to help with the image piece if that's useful — e.g. a focused, cross-platform image-rendering PR with a safe default — whatever best fits how you and the maintainers want to sequence things.

@sirily11

sirily11 commented Jul 1, 2026

Copy link
Copy Markdown
Author

thanks for tackling this, sirily11 — image support is something I'd really like to see land, and this is a strong start.

a few notes from reading through, in case they're useful:

  1. macOS / AppKit build. MarkdownImageView imports UIKit and uses UIImage directly, so it won't compile on AppKit/macOS. The rest of the library stays cross-platform via the MDImage typealias (Sources/MarkdownText/Utilities/MDImage.swift) and #if canImport(UIKit) / #elseif canImport(AppKit) guards, and there's active macOS work in flight (the macOS BlockMathView, plus Add macOS support with dedicated NSTextView-based paragraph rendering #92 / Add AppKit paragraph rendering layer with full iOS parity #106) — so it'd be worth following that pattern here.
  2. remote loading by default. the default view falls through to AsyncImage for any http(s) source, so remote images are fetched automatically. since this library renders LLM-produced Markdown, auto-loading arbitrary URLs straight from the model output can be a privacy/security concern (tracking pixels, client-IP leakage, SSRF-style requests to internal hosts). It might be worth making remote loading opt-in (e.g. a config flag) rather than the default, and leaving network policy (caching, pinning, allowlisting) to the host app — curious how you and the maintainers see it.
  3. scope / sequencing. this PR bundles image rendering together with the more general custom-view-builder + block-directive support. since images are already on the roadmap while the custom-view direction is still being discussed in Feature request: Image rendering support and custom view support #89, would it make sense to land the image part as a focused, self-contained change first? It would also clear most of the current merge conflicts — the MarkdownRenderConfig / MarkdownRenderConfig+Builders conflicts come entirely from the customViewBuilder addition, leaving just Block/Paragraph+.swift.

happy to help with the image piece if that's useful — e.g. a focused, cross-platform image-rendering PR with a safe default — whatever best fits how you and the maintainers want to sequence things.

Yeah. I would love to split this PR into much more smaller one and only focus on the Image for now. Thanks for the suggestions!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants