From 42366538990720cb095f4aca135397ab37a7ff9f Mon Sep 17 00:00:00 2001 From: X Code Date: Sun, 30 Jan 2022 19:34:26 -0800 Subject: [PATCH] Update RenderEditableContainerBox constructor --- lib/src/widgets/editor.dart | 29 +++++++++++++++++------------ lib/src/widgets/text_block.dart | 13 ++++++------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/lib/src/widgets/editor.dart b/lib/src/widgets/editor.dart index b36e2835..617b5fb0 100644 --- a/lib/src/widgets/editor.dart +++ b/lib/src/widgets/editor.dart @@ -742,11 +742,11 @@ class RenderEditor extends RenderEditableContainerBox _cursorController = cursorController, _maxContentWidth = maxContentWidth, super( - children, - document.root, - textDirection, - scrollBottomInset, - padding, + children: children, + container: document.root, + textDirection: textDirection, + scrollBottomInset: scrollBottomInset, + padding: padding, ); final CursorCont _cursorController; @@ -1569,6 +1569,9 @@ class RenderEditor extends RenderEditableContainerBox class EditableContainerParentData extends ContainerBoxParentData {} +/// Multi-child render box of editable content. +/// +/// Common ancestor for [RenderEditor] and [RenderEditableTextBlock]. class RenderEditableContainerBox extends RenderBox with ContainerRenderObjectMixin { RenderEditableContainerBox( - List? children, - this._container, - this.textDirection, - this.scrollBottomInset, - this._padding, - ) : assert(_padding.isNonNegative) { + {required container_node.Container container, + required this.textDirection, + required this.scrollBottomInset, + required EdgeInsetsGeometry padding, + List? children}) + : assert(padding.isNonNegative), + _container = container, + _padding = padding { addAll(children); } @@ -1627,7 +1632,7 @@ class RenderEditableContainerBox extends RenderBox RenderEditableBox childAtPosition(TextPosition position) { assert(firstChild != null); - final targetNode = _container.queryChild(position.offset, false).node; + final targetNode = container.queryChild(position.offset, false).node; var targetChild = firstChild; while (targetChild != null) { diff --git a/lib/src/widgets/text_block.dart b/lib/src/widgets/text_block.dart index 6b686879..370c780f 100644 --- a/lib/src/widgets/text_block.dart +++ b/lib/src/widgets/text_block.dart @@ -294,18 +294,17 @@ class RenderEditableTextBlock extends RenderEditableContainerBox required double scrollBottomInset, required Decoration decoration, List? children, - ImageConfiguration configuration = ImageConfiguration.empty, EdgeInsets contentPadding = EdgeInsets.zero, }) : _decoration = decoration, - _configuration = configuration, + _configuration = ImageConfiguration(textDirection: textDirection), _savedPadding = padding, _contentPadding = contentPadding, super( - children, - block, - textDirection, - scrollBottomInset, - padding.add(contentPadding), + children: children, + container: block, + textDirection: textDirection, + scrollBottomInset: scrollBottomInset, + padding: padding.add(contentPadding), ); EdgeInsetsGeometry _savedPadding;