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

[GB-Mobile Integration] Fix for Backspace does not outdent nested list item #821

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

[GB-Mobile Integration] Fix for Backspace does not outdent nested list item #821

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f08763
Make sure to call the BackSpace listener when the backspace key is pr…
daniloercoli Jun 4, 2019
fbf98c1
Make sure to properly catch the selection status and do not fire the …
daniloercoli Jun 4, 2019
6bcf5bc
Add better comments to the code
daniloercoli Jun 4, 2019
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
32 changes: 23 additions & 9 deletions aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,31 +497,45 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
temp
}

val emptyEditTextBackspaceDetector = InputFilter { source, start, end, dest, dstart, dend ->
if (selectionStart == 0 && selectionEnd == 0
&& end == 0 && start == 0
&& dstart == 0 && dend == 0
&& !isHandlingBackspaceEvent) {
val backspaceDetector = InputFilter { source, start, end, dest, dstart, dend ->
if (isHandlingBackspaceEvent) {
// It's already handling a backspace event. Do nothing.
} else if (end != 0 || start != 0) {
// Not a text erase event
} else if (selectionStart != selectionEnd) {
// there is something selected on the editor, let's make Aztec do the work
} else if (onAztecKeyListener != null) {
// There is a listener set, let's use it
isHandlingBackspaceEvent = true

// Prevent the forced backspace from being added to the history stack
consumeHistoryEvent = true

handleBackspaceAndEnter(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
handleBackspaceAndEnter(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL), start, end, dstart, dend)
isHandlingBackspaceEvent = false
} else if (dstart == 0 && dend == 0) {
// Fallback to the old Aztec implementation that does check only the beginnning of the field
// Make sure we're at the beginning of the editor field
isHandlingBackspaceEvent = true

// Prevent the forced backspace from being added to the history stack
consumeHistoryEvent = true

handleBackspaceAndEnter(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL), start, end, dstart, dend)
isHandlingBackspaceEvent = false
}
source
}

if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O || Build.VERSION.SDK_INT == Build.VERSION_CODES.O_MR1) {
// dynamicLayoutCrashPreventer needs to be first in array as these are going to be chained when processed
filters = arrayOf(dynamicLayoutCrashPreventer, emptyEditTextBackspaceDetector)
filters = arrayOf(dynamicLayoutCrashPreventer, backspaceDetector)
} else {
filters = arrayOf(emptyEditTextBackspaceDetector)
filters = arrayOf(backspaceDetector)
}
}

private fun handleBackspaceAndEnter(event: KeyEvent): Boolean {
private fun handleBackspaceAndEnter(event: KeyEvent, start: Int = -1, end: Int = -1, dstart: Int = -1, dend: Int = -1): Boolean {
if (event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER) {
// Check if the external listener has consumed the enter pressed event
// In that case stop the execution
Expand Down