Skip to content

Commit

Permalink
upgrade SDK 2.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucky1213
lucky1213 committed Feb 14, 2022
1 parent 971d5ad commit 6e42135
Show file tree
Hide file tree
Showing 7 changed files with 2,411 additions and 863 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
## [1.0.0] - Upgrade SDK 2.0.6 & support null-safety

## [1.0.1] - Upgrade SDK 2.2.1
## [1.0.2] - Upgrade SDK 2.10.1
2,214 changes: 1,697 additions & 517 deletions lib/editable_text.dart
View file

Large diffs are not rendered by default.

278 changes: 175 additions & 103 deletions lib/extended_selectable_text.dart
View file

Large diffs are not rendered by default.

584 changes: 373 additions & 211 deletions lib/extended_textfield.dart
View file

Large diffs are not rendered by default.

180 changes: 153 additions & 27 deletions lib/text_selection.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
part of flutter_extended_text_field;


abstract class ExtendedTextSelectionGestureDetectorBuilderDelegate {
/// [GlobalKey] to the [EditableText] for which the
/// [ExtendedTextSelectionGestureDetectorBuilder] will build a [TextSelectionGestureDetector].
Expand Down Expand Up @@ -29,7 +28,7 @@ class ExtendedTextSelectionGestureDetectorBuilder {
@protected
final ExtendedTextSelectionGestureDetectorBuilderDelegate delegate;

/// Returns true iff lastSecondaryTapDownPosition was on selection.
/// Returns true if lastSecondaryTapDownPosition was on selection.
bool get _lastSecondaryTapWasOnSelection {
assert(renderEditable.lastSecondaryTapDownPosition != null);
if (renderEditable.selection == null) {
Expand All @@ -40,8 +39,69 @@ class ExtendedTextSelectionGestureDetectorBuilder {
renderEditable.lastSecondaryTapDownPosition!,
);

return renderEditable.selection!.base.offset <= textPosition.offset
&& renderEditable.selection!.extent.offset >= textPosition.offset;
return renderEditable.selection!.start <= textPosition.offset &&
renderEditable.selection!.end >= textPosition.offset;
}

// Expand the selection to the given global position.
//
// Either base or extent will be moved to the last tapped position, whichever
// is closest. The selection will never shrink or pivot, only grow.
//
// See also:
//
// * [_extendSelection], which is similar but pivots the selection around
// the base.
void _expandSelection(Offset offset, SelectionChangedCause cause) {
assert(cause != null);
assert(offset != null);
assert(renderEditable.selection?.baseOffset != null);

final TextPosition tappedPosition =
renderEditable.getPositionForPoint(offset);
final TextSelection selection = renderEditable.selection!;
final bool baseIsCloser =
(tappedPosition.offset - selection.baseOffset).abs() <
(tappedPosition.offset - selection.extentOffset).abs();
final TextSelection nextSelection = selection.copyWith(
baseOffset: baseIsCloser ? selection.extentOffset : selection.baseOffset,
extentOffset: tappedPosition.offset,
);

editableText.userUpdateTextEditingValue(
editableText.textEditingValue.copyWith(
selection: nextSelection,
),
cause,
);
}

// Extend the selection to the given global position.
//
// Holds the base in place and moves the extent.
//
// See also:
//
// * [_expandSelection], which is similar but always increases the size of
// the selection.
void _extendSelection(Offset offset, SelectionChangedCause cause) {
assert(cause != null);
assert(offset != null);
assert(renderEditable.selection?.baseOffset != null);

final TextPosition tappedPosition =
renderEditable.getPositionForPoint(offset);
final TextSelection selection = renderEditable.selection!;
final TextSelection nextSelection = selection.copyWith(
extentOffset: tappedPosition.offset,
);

editableText.userUpdateTextEditingValue(
editableText.textEditingValue.copyWith(
selection: nextSelection,
),
cause,
);
}

/// Whether to show the selection toolbar.
Expand All @@ -55,13 +115,20 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// The [State] of the [EditableText] for which the builder will provide a
/// [TextSelectionGestureDetector].
@protected
ExtendedEditableTextState get editableText => delegate.editableTextKey.currentState!;
ExtendedEditableTextState get editableText =>
delegate.editableTextKey.currentState!;

/// The [RenderObject] of the [EditableText] for which the builder will
/// provide a [TextSelectionGestureDetector].
@protected
RenderEditable get renderEditable => editableText.renderEditable;

// The viewport offset pixels of the [RenderEditable] at the last drag start.
double _dragStartViewportOffset = 0.0;

// True iff a tap + shift has been detected but the tap has not yet come up.
bool _isShiftTapping = false;

/// Handler for [TextSelectionGestureDetector.onTapDown].
///
/// By default, it forwards the tap to [RenderEditable.handleTapDown] and sets
Expand All @@ -78,9 +145,31 @@ class ExtendedTextSelectionGestureDetectorBuilder {
// trigger the selection overlay.
// For backwards-compatibility, we treat a null kind the same as touch.
final PointerDeviceKind? kind = details.kind;
_shouldShowSelectionToolbar = kind == null
|| kind == PointerDeviceKind.touch
|| kind == PointerDeviceKind.stylus;
_shouldShowSelectionToolbar = kind == null ||
kind == PointerDeviceKind.touch ||
kind == PointerDeviceKind.stylus;

// Handle shift + click selection if needed.
final bool isShiftPressed =
HardwareKeyboard.instance.logicalKeysPressed.any(<LogicalKeyboardKey>{
LogicalKeyboardKey.shiftLeft,
LogicalKeyboardKey.shiftRight,
}.contains);
if (isShiftPressed && renderEditable.selection?.baseOffset != null) {
_isShiftTapping = true;
switch (defaultTargetPlatform) {
case TargetPlatform.iOS:
case TargetPlatform.macOS:
_expandSelection(details.globalPosition, SelectionChangedCause.tap);
break;
case TargetPlatform.android:
case TargetPlatform.fuchsia:
case TargetPlatform.linux:
case TargetPlatform.windows:
_extendSelection(details.globalPosition, SelectionChangedCause.tap);
break;
}
}
}

/// Handler for [TextSelectionGestureDetector.onForcePressStart].
Expand Down Expand Up @@ -124,8 +213,7 @@ class ExtendedTextSelectionGestureDetectorBuilder {
from: details.globalPosition,
cause: SelectionChangedCause.forcePress,
);
if (shouldShowSelectionToolbar)
editableText.showToolbar();
if (shouldShowSelectionToolbar) editableText.showToolbar();
}

/// Handler for [TextSelectionGestureDetector.onSingleTapUp].
Expand All @@ -138,8 +226,37 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// this callback.
@protected
void onSingleTapUp(TapUpDetails details) {
if (_isShiftTapping) {
_isShiftTapping = false;
return;
}

if (delegate.selectionEnabled) {
renderEditable.selectWordEdge(cause: SelectionChangedCause.tap);
switch (defaultTargetPlatform) {
case TargetPlatform.iOS:
case TargetPlatform.macOS:
switch (details.kind) {
case PointerDeviceKind.mouse:
case PointerDeviceKind.stylus:
case PointerDeviceKind.invertedStylus:
// Precise devices should place the cursor at a precise position.
renderEditable.selectPosition(cause: SelectionChangedCause.tap);
break;
case PointerDeviceKind.touch:
case PointerDeviceKind.unknown:
// On macOS/iOS/iPadOS a touch tap places the cursor at the edge
// of the word.
renderEditable.selectWordEdge(cause: SelectionChangedCause.tap);
break;
}
break;
case TargetPlatform.android:
case TargetPlatform.fuchsia:
case TargetPlatform.linux:
case TargetPlatform.windows:
renderEditable.selectPosition(cause: SelectionChangedCause.tap);
break;
}
}
}

Expand All @@ -152,7 +269,9 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// * [TextSelectionGestureDetector.onSingleTapCancel], which triggers
/// this callback.
@protected
void onSingleTapCancel() {/* Subclass should override this method if needed. */}
void onSingleTapCancel() {
/* Subclass should override this method if needed. */
}

/// Handler for [TextSelectionGestureDetector.onSingleLongTapStart].
///
Expand Down Expand Up @@ -202,8 +321,7 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// callback.
@protected
void onSingleLongTapEnd(LongPressEndDetails details) {
if (shouldShowSelectionToolbar)
editableText.showToolbar();
if (shouldShowSelectionToolbar) editableText.showToolbar();
}

/// Handler for [TextSelectionGestureDetector.onSecondaryTap].
Expand Down Expand Up @@ -248,8 +366,7 @@ class ExtendedTextSelectionGestureDetectorBuilder {
void onDoubleTapDown(TapDownDetails details) {
if (delegate.selectionEnabled) {
renderEditable.selectWord(cause: SelectionChangedCause.tap);
if (shouldShowSelectionToolbar)
editableText.showToolbar();
if (shouldShowSelectionToolbar) editableText.showToolbar();
}
}

Expand All @@ -263,17 +380,18 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// this callback.
@protected
void onDragSelectionStart(DragStartDetails details) {
if (!delegate.selectionEnabled)
return;
if (!delegate.selectionEnabled) return;
final PointerDeviceKind? kind = details.kind;
_shouldShowSelectionToolbar = kind == null
|| kind == PointerDeviceKind.touch
|| kind == PointerDeviceKind.stylus;
_shouldShowSelectionToolbar = kind == null ||
kind == PointerDeviceKind.touch ||
kind == PointerDeviceKind.stylus;

renderEditable.selectPositionAt(
from: details.globalPosition,
cause: SelectionChangedCause.drag,
);

_dragStartViewportOffset = renderEditable.offset.pixels;
}

/// Handler for [TextSelectionGestureDetector.onDragSelectionUpdate].
Expand All @@ -286,11 +404,17 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// * [TextSelectionGestureDetector.onDragSelectionUpdate], which triggers
/// this callback./lib/src/material/text_field.dart
@protected
void onDragSelectionUpdate(DragStartDetails startDetails, DragUpdateDetails updateDetails) {
if (!delegate.selectionEnabled)
return;
void onDragSelectionUpdate(
DragStartDetails startDetails, DragUpdateDetails updateDetails) {
if (!delegate.selectionEnabled) return;

// Adjust the drag start offset for possible viewport offset changes.
final Offset startOffset = renderEditable.maxLines == 1
? Offset(renderEditable.offset.pixels - _dragStartViewportOffset, 0.0)
: Offset(0.0, renderEditable.offset.pixels - _dragStartViewportOffset);

renderEditable.selectPositionAt(
from: startDetails.globalPosition,
from: startDetails.globalPosition - startOffset,
to: updateDetails.globalPosition,
cause: SelectionChangedCause.drag,
);
Expand All @@ -305,7 +429,9 @@ class ExtendedTextSelectionGestureDetectorBuilder {
/// * [TextSelectionGestureDetector.onDragSelectionEnd], which triggers this
/// callback.
@protected
void onDragSelectionEnd(DragEndDetails details) {/* Subclass should override this method if needed. */}
void onDragSelectionEnd(DragEndDetails details) {
/* Subclass should override this method if needed. */
}

/// Returns a [TextSelectionGestureDetector] configured with the handlers
/// provided by this builder.
Expand Down Expand Up @@ -336,4 +462,4 @@ class ExtendedTextSelectionGestureDetectorBuilder {
child: child,
);
}
}
}
15 changes: 11 additions & 4 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: characters
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
version: "1.2.0"
collection:
dependency: transitive
description:
Expand All @@ -20,13 +20,20 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.3"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
version: "1.7.0"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -45,7 +52,7 @@ packages:
name: vector_math
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.0"
version: "2.1.1"
sdks:
dart: ">=2.12.0 <3.0.0"
dart: ">=2.14.0 <3.0.0"
flutter: ">=2.2.1"
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: flutter_extended_text_field
description: Extend official TextField widget, support focus without pop-up keyboard.
version: 1.0.1
version: 1.0.2
homepage: https://github.com/lucky1213/extended_textfield

environment:
Expand Down

0 comments on commit 6e42135

Please sign in to comment.