Merge branch 'main' into feature/304-nr-update-va-ussf-logos

department-of-veterans-affairs · May 14, 2024 · 7300476 · 7300476
2 parents bc8ea1a + d4e82d4
commit 7300476
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [components-v0.15.3](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.15.3) (2024-05-14)
+
+[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.15.2...components-v0.15.3)
+
+**Merged pull requests:**
+
+- \[Bug\] Fix TS complaint in Icon [\#318](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/318) ([TimRoe](https://github.com/TimRoe))
+
 ## [components-v0.15.2](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.15.2) (2024-05-14)
 
 [Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.15.1...components-v0.15.2)

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-component-library",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "VA Design System Mobile Component Library",
   "main": "src/index.tsx",
   "scripts": {

diff --git a/packages/components/src/components/Icon/Icon.tsx b/packages/components/src/components/Icon/Icon.tsx
@@ -211,7 +211,8 @@ export const Icon: FC<IconProps> = ({
   const fontScale = useWindowDimensions().fontScale
   const fs = (val: number) => fontScale * val
 
-  const _Icon: FC<SvgProps> = name ? IconMap[name] : svg
+  // ! to override TS incorrectly thinking svg can be undefined after update
+  const _Icon: FC<SvgProps> = name ? IconMap[name] : svg!
 
   if (typeof fill === 'object') {
     fill = isDarkMode ? fill.dark : fill.light