diff --git a/.storybook/main.ts b/.storybook/main.ts index ce090486..708c85b4 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -37,7 +37,7 @@ const config: StorybookConfig = { staticDirs: [ "../example/assets/css", "../example/assets/fonts/TitilliumSansPro", - "../example/assets/fonts/ReadexPro", + "../example/assets/fonts/Titillio", "../example/assets/fonts/DMMono", "../repo-assets", "../stories/assets" diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 8005ef49..4f78bb75 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -2,7 +2,12 @@ - + + + + + + diff --git a/example/android/app/src/main/assets/fonts/ReadexPro-Regular.ttf b/example/android/app/src/main/assets/fonts/ReadexPro-Regular.ttf deleted file mode 100644 index 542d479e..00000000 Binary files a/example/android/app/src/main/assets/fonts/ReadexPro-Regular.ttf and /dev/null differ diff --git a/example/android/app/src/main/assets/fonts/ReadexPro-SemiBold.ttf b/example/android/app/src/main/assets/fonts/ReadexPro-SemiBold.ttf deleted file mode 100644 index 5ca73122..00000000 Binary files a/example/android/app/src/main/assets/fonts/ReadexPro-SemiBold.ttf and /dev/null differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Black.otf b/example/android/app/src/main/assets/fonts/Titillio-Black.otf new file mode 100644 index 00000000..3c0ef91b Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Black.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-BlackItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-BlackItalic.otf new file mode 100644 index 00000000..736a84df Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-BlackItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Bold.otf b/example/android/app/src/main/assets/fonts/Titillio-Bold.otf new file mode 100644 index 00000000..96875a29 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Bold.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-BoldItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-BoldItalic.otf new file mode 100644 index 00000000..1d4c6ad6 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-BoldItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Extrablack.otf b/example/android/app/src/main/assets/fonts/Titillio-Extrablack.otf new file mode 100644 index 00000000..510f0284 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Extrablack.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-ExtrablackItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-ExtrablackItalic.otf new file mode 100644 index 00000000..47af7a8e Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-ExtrablackItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Extrabold.otf b/example/android/app/src/main/assets/fonts/Titillio-Extrabold.otf new file mode 100644 index 00000000..c91a55e3 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Extrabold.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-ExtraboldItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-ExtraboldItalic.otf new file mode 100644 index 00000000..98f420ff Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-ExtraboldItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Light.otf b/example/android/app/src/main/assets/fonts/Titillio-Light.otf new file mode 100644 index 00000000..feee6497 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Light.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-LightItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-LightItalic.otf new file mode 100644 index 00000000..71fc52d4 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-LightItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Regular.otf b/example/android/app/src/main/assets/fonts/Titillio-Regular.otf new file mode 100644 index 00000000..146cf787 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Regular.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-RegularItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-RegularItalic.otf new file mode 100644 index 00000000..cb0ab973 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-RegularItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Semibold.otf b/example/android/app/src/main/assets/fonts/Titillio-Semibold.otf new file mode 100644 index 00000000..216d916b Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Semibold.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-SemiboldItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-SemiboldItalic.otf new file mode 100644 index 00000000..c032c6a6 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-SemiboldItalic.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-Thin.otf b/example/android/app/src/main/assets/fonts/Titillio-Thin.otf new file mode 100644 index 00000000..c3551aa6 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-Thin.otf differ diff --git a/example/android/app/src/main/assets/fonts/Titillio-ThinItalic.otf b/example/android/app/src/main/assets/fonts/Titillio-ThinItalic.otf new file mode 100644 index 00000000..5685c7a0 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/Titillio-ThinItalic.otf differ diff --git a/example/android/link-assets-manifest.json b/example/android/link-assets-manifest.json index 2839b8fb..70e00782 100644 --- a/example/android/link-assets-manifest.json +++ b/example/android/link-assets-manifest.json @@ -54,12 +54,68 @@ "sha1": "6bb6bf0c5d7a7f50606cc276cc4ef1787f52a928" }, { - "path": "assets/fonts/ReadexPro/ReadexPro-Regular.ttf", - "sha1": "93e4080794b725f216a94b57ed62a51bc77bce91" + "path": "assets/fonts/Titillio/Titillio-Black.otf", + "sha1": "ab71d06a0c7cbac0f069ad37758de4ffb6105b75" }, { - "path": "assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf", - "sha1": "b4ec28a6b1ba6ed730beb37f06b1b81c5e2163a3" + "path": "assets/fonts/Titillio/Titillio-BlackItalic.otf", + "sha1": "984c6762c6a4007dbaa4191450701dfe4b3c32e2" + }, + { + "path": "assets/fonts/Titillio/Titillio-Bold.otf", + "sha1": "063279df70343ff1d64386422197b916c28fc46e" + }, + { + "path": "assets/fonts/Titillio/Titillio-BoldItalic.otf", + "sha1": "0d4912434cd31bb17a79de5620a9002589184aa2" + }, + { + "path": "assets/fonts/Titillio/Titillio-Extrablack.otf", + "sha1": "91bc736eb8911eeaf7e8c6af129fc6584b6a73e2" + }, + { + "path": "assets/fonts/Titillio/Titillio-ExtrablackItalic.otf", + "sha1": "0949d60e776b7b776ffae8b42ed2c680d4e8e259" + }, + { + "path": "assets/fonts/Titillio/Titillio-Extrabold.otf", + "sha1": "e2157b363c0dab2a12236aec75016d666dd2f099" + }, + { + "path": "assets/fonts/Titillio/Titillio-ExtraboldItalic.otf", + "sha1": "0fb6f663dad1559230d754a885c56b3ae9e7633c" + }, + { + "path": "assets/fonts/Titillio/Titillio-Light.otf", + "sha1": "75dff329af1d38450d73e2ffa42046c209ebeecd" + }, + { + "path": "assets/fonts/Titillio/Titillio-LightItalic.otf", + "sha1": "3a896c3efe30713e424b4923f896794c02a731e4" + }, + { + "path": "assets/fonts/Titillio/Titillio-Regular.otf", + "sha1": "2ef70364b63b023170e556be1c1142fd2f39c921" + }, + { + "path": "assets/fonts/Titillio/Titillio-RegularItalic.otf", + "sha1": "076718292c7a43b4274b18057fe2149f24a2147c" + }, + { + "path": "assets/fonts/Titillio/Titillio-Semibold.otf", + "sha1": "40ae4e6ceb0d41c48aea604d2755936d86dc704d" + }, + { + "path": "assets/fonts/Titillio/Titillio-SemiboldItalic.otf", + "sha1": "6e0eb54a25d0cfc63113f2aefc9207381fa98a64" + }, + { + "path": "assets/fonts/Titillio/Titillio-Thin.otf", + "sha1": "8a66b26e0f70dcb60f599726fd5ced68f18b8ae0" + }, + { + "path": "assets/fonts/Titillio/Titillio-ThinItalic.otf", + "sha1": "9257e7b33a4e2b3cbba6c6a46701b886b9520f3c" }, { "path": "assets/fonts/DMMono/DMMono-Medium.ttf", diff --git a/example/assets/css/fonts.css b/example/assets/css/fonts.css index 43d46f58..785305c3 100644 --- a/example/assets/css/fonts.css +++ b/example/assets/css/fonts.css @@ -1,10 +1,45 @@ @font-face { - font-family: 'ReadexPro'; - src: url('ReadexPro-Regular.ttf') format("truetype"); + font-family: 'Titillio 3'; + src: url('Titillio-Thin.otf') format("truetype"); + font-weight: 200; + font-style: normal; +} + +@font-face { + font-family: 'Titillio 3'; + src: url('Titillio-Light.otf') format("truetype"); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Titillio 3'; + src: url('Titillio-Regular.otf') format("truetype"); font-weight: 400; font-style: normal; } +@font-face { + font-family: 'Titillio 3'; + src: url('Titillio-Semibold.otf') format("truetype"); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: 'Titillio 3'; + src: url('Titillio-Bold.otf') format("truetype"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'Titillio 3'; + src: url('Titillio-Black.otf') format("truetype"); + font-weight: 900; + font-style: normal; +} + /* DM MONO */ @font-face { font-family: 'DMMono'; diff --git a/example/assets/fonts/ReadexPro/ReadexPro-Regular.ttf b/example/assets/fonts/ReadexPro/ReadexPro-Regular.ttf deleted file mode 100644 index 542d479e..00000000 Binary files a/example/assets/fonts/ReadexPro/ReadexPro-Regular.ttf and /dev/null differ diff --git a/example/assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf b/example/assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf deleted file mode 100644 index 5ca73122..00000000 Binary files a/example/assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf and /dev/null differ diff --git a/example/assets/fonts/Titillio/Titillio-Black.otf b/example/assets/fonts/Titillio/Titillio-Black.otf new file mode 100644 index 00000000..3c0ef91b Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Black.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-BlackItalic.otf b/example/assets/fonts/Titillio/Titillio-BlackItalic.otf new file mode 100644 index 00000000..736a84df Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-BlackItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Bold.otf b/example/assets/fonts/Titillio/Titillio-Bold.otf new file mode 100644 index 00000000..96875a29 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Bold.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-BoldItalic.otf b/example/assets/fonts/Titillio/Titillio-BoldItalic.otf new file mode 100644 index 00000000..1d4c6ad6 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-BoldItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Extrablack.otf b/example/assets/fonts/Titillio/Titillio-Extrablack.otf new file mode 100644 index 00000000..510f0284 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Extrablack.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-ExtrablackItalic.otf b/example/assets/fonts/Titillio/Titillio-ExtrablackItalic.otf new file mode 100644 index 00000000..47af7a8e Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-ExtrablackItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Extrabold.otf b/example/assets/fonts/Titillio/Titillio-Extrabold.otf new file mode 100644 index 00000000..c91a55e3 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Extrabold.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-ExtraboldItalic.otf b/example/assets/fonts/Titillio/Titillio-ExtraboldItalic.otf new file mode 100644 index 00000000..98f420ff Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-ExtraboldItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Light.otf b/example/assets/fonts/Titillio/Titillio-Light.otf new file mode 100644 index 00000000..feee6497 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Light.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-LightItalic.otf b/example/assets/fonts/Titillio/Titillio-LightItalic.otf new file mode 100644 index 00000000..71fc52d4 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-LightItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Regular.otf b/example/assets/fonts/Titillio/Titillio-Regular.otf new file mode 100644 index 00000000..146cf787 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Regular.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-RegularItalic.otf b/example/assets/fonts/Titillio/Titillio-RegularItalic.otf new file mode 100644 index 00000000..cb0ab973 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-RegularItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Semibold.otf b/example/assets/fonts/Titillio/Titillio-Semibold.otf new file mode 100644 index 00000000..216d916b Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Semibold.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-SemiboldItalic.otf b/example/assets/fonts/Titillio/Titillio-SemiboldItalic.otf new file mode 100644 index 00000000..c032c6a6 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-SemiboldItalic.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-Thin.otf b/example/assets/fonts/Titillio/Titillio-Thin.otf new file mode 100644 index 00000000..c3551aa6 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-Thin.otf differ diff --git a/example/assets/fonts/Titillio/Titillio-ThinItalic.otf b/example/assets/fonts/Titillio/Titillio-ThinItalic.otf new file mode 100644 index 00000000..5685c7a0 Binary files /dev/null and b/example/assets/fonts/Titillio/Titillio-ThinItalic.otf differ diff --git a/example/ios/ExampleApp.xcodeproj/project.pbxproj b/example/ios/ExampleApp.xcodeproj/project.pbxproj index 5aaa2b50..29be4a29 100644 --- a/example/ios/ExampleApp.xcodeproj/project.pbxproj +++ b/example/ios/ExampleApp.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* ExampleAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ExampleAppTests.m */; }; + 0C3C1E3040E34DDEB7ABFB43 /* Titillio-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CDB5BAA288C747E6B86FE84D /* Titillio-ThinItalic.otf */; }; 0C59F26DDBD344E4806A4529 /* TitilliumSansPro-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = BF7A394314AE48669CF9322B /* TitilliumSansPro-Semibold.otf */; }; 0C80B921A6F3F58F76C31292 /* libPods-ExampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-ExampleApp.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; @@ -15,21 +16,34 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 156FEFA162CE4118B7B0E409 /* TitilliumSansPro-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6C6D7476B139472CA35D0A7C /* TitilliumSansPro-Black.otf */; }; 16EB711B49904FDCB773BFF8 /* TitilliumSansPro-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 165A63C9D24A49A0884E935F /* TitilliumSansPro-Light.otf */; }; - 2097F76B68D349EFBD2A8A4C /* ReadexPro-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2473ADE2FEB04232B7E24471 /* ReadexPro-SemiBold.ttf */; }; + 1D6E6F9B4C16432CA6BEBF9B /* Titillio-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = D206717D13554353B50B2957 /* Titillio-Light.otf */; }; + 1EAA0F16FC594FA780EC142A /* Titillio-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CEBAB7CB47BF4FC9BE56B10B /* Titillio-Bold.otf */; }; + 21717B5E05AE475F98736DF3 /* Titillio-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D45E0DCC845A427BA80DDCED /* Titillio-BlackItalic.otf */; }; 358B339E53D745279D8F0A92 /* TitilliumSansPro-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 721969CE7F714270A560A3C2 /* TitilliumSansPro-BoldItalic.otf */; }; 3A4D6DDAEE064A62BCB9E41C /* TitilliumSansPro-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2D914480BB10462696485089 /* TitilliumSansPro-ThinItalic.otf */; }; + 3E9A766310EF4D7182ECE58B /* Titillio-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9323387669874BCA88DEAAB7 /* Titillio-BoldItalic.otf */; }; 493FA456AB57478891021E84 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */; }; + 497AFB642D5642ECA1B57F46 /* Titillio-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0C2B73AC2CA34996A186ECD8 /* Titillio-Regular.otf */; }; 4E98DA23C9A74ABD815AA090 /* TitilliumSansPro-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5FC82A404FE3426DAF4CC14B /* TitilliumSansPro-Thin.otf */; }; 516EE70168A44DD5BA34112C /* TitilliumSansPro-SemiboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = FF23D2E42775424F9E287256 /* TitilliumSansPro-SemiboldItalic.otf */; }; 5BE5117A57FA4A15A1780DF3 /* TitilliumSansPro-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 89F7AF8F0D5B498AA788BA72 /* TitilliumSansPro-Bold.otf */; }; 5CF5F4DBD1B145F487CED1AB /* DMMono-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */; }; 6638A00F6A5243B8BB420D6A /* TitilliumSansPro-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = BACE855F75F5475DB313F98A /* TitilliumSansPro-Italic.otf */; }; + 6652BE50724D4E21A4FFBB45 /* Titillio-LightItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = BD03350B17FC4A8BBFB935CA /* Titillio-LightItalic.otf */; }; 7699B88040F8A987B510C191 /* libPods-ExampleApp-ExampleAppTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-ExampleApp-ExampleAppTests.a */; }; + 786E050A56AD49448D8D7125 /* Titillio-ExtraboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D250123C226F48A8B293E7B4 /* Titillio-ExtraboldItalic.otf */; }; + 7D11DCF42F7C42949A3B25FB /* Titillio-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5F1AADB543D24D808DF674BE /* Titillio-Semibold.otf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + 902050E1E877447499F8AF25 /* Titillio-Extrablack.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0E85246882A147CAB9F19177 /* Titillio-Extrablack.otf */; }; 9E386271F0FF4FED8E88ACBE /* TitilliumSansPro-LightItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = E1250CCE3DA54D589AB013F6 /* TitilliumSansPro-LightItalic.otf */; }; + A2639A8C82FC46B9927310F9 /* Titillio-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 463C2C4990BE436BBAE9E663 /* Titillio-Black.otf */; }; + B33CF7125A7C4FBB98253E2F /* Titillio-Extrabold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5070E0C4AA8E482D9C9099B5 /* Titillio-Extrabold.otf */; }; + C9D83757996E4132BE18346A /* Titillio-ExtrablackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 17BFE9FD4EE94A2381B4C39C /* Titillio-ExtrablackItalic.otf */; }; CF08661296A84F3790AE7176 /* TitilliumSansPro-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 555A35FB015A4CFBA6E6670B /* TitilliumSansPro-Regular.otf */; }; + D8750855083A4030BBF76F07 /* Titillio-RegularItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 84AFD11CE456424CA5DEAFD7 /* Titillio-RegularItalic.otf */; }; DBC2F57CBD33421CAAE5ECF2 /* TitilliumSansPro-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B25A42218CA0455EB3DC54ED /* TitilliumSansPro-BlackItalic.otf */; }; - DD2EDEE079464A559B3FE549 /* ReadexPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */; }; + E3FA1603F38846889B4DC948 /* Titillio-SemiboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B371518363164094B73176EE /* Titillio-SemiboldItalic.otf */; }; + EB544EEBF56F494EBA967C80 /* Titillio-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 7EF8935DC94F47A9BBDFD6C8 /* Titillio-Thin.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -46,6 +60,8 @@ 00E356EE1AD99517003FC87E /* ExampleAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* ExampleAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleAppTests.m; sourceTree = ""; }; + 0C2B73AC2CA34996A186ECD8 /* Titillio-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Regular.otf"; path = "../assets/fonts/Titillio/Titillio-Regular.otf"; sourceTree = ""; }; + 0E85246882A147CAB9F19177 /* Titillio-Extrablack.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Extrablack.otf"; path = "../assets/fonts/Titillio/Titillio-Extrablack.otf"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* ExampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ExampleApp/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = ExampleApp/AppDelegate.mm; sourceTree = ""; }; @@ -53,26 +69,38 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ExampleApp/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ExampleApp/main.m; sourceTree = ""; }; 165A63C9D24A49A0884E935F /* TitilliumSansPro-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Light.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf"; sourceTree = ""; }; + 17BFE9FD4EE94A2381B4C39C /* Titillio-ExtrablackItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-ExtrablackItalic.otf"; path = "../assets/fonts/Titillio/Titillio-ExtrablackItalic.otf"; sourceTree = ""; }; 19F6CBCC0A4E27FBF8BF4A61 /* libPods-ExampleApp-ExampleAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleApp-ExampleAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = LICENSE.txt; path = ../assets/fonts/TitilliumSansPro/LICENSE.txt; sourceTree = ""; }; 1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "DMMono-Medium.ttf"; path = "../assets/fonts/DMMono/DMMono-Medium.ttf"; sourceTree = ""; }; - 2473ADE2FEB04232B7E24471 /* ReadexPro-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ReadexPro-SemiBold.ttf"; path = "../assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf"; sourceTree = ""; }; 2D914480BB10462696485089 /* TitilliumSansPro-ThinItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-ThinItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-ThinItalic.otf"; sourceTree = ""; }; 3B4392A12AC88292D35C810B /* Pods-ExampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.debug.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.debug.xcconfig"; sourceTree = ""; }; + 463C2C4990BE436BBAE9E663 /* Titillio-Black.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Black.otf"; path = "../assets/fonts/Titillio/Titillio-Black.otf"; sourceTree = ""; }; + 5070E0C4AA8E482D9C9099B5 /* Titillio-Extrabold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Extrabold.otf"; path = "../assets/fonts/Titillio/Titillio-Extrabold.otf"; sourceTree = ""; }; 555A35FB015A4CFBA6E6670B /* TitilliumSansPro-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Regular.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf"; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-ExampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.release.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.release.xcconfig"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-ExampleApp-ExampleAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp-ExampleAppTests.debug.xcconfig"; path = "Target Support Files/Pods-ExampleApp-ExampleAppTests/Pods-ExampleApp-ExampleAppTests.debug.xcconfig"; sourceTree = ""; }; 5DCACB8F33CDC322A6C60F78 /* libPods-ExampleApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleApp.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5F1AADB543D24D808DF674BE /* Titillio-Semibold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Semibold.otf"; path = "../assets/fonts/Titillio/Titillio-Semibold.otf"; sourceTree = ""; }; 5FC82A404FE3426DAF4CC14B /* TitilliumSansPro-Thin.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Thin.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf"; sourceTree = ""; }; 6C6D7476B139472CA35D0A7C /* TitilliumSansPro-Black.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Black.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf"; sourceTree = ""; }; 721969CE7F714270A560A3C2 /* TitilliumSansPro-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-BoldItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-BoldItalic.otf"; sourceTree = ""; }; + 7EF8935DC94F47A9BBDFD6C8 /* Titillio-Thin.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Thin.otf"; path = "../assets/fonts/Titillio/Titillio-Thin.otf"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ExampleApp/LaunchScreen.storyboard; sourceTree = ""; }; + 84AFD11CE456424CA5DEAFD7 /* Titillio-RegularItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-RegularItalic.otf"; path = "../assets/fonts/Titillio/Titillio-RegularItalic.otf"; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-ExampleApp-ExampleAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp-ExampleAppTests.release.xcconfig"; path = "Target Support Files/Pods-ExampleApp-ExampleAppTests/Pods-ExampleApp-ExampleAppTests.release.xcconfig"; sourceTree = ""; }; 89F7AF8F0D5B498AA788BA72 /* TitilliumSansPro-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Bold.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf"; sourceTree = ""; }; - AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ReadexPro-Regular.ttf"; path = "../assets/fonts/ReadexPro/ReadexPro-Regular.ttf"; sourceTree = ""; }; + 9323387669874BCA88DEAAB7 /* Titillio-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-BoldItalic.otf"; path = "../assets/fonts/Titillio/Titillio-BoldItalic.otf"; sourceTree = ""; }; B25A42218CA0455EB3DC54ED /* TitilliumSansPro-BlackItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-BlackItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-BlackItalic.otf"; sourceTree = ""; }; + B371518363164094B73176EE /* Titillio-SemiboldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-SemiboldItalic.otf"; path = "../assets/fonts/Titillio/Titillio-SemiboldItalic.otf"; sourceTree = ""; }; BACE855F75F5475DB313F98A /* TitilliumSansPro-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Italic.otf"; sourceTree = ""; }; + BD03350B17FC4A8BBFB935CA /* Titillio-LightItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-LightItalic.otf"; path = "../assets/fonts/Titillio/Titillio-LightItalic.otf"; sourceTree = ""; }; BF7A394314AE48669CF9322B /* TitilliumSansPro-Semibold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Semibold.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf"; sourceTree = ""; }; + CDB5BAA288C747E6B86FE84D /* Titillio-ThinItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-ThinItalic.otf"; path = "../assets/fonts/Titillio/Titillio-ThinItalic.otf"; sourceTree = ""; }; + CEBAB7CB47BF4FC9BE56B10B /* Titillio-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Bold.otf"; path = "../assets/fonts/Titillio/Titillio-Bold.otf"; sourceTree = ""; }; + D206717D13554353B50B2957 /* Titillio-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-Light.otf"; path = "../assets/fonts/Titillio/Titillio-Light.otf"; sourceTree = ""; }; + D250123C226F48A8B293E7B4 /* Titillio-ExtraboldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-ExtraboldItalic.otf"; path = "../assets/fonts/Titillio/Titillio-ExtraboldItalic.otf"; sourceTree = ""; }; + D45E0DCC845A427BA80DDCED /* Titillio-BlackItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Titillio-BlackItalic.otf"; path = "../assets/fonts/Titillio/Titillio-BlackItalic.otf"; sourceTree = ""; }; E1250CCE3DA54D589AB013F6 /* TitilliumSansPro-LightItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-LightItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-LightItalic.otf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; FF23D2E42775424F9E287256 /* TitilliumSansPro-SemiboldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-SemiboldItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-SemiboldItalic.otf"; sourceTree = ""; }; @@ -173,10 +201,8 @@ 8B89E994FF304D53907AB447 /* Resources */ = { isa = PBXGroup; children = ( - AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */, 1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */, 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */, - 2473ADE2FEB04232B7E24471 /* ReadexPro-SemiBold.ttf */, 6C6D7476B139472CA35D0A7C /* TitilliumSansPro-Black.otf */, B25A42218CA0455EB3DC54ED /* TitilliumSansPro-BlackItalic.otf */, 89F7AF8F0D5B498AA788BA72 /* TitilliumSansPro-Bold.otf */, @@ -189,6 +215,22 @@ FF23D2E42775424F9E287256 /* TitilliumSansPro-SemiboldItalic.otf */, 5FC82A404FE3426DAF4CC14B /* TitilliumSansPro-Thin.otf */, 2D914480BB10462696485089 /* TitilliumSansPro-ThinItalic.otf */, + 463C2C4990BE436BBAE9E663 /* Titillio-Black.otf */, + D45E0DCC845A427BA80DDCED /* Titillio-BlackItalic.otf */, + CEBAB7CB47BF4FC9BE56B10B /* Titillio-Bold.otf */, + 9323387669874BCA88DEAAB7 /* Titillio-BoldItalic.otf */, + 0E85246882A147CAB9F19177 /* Titillio-Extrablack.otf */, + 17BFE9FD4EE94A2381B4C39C /* Titillio-ExtrablackItalic.otf */, + 5070E0C4AA8E482D9C9099B5 /* Titillio-Extrabold.otf */, + D250123C226F48A8B293E7B4 /* Titillio-ExtraboldItalic.otf */, + D206717D13554353B50B2957 /* Titillio-Light.otf */, + BD03350B17FC4A8BBFB935CA /* Titillio-LightItalic.otf */, + 0C2B73AC2CA34996A186ECD8 /* Titillio-Regular.otf */, + 84AFD11CE456424CA5DEAFD7 /* Titillio-RegularItalic.otf */, + 5F1AADB543D24D808DF674BE /* Titillio-Semibold.otf */, + B371518363164094B73176EE /* Titillio-SemiboldItalic.otf */, + 7EF8935DC94F47A9BBDFD6C8 /* Titillio-Thin.otf */, + CDB5BAA288C747E6B86FE84D /* Titillio-ThinItalic.otf */, ); name = Resources; path = ""; @@ -301,10 +343,8 @@ files = ( 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, - DD2EDEE079464A559B3FE549 /* ReadexPro-Regular.ttf in Resources */, 5CF5F4DBD1B145F487CED1AB /* DMMono-Medium.ttf in Resources */, 493FA456AB57478891021E84 /* LICENSE.txt in Resources */, - 2097F76B68D349EFBD2A8A4C /* ReadexPro-SemiBold.ttf in Resources */, 156FEFA162CE4118B7B0E409 /* TitilliumSansPro-Black.otf in Resources */, DBC2F57CBD33421CAAE5ECF2 /* TitilliumSansPro-BlackItalic.otf in Resources */, 5BE5117A57FA4A15A1780DF3 /* TitilliumSansPro-Bold.otf in Resources */, @@ -317,6 +357,22 @@ 516EE70168A44DD5BA34112C /* TitilliumSansPro-SemiboldItalic.otf in Resources */, 4E98DA23C9A74ABD815AA090 /* TitilliumSansPro-Thin.otf in Resources */, 3A4D6DDAEE064A62BCB9E41C /* TitilliumSansPro-ThinItalic.otf in Resources */, + A2639A8C82FC46B9927310F9 /* Titillio-Black.otf in Resources */, + 21717B5E05AE475F98736DF3 /* Titillio-BlackItalic.otf in Resources */, + 1EAA0F16FC594FA780EC142A /* Titillio-Bold.otf in Resources */, + 3E9A766310EF4D7182ECE58B /* Titillio-BoldItalic.otf in Resources */, + 902050E1E877447499F8AF25 /* Titillio-Extrablack.otf in Resources */, + C9D83757996E4132BE18346A /* Titillio-ExtrablackItalic.otf in Resources */, + B33CF7125A7C4FBB98253E2F /* Titillio-Extrabold.otf in Resources */, + 786E050A56AD49448D8D7125 /* Titillio-ExtraboldItalic.otf in Resources */, + 1D6E6F9B4C16432CA6BEBF9B /* Titillio-Light.otf in Resources */, + 6652BE50724D4E21A4FFBB45 /* Titillio-LightItalic.otf in Resources */, + 497AFB642D5642ECA1B57F46 /* Titillio-Regular.otf in Resources */, + D8750855083A4030BBF76F07 /* Titillio-RegularItalic.otf in Resources */, + 7D11DCF42F7C42949A3B25FB /* Titillio-Semibold.otf in Resources */, + E3FA1603F38846889B4DC948 /* Titillio-SemiboldItalic.otf in Resources */, + EB544EEBF56F494EBA967C80 /* Titillio-Thin.otf in Resources */, + 0C3C1E3040E34DDEB7ABFB43 /* Titillio-ThinItalic.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/example/ios/ExampleApp/Info.plist b/example/ios/ExampleApp/Info.plist index 58f9377d..ad317572 100644 --- a/example/ios/ExampleApp/Info.plist +++ b/example/ios/ExampleApp/Info.plist @@ -55,9 +55,7 @@ UIAppFonts - ReadexPro-Regular.ttf DMMono-Medium.ttf - ReadexPro-SemiBold.ttf TitilliumSansPro-Black.otf TitilliumSansPro-BlackItalic.otf TitilliumSansPro-Bold.otf @@ -70,6 +68,22 @@ TitilliumSansPro-SemiboldItalic.otf TitilliumSansPro-Thin.otf TitilliumSansPro-ThinItalic.otf + Titillio-Black.otf + Titillio-BlackItalic.otf + Titillio-Bold.otf + Titillio-BoldItalic.otf + Titillio-Extrablack.otf + Titillio-ExtrablackItalic.otf + Titillio-Extrabold.otf + Titillio-ExtraboldItalic.otf + Titillio-Light.otf + Titillio-LightItalic.otf + Titillio-Regular.otf + Titillio-RegularItalic.otf + Titillio-Semibold.otf + Titillio-SemiboldItalic.otf + Titillio-Thin.otf + Titillio-ThinItalic.otf diff --git a/example/ios/link-assets-manifest.json b/example/ios/link-assets-manifest.json index 2839b8fb..70e00782 100644 --- a/example/ios/link-assets-manifest.json +++ b/example/ios/link-assets-manifest.json @@ -54,12 +54,68 @@ "sha1": "6bb6bf0c5d7a7f50606cc276cc4ef1787f52a928" }, { - "path": "assets/fonts/ReadexPro/ReadexPro-Regular.ttf", - "sha1": "93e4080794b725f216a94b57ed62a51bc77bce91" + "path": "assets/fonts/Titillio/Titillio-Black.otf", + "sha1": "ab71d06a0c7cbac0f069ad37758de4ffb6105b75" }, { - "path": "assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf", - "sha1": "b4ec28a6b1ba6ed730beb37f06b1b81c5e2163a3" + "path": "assets/fonts/Titillio/Titillio-BlackItalic.otf", + "sha1": "984c6762c6a4007dbaa4191450701dfe4b3c32e2" + }, + { + "path": "assets/fonts/Titillio/Titillio-Bold.otf", + "sha1": "063279df70343ff1d64386422197b916c28fc46e" + }, + { + "path": "assets/fonts/Titillio/Titillio-BoldItalic.otf", + "sha1": "0d4912434cd31bb17a79de5620a9002589184aa2" + }, + { + "path": "assets/fonts/Titillio/Titillio-Extrablack.otf", + "sha1": "91bc736eb8911eeaf7e8c6af129fc6584b6a73e2" + }, + { + "path": "assets/fonts/Titillio/Titillio-ExtrablackItalic.otf", + "sha1": "0949d60e776b7b776ffae8b42ed2c680d4e8e259" + }, + { + "path": "assets/fonts/Titillio/Titillio-Extrabold.otf", + "sha1": "e2157b363c0dab2a12236aec75016d666dd2f099" + }, + { + "path": "assets/fonts/Titillio/Titillio-ExtraboldItalic.otf", + "sha1": "0fb6f663dad1559230d754a885c56b3ae9e7633c" + }, + { + "path": "assets/fonts/Titillio/Titillio-Light.otf", + "sha1": "75dff329af1d38450d73e2ffa42046c209ebeecd" + }, + { + "path": "assets/fonts/Titillio/Titillio-LightItalic.otf", + "sha1": "3a896c3efe30713e424b4923f896794c02a731e4" + }, + { + "path": "assets/fonts/Titillio/Titillio-Regular.otf", + "sha1": "2ef70364b63b023170e556be1c1142fd2f39c921" + }, + { + "path": "assets/fonts/Titillio/Titillio-RegularItalic.otf", + "sha1": "076718292c7a43b4274b18057fe2149f24a2147c" + }, + { + "path": "assets/fonts/Titillio/Titillio-Semibold.otf", + "sha1": "40ae4e6ceb0d41c48aea604d2755936d86dc704d" + }, + { + "path": "assets/fonts/Titillio/Titillio-SemiboldItalic.otf", + "sha1": "6e0eb54a25d0cfc63113f2aefc9207381fa98a64" + }, + { + "path": "assets/fonts/Titillio/Titillio-Thin.otf", + "sha1": "8a66b26e0f70dcb60f599726fd5ced68f18b8ae0" + }, + { + "path": "assets/fonts/Titillio/Titillio-ThinItalic.otf", + "sha1": "9257e7b33a4e2b3cbba6c6a46701b886b9520f3c" }, { "path": "assets/fonts/DMMono/DMMono-Medium.ttf", diff --git a/example/package.json b/example/package.json index 3c58487a..e583bda6 100644 --- a/example/package.json +++ b/example/package.json @@ -25,7 +25,7 @@ "react-native-gesture-handler": "^2.12.1", "react-native-haptic-feedback": "^2.0.3", "react-native-linear-gradient": "^2.8.1", - "react-native-reanimated": "3.12.0", + "react-native-reanimated": "3.15.0", "react-native-safe-area-context": "^4.7.1", "react-native-screens": "^3.23.0", "react-native-svg": "^15.1.0", diff --git a/example/react-native.config.js b/example/react-native.config.js index 52990da8..ff44d77f 100644 --- a/example/react-native.config.js +++ b/example/react-native.config.js @@ -12,7 +12,7 @@ module.exports = { }, assets: [ "./assets/fonts/TitilliumSansPro", - "./assets/fonts/ReadexPro", + "./assets/fonts/Titillio", "./assets/fonts/DMMono" ] }; diff --git a/example/src/components/IconViewerBox.tsx b/example/src/components/IconViewerBox.tsx index 882f230b..3348920a 100644 --- a/example/src/components/IconViewerBox.tsx +++ b/example/src/components/IconViewerBox.tsx @@ -1,6 +1,11 @@ -import { IOColors, useIOTheme } from "@pagopa/io-app-design-system"; +import { + IOColors, + IOFontSize, + IOText, + useIOTheme +} from "@pagopa/io-app-design-system"; import React from "react"; -import { StyleSheet, Text, View } from "react-native"; +import { StyleSheet, View } from "react-native"; export const iconItemGutter = 8; @@ -41,15 +46,6 @@ const styles = StyleSheet.create({ iconItemLarger: { padding: 12 }, - iconLabelSmall: { - fontSize: 8 - }, - iconLabelMedium: { - fontSize: 10 - }, - iconLabelLarge: { - fontSize: 11 - }, signalDot: { position: "absolute", right: 4, @@ -72,17 +68,17 @@ const sizeMap = { small: { wrapper: styles.iconWrapperSmall, item: styles.iconItemLarger, - label: styles.iconLabelSmall + label: 9 as IOFontSize }, medium: { wrapper: styles.iconWrapperMedium, item: null, - label: styles.iconLabelMedium + label: 10 as IOFontSize }, large: { wrapper: styles.iconWrapperLarge, item: styles.iconItemLarger, - label: styles.iconLabelLarge + label: 11 as IOFontSize } }; @@ -112,16 +108,14 @@ export const IconViewerBox = ({ {name && ( - {name} - + )} diff --git a/example/src/navigation/navigator.tsx b/example/src/navigation/navigator.tsx index b80a2cec..3860069a 100644 --- a/example/src/navigation/navigator.tsx +++ b/example/src/navigation/navigator.tsx @@ -91,7 +91,7 @@ const AppNavigator = () => { initialRouteName={APP_ROUTES.MAIN} screenOptions={{ headerTitleStyle: { - fontFamily: "Readex Pro", + fontFamily: "Titillio", fontSize: 14, fontWeight: "normal" }, diff --git a/example/src/pages/NumberPad.tsx b/example/src/pages/NumberPad.tsx index 79cd0080..60880f2a 100644 --- a/example/src/pages/NumberPad.tsx +++ b/example/src/pages/NumberPad.tsx @@ -6,7 +6,7 @@ import { IOColors, IOStyles, IOVisualCostants, - LabelSmallAlt, + LabelSmall, ListItemSwitch, NumberPad, VSpacer, @@ -69,9 +69,12 @@ export const NumberPadScreen = () => {
{"Value Typed on the NumberPad component"}
- + {value} - + ( - @@ -314,18 +312,6 @@ export const LabelMiniRow = () => ( ); -export const LabelSmallAltRow = () => ( - - Label small alt - - Label small alt - - - Label small alt - - -); - export const LabelRow = () => ( diff --git a/example/yarn.lock b/example/yarn.lock index 30c8a84b..124ac6f5 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -38,11 +38,25 @@ "@babel/highlight" "^7.24.7" picocolors "^1.0.0" +"@babel/code-frame@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== + dependencies: + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" + picocolors "^1.0.0" + "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== +"@babel/compat-data@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e" + integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg== + "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.20.0": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f" @@ -94,6 +108,17 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" +"@babel/generator@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f" + integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw== + dependencies: + "@babel/parser" "^7.26.2" + "@babel/types" "^7.26.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" + "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" @@ -101,6 +126,13 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-annotate-as-pure@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" + integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== + dependencies: + "@babel/types" "^7.25.9" + "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892" @@ -112,6 +144,17 @@ lru-cache "^5.1.1" semver "^6.3.1" +"@babel/helper-compilation-targets@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875" + integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ== + dependencies: + "@babel/compat-data" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" + lru-cache "^5.1.1" + semver "^6.3.1" + "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236" @@ -127,6 +170,19 @@ "@babel/helper-split-export-declaration" "^7.22.6" semver "^6.3.1" +"@babel/helper-create-class-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83" + integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/traverse" "^7.25.9" + semver "^6.3.1" + "@babel/helper-create-regexp-features-plugin@^7.22.5": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6" @@ -136,6 +192,15 @@ regexpu-core "^5.3.1" semver "^6.3.1" +"@babel/helper-create-regexp-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26" + integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + regexpu-core "^6.1.1" + semver "^6.3.1" + "@babel/helper-define-polyfill-provider@^0.4.1": version "0.4.1" resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz#af1429c4a83ac316a6a8c2cc8ff45cb5d2998d3a" @@ -187,6 +252,14 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-member-expression-to-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3" + integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/helper-module-imports@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" @@ -212,6 +285,13 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-optimise-call-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e" + integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ== + dependencies: + "@babel/types" "^7.25.9" + "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" @@ -222,6 +302,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== +"@babel/helper-plugin-utils@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46" + integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw== + "@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82" @@ -240,6 +325,15 @@ "@babel/helper-member-expression-to-functions" "^7.22.5" "@babel/helper-optimise-call-expression" "^7.22.5" +"@babel/helper-replace-supers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5" + integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/helper-simple-access@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" @@ -262,6 +356,14 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" +"@babel/helper-skip-transparent-expression-wrappers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9" + integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" @@ -279,6 +381,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" @@ -294,11 +401,21 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + "@babel/helper-validator-option@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== +"@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== + "@babel/helper-wrap-function@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz#189937248c45b0182c1dcf32f3444ca153944cb9" @@ -360,6 +477,13 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.0.tgz#9fdc9237504d797b6e7b8f66e78ea7f570d256ad" integrity sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA== +"@babel/parser@^7.25.9", "@babel/parser@^7.26.2": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11" + integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ== + dependencies: + "@babel/types" "^7.26.0" + "@babel/plugin-proposal-async-generator-functions@^7.0.0": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" @@ -586,6 +710,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-class-properties@^7.0.0-0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f" + integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-transform-classes@^7.0.0": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363" @@ -601,6 +733,18 @@ "@babel/helper-split-export-declaration" "^7.22.6" globals "^11.1.0" +"@babel/plugin-transform-classes@^7.0.0-0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52" + integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/traverse" "^7.25.9" + globals "^11.1.0" + "@babel/plugin-transform-computed-properties@^7.0.0": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869" @@ -815,6 +959,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-unicode-regex@^7.0.0-0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1" + integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/preset-flow@^7.13.13": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.22.5.tgz#876f24ab6b38bd79703a93f32020ca2162312784" @@ -885,6 +1037,15 @@ "@babel/parser" "^7.25.0" "@babel/types" "^7.25.0" +"@babel/template@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/traverse@^7.20.0", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" @@ -914,6 +1075,19 @@ debug "^4.3.1" globals "^11.1.0" +"@babel/traverse@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84" + integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/generator" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/template" "^7.25.9" + "@babel/types" "^7.25.9" + debug "^4.3.1" + globals "^11.1.0" + "@babel/types@^7.0.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" @@ -941,6 +1115,14 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" +"@babel/types@^7.25.9", "@babel/types@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" + integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@egjs/hammerjs@^2.0.17": version "2.0.17" resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124" @@ -1953,6 +2135,16 @@ browserslist@^4.21.9: node-releases "^2.0.12" update-browserslist-db "^1.0.11" +browserslist@^4.24.0: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + dependencies: + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" + node-releases "^2.0.18" + update-browserslist-db "^1.1.1" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -2017,6 +2209,11 @@ caniuse-lite@^1.0.30001503: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz#90fabae294215c3495807eb24fc809e11dc2f0a8" integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA== +caniuse-lite@^1.0.30001669: + version "1.0.30001679" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz#18c573b72f72ba70822194f6c39e7888597f9e32" + integrity sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA== + chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -2393,6 +2590,11 @@ electron-to-chromium@^1.4.431: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.466.tgz#17193d70f203da3d52a89c653b8d89f47a51d79d" integrity sha512-TSkRvbXRXD8BwhcGlZXDsbI2lRoP8dvqR7LQnqQNk9KxXBc4tG8O+rTuXgTyIpEdiqSGKEBSqrxdqEntnjNncA== +electron-to-chromium@^1.5.41: + version "1.5.55" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz#73684752aa2e1aa49cafb355a41386c6637e76a9" + integrity sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -2440,6 +2642,11 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -3240,6 +3447,11 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +jsesc@^3.0.2, jsesc@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== + jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" @@ -4120,6 +4332,11 @@ node-releases@^2.0.12: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== + node-stream-zip@^1.9.1: version "1.15.0" resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea" @@ -4336,6 +4553,11 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== + picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" @@ -4502,16 +4724,19 @@ react-native-linear-gradient@^2.8.1: resolved "https://registry.yarnpkg.com/react-native-linear-gradient/-/react-native-linear-gradient-2.8.1.tgz#e4284f3cb1ba403b8c03364f7569f0c9e4101862" integrity sha512-934R4Bnjo7mYT38W9ypS1Dq/YW6TgyGdkHg+w72HNxN0ZDKG1GqAnZ6XlicMUYJDh7ViiJAKN8eOF3Ho0N4J0Q== -react-native-reanimated@3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.12.0.tgz#2c768d43971bb19e425c436c892bf68c74b9ccab" - integrity sha512-Bwa4jKL/QttnV8pQYiX+1N5a6XgL8yZtMyH+7UbEaW7ZeNCv1Pxp2PmYu/bP3LafCkmS9Yj/hY2adYNKe58g9A== +react-native-reanimated@3.15.0: + version "3.15.0" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.15.0.tgz#8814af7c78bbdf4c92bbd583f2266febf962e66a" + integrity sha512-yGxOyYAAu/5CyjonM2SgsM5sviiiK8HiHL9jT1bKfRxMLnNX9cFP8/UXRkbMT7ZXIfOlCvNFR0AqnphpuXIPVA== dependencies: "@babel/plugin-transform-arrow-functions" "^7.0.0-0" + "@babel/plugin-transform-class-properties" "^7.0.0-0" + "@babel/plugin-transform-classes" "^7.0.0-0" "@babel/plugin-transform-nullish-coalescing-operator" "^7.0.0-0" "@babel/plugin-transform-optional-chaining" "^7.0.0-0" "@babel/plugin-transform-shorthand-properties" "^7.0.0-0" "@babel/plugin-transform-template-literals" "^7.0.0-0" + "@babel/plugin-transform-unicode-regex" "^7.0.0-0" "@babel/preset-typescript" "^7.16.7" convert-source-map "^2.0.0" invariant "^2.2.4" @@ -4653,6 +4878,13 @@ regenerate-unicode-properties@^10.1.0: dependencies: regenerate "^1.4.2" +regenerate-unicode-properties@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0" + integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA== + dependencies: + regenerate "^1.4.2" + regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" @@ -4675,6 +4907,30 @@ regexpu-core@^5.3.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.1.0" +regexpu-core@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac" + integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw== + dependencies: + regenerate "^1.4.2" + regenerate-unicode-properties "^10.2.0" + regjsgen "^0.8.0" + regjsparser "^0.11.0" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" + +regjsgen@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab" + integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== + +regjsparser@^0.11.0: + version "0.11.2" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.2.tgz#7404ad42be00226d72bcf1f003f1f441861913d8" + integrity sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA== + dependencies: + jsesc "~3.0.2" + regjsparser@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" @@ -5197,6 +5453,14 @@ update-browserslist-db@^1.0.11: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== + dependencies: + escalade "^3.2.0" + picocolors "^1.1.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" diff --git a/package.json b/package.json index 35e23fdb..9e109d1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pagopa/io-app-design-system", - "version": "2.0.6", + "version": "2.1.0-3", "description": "The library defining the core components of the design system of @pagopa/io-app", "main": "lib/commonjs/index", "module": "lib/module/index", @@ -191,7 +191,7 @@ "react-native-gesture-handler": "^2.12.0", "react-native-haptic-feedback": "^2.0.2", "react-native-linear-gradient": "^2.5.6", - "react-native-reanimated": "3.12.0", + "react-native-reanimated": "3.15.0", "react-native-safe-area-context": "^3.3.2", "react-native-svg": "^15.1.0", "rn-placeholder": "1.3.3" diff --git a/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap b/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap index 6c9fb1d6..882d7233 100644 --- a/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap +++ b/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap @@ -92,7 +92,7 @@ exports[`Test Advice Components - Experimental Enabled Advice Snapshot 1`] = ` {}, { "color": "#555C70", - "fontFamily": "Titillium Sans Pro", + "fontFamily": "Titillio", "fontSize": 16, "fontStyle": "normal", "fontWeight": "400", diff --git a/src/components/badge/Badge.tsx b/src/components/badge/Badge.tsx index 12f412e2..f8f00acb 100644 --- a/src/components/badge/Badge.tsx +++ b/src/components/badge/Badge.tsx @@ -164,8 +164,8 @@ export const Badge = ({ text, outline = false, variant, testID }: Badge) => { ]} > ( accessible={false} accessibilityElementsHidden importantForAccessibility="no-hide-descendants" - font={isExperimental ? "ReadexPro" : "TitilliumSansPro"} - weight={isExperimental ? "Regular" : "Bold"} + font={isExperimental ? "Titillio" : "TitilliumSansPro"} + weight={isExperimental ? "Semibold" : "Bold"} size={buttonTextFontSize} style={ disabled diff --git a/src/components/buttons/ButtonOutline.tsx b/src/components/buttons/ButtonOutline.tsx index 877b8a3a..b524a81e 100644 --- a/src/components/buttons/ButtonOutline.tsx +++ b/src/components/buttons/ButtonOutline.tsx @@ -374,8 +374,8 @@ export const ButtonOutline = React.forwardRef( )} - + {label} - + {isSuggested && ( <> diff --git a/src/components/listitems/ListItemTransaction.tsx b/src/components/listitems/ListItemTransaction.tsx index ee51c7e9..19f9ec8d 100644 --- a/src/components/listitems/ListItemTransaction.tsx +++ b/src/components/listitems/ListItemTransaction.tsx @@ -24,7 +24,7 @@ import { LogoPaymentWithFallback } from "../common/LogoPaymentWithFallback"; import { IOIconSizeScale, Icon } from "../icons"; import { IOLogoPaymentType } from "../logos"; import { VSpacer } from "../spacer"; -import { H6, LabelSmall, LabelSmallAlt } from "../typography"; +import { H6, LabelSmall } from "../typography"; import { PressableBaseProps, PressableListItemBase @@ -192,12 +192,13 @@ export const ListItemTransaction = ({ )} - {title} - + {subtitle} diff --git a/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap b/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap index 71c4dc37..8fbfef81 100644 --- a/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap +++ b/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap @@ -84,10 +84,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemAction Snapsh {}, { "color": "#0B3EE3", - "fontFamily": "Readex Pro", + "fontFamily": "Titillio", "fontSize": 16, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 20, }, ] @@ -176,10 +176,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemIDP Snapshot }, { "color": "#555C70", - "fontFamily": "Readex Pro", + "fontFamily": "Titillio", "fontSize": 12, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 16, }, ] @@ -245,7 +245,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfo Snapshot {}, { "color": "#555C70", - "fontFamily": "Titillium Sans Pro", + "fontFamily": "Titillio", "fontSize": 14, "fontStyle": "normal", "fontWeight": "400", @@ -266,10 +266,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfo Snapshot {}, { "color": "#0E0F13", - "fontFamily": "Readex Pro", - "fontSize": 16, + "fontFamily": "Titillio", + "fontSize": 18, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 24, }, ] @@ -367,7 +367,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfoCopy Snap {}, { "color": "#555C70", - "fontFamily": "Titillium Sans Pro", + "fontFamily": "Titillio", "fontSize": 14, "fontStyle": "normal", "fontWeight": "400", @@ -388,10 +388,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfoCopy Snap {}, { "color": "#0B3EE3", - "fontFamily": "Readex Pro", - "fontSize": 16, + "fontFamily": "Titillio", + "fontSize": 18, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 24, }, ] @@ -555,10 +555,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemNav Snapshot {}, { "color": "#0E0F13", - "fontFamily": "Readex Pro", - "fontSize": 16, + "fontFamily": "Titillio", + "fontSize": 18, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 24, }, ] @@ -784,10 +784,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemNavAlert Snap {}, { "color": "#0E0F13", - "fontFamily": "Readex Pro", - "fontSize": 16, + "fontFamily": "Titillio", + "fontSize": 18, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 24, }, ] @@ -952,10 +952,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou {}, { "color": "#0E0F13", - "fontFamily": "Readex Pro", + "fontFamily": "Titillio", "fontSize": 14, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 21, }, ] @@ -1051,7 +1051,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou {}, { "color": "#5517E3", - "fontFamily": "Titillium Sans Pro", + "fontFamily": "Titillio", "fontSize": 14, "fontStyle": "normal", "fontWeight": "400", @@ -1090,10 +1090,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou {}, { "color": "#0B3EE3", - "fontFamily": "Readex Pro", - "fontSize": 16, + "fontFamily": "Titillio", + "fontSize": 18, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 24, }, ] @@ -1340,10 +1340,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou {}, { "color": "#0E0F13", - "fontFamily": "Readex Pro", + "fontFamily": "Titillio", "fontSize": 14, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 21, }, ] @@ -1378,10 +1378,10 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou {}, { "color": "#0B3EE3", - "fontFamily": "Readex Pro", - "fontSize": 16, + "fontFamily": "Titillio", + "fontSize": 18, "fontStyle": "normal", - "fontWeight": "400", + "fontWeight": "600", "lineHeight": 24, }, ] @@ -1967,7 +1967,7 @@ exports[`Test List Item Components ListItemInfo Snapshot 1`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } @@ -2089,7 +2089,7 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } @@ -2256,7 +2256,7 @@ exports[`Test List Item Components ListItemNav Snapshot 1`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } @@ -2485,7 +2485,7 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } @@ -2650,7 +2650,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` { "color": "#0E0F13", "fontFamily": "Titillium Sans Pro", - "fontSize": 16, + "fontSize": 14, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 21, @@ -2791,7 +2791,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } @@ -3038,7 +3038,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 2`] = ` { "color": "#0E0F13", "fontFamily": "Titillium Sans Pro", - "fontSize": 16, + "fontSize": 14, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 21, @@ -3079,7 +3079,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 2`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } diff --git a/src/components/modules/ModuleAttachment.tsx b/src/components/modules/ModuleAttachment.tsx index 649efe26..4689aee6 100644 --- a/src/components/modules/ModuleAttachment.tsx +++ b/src/components/modules/ModuleAttachment.tsx @@ -7,7 +7,7 @@ import { Badge } from "../badge"; import { Icon } from "../icons"; import { LoadingSpinner } from "../loadingSpinner"; import { HStack, VStack } from "../stack"; -import { LabelSmallAlt } from "../typography"; +import { Label } from "../typography"; import { ModuleStatic } from "./ModuleStatic"; import { PressableModuleBase } from "./PressableModuleBase"; @@ -66,12 +66,13 @@ const ModuleAttachmentContent = ({ space={4} style={{ alignItems: "flex-start", flexShrink: 1, flexGrow: 1 }} > - {title} - + diff --git a/src/components/modules/ModuleCredential.tsx b/src/components/modules/ModuleCredential.tsx index ee795a61..e6634b48 100644 --- a/src/components/modules/ModuleCredential.tsx +++ b/src/components/modules/ModuleCredential.tsx @@ -20,7 +20,7 @@ import { Badge } from "../badge"; import { IOIcons, Icon } from "../icons"; import { LoadingSpinner } from "../loadingSpinner"; import { HStack } from "../stack/Stack"; -import { LabelSmallAlt } from "../typography"; +import { LabelSmall } from "../typography"; import { ModuleStatic } from "./ModuleStatic"; import { PressableModuleBase, @@ -89,14 +89,15 @@ const ModuleCredential = (props: WithTestID) => { {/* Graphical assets */} {iconComponent ?? imageComponent} - {label} - + {badge ? ( diff --git a/src/components/modules/ModuleIDP.tsx b/src/components/modules/ModuleIDP.tsx index a046fc41..6a625a33 100644 --- a/src/components/modules/ModuleIDP.tsx +++ b/src/components/modules/ModuleIDP.tsx @@ -59,8 +59,8 @@ export const ModuleIDP = ({ withLooseSpacing={withLooseSpacing} > ) => { {iconComponent ?? imageComponent} - {title} - + {subtitle && ( {subtitle} )} diff --git a/src/components/modules/ModulePaymentNotice.tsx b/src/components/modules/ModulePaymentNotice.tsx index cdd563ae..673378eb 100644 --- a/src/components/modules/ModulePaymentNotice.tsx +++ b/src/components/modules/ModulePaymentNotice.tsx @@ -7,7 +7,7 @@ import { WithTestID } from "../../utils/types"; import { Badge } from "../badge"; import { Icon } from "../icons"; import { HStack, VStack } from "../stack"; -import { H6, LabelSmall, LabelSmallAlt } from "../typography"; +import { H6, Label, LabelSmall } from "../typography"; import { ModuleStatic } from "./ModuleStatic"; import { PressableModuleBase } from "./PressableModuleBase"; @@ -98,12 +98,13 @@ const ModulePaymentNoticeContent = ({ )} {subtitle && ( - {subtitle} - + )} diff --git a/src/components/searchInput/SearchInput.tsx b/src/components/searchInput/SearchInput.tsx index 6759fc27..df36e761 100644 --- a/src/components/searchInput/SearchInput.tsx +++ b/src/components/searchInput/SearchInput.tsx @@ -326,7 +326,7 @@ const styles = StyleSheet.create({ placeholder: { ...makeFontStyleObject( inputFontSizePlaceholder, - "ReadexPro", + "Titillio", undefined, "Regular" ) diff --git a/src/components/tag/Tag.tsx b/src/components/tag/Tag.tsx index 406756cb..8f1fda14 100644 --- a/src/components/tag/Tag.tsx +++ b/src/components/tag/Tag.tsx @@ -169,8 +169,8 @@ export const Tag = ({ {variantProps && text && } {text && ( ( ref?: ForwardedRef ) => { const theme = useIOTheme(); + const { isExperimental } = useIOExperimentalDesign(); const defaultColor = asLink ? theme["interactiveElem-default"] @@ -33,8 +40,12 @@ export const Body = forwardRef( const BodyProps: IOTextProps = { ...props, dynamicTypeRamp: "body", // iOS only - font: "TitilliumSansPro", - weight: customWeight ?? "Regular", + font: isExperimental ? fontName : legacyFontName, + weight: customWeight + ? customWeight + : isExperimental + ? fontWeight + : legacyFontWeight, size: bodyFontSize, lineHeight: bodyLineHeight, color: customColor ?? defaultColor, diff --git a/src/components/typography/ButtonText.tsx b/src/components/typography/ButtonText.tsx index b73f0a2c..729f5d7c 100644 --- a/src/components/typography/ButtonText.tsx +++ b/src/components/typography/ButtonText.tsx @@ -9,8 +9,8 @@ export const buttonTextFontSize: IOFontSize = 16; /* Needed to render `ButtonOutline` and`ButtonLink` because they use `AnimatedText` for color transition through Reanimated */ const defaultColor: IOColors = "white"; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 const legacyFontName: IOFontFamily = "TitilliumSansPro"; diff --git a/src/components/typography/Caption.tsx b/src/components/typography/Caption.tsx index ea249078..198c615a 100644 --- a/src/components/typography/Caption.tsx +++ b/src/components/typography/Caption.tsx @@ -7,7 +7,7 @@ import { IOText, IOTextProps, TypographicStyleProps } from "./IOText"; const defaultColor: keyof IOTheme = "textBody-default"; export const captionFontSize: IOFontSize = 12; -const fontName: IOFontFamily = "ReadexPro"; +const fontName: IOFontFamily = "Titillio"; const fontWeight: IOFontWeight = "Regular"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 diff --git a/src/components/typography/Chip.tsx b/src/components/typography/Chip.tsx index 04357cd7..41a98573 100644 --- a/src/components/typography/Chip.tsx +++ b/src/components/typography/Chip.tsx @@ -4,7 +4,7 @@ import { useIOExperimentalDesign, useIOTheme } from "../../core"; import { IOFontFamily } from "../../utils/fonts"; import { IOText, IOTextProps, TypographicStyleProps } from "./IOText"; -const fontName: IOFontFamily = "ReadexPro"; +const fontName: IOFontFamily = "Titillio"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 const legacyFontName: IOFontFamily = "TitilliumSansPro"; /** diff --git a/src/components/typography/H1.tsx b/src/components/typography/H1.tsx index 673b85c8..a1fe4629 100644 --- a/src/components/typography/H1.tsx +++ b/src/components/typography/H1.tsx @@ -8,12 +8,10 @@ const defaultColor: keyof IOTheme = "textHeading-default"; export const h1FontSize: IOFontSize = 28; export const h1LineHeight = 42; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 -const legacyH1FontSize: IOFontSize = 31; -const legacyH1LineHeight = 43; const legacyFontName: IOFontFamily = "TitilliumSansPro"; const legacyFontWeight: IOFontWeight = "Semibold"; @@ -30,8 +28,8 @@ export const H1 = forwardRef( dynamicTypeRamp: "largeTitle", // iOS only font: isExperimental ? fontName : legacyFontName, weight: isExperimental ? fontWeight : legacyFontWeight, - size: isExperimental ? h1FontSize : legacyH1FontSize, - lineHeight: isExperimental ? h1LineHeight : legacyH1LineHeight, + size: h1FontSize, + lineHeight: h1LineHeight, color: customColor ?? theme[defaultColor] }; diff --git a/src/components/typography/H2.tsx b/src/components/typography/H2.tsx index 4ffaf606..3032c2b8 100644 --- a/src/components/typography/H2.tsx +++ b/src/components/typography/H2.tsx @@ -8,8 +8,8 @@ const defaultColor: keyof IOTheme = "textHeading-default"; export const h2FontSize: IOFontSize = 26; export const h2LineHeight = 34; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 const legacyH2FontSize: IOFontSize = 28; diff --git a/src/components/typography/H3.tsx b/src/components/typography/H3.tsx index 7005cf98..2736bcba 100644 --- a/src/components/typography/H3.tsx +++ b/src/components/typography/H3.tsx @@ -9,8 +9,8 @@ const defaultColor: keyof IOTheme = "textHeading-default"; /* Common typographic styles */ export const h3FontSize: IOFontSize = 22; export const h3LineHeight = 33; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 const legacyFontName: IOFontFamily = "TitilliumSansPro"; diff --git a/src/components/typography/H4.tsx b/src/components/typography/H4.tsx index 52bf1c12..2f493e43 100644 --- a/src/components/typography/H4.tsx +++ b/src/components/typography/H4.tsx @@ -8,8 +8,8 @@ const defaultColor: keyof IOTheme = "textHeading-default"; export const h4FontSize: IOFontSize = 20; export const h4LineHeight = 24; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 const legacyFontName: IOFontFamily = "TitilliumSansPro"; diff --git a/src/components/typography/H5.tsx b/src/components/typography/H5.tsx index 1273a1ab..b5e36076 100644 --- a/src/components/typography/H5.tsx +++ b/src/components/typography/H5.tsx @@ -1,11 +1,17 @@ import React, { ForwardedRef, forwardRef } from "react"; import { View } from "react-native"; -import { IOTheme, useIOTheme } from "../../core"; -import { IOFontSize } from "../../utils/fonts"; +import { IOTheme, useIOExperimentalDesign, useIOTheme } from "../../core"; +import { IOFontFamily, IOFontSize, IOFontWeight } from "../../utils/fonts"; import { IOText, IOTextProps, TypographicStyleProps } from "./IOText"; const defaultColor: keyof IOTheme = "textHeading-default"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; + +const legacyFontName: IOFontFamily = "TitilliumSansPro"; +const legacyFontWeight: IOFontWeight = "Semibold"; + export const h5FontSize: IOFontSize = 14; export const h5LineHeight = 16; @@ -15,12 +21,13 @@ export const h5LineHeight = 16; export const H5 = forwardRef( ({ color: customColor, ...props }, ref?: ForwardedRef) => { const theme = useIOTheme(); + const { isExperimental } = useIOExperimentalDesign(); const H5Props: IOTextProps = { ...props, dynamicTypeRamp: "subheadline", // iOS only - font: "TitilliumSansPro", - weight: "Semibold", + font: isExperimental ? fontName : legacyFontName, + weight: isExperimental ? fontWeight : legacyFontWeight, size: h5FontSize, lineHeight: h5LineHeight, color: customColor ?? theme[defaultColor], diff --git a/src/components/typography/H6.tsx b/src/components/typography/H6.tsx index dc4ab95a..b63d736d 100644 --- a/src/components/typography/H6.tsx +++ b/src/components/typography/H6.tsx @@ -6,14 +6,12 @@ import { IOText, IOTextProps, TypographicStyleProps } from "./IOText"; const defaultColor: keyof IOTheme = "textHeading-default"; -export const h6FontSize: IOFontSize = 16; +export const h6FontSize: IOFontSize = 18; export const h6LineHeight = 24; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 -const legacyFontSize: IOFontSize = 18; -const legacyLineHeight = 25; const legacyFontName: IOFontFamily = "TitilliumSansPro"; const legacyFontWeight: IOFontWeight = "Semibold"; @@ -29,8 +27,8 @@ export const H6 = forwardRef( ...props, dynamicTypeRamp: "headline", // iOS only font: isExperimental ? fontName : legacyFontName, - size: isExperimental ? h6FontSize : legacyFontSize, - lineHeight: isExperimental ? h6LineHeight : legacyLineHeight, + size: h6FontSize, + lineHeight: h6LineHeight, weight: isExperimental ? fontWeight : legacyFontWeight, color: customColor ?? theme[defaultColor] }; diff --git a/src/components/typography/Hero.tsx b/src/components/typography/Hero.tsx index 3355f421..48cf3420 100644 --- a/src/components/typography/Hero.tsx +++ b/src/components/typography/Hero.tsx @@ -8,8 +8,8 @@ const defaultColor: keyof IOTheme = "textHeading-default"; export const heroFontSize: IOFontSize = 32; export const heroLineHeight = 48; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; // TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 const legacyHeroFontSize: IOFontSize = 35; diff --git a/src/components/typography/Label.tsx b/src/components/typography/Label.tsx index 21e081d0..583aeeb5 100644 --- a/src/components/typography/Label.tsx +++ b/src/components/typography/Label.tsx @@ -1,7 +1,7 @@ import React, { ForwardedRef, forwardRef } from "react"; import { View } from "react-native"; -import { useIOTheme } from "../../core"; -import { IOFontWeight } from "../../utils/fonts"; +import { useIOExperimentalDesign, useIOTheme } from "../../core"; +import { IOFontFamily, IOFontWeight } from "../../utils/fonts"; import { IOText, IOTextProps, @@ -13,6 +13,12 @@ type LabelProps = TypographicStyleProps & { weight?: Extract; } & TypographicStyleAsLinkProps; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; + +const legacyFontName: IOFontFamily = "TitilliumSansPro"; +const legacyFontWeight: IOFontWeight = "Semibold"; + /** * `LabelSmall` typographic style */ @@ -22,6 +28,7 @@ export const Label = forwardRef( ref?: ForwardedRef ) => { const theme = useIOTheme(); + const { isExperimental } = useIOExperimentalDesign(); const defaultColor = asLink ? theme["interactiveElem-default"] @@ -29,8 +36,12 @@ export const Label = forwardRef( const LabelProps: IOTextProps = { ...props, - font: "TitilliumSansPro", - weight: customWeight ?? "Semibold", + font: isExperimental ? fontName : legacyFontName, + weight: customWeight + ? customWeight + : isExperimental + ? fontWeight + : legacyFontWeight, size: 16, lineHeight: 24, color: customColor ?? defaultColor, diff --git a/src/components/typography/LabelMini.tsx b/src/components/typography/LabelMini.tsx index bd503e60..b0bdde74 100644 --- a/src/components/typography/LabelMini.tsx +++ b/src/components/typography/LabelMini.tsx @@ -1,7 +1,7 @@ import React, { ForwardedRef, forwardRef } from "react"; import { View } from "react-native"; -import { useIOTheme } from "../../core"; -import { IOFontWeight } from "../../utils/fonts"; +import { useIOExperimentalDesign, useIOTheme } from "../../core"; +import { IOFontFamily, IOFontWeight } from "../../utils/fonts"; import { IOText, IOTextProps, @@ -13,6 +13,12 @@ type LabelMiniProps = TypographicStyleProps & { weight?: Extract; } & TypographicStyleAsLinkProps; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; + +const legacyFontName: IOFontFamily = "TitilliumSansPro"; +const legacyFontWeight: IOFontWeight = "Semibold"; + /** * `LabelMini` typographic style */ @@ -22,6 +28,7 @@ export const LabelMini = forwardRef( ref?: ForwardedRef ) => { const theme = useIOTheme(); + const { isExperimental } = useIOExperimentalDesign(); const defaultColor = asLink ? theme["interactiveElem-default"] @@ -30,8 +37,12 @@ export const LabelMini = forwardRef( const LabelMiniProps: IOTextProps = { ...props, dynamicTypeRamp: "footnote" /* iOS only */, - font: "TitilliumSansPro", - weight: customWeight ?? "Semibold", + font: isExperimental ? fontName : legacyFontName, + weight: customWeight + ? customWeight + : isExperimental + ? fontWeight + : legacyFontWeight, size: 12, lineHeight: 18, color: customColor ?? defaultColor, diff --git a/src/components/typography/LabelSmall.tsx b/src/components/typography/LabelSmall.tsx index 1a6f1f57..53900637 100644 --- a/src/components/typography/LabelSmall.tsx +++ b/src/components/typography/LabelSmall.tsx @@ -1,7 +1,7 @@ import React, { ForwardedRef, forwardRef } from "react"; import { View } from "react-native"; -import { useIOTheme } from "../../core"; -import { IOFontWeight } from "../../utils/fonts"; +import { useIOExperimentalDesign, useIOTheme } from "../../core"; +import { IOFontFamily, IOFontWeight } from "../../utils/fonts"; import { IOText, IOTextProps, @@ -13,6 +13,12 @@ type LabelSmallProps = TypographicStyleProps & { weight?: Extract; } & TypographicStyleAsLinkProps; +const fontName: IOFontFamily = "Titillio"; +const fontWeight: IOFontWeight = "Semibold"; + +const legacyFontName: IOFontFamily = "TitilliumSansPro"; +const legacyFontWeight: IOFontWeight = "Semibold"; + /** * `LabelSmall` typographic style */ @@ -22,6 +28,7 @@ export const LabelSmall = forwardRef( ref?: ForwardedRef ) => { const theme = useIOTheme(); + const { isExperimental } = useIOExperimentalDesign(); const defaultColor = asLink ? theme["interactiveElem-default"] @@ -30,8 +37,12 @@ export const LabelSmall = forwardRef( const LabelSmallProps: IOTextProps = { ...props, dynamicTypeRamp: "footnote" /* iOS only */, - font: "TitilliumSansPro", - weight: customWeight ?? "Semibold", + font: isExperimental ? fontName : legacyFontName, + weight: customWeight + ? customWeight + : isExperimental + ? fontWeight + : legacyFontWeight, size: 14, lineHeight: 21, color: customColor ?? defaultColor, diff --git a/src/components/typography/LabelSmallAlt.tsx b/src/components/typography/LabelSmallAlt.tsx deleted file mode 100644 index b81420b5..00000000 --- a/src/components/typography/LabelSmallAlt.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React, { ForwardedRef, forwardRef } from "react"; -import { View } from "react-native"; -import { useIOExperimentalDesign, useIOTheme } from "../../core"; -import { IOFontFamily, IOFontWeight } from "../../utils/fonts"; -import { IOText, IOTextProps, TypographicStyleProps } from "./IOText"; - -const fontSize = 14; -const lineHeight = 21; -const fontName: IOFontFamily = "ReadexPro"; -const fontWeight: IOFontWeight = "Regular"; - -// TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153 -const legacyFontSize = 16; -const legacyFontName: IOFontFamily = "TitilliumSansPro"; -const legacyFontWeight: IOFontWeight = "Semibold"; - -/** - * `LabelSmallAlt` typographic style. It's referenced as `LabelSmallReadex` in the design projects. - */ -export const LabelSmallAlt = forwardRef( - ({ color: customColor, ...props }, ref?: ForwardedRef) => { - const theme = useIOTheme(); - const { isExperimental } = useIOExperimentalDesign(); - - const LabelSmallAltProps: IOTextProps = { - ...props, - dynamicTypeRamp: "footnote" /* iOS only */, - font: isExperimental ? fontName : legacyFontName, - weight: isExperimental ? fontWeight : legacyFontWeight, - size: isExperimental ? fontSize : legacyFontSize, - lineHeight, - color: customColor ?? theme["textBody-tertiary"] - }; - - return ( - - {props.children} - - ); - } -); diff --git a/src/components/typography/__test__/__snapshots__/typography.test.tsx.snap b/src/components/typography/__test__/__snapshots__/typography.test.tsx.snap index af3954a7..02621e53 100644 --- a/src/components/typography/__test__/__snapshots__/typography.test.tsx.snap +++ b/src/components/typography/__test__/__snapshots__/typography.test.tsx.snap @@ -81,10 +81,10 @@ exports[`Test Typography Components H1 Snapshot 1`] = ` { "color": "#0E0F13", "fontFamily": "Titillium Sans Pro", - "fontSize": 31, + "fontSize": 28, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 43, + "lineHeight": 42, }, ] } @@ -104,10 +104,10 @@ exports[`Test Typography Components H1 Snapshot 2`] = ` { "color": "#FFFFFF", "fontFamily": "Titillium Sans Pro", - "fontSize": 31, + "fontSize": 28, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 43, + "lineHeight": 42, }, ] } @@ -441,7 +441,7 @@ exports[`Test Typography Components H6 Snapshot 1`] = ` "fontSize": 18, "fontStyle": "normal", "fontWeight": "600", - "lineHeight": 25, + "lineHeight": 24, }, ] } diff --git a/src/components/typography/index.tsx b/src/components/typography/index.tsx index 4116ce02..414d0764 100644 --- a/src/components/typography/index.tsx +++ b/src/components/typography/index.tsx @@ -15,7 +15,6 @@ export * from "./H6"; export * from "./Hero"; export * from "./Label"; export * from "./LabelSmall"; -export * from "./LabelSmallAlt"; export * from "./LabelMini"; export * from "./BodyMonospace"; export * from "./common"; diff --git a/src/components/typography/markdown/MdH1.tsx b/src/components/typography/markdown/MdH1.tsx index 70f41585..51e0f69d 100644 --- a/src/components/typography/markdown/MdH1.tsx +++ b/src/components/typography/markdown/MdH1.tsx @@ -14,8 +14,8 @@ export const MdH1 = forwardRef( const MdH1Props: IOTextProps = { ...props, - font: isExperimental ? "ReadexPro" : "TitilliumSansPro", - weight: isExperimental ? "Regular" : "Semibold", + font: isExperimental ? "Titillio" : "TitilliumSansPro", + weight: "Semibold", size: 20, lineHeight: 24, color: customColor ?? theme["textHeading-tertiary"] diff --git a/src/components/typography/markdown/MdH2.tsx b/src/components/typography/markdown/MdH2.tsx index 26c2b838..99e75cb5 100644 --- a/src/components/typography/markdown/MdH2.tsx +++ b/src/components/typography/markdown/MdH2.tsx @@ -13,11 +13,9 @@ export const MdH2 = forwardRef( const MdH2Props: IOTextProps = { ...props, - font: isExperimental ? "ReadexPro" : "TitilliumSansPro", - weight: isExperimental ? "Regular" : "Semibold", - /* We set 18 instead of 16 to diffrentiate from the H3 typographic style. -It should be 16 with `SemiBold` font weight. */ - size: 18, + font: isExperimental ? "Titillio" : "TitilliumSansPro", + weight: "Semibold", + size: 16, lineHeight: 24, color: customColor ?? theme["textHeading-tertiary"] }; diff --git a/src/components/typography/markdown/MdH3.tsx b/src/components/typography/markdown/MdH3.tsx index 50d92039..70f89d83 100644 --- a/src/components/typography/markdown/MdH3.tsx +++ b/src/components/typography/markdown/MdH3.tsx @@ -13,8 +13,8 @@ export const MdH3 = forwardRef( const MdH3Props: IOTextProps = { ...props, - font: isExperimental ? "ReadexPro" : "TitilliumSansPro", - weight: isExperimental ? "Regular" : "Semibold", + font: isExperimental ? "Titillio" : "TitilliumSansPro", + weight: "Regular", size: 16, lineHeight: 24, color: customColor ?? theme["textHeading-tertiary"] diff --git a/src/utils/fonts.ts b/src/utils/fonts.ts index 2ff4be4f..f4c6c9fd 100644 --- a/src/utils/fonts.ts +++ b/src/utils/fonts.ts @@ -16,11 +16,11 @@ const fonts = { ios: "Titillium Sans Pro", default: "TitilliumSansPro" }), - ReadexPro: Platform.select({ - android: "ReadexPro", - web: "ReadexPro", - ios: "Readex Pro", - default: "ReadexPro" + Titillio: Platform.select({ + android: "Titillio", + web: "Titillio", + ios: "Titillio", + default: "Titillio" }), DMMono: Platform.select({ android: "DMMono", @@ -28,7 +28,7 @@ const fonts = { ios: "DM Mono", default: "DMMono" }) -}; +} as const; export type IOFontFamily = keyof typeof fonts; @@ -44,10 +44,18 @@ export type IOFontSize = (typeof allFontSizes)[number]; * Font Weights */ -const weights = ["Light", "Regular", "Medium", "Semibold", "Bold"] as const; +const weights = [ + "Thin", + "Light", + "Regular", + "Medium", + "Semibold", + "Bold", + "Black" +] as const; export type IOFontWeight = (typeof weights)[number]; -const weightValues = ["300", "400", "500", "600", "700"] as const; +const weightValues = ["200", "300", "400", "500", "600", "700", "900"] as const; export type IOFontWeightNumeric = (typeof weightValues)[number]; /** @@ -55,11 +63,13 @@ export type IOFontWeightNumeric = (typeof weightValues)[number]; * used on iOS */ export const fontWeights: Record = { + Thin: "200", Light: "300", Regular: "400", Medium: "500", Semibold: "600", - Bold: "700" + Bold: "700", + Black: "900" }; type FontStyleObject = { @@ -96,7 +106,7 @@ export const makeFontFamilyName = ( font: IOFontFamily, weight: IOFontWeight = defaultWeight, fontStyle: TextStyle["fontStyle"] = "normal" -): FontStyleObject["fontFamily"] => +): string => Platform.select({ web: fonts[font], android: `${fonts[font]}-${weight || "Regular"}${ diff --git a/stories/markdown/Typography.md b/stories/markdown/Typography.md index 387d6c20..4905c7dd 100644 --- a/stories/markdown/Typography.md +++ b/stories/markdown/Typography.md @@ -11,7 +11,7 @@ The app uses `TitilliumSansPro` as main font. Font object mapping and definition The library supports three different font families: - `TitilliumSansPro` -- `ReadexPro` +- `Titillio` - `DMMono` -The `ReadexPro` font is visible only enabling the experimental features of the library for more information see the [IODSExperimentalContext](/docs/core-core--docs#iodsexperimentalcontext) section. \ No newline at end of file +The `Titillio` font is visible only enabling the experimental features of the library for more information see the [IODSExperimentalContext](/docs/core-core--docs#iodsexperimentalcontext) section. \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 9fc6fe3e..32039d36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,11 +38,25 @@ "@babel/highlight" "^7.24.7" picocolors "^1.0.0" +"@babel/code-frame@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== + dependencies: + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" + picocolors "^1.0.0" + "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": version "7.22.9" resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== +"@babel/compat-data@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e" + integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg== + "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.18.5", "@babel/core@^7.20.0", "@babel/core@^7.22.0", "@babel/core@^7.22.9", "@babel/core@^7.7.5": version "7.22.11" resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz#8033acaa2aa24c3f814edaaa057f3ce0ba559c24" @@ -124,6 +138,17 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" +"@babel/generator@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f" + integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw== + dependencies: + "@babel/parser" "^7.26.2" + "@babel/types" "^7.26.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" + "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" @@ -131,6 +156,13 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-annotate-as-pure@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" + integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== + dependencies: + "@babel/types" "^7.25.9" + "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5": version "7.22.10" resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz#573e735937e99ea75ea30788b57eb52fab7468c9" @@ -160,6 +192,17 @@ lru-cache "^5.1.1" semver "^6.3.1" +"@babel/helper-compilation-targets@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875" + integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ== + dependencies: + "@babel/compat-data" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" + lru-cache "^5.1.1" + semver "^6.3.1" + "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.5": version "7.22.11" resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz#4078686740459eeb4af3494a273ac09148dfb213" @@ -175,6 +218,19 @@ "@babel/helper-split-export-declaration" "^7.22.6" semver "^6.3.1" +"@babel/helper-create-class-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83" + integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/traverse" "^7.25.9" + semver "^6.3.1" + "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": version "7.22.9" resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6" @@ -184,6 +240,15 @@ regexpu-core "^5.3.1" semver "^6.3.1" +"@babel/helper-create-regexp-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26" + integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + regexpu-core "^6.1.1" + semver "^6.3.1" + "@babel/helper-define-polyfill-provider@^0.4.2": version "0.4.2" resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7" @@ -235,6 +300,14 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-member-expression-to-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3" + integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/helper-module-imports@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" @@ -278,6 +351,13 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-optimise-call-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e" + integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ== + dependencies: + "@babel/types" "^7.25.9" + "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" @@ -288,6 +368,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== +"@babel/helper-plugin-utils@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46" + integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw== + "@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5", "@babel/helper-remap-async-to-generator@^7.22.9": version "7.22.9" resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82" @@ -306,6 +391,15 @@ "@babel/helper-member-expression-to-functions" "^7.22.5" "@babel/helper-optimise-call-expression" "^7.22.5" +"@babel/helper-replace-supers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5" + integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/helper-simple-access@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" @@ -328,6 +422,14 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" +"@babel/helper-skip-transparent-expression-wrappers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9" + integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" @@ -345,6 +447,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" @@ -360,6 +467,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + "@babel/helper-validator-option@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" @@ -370,6 +482,11 @@ resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== +"@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== + "@babel/helper-wrap-function@^7.22.9": version "7.22.10" resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz#d845e043880ed0b8c18bd194a12005cb16d2f614" @@ -431,6 +548,13 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.0.tgz#9fdc9237504d797b6e7b8f66e78ea7f570d256ad" integrity sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA== +"@babel/parser@^7.25.9", "@babel/parser@^7.26.2": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11" + integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ== + dependencies: + "@babel/types" "^7.26.0" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e" @@ -739,6 +863,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-class-properties@^7.0.0-0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f" + integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-transform-class-properties@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77" @@ -771,6 +903,18 @@ "@babel/helper-split-export-declaration" "^7.22.6" globals "^11.1.0" +"@babel/plugin-transform-classes@^7.0.0-0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52" + integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/traverse" "^7.25.9" + globals "^11.1.0" + "@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869" @@ -1187,6 +1331,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-unicode-regex@^7.0.0-0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1" + integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-transform-unicode-sets-regex@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91" @@ -1379,6 +1531,15 @@ "@babel/parser" "^7.25.0" "@babel/types" "^7.25.0" +"@babel/template@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/traverse@^7.1.6", "@babel/traverse@^7.20.0", "@babel/traverse@^7.22.11", "@babel/traverse@^7.22.8", "@babel/traverse@^7.23.2", "@babel/traverse@^7.7.4": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" @@ -1408,6 +1569,19 @@ debug "^4.3.1" globals "^11.1.0" +"@babel/traverse@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84" + integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/generator" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/template" "^7.25.9" + "@babel/types" "^7.25.9" + debug "^4.3.1" + globals "^11.1.0" + "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.11", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.22.11" resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz#0e65a6a1d4d9cbaa892b2213f6159485fe632ea2" @@ -1435,6 +1609,14 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" +"@babel/types@^7.25.9", "@babel/types@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" + integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@base2/pretty-print-object@1.0.1": version "1.0.1" resolved "https://registry.npmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4" @@ -5602,6 +5784,16 @@ browserslist@^4.14.5, browserslist@^4.20.4, browserslist@^4.21.10, browserslist@ node-releases "^2.0.13" update-browserslist-db "^1.0.11" +browserslist@^4.24.0: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + dependencies: + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" + node-releases "^2.0.18" + update-browserslist-db "^1.1.1" + bser@2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -5787,6 +5979,11 @@ caniuse-lite@^1.0.30001517: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001645.tgz" integrity sha512-GFtY2+qt91kzyMk6j48dJcwJVq5uTkk71XxE3RtScx7XWRLsO7bU44LOFkOZYR8w9YMS0UhPSYpN/6rAMImmLw== +caniuse-lite@^1.0.30001669: + version "1.0.30001679" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz#18c573b72f72ba70822194f6c39e7888597f9e32" + integrity sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA== + case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" @@ -7164,6 +7361,11 @@ electron-to-chromium@^1.4.477: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.505.tgz#00571ade5975b58413f0f56a665b065bfc29cdfc" integrity sha512-0A50eL5BCCKdxig2SsCXhpuztnB9PfUgRMojj5tMvt8O54lbwz3t6wNgnpiTRosw5QjlJB7ixhVyeg8daLQwSQ== +electron-to-chromium@^1.5.41: + version "1.5.55" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz#73684752aa2e1aa49cafb355a41386c6637e76a9" + integrity sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg== + emitter-listener@^1.0.1, emitter-listener@^1.1.1: version "1.1.2" resolved "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" @@ -7422,6 +7624,11 @@ escalade@^3.1.1: resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + escape-goat@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz#9424820331b510b0666b98f7873fe11ac4aa8081" @@ -10396,6 +10603,11 @@ jsesc@^2.5.1: resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +jsesc@^3.0.2, jsesc@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== + jsesc@~0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" @@ -11740,6 +11952,11 @@ node-releases@^2.0.13: resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== + node-stream-zip@^1.9.1: version "1.15.0" resolved "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea" @@ -12360,6 +12577,11 @@ picocolors@^1.0.0: resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" @@ -12957,16 +13179,19 @@ react-native-linear-gradient@^2.5.6: resolved "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.8.2.tgz#9811c91751be673ef928ef4aa3ff3a70b82935d6" integrity sha512-hgmCsgzd58WNcDCyPtKrvxsaoETjb/jLGxis/dmU3Aqm2u4ICIduj4ECjbil7B7pm9OnuTkmpwXu08XV2mpg8g== -react-native-reanimated@3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.12.0.tgz#2c768d43971bb19e425c436c892bf68c74b9ccab" - integrity sha512-Bwa4jKL/QttnV8pQYiX+1N5a6XgL8yZtMyH+7UbEaW7ZeNCv1Pxp2PmYu/bP3LafCkmS9Yj/hY2adYNKe58g9A== +react-native-reanimated@3.15.0: + version "3.15.0" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.15.0.tgz#8814af7c78bbdf4c92bbd583f2266febf962e66a" + integrity sha512-yGxOyYAAu/5CyjonM2SgsM5sviiiK8HiHL9jT1bKfRxMLnNX9cFP8/UXRkbMT7ZXIfOlCvNFR0AqnphpuXIPVA== dependencies: "@babel/plugin-transform-arrow-functions" "^7.0.0-0" + "@babel/plugin-transform-class-properties" "^7.0.0-0" + "@babel/plugin-transform-classes" "^7.0.0-0" "@babel/plugin-transform-nullish-coalescing-operator" "^7.0.0-0" "@babel/plugin-transform-optional-chaining" "^7.0.0-0" "@babel/plugin-transform-shorthand-properties" "^7.0.0-0" "@babel/plugin-transform-template-literals" "^7.0.0-0" + "@babel/plugin-transform-unicode-regex" "^7.0.0-0" "@babel/preset-typescript" "^7.16.7" convert-source-map "^2.0.0" invariant "^2.2.4" @@ -13274,6 +13499,13 @@ regenerate-unicode-properties@^10.1.0: dependencies: regenerate "^1.4.2" +regenerate-unicode-properties@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0" + integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA== + dependencies: + regenerate "^1.4.2" + regenerate@^1.4.2: version "1.4.2" resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" @@ -13325,6 +13557,18 @@ regexpu-core@^5.3.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.1.0" +regexpu-core@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac" + integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw== + dependencies: + regenerate "^1.4.2" + regenerate-unicode-properties "^10.2.0" + regjsgen "^0.8.0" + regjsparser "^0.11.0" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" + registry-auth-token@^5.0.1: version "5.0.2" resolved "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz#8b026cc507c8552ebbe06724136267e63302f756" @@ -13339,6 +13583,18 @@ registry-url@^6.0.0: dependencies: rc "1.2.8" +regjsgen@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab" + integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== + +regjsparser@^0.11.0: + version "0.11.2" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.2.tgz#7404ad42be00226d72bcf1f003f1f441861913d8" + integrity sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA== + dependencies: + jsesc "~3.0.2" + regjsparser@^0.9.1: version "0.9.1" resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" @@ -14973,6 +15229,14 @@ update-browserslist-db@^1.0.11: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== + dependencies: + escalade "^3.2.0" + picocolors "^1.1.0" + update-notifier@6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz#a6990253dfe6d5a02bd04fbb6a61543f55026b60"