Skip to content
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

Jump to bottom

[LTS] Release/flutter 2.5.x #1311

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[LTS] Release/flutter 2.5.x #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aca52c0
refactor: downgrade to 2.5.x
wssgcg1213 Apr 11, 2022
1504a09
Merge branch 'release/flutter-2.5.x' into resolve-253
wssgcg1213 Apr 21, 2022
edb7291
Merge pull request #1319 from openkraken/resolve-253
wssgcg1213 Apr 21, 2022
e3c0a27
Merge pull request #1345 from openkraken/main
wssgcg1213 May 6, 2022
524d2b8
fix: compatible with 2.5
wssgcg1213 May 6, 2022
7efd3be
Merge pull request #1380 from openkraken/main
wssgcg1213 May 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
218 changes: 63 additions & 155 deletions kraken/lib/src/dom/elements/text_form_control.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'dart:ui';
import 'package:flutter/animation.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/rendering.dart' hide RenderEditable;
import 'package:flutter/rendering.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
Expand Down Expand Up @@ -131,90 +132,7 @@ class EditableTextDelegate with TextEditingActionTarget implements TextSelection
}

@override
void copySelection(SelectionChangedCause cause) {
super.copySelection(cause);
if (cause == SelectionChangedCause.toolbar) {
bringIntoView(textEditingValue.selection.extent);
hideToolbar(false);

switch (defaultTargetPlatform) {
case TargetPlatform.iOS:
break;
case TargetPlatform.macOS:
case TargetPlatform.android:
case TargetPlatform.fuchsia:
case TargetPlatform.linux:
case TargetPlatform.windows:
// Collapse the selection and hide the toolbar and handles.
userUpdateTextEditingValue(
TextEditingValue(
text: textEditingValue.text,
selection: TextSelection.collapsed(offset: textEditingValue.selection.end),
),
SelectionChangedCause.toolbar,
);
break;
}
}
}

@override
void cutSelection(SelectionChangedCause cause) {
super.cutSelection(cause);
if (cause == SelectionChangedCause.toolbar) {
bringIntoView(textEditingValue.selection.extent);
hideToolbar();
}
}

@override
Future<void> pasteText(SelectionChangedCause cause) async {
super.pasteText(cause);
if (cause == SelectionChangedCause.toolbar) {
bringIntoView(textEditingValue.selection.extent);
hideToolbar();
}
}

@override
void selectAll(SelectionChangedCause cause) async {
super.selectAll(cause);
if (cause == SelectionChangedCause.toolbar) {
bringIntoView(textEditingValue.selection.extent);
}
}

@override
void debugAssertLayoutUpToDate() {
RenderEditable? editable = _textFormControlElement.renderEditable;
assert(editable != null);
editable!.debugAssertLayoutUpToDate();
}


@override
bool get obscureText => _textFormControlElement.obscureText;

@override
bool get readOnly => _textFormControlElement.readOnly;

@override
bool get selectionEnabled => _textFormControlElement.renderEditable?.selectionEnabled ?? false;

@override
void setTextEditingValue(TextEditingValue newValue, SelectionChangedCause cause) {
if (newValue == textEditingValue) {
return;
}

RenderEditable? renderEditable = _textFormControlElement.renderEditable;
if (renderEditable != null) {
renderEditable.textSelectionDelegate.userUpdateTextEditingValue(newValue, cause);
}
}

@override
TextLayoutMetrics get textLayoutMetrics => _textFormControlElement.renderEditable!;
RenderEditable get renderEditable => _textFormControlElement.renderEditable!;
}

class TextFormControlElement extends Element implements TextInputClient, TickerProvider {
Expand All @@ -227,15 +145,11 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
textSelectionDelegate = EditableTextDelegate(this);
_textInputType = isMultiline ? TextInputType.multiline : TextInputType.text;
_scrollable = KrakenScrollable(
axisDirection: isMultiline ? AxisDirection.down : AxisDirection.right
axisDirection: isMultiline ? AxisDirection.down : AxisDirection.right
);
scrollOffset = _scrollable.position;
}

// The [TextEditableActionTarget] used to apply actions.
// See also widgets/text_control.dart
Object? textEditingActionTarget;

