Skip to content

Commit f863b84

Browse files
committed
fix: clean up
1 parent 99cf12e commit f863b84

17 files changed

Lines changed: 186 additions & 142 deletions

ios/HybridNitroText.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ class HybridNitroText : HybridNitroTextSpec, NitroTextViewDelegate {
116116
fontStyle: fontStyle,
117117
lineHeight: lineHeight,
118118
textAlign: textAlign,
119-
textTransform: textTransform
119+
textTransform: textTransform,
120+
numberOfLines: numberOfLines,
121+
ellipsizeMode: ellipsizeMode
120122
)
121123
nitroTextImpl.apply(fragments: fragments, text: text, top: top)
122124
}

ios/NitroTextImpl+Fragment.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ extension NitroTextImpl {
1616
let lineHeight: Double?
1717
let textAlign: TextAlign?
1818
let textTransform: TextTransform?
19+
let numberOfLines: Double?
20+
let ellipsizeMode: EllipsizeMode?
1921
}
2022

2123
func apply(fragments: [Fragment]?, text: String?, top: FragmentTopDefaults) {
@@ -31,7 +33,8 @@ extension NitroTextImpl {
3133
text: t,
3234
numberOfLines: nil,
3335
textAlign: top.textAlign,
34-
textTransform: top.textTransform
36+
textTransform: top.textTransform,
37+
ellipsizeMode: top.ellipsizeMode,
3538
)
3639
setFragments([single])
3740
} else {
@@ -52,6 +55,8 @@ extension NitroTextImpl {
5255
if frag.fontColor == nil, let v = top.fontColor, !v.isEmpty { frag.fontColor = v }
5356
if frag.textAlign == nil, let v = top.textAlign { frag.textAlign = v }
5457
if frag.textTransform == nil, let v = top.textTransform { frag.textTransform = v }
58+
if frag.numberOfLines == nil, let v = top.numberOfLines { frag.numberOfLines = v }
59+
if frag.ellipsizeMode == nil, let v = top.ellipsizeMode { frag.ellipsizeMode = v }
5560
merged.append(frag)
5661
}
5762
setFragments(merged)

ios/NitroTextImpl.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ final class NitroTextImpl {
3636
case .some(.clip): currentEllipsize = .byClipping
3737
default: currentEllipsize = .byTruncatingTail
3838
}
39-
// Re-apply to container based on current numberOfLines
4039
guard let n = nitroTextView?.textContainer.maximumNumberOfLines else { return }
4140
nitroTextView?.textContainer.lineBreakMode = effectiveLineBreakMode(forLines: n)
4241
}
4342

4443
func effectiveLineBreakMode(forLines n: Int) -> NSLineBreakMode {
4544
guard n > 0 else { return .byWordWrapping }
4645
if n == 1 { return currentEllipsize }
47-
// For multi-line, iOS only reliably supports tail truncation or clipping.
4846
switch currentEllipsize {
4947
case .byClipping:
5048
return .byWordWrapping

nitrogen/generated/ios/NitroText-Swift-Cxx-Bridge.hpp

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nitrogen/generated/ios/c++/HybridNitroTextSpecSwift.hpp

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nitrogen/generated/ios/c++/views/HybridNitroTextComponent.mm

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nitrogen/generated/ios/swift/Fragment.swift

Lines changed: 24 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nitrogen/generated/ios/swift/HybridNitroTextSpec.swift

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nitrogen/generated/ios/swift/HybridNitroTextSpec_cxx.swift

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)