Merge flutter/flutter#144577

Author: zmtzawqlp

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 13.0.1
+
+* Merge https://github.com/flutter/flutter/pull/144577
+
 ## 13.0.0
 
 * Migrate to Flutter 3.19.0

lib/src/extended/rendering/paragraph.dart

@@ -129,17 +129,13 @@ class ExtendedRenderParagraph extends _RenderParagraph
  locale: locale,
  )..layout();
  if (didOverflowWidth) {
- double fadeEnd, fadeStart;
- switch (textDirection) {
- case TextDirection.rtl:
- fadeEnd = 0.0;
- fadeStart = fadeSizePainter.width;
- break;
- case TextDirection.ltr:
- fadeEnd = size.width;
- fadeStart = fadeEnd - fadeSizePainter.width;
- break;
- }
+ final (double fadeStart, double fadeEnd) = switch (textDirection) {
+ TextDirection.rtl => (fadeSizePainter.width, 0.0),
+ TextDirection.ltr => (
+ size.width - fadeSizePainter.width,
+ size.width
+ ),
+ };
  _overflowShader = ui.Gradient.linear(
  Offset(fadeStart, 0.0),
  Offset(fadeEnd, 0.0),

lib/src/official/rendering/paragraph.dart

@@ -61,6 +61,27 @@ class _RenderParagraph extends RenderBox
  String.fromCharCode(PlaceholderSpan.placeholderCodeUnit);
  final TextPainter _textPainter;
 
+ // Currently, computing min/max intrinsic width/height will destroy state
+ // inside the painter. Instead of calling _layout again to get back the correct
+ // state, use a separate TextPainter for intrinsics calculation.
+ //
+ // TODO(abarth): Make computing the min/max intrinsic width/height a
+ // non-destructive operation.
+ TextPainter? _textIntrinsicsCache;
+ TextPainter get _textIntrinsics {
+ return (_textIntrinsicsCache ??= TextPainter())
+ ..text = _textPainter.text
+ ..textAlign = _textPainter.textAlign
+ ..textDirection = _textPainter.textDirection
+ ..textScaler = _textPainter.textScaler
+ ..maxLines = _textPainter.maxLines
+ ..ellipsis = _textPainter.ellipsis
+ ..locale = _textPainter.locale
+ ..strutStyle = _textPainter.strutStyle
+ ..textWidthBasis = _textPainter.textWidthBasis
+ ..textHeightBehavior = _textPainter.textHeightBehavior;
+ }
+
  List<AttributedString>? _cachedAttributedLabels;
 
  List<InlineSpanSemanticsInformation>? _cachedCombinedSemanticsInfos;
@@ -162,10 +183,13 @@ class _RenderParagraph extends RenderBox
  if (end == -1) {
  end = plainText.length;
  }
- result.add(_SelectableFragment(
+ result.add(
+ _SelectableFragment(
  paragraph: this,
  range: TextRange(start: start, end: end),
- fullText: plainText));
+ fullText: plainText,
+ ),
+ );
  start = end;
  }
  start += 1;
@@ -199,6 +223,7 @@ class _RenderParagraph extends RenderBox
  _removeSelectionRegistrarSubscription();
  _disposeSelectableFragments();
  _textPainter.dispose();
+ _textIntrinsicsCache?.dispose();
  super.dispose();
  }
 
