Bugfix/18670 cursor position retention #18759
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit refactors the `CardTemplateEditor` to remove the `cursorPosition` argument from `CardTemplateFragment.newInstance`. The `cursorPosition` is now directly retrieved from the `tabToCursorPosition` map within the `CardTemplateFragment` when setting the editor view. This simplifies the fragment's initialization and makes the cursor position handling more localized. Additionally, a check is added in `afterTextChanged` to ensure `tabToCursorPosition` is only updated if the selection start is not 0, preventing incorrect cursor position updates in certain scenarios.
This change modifies how cursor positions are stored in the Card Template Editor. Previously, only one cursor position was saved per card template. Now, the cursor position is saved independently for each editor window (front, style, back) within each card template. This ensures that when switching between editor windows or card templates, the cursor remains in its last known position for that specific window and template combination.
When a new card template tab is created in the CardTemplateEditor, ensure the `tabToCursorPosition` map, which stores cursor positions for each editor window within that tab, is initialized.
The variable `tabToCursorPosition` stores a map of tab indices to a map of editor view IDs to cursor positions. Renaming it to `tabToCursorPositions` (plural) better reflects that it holds multiple cursor positions for each tab, one for each editor window (front, style, back) within that tab.
The `setCurrentEditorView` method now requires a `cardId` parameter. This commit updates the test cases to pass a default `cardId` of 0 when calling this method.
The cursor position was not being saved correctly when switching between editor views (Front, Back, Styling). This commit ensures that the cursor position is saved before changing the editor view and restored when switching back. The previous logic that saved the cursor position whenever the text changed did not account for just the cursor position change and one had to change the text to trigger a save of cursor position.
|
Closed the last PR due to some missed updates. This one contains the complete and corrected changes. |
david-allison
approved these changes
Jul 9, 2025
| * The inner HashMap's key is the editor window ID (e.g., R.id.front_edit). | ||
| * The value is the cursor position within that editor window. | ||
| */ | ||
| private var tabToCursorPositions: HashMap<Int, HashMap<Int, Int>> = HashMap() |
There was a problem hiding this comment.
This would be more readable if you made private typealiases for the Ints
david-allison
added
Needs Second Approval
mikehardy
approved these changes
Jul 12, 2025
mikehardy
added
Pending Merge
github-actions
bot
removed
squash-merge
|
This doesn't cherry-pick cleanly and I'd prefer not to hand-hack the diff for a non-crash fix |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose / Description
Fixes
Approach
In the card template editor when switching from front to back to css. The cursor position was not retained, this was due to faulty cursor position updation. This issue was solved by saving the cursor position when the editor view was changed and not when the text was changed. Also only a single cursor position was stored per card, which is not enough for all the three views i.e. front, back and css. This was taken care of by storing a HashMap<Int, Int> for every card instead of a card.
How Has This Been Tested?
On an Android 15 phone
Checklist