Improve Default Placeholder

divadretlaw · Jan 26, 2024 · 064c4f1 · 064c4f1
1 parent d29af75
commit 064c4f1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/Sources/EmojiText/EmojiText.swift b/Sources/EmojiText/EmojiText.swift
@@ -97,14 +97,18 @@ public struct EmojiText: View {
     // MARK: - Load Emojis
 
     func loadPlaceholders() -> [String: RenderedEmoji] {
+        let font = EmojiFont.preferredFont(from: font, for: dynamicTypeSize)
+        let baselineOffset = emojiBaselineOffset ?? -(font.pointSize - font.capHeight) / 2
+
         var placeholders = [String: RenderedEmoji]()
 
         for emoji in emojis {
             switch emoji {
             case let localEmoji as LocalEmoji:
                 placeholders[emoji.shortcode] = RenderedEmoji(
                     from: localEmoji,
-                    targetHeight: targetHeight
+                    targetHeight: targetHeight,
+                    baselineOffset: baselineOffset
                 )
             case let sfSymbolEmoji as SFSymbolEmoji:
                 placeholders[emoji.shortcode] = RenderedEmoji(
@@ -114,7 +118,8 @@ public struct EmojiText: View {
                 placeholders[emoji.shortcode] = RenderedEmoji(
                     from: emoji,
                     placeholder: emojiPlaceholder,
-                    targetHeight: targetHeight
+                    targetHeight: targetHeight,
+                    baselineOffset: baselineOffset
                 )
             }
         }

diff --git a/Sources/EmojiText/Environment.swift b/Sources/EmojiText/Environment.swift
@@ -17,7 +17,17 @@ struct EmojiImagePipelineKey: EnvironmentKey {
 
 struct EmojiPlaceholderKey: EnvironmentKey {
     static var defaultValue: any CustomEmoji {
-        SFSymbolEmoji.placeholder
+        #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS) || os(visionOS)
+        if let image = UIImage(systemName: "square.dashed") {
+            return LocalEmoji(shortcode: "square.dashed", image: image, renderingMode: .template)
+        }
+        #elseif os(macOS)
+        if let image = NSImage(systemName: "square.dashed") {
+            return LocalEmoji(shortcode: "square.dashed", image: image, renderingMode: .template)
+        }
+        #endif
+
+        return SFSymbolEmoji(shortcode: "square.dashed", symbolRenderingMode: .monochrome, renderingMode: .template)
     }
 }
 

diff --git a/Sources/EmojiText/Model/Emoji/RenderedEmoji.swift b/Sources/EmojiText/Model/Emoji/RenderedEmoji.swift
@@ -58,10 +58,10 @@ struct RenderedEmoji: Hashable, Equatable, Identifiable {
         self.sourceHash = emoji.hashValue
     }
 
-    init(from emoji: any CustomEmoji, placeholder: any CustomEmoji, animated: Bool = false, targetHeight: CGFloat) {
+    init(from emoji: any CustomEmoji, placeholder: any CustomEmoji, animated: Bool = false, targetHeight: CGFloat, baselineOffset: CGFloat? = nil) {
         self.shortcode = "placeholder"
         self.renderingMode = emoji.renderingMode
-        self.baselineOffset = emoji.baselineOffset
+        self.baselineOffset = emoji.baselineOffset ?? baselineOffset
         self.symbolRenderingMode = emoji.symbolRenderingMode
         self.placeholderId = UUID()
         // The source hash is the cominbed value of the emoji & target height
@@ -76,7 +76,7 @@ struct RenderedEmoji: Hashable, Equatable, Identifiable {
         case let sfSymbolEmoji as SFSymbolEmoji:
             self.rawImage = RenderedImage(systemName: sfSymbolEmoji.shortcode)
         default:
-            self.rawImage = RenderedImage(systemName: SFSymbolEmoji.placeholder.shortcode)
+            self.rawImage = RenderedImage(systemName: SFSymbolEmoji.fallback.shortcode)
             Logger.emojiText.error("Unsupported CustomEmoji was used as placeholder. Only LocalEmoji and SFSymbolEmoji are supported. This is a bug. Please file a report at https://github.com/divadretlaw/EmojiText")
         }
     }

diff --git a/Sources/EmojiText/Model/Emoji/SFSymbolEmoji.swift b/Sources/EmojiText/Model/Emoji/SFSymbolEmoji.swift
@@ -29,8 +29,7 @@ public struct SFSymbolEmoji: CustomEmoji {
         self.renderingMode = renderingMode
     }
 
-    /// The default placeholder
-    static var placeholder: Self {
+    static var fallback: Self {
         SFSymbolEmoji(shortcode: "square.dashed", symbolRenderingMode: .monochrome, renderingMode: .template)
     }
 
@@ -45,7 +44,7 @@ public struct SFSymbolEmoji: CustomEmoji {
 extension EmojiImage {
     static func from(emoji: SFSymbolEmoji) -> EmojiImage {
         EmojiImage(systemName: emoji.shortcode)
-        ?? EmojiImage(systemName: SFSymbolEmoji.placeholder.shortcode)
+        ?? EmojiImage(systemName: SFSymbolEmoji.fallback.shortcode)
         ?? EmojiImage()
     }
 }