diff --git a/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift b/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift index 45b17cc966..5461041038 100644 --- a/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift +++ b/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift @@ -10,8 +10,8 @@ public class ExpoSelectableTextModule: Module { Prop("segments") { (view: ExpoSelectableTextView, prop: String) in // Convert the JSON to segments if let data = prop.data(using: .utf8) { - if let segments = try? JSONDecoder().decode([TextSegment].self, from: data) { - view.segments = segments + if let segments = try? JSONDecoder().decode(TextSegments.self, from: data) { + view.segments = segments.segments } } } diff --git a/modules/expo-selectable-text/ios/TextSegment.swift b/modules/expo-selectable-text/ios/TextSegment.swift index 610dfdb10d..8c410aaaab 100644 --- a/modules/expo-selectable-text/ios/TextSegment.swift +++ b/modules/expo-selectable-text/ios/TextSegment.swift @@ -1,5 +1,8 @@ import ExpoModulesCore +struct TextSegments: Decodable { + let segments: Array +} struct TextSegment: Decodable { let index: Int diff --git a/modules/expo-selectable-text/src/ExpoSelectableText.types.ts b/modules/expo-selectable-text/src/ExpoSelectableText.types.ts index e012eb5553..8dce1fd910 100644 --- a/modules/expo-selectable-text/src/ExpoSelectableText.types.ts +++ b/modules/expo-selectable-text/src/ExpoSelectableText.types.ts @@ -1,5 +1,5 @@ import React from 'react' -import {ColorValue, TextStyle, ViewStyle} from 'react-native' +import {TextStyle, ViewStyle} from 'react-native' interface ExpoProTextViewCommonProps { selectable?: boolean diff --git a/src/view/com/util/text/Text.tsx b/src/view/com/util/text/Text.tsx index eca265741d..04e0e2a5ae 100644 --- a/src/view/com/util/text/Text.tsx +++ b/src/view/com/util/text/Text.tsx @@ -4,7 +4,6 @@ import {s, lh} from 'lib/styles' import {useTheme, TypographyVariant} from 'lib/ThemeContext' import {SelectableText} from '../../../../../modules/expo-selectable-text' import {isIOS} from 'platform/detection' -import {fontSize} from '#/alf/tokens' export type CustomTextProps = TextProps & { type?: TypographyVariant