bool isMultiline;
int? get _maxLines {
if (isMultiline) {
Expand Down Expand Up @@ -286,9 +200,9 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
TextSpan get placeholderTextSpan {
// TODO: support ::placeholder pseudo element
return _buildTextSpan(
text: placeholderText,
// The color of placeholder.
color: Color.fromARGB(255, 169, 169, 169)
text: placeholderText,
// The color of placeholder.
color: Color.fromARGB(255, 169, 169, 169)
);
}

Expand All @@ -306,6 +220,7 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP

static String obscuringCharacter = '•';


int get width => int.tryParse(getAttribute('width') ?? '') ?? 0;
set width(int value) {
if (value < 0) value = 0;
Expand Down Expand Up @@ -565,18 +480,18 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
void _onStyleChanged(String property, String? original, String present) {
// Need to rebuild text span when text related style changed.
if (property == COLOR
|| property == FONT_WEIGHT
|| property == FONT_STYLE
|| property == FONT_FAMILY
|| property == FONT_SIZE
|| property == LINE_HEIGHT
|| property == LETTER_SPACING
|| property == WORD_SPACING
|| property == WHITE_SPACE
|| property == TEXT_DECORATION_LINE
|| property == TEXT_DECORATION_COLOR
|| property == TEXT_DECORATION_STYLE
|| property == TEXT_SHADOW
|| property == FONT_WEIGHT
|| property == FONT_STYLE
|| property == FONT_FAMILY
|| property == FONT_SIZE
|| property == LINE_HEIGHT
|| property == LETTER_SPACING
|| property == WORD_SPACING
|| property == WHITE_SPACE
|| property == TEXT_DECORATION_LINE
|| property == TEXT_DECORATION_COLOR
|| property == TEXT_DECORATION_STYLE
|| property == TEXT_SHADOW
) {
_rebuildTextSpan();
}
Expand All @@ -601,12 +516,12 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP

TextSpan _buildTextSpan({ String? text, Color? color }) {
return CSSTextMixin.createTextSpan(text ?? '', renderStyle,
color: color,
// For multiline editing, lineHeight works for inner text in the element,
// so it needs to set line-height of textSpan for RenderEditable to use.
height: isMultiline && renderStyle.lineHeight != CSSLengthValue.normal
? renderStyle.lineHeight.computedValue / renderStyle.fontSize.computedValue
: null
color: color,
// For multiline editing, lineHeight works for inner text in the element,
// so it needs to set line-height of textSpan for RenderEditable to use.
height: isMultiline && renderStyle.lineHeight != CSSLengthValue.normal
? renderStyle.lineHeight.computedValue / renderStyle.fontSize.computedValue
: null
);
}

Expand All @@ -626,14 +541,14 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
// cause RenderEditable does not expose textPainter.
Size getTextSize() {
TextPainter textPainter = TextPainter(
text: renderEditable!.text,
maxLines: _maxLines,
textDirection: TextDirection.ltr
text: renderEditable!.text,
maxLines: _maxLines,
textDirection: TextDirection.ltr
);

double maxWidth = isMultiline
? renderEditable!.size.width
: double.infinity;
? renderEditable!.size.width
: double.infinity;

textPainter.layout(maxWidth: maxWidth);

Expand All @@ -649,11 +564,11 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
locale: CSSText.getLocale(),
);
TextPainter painter = TextPainter(
text: TextSpan(
text: '0',
style: textStyle,
),
textDirection: TextDirection.ltr
text: TextSpan(
text: '0',
style: textStyle,
),
textDirection: TextDirection.ltr
);
painter.layout();

Expand Down Expand Up @@ -705,7 +620,7 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
// Cache text size on touch start to be used in touch move and touch end.
_textSize = getTextSize();
} else if (event.type == EVENT_TOUCH_MOVE ||
event.type == EVENT_TOUCH_END
event.type == EVENT_TOUCH_END
) {
TouchList touches = (event as TouchEvent).touches;
if (touches.length > 1) return;
Expand All @@ -716,7 +631,7 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
// Disable text selection and enable scrolling when text size is larger than
// text form control element size.
if ((!isMultiline && (_textSize!.width > renderEditable!.size.width))
|| (isMultiline && (_textSize!.height > renderEditable!.size.height))) {
|| (isMultiline && (_textSize!.height > renderEditable!.size.height))) {
return;
}

Expand Down Expand Up @@ -773,8 +688,8 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
obscureText: obscureText,
autocorrect: autoCorrect,
inputAction: _textInputType == TextInputType.multiline
? TextInputAction.newline
: _textInputAction,
? TextInputAction.newline
: _textInputAction,
textCapitalization: TextCapitalization.none,
keyboardAppearance: Brightness.light,
);
Expand Down Expand Up @@ -878,47 +793,47 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
void performAction(TextInputAction action) {
switch (action) {
case TextInputAction.newline:
// If this is a multiline EditableText, do nothing for a "newline"
// action; The newline is already inserted. Otherwise, finalize
// editing.
// If this is a multiline EditableText, do nothing for a "newline"
// action; The newline is already inserted. Otherwise, finalize
// editing.
if (!isMultiline)
blur();
break;
case TextInputAction.done:
blur();
break;
case TextInputAction.none:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.unspecified:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.go:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.search:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.send:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.next:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.previous:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.continueAction:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.join:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.route:
// TODO: Handle this case.
// TODO: Handle this case.
break;
case TextInputAction.emergencyCall:
// TODO: Handle this case.
// TODO: Handle this case.
break;
}
}
Expand Down Expand Up @@ -994,9 +909,9 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
// changed. Also, the user long pressing should always send a selection change
// as well.
if (selectionChanged ||
(userInteraction &&
(cause == SelectionChangedCause.longPress ||
cause == SelectionChangedCause.keyboard))) {
(userInteraction &&
(cause == SelectionChangedCause.longPress ||
cause == SelectionChangedCause.keyboard))) {
_handleSelectionChanged(value.selection, cause);
}

Expand Down Expand Up @@ -1144,7 +1059,7 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP

@override
void updateEditingValue(TextEditingValue value) {
_lastKnownRemoteTextEditingValue = value;
_lastKnownRemoteTextEditingValue = value;

if (value == _value) {
// This is possible, for example, when the numeric keyboard is input,
Expand Down Expand Up @@ -1209,7 +1124,7 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
textInputType = TextInputType.text;
_enablePassword();
break;
// @TODO: more types.
// @TODO: more types.
}
}

Expand Down Expand Up @@ -1328,10 +1243,10 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
if (!isMultiline) {
additionalOffset = rect.width >= editableSize.width
// Center `rect` if it's oversized.
? editableSize.width / 2 - rect.center.dx
? editableSize.width / 2 - rect.center.dx
// Valid additional offsets range from (rect.right - size.width)
// to (rect.left). Pick the closest one if out of range.
: 0.0.clamp(rect.right - editableSize.width, rect.left);
: 0.0.clamp(rect.right - editableSize.width, rect.left);
unitOffset = const Offset(1, 0);
} else {
// The caret is vertically centered within the line. Expand the caret's
Expand All @@ -1344,15 +1259,15 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
);

additionalOffset = expandedRect.height >= editableSize.height
? editableSize.height / 2 - expandedRect.center.dy
: 0.0.clamp(expandedRect.bottom - editableSize.height, expandedRect.top);
? editableSize.height / 2 - expandedRect.center.dy
: 0.0.clamp(expandedRect.bottom - editableSize.height, expandedRect.top);
unitOffset = const Offset(0, 1);
}

// No over scrolling when encountering tall fonts/scripts that extend past
// the ascent.
final double targetOffset = (additionalOffset + _scrollable.position!.pixels)
.clamp(
.clamp(
_scrollable.position!.minScrollExtent,
_scrollable.position!.maxScrollExtent,
);
Expand Down Expand Up @@ -1451,11 +1366,4 @@ class TextFormControlElement extends Element implements TextInputClient, TickerP
// TODO: implement showAutocorrectionPromptRect
print('ShowAutocorrectionPromptRect start: $start, end: $end');
}

@override
void dispose() {
textEditingActionTarget = null;
super.dispose();
}
}