From 4939d579cdf6a925652ee61d7d9452c85386c3dc Mon Sep 17 00:00:00 2001 From: Bartosz Grajdek Date: Fri, 25 Aug 2023 10:52:11 +0200 Subject: [PATCH 1/2] [TS migration] Migrate 'fontFamily' style to TypeScript --- src/styles/fontFamily/bold/index.android.js | 3 --- src/styles/fontFamily/bold/index.android.ts | 3 +++ src/styles/fontFamily/bold/index.ios.js | 3 --- src/styles/fontFamily/bold/index.ios.ts | 3 +++ src/styles/fontFamily/bold/{index.js => index.ts} | 2 +- .../{index.native.js => index.native.ts} | 3 ++- src/styles/fontFamily/{index.js => index.ts} | 3 ++- src/styles/fontFamily/types.ts | 15 +++++++++++++++ 8 files changed, 26 insertions(+), 9 deletions(-) delete mode 100644 src/styles/fontFamily/bold/index.android.js create mode 100644 src/styles/fontFamily/bold/index.android.ts delete mode 100644 src/styles/fontFamily/bold/index.ios.js create mode 100644 src/styles/fontFamily/bold/index.ios.ts rename src/styles/fontFamily/bold/{index.js => index.ts} (82%) rename src/styles/fontFamily/{index.native.js => index.native.ts} (86%) rename src/styles/fontFamily/{index.js => index.ts} (91%) create mode 100644 src/styles/fontFamily/types.ts diff --git a/src/styles/fontFamily/bold/index.android.js b/src/styles/fontFamily/bold/index.android.js deleted file mode 100644 index 7473e4d7533c..000000000000 --- a/src/styles/fontFamily/bold/index.android.js +++ /dev/null @@ -1,3 +0,0 @@ -const bold = 'ExpensifyNeue-Bold'; - -export default bold; diff --git a/src/styles/fontFamily/bold/index.android.ts b/src/styles/fontFamily/bold/index.android.ts new file mode 100644 index 000000000000..ee8576cfc139 --- /dev/null +++ b/src/styles/fontFamily/bold/index.android.ts @@ -0,0 +1,3 @@ +const bold = 'ExpensifyNeue-Bold' as string; + +export default bold; diff --git a/src/styles/fontFamily/bold/index.ios.js b/src/styles/fontFamily/bold/index.ios.js deleted file mode 100644 index 3ba35f200d3d..000000000000 --- a/src/styles/fontFamily/bold/index.ios.js +++ /dev/null @@ -1,3 +0,0 @@ -const bold = 'ExpensifyNeue-Regular'; - -export default bold; diff --git a/src/styles/fontFamily/bold/index.ios.ts b/src/styles/fontFamily/bold/index.ios.ts new file mode 100644 index 000000000000..0195be2b1f13 --- /dev/null +++ b/src/styles/fontFamily/bold/index.ios.ts @@ -0,0 +1,3 @@ +const bold = 'ExpensifyNeue-Regular' as string; + +export default bold; diff --git a/src/styles/fontFamily/bold/index.js b/src/styles/fontFamily/bold/index.ts similarity index 82% rename from src/styles/fontFamily/bold/index.js rename to src/styles/fontFamily/bold/index.ts index 66d3c64f3565..296ca81e52f3 100644 --- a/src/styles/fontFamily/bold/index.js +++ b/src/styles/fontFamily/bold/index.ts @@ -1,3 +1,3 @@ -const bold = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji'; +const bold = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji' as string; export default bold; diff --git a/src/styles/fontFamily/index.native.js b/src/styles/fontFamily/index.native.ts similarity index 86% rename from src/styles/fontFamily/index.native.js rename to src/styles/fontFamily/index.native.ts index 369d1f66f8f1..0d6c253eb3a6 100644 --- a/src/styles/fontFamily/index.native.js +++ b/src/styles/fontFamily/index.native.ts @@ -1,6 +1,7 @@ import bold from './bold'; +import FontFamilyStyles from './types'; -const fontFamily = { +const fontFamily: FontFamilyStyles = { EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic', EXP_NEUE_BOLD: bold, EXP_NEUE: 'ExpensifyNeue-Regular', diff --git a/src/styles/fontFamily/index.js b/src/styles/fontFamily/index.ts similarity index 91% rename from src/styles/fontFamily/index.js rename to src/styles/fontFamily/index.ts index 899ef20772de..57d08ce28771 100644 --- a/src/styles/fontFamily/index.js +++ b/src/styles/fontFamily/index.ts @@ -1,8 +1,9 @@ import bold from './bold'; +import FontFamilyStyles from './types'; // In windows and ubuntu, we need some extra system fonts for emojis to work properly // otherwise few of them will appear as black and white -const fontFamily = { +const fontFamily: FontFamilyStyles = { EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic, Segoe UI Emoji, Noto Color Emoji', EXP_NEUE_BOLD: bold, EXP_NEUE: 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji', diff --git a/src/styles/fontFamily/types.ts b/src/styles/fontFamily/types.ts new file mode 100644 index 000000000000..4c9a121e80d7 --- /dev/null +++ b/src/styles/fontFamily/types.ts @@ -0,0 +1,15 @@ +type FontFamilyKeys = + | 'EXP_NEUE_ITALIC' + | 'EXP_NEUE_BOLD' + | 'EXP_NEUE' + | 'EXP_NEW_KANSAS_MEDIUM' + | 'EXP_NEW_KANSAS_MEDIUM_ITALIC' + | 'SYSTEM' + | 'MONOSPACE' + | 'MONOSPACE_ITALIC' + | 'MONOSPACE_BOLD' + | 'MONOSPACE_BOLD_ITALIC'; + +type FontFamilyStyles = Record; + +export default FontFamilyStyles; From 48a1a93a477026f8439a4f62a25d4f56e387a632 Mon Sep 17 00:00:00 2001 From: Bartosz Grajdek Date: Fri, 25 Aug 2023 10:59:00 +0200 Subject: [PATCH 2/2] Remove assertions --- src/styles/fontFamily/bold/index.android.js | 3 +++ src/styles/fontFamily/bold/index.android.ts | 3 --- src/styles/fontFamily/bold/index.ios.js | 3 +++ src/styles/fontFamily/bold/index.ios.ts | 3 --- src/styles/fontFamily/bold/{index.ts => index.js} | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/styles/fontFamily/bold/index.android.js delete mode 100644 src/styles/fontFamily/bold/index.android.ts create mode 100644 src/styles/fontFamily/bold/index.ios.js delete mode 100644 src/styles/fontFamily/bold/index.ios.ts rename src/styles/fontFamily/bold/{index.ts => index.js} (82%) diff --git a/src/styles/fontFamily/bold/index.android.js b/src/styles/fontFamily/bold/index.android.js new file mode 100644 index 000000000000..7473e4d7533c --- /dev/null +++ b/src/styles/fontFamily/bold/index.android.js @@ -0,0 +1,3 @@ +const bold = 'ExpensifyNeue-Bold'; + +export default bold; diff --git a/src/styles/fontFamily/bold/index.android.ts b/src/styles/fontFamily/bold/index.android.ts deleted file mode 100644 index ee8576cfc139..000000000000 --- a/src/styles/fontFamily/bold/index.android.ts +++ /dev/null @@ -1,3 +0,0 @@ -const bold = 'ExpensifyNeue-Bold' as string; - -export default bold; diff --git a/src/styles/fontFamily/bold/index.ios.js b/src/styles/fontFamily/bold/index.ios.js new file mode 100644 index 000000000000..3ba35f200d3d --- /dev/null +++ b/src/styles/fontFamily/bold/index.ios.js @@ -0,0 +1,3 @@ +const bold = 'ExpensifyNeue-Regular'; + +export default bold; diff --git a/src/styles/fontFamily/bold/index.ios.ts b/src/styles/fontFamily/bold/index.ios.ts deleted file mode 100644 index 0195be2b1f13..000000000000 --- a/src/styles/fontFamily/bold/index.ios.ts +++ /dev/null @@ -1,3 +0,0 @@ -const bold = 'ExpensifyNeue-Regular' as string; - -export default bold; diff --git a/src/styles/fontFamily/bold/index.ts b/src/styles/fontFamily/bold/index.js similarity index 82% rename from src/styles/fontFamily/bold/index.ts rename to src/styles/fontFamily/bold/index.js index 296ca81e52f3..66d3c64f3565 100644 --- a/src/styles/fontFamily/bold/index.ts +++ b/src/styles/fontFamily/bold/index.js @@ -1,3 +1,3 @@ -const bold = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji' as string; +const bold = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji'; export default bold;