@ -16,13 +16,13 @@ import 'package:flutter_quill/models/documents/nodes/embed.dart';
import ' package:flutter_quill/models/documents/nodes/leaf.dart ' as leaf ; import ' package:flutter_quill/models/documents/nodes/leaf.dart ' as leaf ;
import ' package:flutter_quill/models/documents/nodes/line.dart ' ; import ' package:flutter_quill/models/documents/nodes/line.dart ' ;
import ' package:flutter_quill/models/documents/nodes/node.dart ' ; import ' package:flutter_quill/models/documents/nodes/node.dart ' ;
import ' package:flutter_quill/utils/universal_ui/universal_ui.dart ' ;
import ' package:flutter_quill/widgets/image.dart ' ; import ' package:flutter_quill/widgets/image.dart ' ;
import ' package:flutter_quill/widgets/raw_editor.dart ' ; import ' package:flutter_quill/widgets/raw_editor.dart ' ;
import ' package:flutter_quill/widgets/responsive_widget.dart ' ; import ' package:flutter_quill/widgets/responsive_widget.dart ' ;
import ' package:flutter_quill/widgets/text_selection.dart ' ; import ' package:flutter_quill/widgets/text_selection.dart ' ;
import ' package:string_validator/string_validator.dart ' ; import ' package:string_validator/string_validator.dart ' ;
import ' package:universal_html/prefer_universal/html.dart ' as html ; import ' package:universal_html/html.dart ' as html ;
import ' package:universal_ui/universal_ui.dart ' ;
import ' package:url_launcher/url_launcher.dart ' ; import ' package:url_launcher/url_launcher.dart ' ;
import ' box.dart ' ; import ' box.dart ' ;
@ -53,9 +53,9 @@ abstract class EditorState extends State<RawEditor> {
void setTextEditingValue ( TextEditingValue value ) ; void setTextEditingValue ( TextEditingValue value ) ;
RenderEditor getRenderEditor ( ) ; RenderEditor ? getRenderEditor ( ) ;
EditorTextSelectionOverlay getSelectionOverlay ( ) ; EditorTextSelectionOverlay ? getSelectionOverlay ( ) ;
bool showToolbar ( ) ; bool showToolbar ( ) ;
@ -146,51 +146,45 @@ class QuillEditor extends StatefulWidget {
final bool scrollable ; final bool scrollable ;
final EdgeInsetsGeometry padding ; final EdgeInsetsGeometry padding ;
final bool autoFocus ; final bool autoFocus ;
final bool showCursor ; final bool ? showCursor ;
final bool readOnly ; final bool readOnly ;
final String placeholder ; final String ? placeholder ;
final bool enableInteractiveSelection ; final bool ? enableInteractiveSelection ;
final double minHeight ; final double ? minHeight ;
final double maxHeight ; final double ? maxHeight ;
final DefaultStyles customStyles ; final DefaultStyles ? customStyles ;
final bool expands ; final bool expands ;
final TextCapitalization textCapitalization ; final TextCapitalization textCapitalization ;
final Brightness keyboardAppearance ; final Brightness keyboardAppearance ;
final ScrollPhysics scrollPhysics ; final ScrollPhysics ? scrollPhysics ;
final ValueChanged < String > onLaunchUrl ; final ValueChanged < String > ? onLaunchUrl ;
final EmbedBuilder embedBuilder ; final EmbedBuilder embedBuilder ;
QuillEditor ( QuillEditor (
{ @ required this . controller , { Key ? key ,
@ required this . focusNode , required this . controller ,
@ required this . scrollController , required this . focusNode ,
@ required this . scrollable , required this . scrollController ,
@ required this . padding , required this . scrollable ,
@ required this . autoFocus , required this . padding ,
required this . autoFocus ,
this . showCursor , this . showCursor ,
@ required this . readOnly , required this . readOnly ,
this . placeholder , this . placeholder ,
this . enableInteractiveSelection , this . enableInteractiveSelection ,
this . minHeight , this . minHeight ,
this . maxHeight , this . maxHeight ,
this . customStyles , this . customStyles ,
@ required this . expands , required this . expands ,
this . textCapitalization = TextCapitalization . sentences , this . textCapitalization = TextCapitalization . sentences ,
this . keyboardAppearance = Brightness . light , this . keyboardAppearance = Brightness . light ,
this . scrollPhysics , this . scrollPhysics ,
this . onLaunchUrl , this . onLaunchUrl ,
this . embedBuilder = this . embedBuilder =
kIsWeb ? _defaultEmbedBuilderWeb : _defaultEmbedBuilder } ) kIsWeb ? _defaultEmbedBuilderWeb : _defaultEmbedBuilder } ) ;
: assert ( controller ! = null ) ,
assert ( scrollController ! = null ) ,
assert ( scrollable ! = null ) ,
assert ( focusNode ! = null ) ,
assert ( autoFocus ! = null ) ,
assert ( readOnly ! = null ) ,
assert ( embedBuilder ! = null ) ;
factory QuillEditor . basic ( factory QuillEditor . basic (
{ @ required QuillController controller , bool readOnly } ) { { Key ? key , required QuillController controller , required bool readOnly } ) {
return QuillEditor ( return QuillEditor (
controller: controller , controller: controller ,
scrollController: ScrollController ( ) , scrollController: ScrollController ( ) ,
@ -209,8 +203,9 @@ class QuillEditor extends StatefulWidget {
class _QuillEditorState extends State < QuillEditor > class _QuillEditorState extends State < QuillEditor >
implements EditorTextSelectionGestureDetectorBuilderDelegate { implements EditorTextSelectionGestureDetectorBuilderDelegate {
final GlobalKey < EditorState > _editorKey = GlobalKey < EditorState > ( ) ; GlobalKey < EditorState > _editorKey = GlobalKey < EditorState > ( ) ;
EditorTextSelectionGestureDetectorBuilder _selectionGestureDetectorBuilder ; late EditorTextSelectionGestureDetectorBuilder
_selectionGestureDetectorBuilder ;
@ override @ override
void initState ( ) { void initState ( ) {
@ -227,10 +222,10 @@ class _QuillEditorState extends State<QuillEditor>
TextSelectionControls textSelectionControls ; TextSelectionControls textSelectionControls ;
bool paintCursorAboveText ; bool paintCursorAboveText ;
bool cursorOpacityAnimates ; bool cursorOpacityAnimates ;
Offset cursorOffset ; Offset ? cursorOffset ;
Color cursorColor ; Color ? cursorColor ;
Color selectionColor ; Color selectionColor ;
Radius cursorRadius ; Radius ? cursorRadius ;
switch ( theme . platform ) { switch ( theme . platform ) {
case TargetPlatform . android: case TargetPlatform . android:
@ -301,7 +296,7 @@ class _QuillEditorState extends State<QuillEditor>
selectionColor , selectionColor ,
textSelectionControls , textSelectionControls ,
widget . keyboardAppearance , widget . keyboardAppearance ,
widget . enableInteractiveSelection , widget . enableInteractiveSelection ! ,
widget . scrollPhysics , widget . scrollPhysics ,
widget . embedBuilder ) , widget . embedBuilder ) ,
) ; ) ;
@ -318,12 +313,12 @@ class _QuillEditorState extends State<QuillEditor>
} }
@ override @ override
bool getSelectionEnabled ( ) { bool ? getSelectionEnabled ( ) {
return widget . enableInteractiveSelection ; return widget . enableInteractiveSelection ;
} }
_requestKeyboard ( ) { _requestKeyboard ( ) {
_editorKey . currentState . requestKeyboard ( ) ; _editorKey . currentState ! . requestKeyboard ( ) ;
} }
} }
@ -336,8 +331,8 @@ class _QuillEditorSelectionGestureDetectorBuilder
@ override @ override
onForcePressStart ( ForcePressDetails details ) { onForcePressStart ( ForcePressDetails details ) {
super . onForcePressStart ( details ) ; super . onForcePressStart ( details ) ;
if ( delegate . getSelectionEnabled ( ) & & shouldShowSelectionToolbar ) { if ( delegate . getSelectionEnabled ( ) ! & & shouldShowSelectionToolbar ) {
getEditor ( ) . showToolbar ( ) ; getEditor ( ) ! . showToolbar ( ) ;
} }
} }
@ -346,13 +341,13 @@ class _QuillEditorSelectionGestureDetectorBuilder
@ override @ override
void onSingleLongTapMoveUpdate ( LongPressMoveUpdateDetails details ) { void onSingleLongTapMoveUpdate ( LongPressMoveUpdateDetails details ) {
if ( ! delegate . getSelectionEnabled ( ) ) { if ( ! delegate . getSelectionEnabled ( ) ! ) {
return ; return ;
} }
switch ( Theme . of ( _state . context ) . platform ) { switch ( Theme . of ( _state . context ) . platform ) {
case TargetPlatform . iOS: case TargetPlatform . iOS:
case TargetPlatform . macOS: case TargetPlatform . macOS:
getRenderEditor ( ) . selectPositionAt ( getRenderEditor ( ) ! . selectPositionAt (
details . globalPosition , details . globalPosition ,
null , null ,
SelectionChangedCause . longPress , SelectionChangedCause . longPress ,
@ -362,7 +357,7 @@ class _QuillEditorSelectionGestureDetectorBuilder
case TargetPlatform . fuchsia: case TargetPlatform . fuchsia:
case TargetPlatform . linux: case TargetPlatform . linux:
case TargetPlatform . windows: case TargetPlatform . windows:
getRenderEditor ( ) . selectWordsInRange ( getRenderEditor ( ) ! . selectWordsInRange (
details . globalPosition - details . offsetFromOrigin , details . globalPosition - details . offsetFromOrigin ,
details . globalPosition , details . globalPosition ,
SelectionChangedCause . longPress , SelectionChangedCause . longPress ,
@ -378,9 +373,9 @@ class _QuillEditorSelectionGestureDetectorBuilder
return false ; return false ;
} }
TextPosition pos = TextPosition pos =
getRenderEditor ( ) . getPositionForOffset ( details . globalPosition ) ; getRenderEditor ( ) ! . getPositionForOffset ( details . globalPosition ) ;
containerNode . ChildQuery result = containerNode . ChildQuery result =
getEditor ( ) . widget . controller . document . queryChild ( pos . offset ) ; getEditor ( ) ! . widget . controller . document . queryChild ( pos . offset ) ;
if ( result . node = = null ) { if ( result . node = = null ) {
return false ; return false ;
} }
@ -391,7 +386,7 @@ class _QuillEditorSelectionGestureDetectorBuilder
if ( line . length = = 1 ) { if ( line . length = = 1 ) {
/ / tapping when no text yet on this line / / tapping when no text yet on this line
_flipListCheckbox ( pos , line , segmentResult ) ; _flipListCheckbox ( pos , line , segmentResult ) ;
getEditor ( ) . widget . controller . updateSelection ( getEditor ( ) ! . widget . controller . updateSelection (
TextSelection . collapsed ( offset: pos . offset ) , ChangeSource . LOCAL ) ; TextSelection . collapsed ( offset: pos . offset ) , ChangeSource . LOCAL ) ;
return true ; return true ;
} }
@ -399,33 +394,34 @@ class _QuillEditorSelectionGestureDetectorBuilder
} }
leaf . Leaf segment = segmentResult . node as leaf . Leaf ; leaf . Leaf segment = segmentResult . node as leaf . Leaf ;
if ( segment . style . containsKey ( Attribute . link . key ) ) { if ( segment . style . containsKey ( Attribute . link . key ) ) {
var launchUrl = getEditor ( ) . widget . onLaunchUrl ; var launchUrl = getEditor ( ) ! . widget . onLaunchUrl ;
if ( launchUrl = = null ) { if ( launchUrl = = null ) {
launchUrl = _launchUrl ; launchUrl = _launchUrl ;
} }
String link = segment . style . attributes [ Attribute . link . key ] . value ; String ? link = segment . style . attributes [ Attribute . link . key ] ! . value ;
if ( getEditor ( ) . widget . readOnly & & link ! = null ) { if ( getEditor ( ) ! . widget . readOnly & & link ! = null ) {
link = link . trim ( ) ; link = link . trim ( ) ;
if ( ! linkPrefixes if ( ! linkPrefixes
. any ( ( linkPrefix ) = > link . toLowerCase ( ) . startsWith ( linkPrefix ) ) ) { . any ( ( linkPrefix ) = > link ! . toLowerCase ( ) . startsWith ( linkPrefix ) ) ) {
link = ' https:// $ link ' ; link = ' https:// $ link ' ;
} }
launchUrl ( link ) ; launchUrl ( link ) ;
} }
return false ; return false ;
} }
if ( getEditor ( ) . widget . readOnly & & segment . value is BlockEmbed ) { if ( getEditor ( ) ! . widget . readOnly & & segment . value is BlockEmbed ) {
BlockEmbed blockEmbed = segment . value as BlockEmbed ; BlockEmbed blockEmbed = segment . value as BlockEmbed ;
if ( blockEmbed . type = = ' image ' ) { if ( blockEmbed . type = = ' image ' ) {
final String imageUrl = blockEmbed . data ; final String imageUrl = blockEmbed . data ;
Navigator . push ( Navigator . push (
getEditor ( ) . context , getEditor ( ) ! . context ,
MaterialPageRoute ( MaterialPageRoute (
builder: ( context ) = > ImageTapWrapper ( builder: ( context ) = > ImageTapWrapper (
imageProvider: imageUrl . startsWith ( ' http ' ) imageProvider: imageUrl . startsWith ( ' http ' )
? NetworkImage ( imageUrl ) ? NetworkImage ( imageUrl )
: isBase64 ( imageUrl ) : isBase64 ( imageUrl )
? Image . memory ( base64 . decode ( imageUrl ) ) ? Image . memory ( base64 . decode ( imageUrl ) )
as ImageProvider < Object > ?
: FileImage ( io . File ( imageUrl ) ) , : FileImage ( io . File ( imageUrl ) ) ,
) , ) ,
) , ) ,
@ -441,25 +437,25 @@ class _QuillEditorSelectionGestureDetectorBuilder
bool _flipListCheckbox ( bool _flipListCheckbox (
TextPosition pos , Line line , containerNode . ChildQuery segmentResult ) { TextPosition pos , Line line , containerNode . ChildQuery segmentResult ) {
if ( getEditor ( ) . widget . readOnly | | if ( getEditor ( ) ! . widget . readOnly | |
! line . style . containsKey ( Attribute . list . key ) | | ! line . style . containsKey ( Attribute . list . key ) | |
segmentResult . offset ! = 0 ) { segmentResult . offset ! = 0 ) {
return false ; return false ;
} }
/ / segmentResult . offset = = 0 means tap at the beginning of the TextLine / / segmentResult . offset = = 0 means tap at the beginning of the TextLine
String listVal = line . style . attributes [ Attribute . list . key ] . value ; String ? listVal = line . style . attributes [ Attribute . list . key ] ! . value ;
if ( listVal = = Attribute . unchecked . value ) { if ( listVal = = Attribute . unchecked . value ) {
getEditor ( ) getEditor ( ) !
. widget . widget
. controller . controller
. formatText ( pos . offset , 0 , Attribute . checked ) ; . formatText ( pos . offset , 0 , Attribute . checked ) ;
} else if ( listVal = = Attribute . checked . value ) { } else if ( listVal = = Attribute . checked . value ) {
getEditor ( ) getEditor ( ) !
. widget . widget
. controller . controller
. formatText ( pos . offset , 0 , Attribute . unchecked ) ; . formatText ( pos . offset , 0 , Attribute . unchecked ) ;
} }
getEditor ( ) . widget . controller . updateSelection ( getEditor ( ) ! . widget . controller . updateSelection (
TextSelection . collapsed ( offset: pos . offset ) , ChangeSource . LOCAL ) ; TextSelection . collapsed ( offset: pos . offset ) , ChangeSource . LOCAL ) ;
return true ; return true ;
} }
@ -470,11 +466,11 @@ class _QuillEditorSelectionGestureDetectorBuilder
@ override @ override
onSingleTapUp ( TapUpDetails details ) { onSingleTapUp ( TapUpDetails details ) {
getEditor ( ) . hideToolbar ( ) ; getEditor ( ) ! . hideToolbar ( ) ;
bool positionSelected = _onTapping ( details ) ; bool positionSelected = _onTapping ( details ) ;
if ( delegate . getSelectionEnabled ( ) & & ! positionSelected ) { if ( delegate . getSelectionEnabled ( ) ! & & ! positionSelected ) {
switch ( Theme . of ( _state . context ) . platform ) { switch ( Theme . of ( _state . context ) . platform ) {
case TargetPlatform . iOS: case TargetPlatform . iOS:
case TargetPlatform . macOS: case TargetPlatform . macOS:
@ -482,11 +478,11 @@ class _QuillEditorSelectionGestureDetectorBuilder
case PointerDeviceKind . mouse: case PointerDeviceKind . mouse:
case PointerDeviceKind . stylus: case PointerDeviceKind . stylus:
case PointerDeviceKind . invertedStylus: case PointerDeviceKind . invertedStylus:
getRenderEditor ( ) . selectPosition ( SelectionChangedCause . tap ) ; getRenderEditor ( ) ! . selectPosition ( SelectionChangedCause . tap ) ;
break ; break ;
case PointerDeviceKind . touch: case PointerDeviceKind . touch:
case PointerDeviceKind . unknown: case PointerDeviceKind . unknown:
getRenderEditor ( ) . selectWordEdge ( SelectionChangedCause . tap ) ; getRenderEditor ( ) ! . selectWordEdge ( SelectionChangedCause . tap ) ;
break ; break ;
} }
break ; break ;
@ -494,7 +490,7 @@ class _QuillEditorSelectionGestureDetectorBuilder
case TargetPlatform . fuchsia: case TargetPlatform . fuchsia:
case TargetPlatform . linux: case TargetPlatform . linux:
case TargetPlatform . windows: case TargetPlatform . windows:
getRenderEditor ( ) . selectPosition ( SelectionChangedCause . tap ) ; getRenderEditor ( ) ! . selectPosition ( SelectionChangedCause . tap ) ;
break ; break ;
} }
} }
@ -503,11 +499,11 @@ class _QuillEditorSelectionGestureDetectorBuilder
@ override @ override
void onSingleLongTapStart ( LongPressStartDetails details ) { void onSingleLongTapStart ( LongPressStartDetails details ) {
if ( delegate . getSelectionEnabled ( ) ) { if ( delegate . getSelectionEnabled ( ) ! ) {
switch ( Theme . of ( _state . context ) . platform ) { switch ( Theme . of ( _state . context ) . platform ) {
case TargetPlatform . iOS: case TargetPlatform . iOS:
case TargetPlatform . macOS: case TargetPlatform . macOS:
getRenderEditor ( ) . selectPositionAt ( getRenderEditor ( ) ! . selectPositionAt (
details . globalPosition , details . globalPosition ,
null , null ,
SelectionChangedCause . longPress , SelectionChangedCause . longPress ,
@ -517,7 +513,7 @@ class _QuillEditorSelectionGestureDetectorBuilder
case TargetPlatform . fuchsia: case TargetPlatform . fuchsia:
case TargetPlatform . linux: case TargetPlatform . linux:
case TargetPlatform . windows: case TargetPlatform . windows:
getRenderEditor ( ) . selectWord ( SelectionChangedCause . longPress ) ; getRenderEditor ( ) ! . selectWord ( SelectionChangedCause . longPress ) ;
Feedback . forLongPress ( _state . context ) ; Feedback . forLongPress ( _state . context ) ;
break ; break ;
default : default :
@ -548,7 +544,7 @@ class RenderEditor extends RenderEditableContainerBox
final ValueNotifier < bool > _selectionEndInViewport = ValueNotifier < bool > ( true ) ; final ValueNotifier < bool > _selectionEndInViewport = ValueNotifier < bool > ( true ) ;
RenderEditor ( RenderEditor (
List < RenderEditableBox > children , List < RenderEditableBox > ? children ,
TextDirection textDirection , TextDirection textDirection ,
EdgeInsetsGeometry padding , EdgeInsetsGeometry padding ,
this . document , this . document ,
@ -558,11 +554,7 @@ class RenderEditor extends RenderEditableContainerBox
this . _startHandleLayerLink , this . _startHandleLayerLink ,
this . _endHandleLayerLink , this . _endHandleLayerLink ,
EdgeInsets floatingCursorAddedMargin ) EdgeInsets floatingCursorAddedMargin )
: assert ( document ! = null ) , : super (
assert ( textDirection ! = null ) ,
assert ( _hasFocus ! = null ) ,
assert ( floatingCursorAddedMargin ! = null ) ,
super (
children , children ,
document . root , document . root ,
textDirection , textDirection ,
@ -570,7 +562,6 @@ class RenderEditor extends RenderEditableContainerBox
) ; ) ;
setDocument ( Document doc ) { setDocument ( Document doc ) {
assert ( doc ! = null ) ;
if ( document = = doc ) { if ( document = = doc ) {
return ; return ;
} }
@ -579,7 +570,6 @@ class RenderEditor extends RenderEditableContainerBox
} }
setHasFocus ( bool h ) { setHasFocus ( bool h ) {
assert ( h ! = null ) ;
if ( _hasFocus = = h ) { if ( _hasFocus = = h ) {
return ; return ;
} }
@ -614,15 +604,13 @@ class RenderEditor extends RenderEditableContainerBox
@ override @ override
List < TextSelectionPoint > getEndpointsForSelection ( List < TextSelectionPoint > getEndpointsForSelection (
TextSelection textSelection ) { TextSelection textSelection ) {
assert ( constraints ! = null ) ;
if ( textSelection . isCollapsed ) { if ( textSelection . isCollapsed ) {
RenderEditableBox child = childAtPosition ( textSelection . extent ) ; RenderEditableBox child = childAtPosition ( textSelection . extent ) ;
TextPosition localPosition = TextPosition ( TextPosition localPosition = TextPosition (
offset: offset:
textSelection . extentOffset - child . getContainer ( ) . getOffset ( ) ) ; textSelection . extentOffset - child . getContainer ( ) . getOffset ( ) ) ;
Offset localOffset = child . getOffsetForCaret ( localPosition ) ; Offset localOffset = child . getOffsetForCaret ( localPosition ) ;
BoxParentData parentData = child . parentData ; BoxParentData parentData = child . parentData as BoxParentData ;
return < TextSelectionPoint > [ return < TextSelectionPoint > [
TextSelectionPoint ( TextSelectionPoint (
Offset ( 0.0 , child . preferredLineHeight ( localPosition ) ) + Offset ( 0.0 , child . preferredLineHeight ( localPosition ) ) +
@ -632,7 +620,7 @@ class RenderEditor extends RenderEditableContainerBox
] ; ] ;
} }
Node baseNode = _container . queryChild ( textSelection . start , false ) . node ; Node ? baseNode = _container . queryChild ( textSelection . start , false ) . node ;
var baseChild = firstChild ; var baseChild = firstChild ;
while ( baseChild ! = null ) { while ( baseChild ! = null ) {
@ -643,7 +631,7 @@ class RenderEditor extends RenderEditableContainerBox
} }
assert ( baseChild ! = null ) ; assert ( baseChild ! = null ) ;
BoxParentData baseParentData = baseChild . parentData ; BoxParentData baseParentData = baseChild ! . parentData as BoxP arentData ;
TextSelection baseSelection = TextSelection baseSelection =
localSelection ( baseChild . getContainer ( ) , textSelection , true ) ; localSelection ( baseChild . getContainer ( ) , textSelection , true ) ;
TextSelectionPoint basePoint = TextSelectionPoint basePoint =
@ -651,8 +639,8 @@ class RenderEditor extends RenderEditableContainerBox
basePoint = TextSelectionPoint ( basePoint = TextSelectionPoint (
basePoint . point + baseParentData . offset , basePoint . direction ) ; basePoint . point + baseParentData . offset , basePoint . direction ) ;
Node extentNode = _container . queryChild ( textSelection . end , false ) . node ; Node ? extentNode = _container . queryChild ( textSelection . end , false ) . node ;
var extentChild = baseChild ; RenderEditableBox ? extentChild = baseChild ;
while ( extentChild ! = null ) { while ( extentChild ! = null ) {
if ( extentChild . getContainer ( ) = = extentNode ) { if ( extentChild . getContainer ( ) = = extentNode ) {
break ; break ;
@ -661,7 +649,7 @@ class RenderEditor extends RenderEditableContainerBox
} }
assert ( extentChild ! = null ) ; assert ( extentChild ! = null ) ;
BoxParentData extentParentData = extentChild . parentData ; BoxParentData extentParentData = extentChild ! . parentData as BoxP arentData ;
TextSelection extentSelection = TextSelection extentSelection =
localSelection ( extentChild . getContainer ( ) , textSelection , true ) ; localSelection ( extentChild . getContainer ( ) , textSelection , true ) ;
TextSelectionPoint extentPoint = TextSelectionPoint extentPoint =
@ -672,7 +660,7 @@ class RenderEditor extends RenderEditableContainerBox
return < TextSelectionPoint > [ basePoint , extentPoint ] ; return < TextSelectionPoint > [ basePoint , extentPoint ] ;
} }
Offset _lastTapDownPosition ; Offset ? _lastTapDownPosition ;
@ override @ override
handleTapDown ( TapDownDetails details ) { handleTapDown ( TapDownDetails details ) {
@ -682,14 +670,9 @@ class RenderEditor extends RenderEditableContainerBox
@ override @ override
selectWordsInRange ( selectWordsInRange (
Offset from , Offset from ,
Offset to , Offset ? to ,
SelectionChangedCause cause , SelectionChangedCause cause ,
) { ) {
assert ( cause ! = null ) ;
assert ( from ! = null ) ;
if ( onSelectionChanged = = null ) {
return ;
}
TextPosition firstPosition = getPositionForOffset ( from ) ; TextPosition firstPosition = getPositionForOffset ( from ) ;
TextSelection firstWord = selectWordAtPosition ( firstPosition ) ; TextSelection firstWord = selectWordAtPosition ( firstPosition ) ;
TextSelection lastWord = TextSelection lastWord =
@ -717,19 +700,13 @@ class RenderEditor extends RenderEditableContainerBox
! focusingEmpty ) { ! focusingEmpty ) {
return ; return ;
} }
if ( onSelectionChanged ! = null ) { onSelectionChanged ( nextSelection , cause ) ;
onSelectionChanged ( nextSelection , cause ) ;
}
} }
@ override @ override
selectWordEdge ( SelectionChangedCause cause ) { selectWordEdge ( SelectionChangedCause cause ) {
assert ( cause ! = null ) ;
assert ( _lastTapDownPosition ! = null ) ; assert ( _lastTapDownPosition ! = null ) ;
if ( onSelectionChanged = = null ) { TextPosition position = getPositionForOffset ( _lastTapDownPosition ! ) ;
return ;
}
TextPosition position = getPositionForOffset ( _lastTapDownPosition ) ;
RenderEditableBox child = childAtPosition ( position ) ; RenderEditableBox child = childAtPosition ( position ) ;
int nodeOffset = child . getContainer ( ) . getOffset ( ) ; int nodeOffset = child . getContainer ( ) . getOffset ( ) ;
TextPosition localPosition = TextPosition ( TextPosition localPosition = TextPosition (
@ -759,16 +736,11 @@ class RenderEditor extends RenderEditableContainerBox
@ override @ override
selectPositionAt ( selectPositionAt (
Offset from , Offset from ,
Offset to , Offset ? to ,
SelectionChangedCause cause , SelectionChangedCause cause ,
) { ) {
assert ( cause ! = null ) ;
assert ( from ! = null ) ;
if ( onSelectionChanged = = null ) {
return ;
}
TextPosition fromPosition = getPositionForOffset ( from ) ; TextPosition fromPosition = getPositionForOffset ( from ) ;
TextPosition toPosition = to = = null ? null : getPositionForOffset ( to ) ; TextPosition ? toPosition = to = = null ? null : getPositionForOffset ( to ) ;
int baseOffset = fromPosition . offset ; int baseOffset = fromPosition . offset ;
int extentOffset = fromPosition . offset ; int extentOffset = fromPosition . offset ;
@ -787,12 +759,12 @@ class RenderEditor extends RenderEditableContainerBox
@ override @ override
selectWord ( SelectionChangedCause cause ) { selectWord ( SelectionChangedCause cause ) {
selectWordsInRange ( _lastTapDownPosition , null , cause ) ; selectWordsInRange ( _lastTapDownPosition ! , null , cause ) ;
} }
@ override @ override
selectPosition ( SelectionChangedCause cause ) { selectPosition ( SelectionChangedCause cause ) {
selectPositionAt ( _lastTapDownPosition , null , cause ) ; selectPositionAt ( _lastTapDownPosition ! , null , cause ) ;
} }
@ override @ override
@ -837,7 +809,7 @@ class RenderEditor extends RenderEditableContainerBox
} }
@ override @ override
bool hitTestChildren ( BoxHitTestResult result , { Offset position } ) { bool hitTestChildren ( BoxHitTestResult result , { required Offset position } ) {
return defaultHitTestChildren ( result , position: position ) ; return defaultHitTestChildren ( result , position: position ) ;
} }
@ -877,9 +849,9 @@ class RenderEditor extends RenderEditableContainerBox
@ override @ override
TextPosition getPositionForOffset ( Offset offset ) { TextPosition getPositionForOffset ( Offset offset ) {
Offset local = globalToLocal ( offset ) ; Offset local = globalToLocal ( offset ) ;
RenderEditableBox child = childAtOffset ( local ) ; RenderEditableBox child = childAtOffset ( local ) ! ;
BoxParentData parentData = child . parentData ; BoxParentData parentData = child . parentData as BoxParentData ;
Offset localOffset = local - parentData . offset ; Offset localOffset = local - parentData . offset ;
TextPosition localPosition = child . getPositionForOffset ( localOffset ) ; TextPosition localPosition = child . getPositionForOffset ( localOffset ) ;
return TextPosition ( return TextPosition (
@ -888,7 +860,7 @@ class RenderEditor extends RenderEditableContainerBox
) ; ) ;
} }
double getOffsetToRevealCursor ( double ? getOffsetToRevealCursor (
double viewportHeight , double scrollOffset , double offsetInViewport ) { double viewportHeight , double scrollOffset , double offsetInViewport ) {
List < TextSelectionPoint > endpoints = getEndpointsForSelection ( selection ) ; List < TextSelectionPoint > endpoints = getEndpointsForSelection ( selection ) ;
TextSelectionPoint endpoint = endpoints . first ; TextSelectionPoint endpoint = endpoints . first ;
@ -902,7 +874,7 @@ class RenderEditor extends RenderEditableContainerBox
kMargin + kMargin +
offsetInViewport ; offsetInViewport ;
final caretBottom = endpoint . point . dy + kMargin + offsetInViewport ; final caretBottom = endpoint . point . dy + kMargin + offsetInViewport ;
double dy ; double ? dy ;
if ( caretTop < scrollOffset ) { if ( caretTop < scrollOffset ) {
dy = caretTop ; dy = caretTop ;
} else if ( caretBottom > scrollOffset + viewportHeight ) { } else if ( caretBottom > scrollOffset + viewportHeight ) {
@ -927,14 +899,11 @@ class RenderEditableContainerBox extends RenderBox
containerNode . Container _container ; containerNode . Container _container ;
TextDirection textDirection ; TextDirection textDirection ;
EdgeInsetsGeometry _padding ; EdgeInsetsGeometry _padding ;
EdgeInsets _resolvedPadding ; EdgeInsets ? _resolvedPadding ;
RenderEditableContainerBox ( List < RenderEditableBox > children , this . _container , RenderEditableContainerBox ( List < RenderEditableBox > ? children , this . _container ,
this . textDirection , this . _padding ) this . textDirection , this . _padding )
: assert ( _container ! = null ) , : assert ( _padding . isNonNegative ) {
assert ( textDirection ! = null ) ,
assert ( _padding ! = null ) ,
assert ( _padding . isNonNegative ) {
addAll ( children ) ; addAll ( children ) ;
} }
@ -943,7 +912,6 @@ class RenderEditableContainerBox extends RenderBox
} }
setContainer ( containerNode . Container c ) { setContainer ( containerNode . Container c ) {
assert ( c ! = null ) ;
if ( _container = = c ) { if ( _container = = c ) {
return ; return ;
} }
@ -954,7 +922,6 @@ class RenderEditableContainerBox extends RenderBox
EdgeInsetsGeometry getPadding ( ) = > _padding ; EdgeInsetsGeometry getPadding ( ) = > _padding ;
setPadding ( EdgeInsetsGeometry value ) { setPadding ( EdgeInsetsGeometry value ) {
assert ( value ! = null ) ;
assert ( value . isNonNegative ) ; assert ( value . isNonNegative ) ;
if ( _padding = = value ) { if ( _padding = = value ) {
return ; return ;
@ -963,22 +930,22 @@ class RenderEditableContainerBox extends RenderBox
_markNeedsPaddingResolution ( ) ; _markNeedsPaddingResolution ( ) ;
} }
EdgeInsets get resolvedPadding = > _resolvedPadding ; EdgeInsets ? get resolvedPadding = > _resolvedPadding ;
_resolvePadding ( ) { _resolvePadding ( ) {
if ( _resolvedPadding ! = null ) { if ( _resolvedPadding ! = null ) {
return ; return ;
} }
_resolvedPadding = _padding . resolve ( textDirection ) ; _resolvedPadding = _padding . resolve ( textDirection ) ;
_resolvedPadding = _resolvedPadding . copyWith ( left: _resolvedPadding . left ) ; _resolvedPadding = _resolvedPadding ! . copyWith ( left: _resolvedPadding ! . left ) ;
assert ( _resolvedPadding . isNonNegative ) ; assert ( _resolvedPadding ! . isNonNegative ) ;
} }
RenderEditableBox childAtPosition ( TextPosition position ) { RenderEditableBox childAtPosition ( TextPosition position ) {
assert ( firstChild ! = null ) ; assert ( firstChild ! = null ) ;
Node targetNode = _container . queryChild ( position . offset , false ) . node ; Node ? targetNode = _container . queryChild ( position . offset , false ) . node ;
var targetChild = firstChild ; var targetChild = firstChild ;
while ( targetChild ! = null ) { while ( targetChild ! = null ) {
@ -998,19 +965,19 @@ class RenderEditableContainerBox extends RenderBox
markNeedsLayout ( ) ; markNeedsLayout ( ) ;
} }
RenderEditableBox childAtOffset ( Offset offset ) { RenderEditableBox ? childAtOffset ( Offset offset ) {
assert ( firstChild ! = null ) ; assert ( firstChild ! = null ) ;
_resolvePadding ( ) ; _resolvePadding ( ) ;
if ( offset . dy < = _resolvedPadding . top ) { if ( offset . dy < = _resolvedPadding ! . top ) {
return firstChild ; return firstChild ;
} }
if ( offset . dy > = size . height - _resolvedPadding . bottom ) { if ( offset . dy > = size . height - _resolvedPadding ! . bottom ) {
return lastChild ; return lastChild ;
} }
var child = firstChild ; var child = firstChild ;
double dx = - offset . dx , dy = _resolvedPadding . top ; double dx = - offset . dx , dy = _resolvedPadding ! . top ;
while ( child ! = null ) { while ( child ! = null ) {
if ( child . size . contains ( offset . translate ( dx , - dy ) ) ) { if ( child . size . contains ( offset . translate ( dx , - dy ) ) ) {
return child ; return child ;
@ -1037,20 +1004,21 @@ class RenderEditableContainerBox extends RenderBox
_resolvePadding ( ) ; _resolvePadding ( ) ;
assert ( _resolvedPadding ! = null ) ; assert ( _resolvedPadding ! = null ) ;
double mainAxisExtent = _resolvedPadding . top ; double mainAxisExtent = _resolvedPadding ! . top ;
var child = firstChild ; var child = firstChild ;
BoxConstraints innerConstraints = BoxConstraints innerConstraints =
BoxConstraints . tightFor ( width: constraints . maxWidth ) BoxConstraints . tightFor ( width: constraints . maxWidth )
. deflate ( _resolvedPadding ) ; . deflate ( _resolvedPadding ! ) ;
while ( child ! = null ) { while ( child ! = null ) {
child . layout ( innerConstraints , parentUsesSize: true ) ; child . layout ( innerConstraints , parentUsesSize: true ) ;
final EditableContainerParentData childParentData = child . parentData ; final EditableContainerParentData childParentData =
childParentData . offset = Offset ( _resolvedPadding . left , mainAxisExtent ) ; child . parentData as EditableContainerParentData ;
childParentData . offset = Offset ( _resolvedPadding ! . left , mainAxisExtent ) ;
mainAxisExtent + = child . size . height ; mainAxisExtent + = child . size . height ;
assert ( child . parentData = = childParentData ) ; assert ( child . parentData = = childParentData ) ;
child = childParentData . nextSibling ; child = childParentData . nextSibling ;
} }
mainAxisExtent + = _resolvedPadding . bottom ; mainAxisExtent + = _resolvedPadding ! . bottom ;
size = constraints . constrain ( Size ( constraints . maxWidth , mainAxisExtent ) ) ; size = constraints . constrain ( Size ( constraints . maxWidth , mainAxisExtent ) ) ;
assert ( size . isFinite ) ; assert ( size . isFinite ) ;
@ -1061,7 +1029,8 @@ class RenderEditableContainerBox extends RenderBox
var child = firstChild ; var child = firstChild ;
while ( child ! = null ) { while ( child ! = null ) {
extent = math . max ( extent , childSize ( child ) ) ; extent = math . max ( extent , childSize ( child ) ) ;
EditableContainerParentData childParentData = child . parentData ; EditableContainerParentData childParentData =
child . parentData as EditableContainerParentData ;
child = childParentData . nextSibling ; child = childParentData . nextSibling ;
} }
return extent ; return extent ;
@ -1072,7 +1041,8 @@ class RenderEditableContainerBox extends RenderBox
var child = firstChild ; var child = firstChild ;
while ( child ! = null ) { while ( child ! = null ) {
extent + = childSize ( child ) ; extent + = childSize ( child ) ;
EditableContainerParentData childParentData = child . parentData ; EditableContainerParentData childParentData =
child . parentData as EditableContainerParentData ;
child = childParentData . nextSibling ; child = childParentData . nextSibling ;
} }
return extent ; return extent ;
@ -1083,10 +1053,10 @@ class RenderEditableContainerBox extends RenderBox
_resolvePadding ( ) ; _resolvePadding ( ) ;
return _getIntrinsicCrossAxis ( ( RenderBox child ) { return _getIntrinsicCrossAxis ( ( RenderBox child ) {
double childHeight = math . max ( double childHeight = math . max (
0.0 , height - _resolvedPadding . top + _resolvedPadding . bottom ) ; 0.0 , height - _resolvedPadding ! . top + _resolvedPadding ! . bottom ) ;
return child . getMinIntrinsicWidth ( childHeight ) + return child . getMinIntrinsicWidth ( childHeight ) +
_resolvedPadding . left + _resolvedPadding ! . left +
_resolvedPadding . right ; _resolvedPadding ! . right ;
} ) ; } ) ;
} }
@ -1095,10 +1065,10 @@ class RenderEditableContainerBox extends RenderBox
_resolvePadding ( ) ; _resolvePadding ( ) ;
return _getIntrinsicCrossAxis ( ( RenderBox child ) { return _getIntrinsicCrossAxis ( ( RenderBox child ) {
double childHeight = math . max ( double childHeight = math . max (
0.0 , height - _resolvedPadding . top + _resolvedPadding . bottom ) ; 0.0 , height - _resolvedPadding ! . top + _resolvedPadding ! . bottom ) ;
return child . getMaxIntrinsicWidth ( childHeight ) + return child . getMaxIntrinsicWidth ( childHeight ) +
_resolvedPadding . left + _resolvedPadding ! . left +
_resolvedPadding . right ; _resolvedPadding ! . right ;
} ) ; } ) ;
} }
@ -1106,11 +1076,11 @@ class RenderEditableContainerBox extends RenderBox
double computeMinIntrinsicHeight ( double width ) { double computeMinIntrinsicHeight ( double width ) {
_resolvePadding ( ) ; _resolvePadding ( ) ;
return _getIntrinsicMainAxis ( ( RenderBox child ) { return _getIntrinsicMainAxis ( ( RenderBox child ) {
double childWidth = double childWidth = math . max (
math . max ( 0.0 , width - _resolvedPadding . left + _resolvedPadding . right ) ; 0.0 , width - _resolvedPadding ! . left + _resolvedPadding ! . right ) ;
return child . getMinIntrinsicHeight ( childWidth ) + return child . getMinIntrinsicHeight ( childWidth ) +
_resolvedPadding . top + _resolvedPadding ! . top +
_resolvedPadding . bottom ; _resolvedPadding ! . bottom ;
} ) ; } ) ;
} }
@ -1118,18 +1088,18 @@ class RenderEditableContainerBox extends RenderBox
double computeMaxIntrinsicHeight ( double width ) { double computeMaxIntrinsicHeight ( double width ) {
_resolvePadding ( ) ; _resolvePadding ( ) ;
return _getIntrinsicMainAxis ( ( RenderBox child ) { return _getIntrinsicMainAxis ( ( RenderBox child ) {
final childWidth = final childWidth = math . max (
math . max ( 0.0 , width - _resolvedPadding . left + _resolvedPadding . right ) ; 0.0 , width - _resolvedPadding ! . left + _resolvedPadding ! . right ) ;
return child . getMaxIntrinsicHeight ( childWidth ) + return child . getMaxIntrinsicHeight ( childWidth ) +
_resolvedPadding . top + _resolvedPadding ! . top +
_resolvedPadding . bottom ; _resolvedPadding ! . bottom ;
} ) ; } ) ;
} }
@ override @ override
double computeDistanceToActualBaseline ( TextBaseline baseline ) { double computeDistanceToActualBaseline ( TextBaseline baseline ) {
_resolvePadding ( ) ; _resolvePadding ( ) ;
return defaultComputeDistanceToFirstActualBaseline ( baseline ) + return defaultComputeDistanceToFirstActualBaseline ( baseline ) ! +
_resolvedPadding . top ; _resolvedPadding ! . top ;
} }
} }
Miller Adulu
4 years ago
committed by
GitHub