@@ -363,51 +388,54 @@ class _RenderParagraph extends RenderBox
 
  Offset _getOffsetForPosition(TextPosition position) {
  return getOffsetForCaret(position, Rect.zero) +
- Offset(0, getFullHeightForCaret(position) ?? 0.0);
- }
-
- List<ui.LineMetrics> _computeLineMetrics() {
- return _textPainter.computeLineMetrics();
+ Offset(0, getFullHeightForCaret(position));
  }
 
  @override
  double computeMinIntrinsicWidth(double height) {
  if (!_canComputeIntrinsics()) {
  return 0.0;
  }
- _textPainter.setPlaceholderDimensions(layoutInlineChildren(
+ final List<PlaceholderDimensions> placeholderDimensions =
+ layoutInlineChildren(
  double.infinity,
  (RenderBox child, BoxConstraints constraints) =>
  Size(child.getMinIntrinsicWidth(double.infinity), 0.0),
- ));
- _layoutText(); // layout with infinite width.
- return _textPainter.minIntrinsicWidth;
+ );
+ return (_textIntrinsics
+ ..setPlaceholderDimensions(placeholderDimensions)
+ ..layout())
+ .minIntrinsicWidth;
  }
 
  @override
  double computeMaxIntrinsicWidth(double height) {
  if (!_canComputeIntrinsics()) {
  return 0.0;
  }
- _textPainter.setPlaceholderDimensions(layoutInlineChildren(
+ final List<PlaceholderDimensions> placeholderDimensions =
+ layoutInlineChildren(
  double.infinity,
  // Height and baseline is irrelevant as all text will be laid
  // out in a single line. Therefore, using 0.0 as a dummy for the height.
  (RenderBox child, BoxConstraints constraints) =>
  Size(child.getMaxIntrinsicWidth(double.infinity), 0.0),
- ));
- _layoutText(); // layout with infinite width.
- return _textPainter.maxIntrinsicWidth;
+ );
+ return (_textIntrinsics
+ ..setPlaceholderDimensions(placeholderDimensions)
+ ..layout())
+ .maxIntrinsicWidth;
  }
 
  double _computeIntrinsicHeight(double width) {
  if (!_canComputeIntrinsics()) {
  return 0.0;
  }
- _textPainter.setPlaceholderDimensions(
- layoutInlineChildren(width, ChildLayoutHelper.dryLayoutChild));
- _layoutText(minWidth: width, maxWidth: width);
- return _textPainter.height;
+ return (_textIntrinsics
+ ..setPlaceholderDimensions(
+ layoutInlineChildren(width, ChildLayoutHelper.dryLayoutChild))
+ ..layout(minWidth: width, maxWidth: _adjustMaxWidth(width)))
+ .height;
  }
 
  @override
@@ -507,14 +535,6 @@ class _RenderParagraph extends RenderBox
  @visibleForTesting
  bool get debugHasOverflowShader => _overflowShader != null;
 
