Skip to content

fix: handle gen2 ios pen race condition #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

fix: handle gen2 ios pen race condition #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions ios/SketchCanvas/RNSketchCanvas.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,27 @@ - (void)didMoveToWindow {
}

- (void)setFrozenImageNeedsUpdate {
if (_frozenImage) {
CGImageRelease(_frozenImage);
CGImageRelease(_translucentFrozenImage);
_frozenImage = nil;
}
if (_translucentFrozenImage) {
CGImageRelease(_translucentFrozenImage);
_translucentFrozenImage = nil;
}
}

- (void)ensureFrozenImagesUpToDate {
if (!_drawingContext || !_translucentDrawingContext) {
[self createDrawingContext];
}
if (!_frozenImage && _drawingContext) {
_frozenImage = CGBitmapContextCreateImage(_drawingContext);
}
if (_currentPath && _currentPath.isTranslucent &&
!_translucentFrozenImage && _translucentDrawingContext) {
_translucentFrozenImage = CGBitmapContextCreateImage(_translucentDrawingContext);
}
}

- (BOOL)openSketchFile:(NSString *)filename directory:(NSString*) directory contentMode:(NSString*)mode {
Expand Down Expand Up @@ -454,6 +471,7 @@ - (void) clear {
}

- (UIImage*)createImageWithTransparentBackground: (BOOL) transparent includeImage:(BOOL)includeImage includeText:(BOOL)includeText cropToImageSize:(BOOL)cropToImageSize {
[self ensureFrozenImagesUpToDate];
if (_backgroundImage && cropToImageSize) {
CGRect rect = CGRectMake(0, 0, _backgroundImage.size.width, _backgroundImage.size.height);
UIGraphicsBeginImageContextWithOptions(rect.size, !transparent, 1);
Expand All @@ -474,10 +492,12 @@ - (UIImage*)createImageWithTransparentBackground: (BOOL) transparent includeImag
}
}
}

CGContextDrawImage(context, targetRect, _frozenImage);
CGContextDrawImage(context, targetRect, _translucentFrozenImage);


if (_frozenImage) CGContextDrawImage(context, targetRect, _frozenImage);
if (_translucentFrozenImage && _currentPath && _currentPath.isTranslucent) {
CGContextDrawImage(context, targetRect, _translucentFrozenImage);
}

// Include current incomplete path in saved image
if (_currentPath) {
[_currentPath drawInContext:context];
Expand Down Expand Up @@ -516,8 +536,10 @@ - (UIImage*)createImageWithTransparentBackground: (BOOL) transparent includeImag
}
}

CGContextDrawImage(context, rect, _frozenImage);
CGContextDrawImage(context, rect, _translucentFrozenImage);
if (_frozenImage) CGContextDrawImage(context, rect, _frozenImage);
if (_translucentFrozenImage && _currentPath && _currentPath.isTranslucent) {
CGContextDrawImage(context, rect, _translucentFrozenImage);
}

// Include current incomplete path in saved image
if (_currentPath) {
Expand Down
Loading