From d8dc402134402b315f80c3918c85d4e9d6740f4d Mon Sep 17 00:00:00 2001 From: Ian Y Date: Mon, 21 Apr 2025 11:12:32 +0800 Subject: [PATCH 1/2] fix: iOS release `toString()` build failure --- ios/RNSketchCanvasViewComponent.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNSketchCanvasViewComponent.mm b/ios/RNSketchCanvasViewComponent.mm index a29ccb6f..c0f807d7 100644 --- a/ios/RNSketchCanvasViewComponent.mm +++ b/ios/RNSketchCanvasViewComponent.mm @@ -73,7 +73,7 @@ -(void)prepareForRecycle { - (NSDictionary*)RNTSketchCanvasTextStructToDict:(const RNTSketchCanvasTextStruct&)txt { return @{ - @"text": RCTNSStringFromString(toString(txt.text)), + @"text": RCTNSStringFromString(txt.text), @"font": RCTNSStringFromString(txt.font), @"fontSize": @(txt.fontSize), @"fontColor": @(txt.fontColor), From cee84266be1eaddf33b872ef846ef77904657050 Mon Sep 17 00:00:00 2001 From: Ian Y Date: Mon, 21 Apr 2025 11:36:50 +0800 Subject: [PATCH 2/2] fix: RN 0.77,x android nullability issue of `path.getString()` --- .../reactnativesketchcanvas/RNTSketchCanvasManager.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/sourcetoad/reactnativesketchcanvas/RNTSketchCanvasManager.kt b/android/src/main/java/com/sourcetoad/reactnativesketchcanvas/RNTSketchCanvasManager.kt index 6e728904..31e32552 100644 --- a/android/src/main/java/com/sourcetoad/reactnativesketchcanvas/RNTSketchCanvasManager.kt +++ b/android/src/main/java/com/sourcetoad/reactnativesketchcanvas/RNTSketchCanvasManager.kt @@ -133,9 +133,9 @@ class RNTSketchCanvasViewManager : if (path != null) { for (i in 0 until path.size()) { val coor = - path.getString(i).split(",".toRegex()).dropLastWhile { it.isEmpty() } - .toTypedArray() - if (pointPath != null) { + path.getString(i)?.split(",".toRegex())?.dropLastWhile { it.isEmpty() } + ?.toTypedArray() + if (coor != null && pointPath != null) { pointPath.add(PointF(coor[0].toFloat(), coor[1].toFloat())) } }