diff --git a/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift b/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift index af92453238..45b17cc966 100644 --- a/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift +++ b/modules/expo-selectable-text/ios/ExpoSelectableTextModule.swift @@ -10,16 +10,12 @@ 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(TextSegments.self, from: data) { - view.segments = segments.segments + if let segments = try? JSONDecoder().decode([TextSegment].self, from: data) { + view.segments = segments } } } - Prop("selectable") { (view: ExpoSelectableTextView, prop: Bool) in - view.textView.isSelectable = prop - } - Prop("rootStyle") { (view: ExpoSelectableTextView, prop: String) in if let data = prop.data(using: .utf8) { if let style = try? JSONDecoder().decode(TextStyle.self, from: data) { @@ -27,6 +23,10 @@ public class ExpoSelectableTextModule: Module { } } } + + Prop("selectable") { (view: ExpoSelectableTextView, prop: Bool) in + view.textView.isSelectable = prop + } } } } diff --git a/modules/expo-selectable-text/ios/TextSegment.swift b/modules/expo-selectable-text/ios/TextSegment.swift index 8c410aaaab..610dfdb10d 100644 --- a/modules/expo-selectable-text/ios/TextSegment.swift +++ b/modules/expo-selectable-text/ios/TextSegment.swift @@ -1,8 +1,5 @@ import ExpoModulesCore -struct TextSegments: Decodable { - let segments: Array -} struct TextSegment: Decodable { let index: Int