feat: allow for not filled sf symbols (#98)

callstackincubator · Oct 30, 2024 · 81926f1 · 81926f1
1 parent 6dc2f3e
commit 81926f1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/example/src/Examples/SFSymbols.tsx b/example/src/Examples/SFSymbols.tsx
@@ -18,7 +18,7 @@ export default function SFSymbols() {
         : { sfSymbol: 'document.fill' },
       unfocusedIcon: isAndroid
         ? require('../../assets/icons/chat_dark.png')
-        : { sfSymbol: 'bubble.left.fill' },
+        : { sfSymbol: 'document' },
       badge: '!',
     },
     {

diff --git a/ios/TabViewImpl.swift b/ios/TabViewImpl.swift
@@ -75,6 +75,7 @@ struct TabViewImpl: View {
           .tag(tabData?.key)
           .tabBadge(tabData?.badge)
       }
+
     }
     .onTabItemLongPress({ index in
       if let key = props.items[safe: index]?.key {
@@ -163,6 +164,7 @@ struct TabItem: View {
       Image(uiImage: icon)
     } else if let sfSymbol, !sfSymbol.isEmpty {
       Image(systemName: sfSymbol)
+        .noneSymbolVariant()
     }
     if (labeled != false) {
       Text(title ?? "")
@@ -190,11 +192,11 @@ extension View {
   func tabBadge(_ data: String?) -> some View {
     if #available(iOS 15.0, macOS 15.0, visionOS 2.0, tvOS 15.0, *) {
       if let data = data, !data.isEmpty {
-        #if !os(tvOS)
+#if !os(tvOS)
         self.badge(data)
-        #else
+#else
         self
-        #endif
+#endif
       } else {
         self
       }
@@ -256,4 +258,16 @@ extension View {
       self
     }
   }
+
+  // Allows TabView to use unfilled SFSymbols.
+  // By default they are always filled.
+  @ViewBuilder
+  func noneSymbolVariant() -> some View {
+    if #available(iOS 15.0, *) {
+      self
+        .environment(\.symbolVariants, .none)
+    } else {
+      self
+    }
+  }
 }