Skip to content

Fix imageConfig being dropped by MarkdownRenderConfig builders #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vincent Peng (vincent-peng) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix imageConfig being dropped by MarkdownRenderConfig builders #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 24 additions & 12 deletions Sources/MarkdownText/Models/MarkdownRenderConfig+Builders.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -41,7 +42,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -60,7 +62,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -79,7 +82,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -98,7 +102,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -117,7 +122,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -136,7 +142,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -156,7 +163,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -175,7 +183,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: value,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -194,7 +203,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: value,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -214,7 +224,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: value,
thematicBreakColor: thematicBreakColor
thematicBreakColor: thematicBreakColor,
imageConfig: imageConfig
)
}

Expand All @@ -233,7 +244,8 @@ extension MarkdownRenderConfig {
codeBlockConfig: codeBlockConfig,
blockSpacing: blockSpacing,
textSelectionConfig: textSelectionConfig,
thematicBreakColor: value
thematicBreakColor: value,
imageConfig: imageConfig
)
}

Expand Down
43 changes: 43 additions & 0 deletions Tests/MarkdownTextTests/MarkdownRenderConfigBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
//

@testable import SwiftStreamingMarkdown
import XCTest

final class MarkdownRenderConfigBuilderTests: XCTestCase {

private var nonDefaultImageConfig: ImageConfig {
ImageConfig(enabled: true, allowedImageTypes: [.remote(allowedDomains: [])])
}

func test_builders_preserve_image_config() {
let defaults = MarkdownRenderConfig.default
let base = defaults.withImageConfig(nonDefaultImageConfig)
let builders: [(MarkdownRenderConfig) -> MarkdownRenderConfig] = [
{ $0.withShouldAnimateText(value: true) },
{ $0.withBlockQuoteStyle(value: defaults.blockQuoteStyle) },
{ $0.withHeadingStyle(value: defaults.headingStyle) },
{ $0.withOrderedListStyle(value: defaults.orderedListStyle) },
{ $0.withParagraphStyle(value: defaults.paragraphStyle) },
{ $0.withTableStyle(value: defaults.tableStyle) },
{ $0.withInlineStyle(value: defaults.inlineStyle) },
{ $0.withTextContextMenu(value: nil) },
{ $0.withBlockSpacing(value: defaults.blockSpacing + 1) },
{ $0.withCodeBlockConfig(value: defaults.codeBlockConfig) },
{ $0.withTextSelectionConfig(value: TextSelectionConfig(isEnabled: false)) },
{ $0.withThematicBreakColor(value: defaults.thematicBreakColor) },
{ $0.withImageConfig(.disabled) }
]

for (index, apply) in builders.enumerated() {
let updated = apply(base)
if index == builders.count - 1 {
XCTAssertEqual(updated.imageConfig, .disabled, "withImageConfig should replace imageConfig")
} else {
XCTAssertEqual(updated.imageConfig, nonDefaultImageConfig, "builder at index \(index) dropped imageConfig")
}
}
}
}