Skip to content

[Super Editor][iOS] - Fix Null dereference in iOS on long-press drag #2999

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

Open
quaaantumdev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Super Editor][iOS] - Fix Null dereference in iOS on long-press drag #2999

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
58 changes: 39 additions & 19 deletions super_editor/lib/src/super_reader/read_only_document_ios_touch_interactor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,26 +658,28 @@ class _SuperReaderIosDocumentTouchInteractorState extends State<SuperReaderIosDo
_globalTapDownOffset = null;
_tapDownLongPressTimer?.cancel();

// TODO: to help the user drag handles instead of scrolling, try checking touch
// placement during onTapDown, and then pick that up here. I think the little
// bit of slop might be the problem.
final selection = widget.readerContext.composer.selection;
if (selection == null) {
return;
}

if (_isLongPressInProgress) {
_dragMode = DragMode.longPress;
_dragHandleType = null;
_longPressStrategy!.onLongPressDragStart();
} else if (_isOverBaseHandle(details.localPosition)) {
_dragMode = DragMode.base;
_dragHandleType = HandleType.upstream;
} else if (_isOverExtentHandle(details.localPosition)) {
_dragMode = DragMode.extent;
_dragHandleType = HandleType.downstream;
} else {
return;
// TODO: to help the user drag handles instead of scrolling, try checking touch
// placement during onTapDown, and then pick that up here. I think the little
// bit of slop might be the problem.
final selection = widget.readerContext.composer.selection;
if (selection == null) {
return;
}

if (_isOverBaseHandle(details.localPosition)) {
_dragMode = DragMode.base;
_dragHandleType = HandleType.upstream;
} else if (_isOverExtentHandle(details.localPosition)) {
_dragMode = DragMode.extent;
_dragHandleType = HandleType.downstream;
} else {
return;
}
}

_controlsController!.hideToolbar();
Expand Down Expand Up @@ -720,6 +722,10 @@ class _SuperReaderIosDocumentTouchInteractorState extends State<SuperReaderIosDo
}

void _onPanUpdate(DragUpdateDetails details) {
if (_dragMode == null) {
return; // The drag was rejected in _onPanStart
}

// The user is dragging a handle. Update the document selection, and
// auto-scroll, if needed.
_globalDragOffset = details.globalPosition;
Expand Down Expand Up @@ -748,6 +754,11 @@ class _SuperReaderIosDocumentTouchInteractorState extends State<SuperReaderIosDo
}

void _updateSelectionForNewDragHandleLocation() {
final selection = widget.readerContext.composer.selection;
if (selection == null) {
return;
}

final docDragDelta = _globalDragOffset! - _globalStartDragOffset!;
final dragScrollDelta = _dragStartScrollOffset! - scrollPosition.pixels;
final docDragPosition = _docLayout
Expand All @@ -758,18 +769,22 @@ class _SuperReaderIosDocumentTouchInteractorState extends State<SuperReaderIosDo
}

if (_dragHandleType == HandleType.upstream) {
_setSelection(widget.readerContext.composer.selection!.copyWith(
_setSelection(selection.copyWith(
base: docDragPosition,
));
} else if (_dragHandleType == HandleType.downstream) {
_setSelection(widget.readerContext.composer.selection!.copyWith(
_setSelection(selection.copyWith(
extent: docDragPosition,
));
}
}

void _onPanEnd(DragEndDetails details) {
scrollPosition.removeListener(_onAutoScrollChange);

if (_dragMode != null) {
_onDragSelectionEnd();
}
}

void _onPanCancel() {
Expand Down Expand Up @@ -843,6 +858,11 @@ class _SuperReaderIosDocumentTouchInteractorState extends State<SuperReaderIosDo
return;
}

final selection = widget.readerContext.composer.selection;
if (selection == null) {
return;
}

late DocumentPosition basePosition;
late DocumentPosition extentPosition;
switch (_dragHandleType!) {
Expand All @@ -851,10 +871,10 @@ class _SuperReaderIosDocumentTouchInteractorState extends State<SuperReaderIosDo
return;
case HandleType.upstream:
basePosition = dragPosition;
extentPosition = widget.readerContext.composer.selection!.extent;
extentPosition = selection.extent;
break;
case HandleType.downstream:
basePosition = widget.readerContext.composer.selection!.base;
basePosition = selection.base;
extentPosition = dragPosition;
break;
}
Expand Down