From 404857817b47d8e333029760fd2ab1b1f97e0e57 Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 22 May 2021 11:59:03 +0200 Subject: [PATCH] Fix null exception --- lib/src/widgets/raw_editor.dart | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart index e52e18cd..066ff675 100644 --- a/lib/src/widgets/raw_editor.dart +++ b/lib/src/widgets/raw_editor.dart @@ -559,13 +559,17 @@ class RawEditorState extends EditorState if (widget.scrollable) { _showCaretOnScreenScheduled = false; - final viewport = RenderAbstractViewport.of(getRenderEditor()); + final renderEditor = getRenderEditor(); + if (renderEditor == null) { + return; + } - final editorOffset = getRenderEditor()! - .localToGlobal(const Offset(0, 0), ancestor: viewport); + final viewport = RenderAbstractViewport.of(renderEditor); + final editorOffset = + renderEditor.localToGlobal(const Offset(0, 0), ancestor: viewport); final offsetInViewport = _scrollController!.offset + editorOffset.dy; - final offset = getRenderEditor()!.getOffsetToRevealCursor( + final offset = renderEditor.getOffsetToRevealCursor( _scrollController!.position.viewportDimension, _scrollController!.offset, offsetInViewport, @@ -584,7 +588,7 @@ class RawEditorState extends EditorState @override RenderEditor? getRenderEditor() { - return _editorKey.currentContext!.findRenderObject() as RenderEditor?; + return _editorKey.currentContext?.findRenderObject() as RenderEditor?; } @override