Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion lib/web_ui/lib/src/engine/text_editing/text_editing.dart
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,15 @@ class InputConfiguration {
@required this.inputType,
@required this.inputAction,
@required this.obscureText,
@required this.autocorrect,
});

InputConfiguration.fromFlutter(Map<String, dynamic> flutterInputConfiguration)
: inputType = EngineInputType.fromName(
flutterInputConfiguration['inputType']['name']),
inputAction = flutterInputConfiguration['inputAction'],
obscureText = flutterInputConfiguration['obscureText'];
obscureText = flutterInputConfiguration['obscureText'],
autocorrect = flutterInputConfiguration['autocorrect'];

/// The type of information being edited in the input control.
final EngineInputType inputType;
Expand All @@ -195,6 +197,15 @@ class InputConfiguration {

/// Whether to hide the text being edited.
final bool obscureText;

/// Whether to enable autocorrection.
///
/// Definition of autocorrect can be found in:
/// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input
///
/// For future manual tests, note that autocorrect is an attribute only
/// supported by Safari.
final bool autocorrect;
}

typedef _OnChangeCallback = void Function(EditingState editingState);
Expand Down Expand Up @@ -372,6 +383,10 @@ class TextEditingElement {
if (inputConfig.obscureText) {
domElement.setAttribute('type', 'password');
}

final String autocorrectValue = inputConfig.autocorrect ? 'on' : 'off';
domElement.setAttribute('autocorrect', autocorrectValue);

_setStaticStyleAttributes(domElement);
owner._setDynamicStyleAttributes(domElement);
domRenderer.glassPaneElement.append(domElement);
Expand Down
47 changes: 47 additions & 0 deletions lib/web_ui/test/text_editing_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ final InputConfiguration singlelineConfig = InputConfiguration(
inputType: EngineInputType.text,
obscureText: false,
inputAction: 'TextInputAction.done',
autocorrect: true,
);
final Map<String, dynamic> flutterSinglelineConfig =
createFlutterConfig('text');
Expand All @@ -34,6 +35,7 @@ final InputConfiguration multilineConfig = InputConfiguration(
inputType: EngineInputType.multiline,
obscureText: false,
inputAction: 'TextInputAction.newline',
autocorrect: true,
);
final Map<String, dynamic> flutterMultilineConfig =
createFlutterConfig('multiline');
Expand Down Expand Up @@ -105,6 +107,7 @@ void main() {
inputType: EngineInputType.text,
inputAction: 'TextInputAction.done',
obscureText: true,
autocorrect: true,
);
editingElement.enable(
config,
Expand All @@ -119,6 +122,46 @@ void main() {
editingElement.disable();
});

test('Knows to turn autocorrect off', () {
final InputConfiguration config = InputConfiguration(
inputType: EngineInputType.text,
inputAction: 'TextInputAction.done',
obscureText: false,
autocorrect: false,
);
editingElement.enable(
config,
onChange: trackEditingState,
onAction: trackInputAction,
);
expect(document.getElementsByTagName('input'), hasLength(1));
final InputElement input = document.getElementsByTagName('input')[0];
expect(editingElement.domElement, input);
expect(input.getAttribute('autocorrect'), 'off');

editingElement.disable();
});

test('Knows to turn autocorrect on', () {
final InputConfiguration config = InputConfiguration(
inputType: EngineInputType.text,
inputAction: 'TextInputAction.done',
obscureText: false,
autocorrect: true,
);
editingElement.enable(
config,
onChange: trackEditingState,
onAction: trackInputAction,
);
expect(document.getElementsByTagName('input'), hasLength(1));
final InputElement input = document.getElementsByTagName('input')[0];
expect(editingElement.domElement, input);
expect(input.getAttribute('autocorrect'), 'on');

editingElement.disable();
});

test('Can read editing state correctly', () {
editingElement.enable(
singlelineConfig,
Expand Down Expand Up @@ -263,6 +306,7 @@ void main() {
inputType: EngineInputType.text,
obscureText: false,
inputAction: 'TextInputAction.done',
autocorrect: true,
);
editingElement.enable(
config,
Expand All @@ -286,6 +330,7 @@ void main() {
inputType: EngineInputType.multiline,
obscureText: false,
inputAction: 'TextInputAction.done',
autocorrect: true,
);
editingElement.enable(
config,
Expand Down Expand Up @@ -1129,13 +1174,15 @@ class PlatformMessagesSpy {
Map<String, dynamic> createFlutterConfig(
String inputType, {
bool obscureText = false,
bool autocorrect = true,
String inputAction,
}) {
return <String, dynamic>{
'inputType': <String, String>{
'name': 'TextInputType.$inputType',
},
'obscureText': obscureText,
'autocorrect': autocorrect,
'inputAction': inputAction ?? 'TextInputAction.done',
};
}