Skip to content

Fix: IOS text view hint should never show while editing #4292

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

Merged
vakrilov merged 2 commits into from
Jun 1, 2017
Merged

Fix: IOS text view hint should never show while editing #4292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe25d1
FIX: Never show text-view hint while editing.
May 30, 2017
4509f04
UI test added
May 30, 2017
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
4 changes: 4 additions & 0 deletions apps/app/ui-tests-app/issues/issue-3354.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export function clear(args) {
const tv = args.object.page.getViewById("tv");
tv.text= "";
}
6 changes: 6 additions & 0 deletions apps/app/ui-tests-app/issues/issue-3354.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
<StackLayout class="p-20">
<TextView id="tv" text="" hint="the hint" ></TextView>
<Button text="clear text" tap="clear"></Button>
</StackLayout>
</Page>
1 change: 1 addition & 0 deletions apps/app/ui-tests-app/issues/main-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export function pageLoaded(args: EventData) {
examples.set("1639", "issues/issue-1639");
examples.set("1657-ios", "issues/issue-1657-ios");
examples.set("tabview-with-scrollview_4022","issues/tabview-with-scrollview_4022");
examples.set("3354-ios", "issues/issue-3354");

let viewModel = new SubMainPageViewModel(wrapLayout, examples);
page.bindingContext = viewModel;
Expand Down
14 changes: 12 additions & 2 deletions tns-core-modules/ui/text-view/text-view.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {
EditableTextBase, editableProperty, hintProperty, textProperty, colorProperty, placeholderColorProperty,
borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty,
paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty,
paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty,
Length, _updateCharactersInRangeReplacementString, Color, layout
} from "../editable-text-base";

Expand All @@ -28,13 +28,21 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
return true;
}

public textViewDidBeginEditing(textView: UITextView) {
var owner = this._owner.get();
if (owner) {
owner._isEditing = true;
}
}

public textViewDidEndEditing(textView: UITextView) {
const owner = this._owner.get();
if (owner) {
if (owner.updateTextTrigger === "focusLost") {
textProperty.nativeValueChange(owner, textView.text);
}

owner._isEditing = false;
owner.dismissSoftInput();
owner._refreshHintState(owner.hint, textView.text);
}
Expand Down Expand Up @@ -63,6 +71,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
private _ios: UITextView;
private _delegate: UITextViewDelegateImpl;
private _isShowingHint: boolean;
public _isEditing: boolean;

constructor() {
super();
Expand Down Expand Up @@ -96,9 +105,10 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
if (this.formattedText) {
return;
}

if (text !== null && text !== undefined && text !== '') {
this.showText();
} else if (hint !== null && hint !== undefined && hint !== '') {
} else if (!this._isEditing && hint !== null && hint !== undefined && hint !== '') {
this.showHint(hint);
} else {
this._isShowingHint = false;
Expand Down