- void _layoutText({double minWidth = 0.0, double maxWidth = double.infinity}) {
- final bool widthMatters = softWrap || overflow == TextOverflow.ellipsis;
- _textPainter.layout(
- minWidth: minWidth,
- maxWidth: widthMatters ? maxWidth : double.infinity,
- );
- }
-
  @override
  void systemFontsDidChange() {
  super.systemFontsDidChange();
@@ -528,24 +548,38 @@ class _RenderParagraph extends RenderBox
  // restored to the original values before final layout and painting.
  List<PlaceholderDimensions>? _placeholderDimensions;
 
+ double _adjustMaxWidth(double maxWidth) {
+ return softWrap || overflow == TextOverflow.ellipsis
+ ? maxWidth
+ : double.infinity;
+ }
+
  void _layoutTextWithConstraints(BoxConstraints constraints) {
- _textPainter.setPlaceholderDimensions(_placeholderDimensions);
- _layoutText(minWidth: constraints.minWidth, maxWidth: constraints.maxWidth);
+ _textPainter
+ ..setPlaceholderDimensions(_placeholderDimensions)
+ ..layout(
+ minWidth: constraints.minWidth,
+ maxWidth: _adjustMaxWidth(constraints.maxWidth));
  }
 
  @override
- Size computeDryLayout(BoxConstraints constraints) {
+ @protected
+ Size computeDryLayout(covariant BoxConstraints constraints) {
  if (!_canComputeIntrinsics()) {
  assert(debugCannotComputeDryLayout(
  reason:
  'Dry layout not available for alignments that require baseline.',
  ));
  return Size.zero;
  }
- _textPainter.setPlaceholderDimensions(layoutInlineChildren(
- constraints.maxWidth, ChildLayoutHelper.dryLayoutChild));
- _layoutText(minWidth: constraints.minWidth, maxWidth: constraints.maxWidth);
- return constraints.constrain(_textPainter.size);
+ final Size size = (_textIntrinsics
+ ..setPlaceholderDimensions(layoutInlineChildren(
+ constraints.maxWidth, ChildLayoutHelper.dryLayoutChild))
+ ..layout(
+ minWidth: constraints.minWidth,
+ maxWidth: _adjustMaxWidth(constraints.maxWidth)))
+ .size;
+ return constraints.constrain(size);
  }
 
  @override
@@ -592,15 +626,13 @@ class _RenderParagraph extends RenderBox
  locale: locale,
  )..layout();
  if (didOverflowWidth) {
- double fadeEnd, fadeStart;
- switch (textDirection) {
- case TextDirection.rtl:
- fadeEnd = 0.0;
- fadeStart = fadeSizePainter.width;
- case TextDirection.ltr:
- fadeEnd = size.width;
- fadeStart = fadeEnd - fadeSizePainter.width;
- }
+ final (double fadeStart, double fadeEnd) = switch (textDirection) {
+ TextDirection.rtl => (fadeSizePainter.width, 0.0),
+ TextDirection.ltr => (
+ size.width - fadeSizePainter.width,
+ size.width
+ ),
+ };
  _overflowShader = ui.Gradient.linear(
  Offset(fadeStart, 0.0),
  Offset(fadeEnd, 0.0),
@@ -628,24 +660,15 @@ class _RenderParagraph extends RenderBox
  defaultApplyPaintTransform(child, transform);
  }
 
- // zmtzawqlp
+ // @override
  // void paint(PaintingContext context, Offset offset) {
- // // Ideally we could compute the min/max intrinsic width/height with a
- // // non-destructive operation. However, currently, computing these values
- // // will destroy state inside the painter. If that happens, we need to get
- // // back the correct state by calling _layout again.
- // //
- // // TODO(abarth): Make computing the min/max intrinsic width/height a
- // // non-destructive operation.
- // //
- // // If you remove this call, make sure that changing the textAlign still
- // // works properly.
+ // // Text alignment only triggers repaint so it's possible the text layout has
+ // // been invalidated but performLayout wasn't called at this point. Make sure
+ // // the TextPainter has a valid layout.
  // _layoutTextWithConstraints(constraints);
-
  // assert(() {
  // if (debugRepaintTextRainbowEnabled) {
- // final Paint paint = Paint()
- // ..color = debugCurrentRepaintColor.toColor();
+ // final Paint paint = Paint()..color = debugCurrentRepaintColor.toColor();
  // context.canvas.drawRect(offset & size, paint);
  // }
  // return true;
@@ -697,7 +720,7 @@ class _RenderParagraph extends RenderBox
  /// {@macro flutter.painting.textPainter.getFullHeightForCaret}
  ///
  /// Valid only after [layout].
- double? getFullHeightForCaret(TextPosition position) {
+ double getFullHeightForCaret(TextPosition position) {
  assert(!debugNeedsLayout);
  _layoutTextWithConstraints(constraints);
  return _textPainter.getFullHeightForCaret(position, Rect.zero);
@@ -816,20 +839,20 @@ class _RenderParagraph extends RenderBox
  super.describeSemanticsConfiguration(config);
  _semanticsInfo = text.getSemanticsInformation();
  bool needsAssembleSemanticsNode = false;
- bool needsChildConfigrationsDelegate = false;
+ bool needsChildConfigurationsDelegate = false;
  for (final InlineSpanSemanticsInformation info in _semanticsInfo!) {
  if (info.recognizer != null) {
  needsAssembleSemanticsNode = true;
  break;
  }
- needsChildConfigrationsDelegate =
- needsChildConfigrationsDelegate || info.isPlaceholder;
+ needsChildConfigurationsDelegate =
+ needsChildConfigurationsDelegate || info.isPlaceholder;
  }
 
  if (needsAssembleSemanticsNode) {
  config.explicitChildNodes = true;
  config.isSemanticBoundary = true;
- } else if (needsChildConfigrationsDelegate) {
+ } else if (needsChildConfigurationsDelegate) {
  config.childConfigurationsDelegate =
  _childSemanticsConfigurationsDelegate;
  } else {
@@ -1816,7 +1839,8 @@ class _SelectableFragment
  TextPosition position,
  {required double horizontalBaselineInParagraphCoordinates,
  required bool below}) {
- final List<ui.LineMetrics> lines = paragraph._computeLineMetrics();
+ final List<ui.LineMetrics> lines =
+ paragraph._textPainter.computeLineMetrics();
  final Offset offset = paragraph.getOffsetForCaret(position, Rect.zero);
  int currentLine = lines.length - 1;
  for (final ui.LineMetrics lineMetrics in lines) {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: extended_text
 description: Extended official text to build special text like inline image or @somebody quickly,it also support custom background,custom over flow and custom selection toolbar and handles.
-version: 13.0.0
+version: 13.0.1
 repository: https://github.com/fluttercandies/extended_text
 issue_tracker: https://github.com/fluttercandies/extended_text/issues
 topics: