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

Text Area wrapping #3933

Merged
merged 172 commits into from
Jan 29, 2024
Merged

Text Area wrapping #3933

merged 172 commits into from
Jan 29, 2024

Conversation

darrenburns
Copy link
Member

@darrenburns darrenburns commented Dec 28, 2023 •
edited
Loading

Adds soft wrapping to the TextArea widget.

darrenburns and others added 30 commits November 15, 2023 12:34
@darrenburns
Add soft_wrap reactive to TextArea
2def1c4
@darrenburns
Remove redundant lines
d2b3e7a
@darrenburns
Add notes, update lockfile for new Rich, skeleton of WrappedDocumentView
0a61a41
@darrenburns
Initial wrapping
8cef051
@darrenburns
Begin implementing wrapping
5641933
@darrenburns
Add tests for wrapped document
add3abd
@darrenburns
Fixing some naming issues
a3a2600
@darrenburns
Fix refresh_range wrapping test
95417a4
@darrenburns
Test wrapping in longer text
2dda263
@darrenburns
Maintaining wrapping offsets
2c9f764
@darrenburns
Remove irrelevant code
aab538f
@darrenburns
Remove more irrelevant code
18fc687
@darrenburns
Remove a comment
325ec78
@darrenburns
Merge branch 'text-area-wrapping' of github.com:Textualize/textual in…
70447ef 
…to text-area-wrapping
@darrenburns
Implementing WrappedDocument required utility methods
6d2c500
@darrenburns
Testing offset to line_index
a770b39
@darrenburns
Test WrappedDocument offset error cases
63ad2c2
@darrenburns
Testing getting offsets
b3b3900
@darrenburns
Testing invalid line numbers being passed to WrappedDocument.get_offsets
8d6784b
@darrenburns
Small optimisations
abd4667
@darrenburns
Fix docstring
dbe056b
@darrenburns @rodrigogiraoserrao
Update src/textual/document/_wrapped_document.py
6444ad0 
Co-authored-by: Rodrigo Girão Serrão <[email protected]>
@darrenburns
Extract logic for converting cell widths to column indices
988e7ab
@darrenburns
Fix click target issue when tabs not fully expanded
e2ff0c4
@darrenburns
Merge branch 'extract-cell-width-measurement' into text-area-wrapping
b85e963
@darrenburns
Merge branch 'main' of github.com:Textualize/textual into extract-cel…
d7a2c19 
…l-width-measurement
@darrenburns
Update CHANGELOG
6c5a98a
@darrenburns
Change line_offset_to_index to offset_to_location (it now works in tw…
e196e01 
…o dimensions) to support click targeting correctly when a document is wrapped.
@darrenburns
Merge branch 'text-area-wrapping' of github.com:Textualize/textual in…
5cca091 
…to text-area-wrapping
@darrenburns
Fix wrapping offset calculation
5f57396
darrenburns and others added 15 commits January 23, 2024 10:39
@darrenburns
Ensure we only wrap once on load
f496c11
@darrenburns
Add syntax mark to test
ba6b0c7
@darrenburns
Create code_editor constructor
b122e94
@darrenburns
Updating tests to account for new defaults
059e6b8
@darrenburns
Renaming
fdd64c9
@darrenburns
Merge branch 'main' of github.com:Textualize/textual into text-area-w…
5a35f3f 
…rapping-widget-changes
@darrenburns
Updating CHANGELOG, docs
a678847
@darrenburns
Docstrings and small renamings
65aee34
@darrenburns
Making some things public, ensuring types exported
5af24a2
@darrenburns
Fix a mypy complaint
bf2b9d5
@darrenburns
Fixing a few more mypy complaints
abcec57
@darrenburns
Rename function to expand_text_tabs_from_widths and add docstring
07f64f3
@darrenburns
Merge branch 'text-area-wrapping-widget-changes' of github.com:Textua…
7f9a47c 
…lize/textual into text-area-wrapping-widget-changes
@darrenburns
TextArea documentation updates
39e7a42
@darrenburns
Merge branch 'main' into text-area-wrapping-widget-changes
9486dd6
@darrenburns darrenburns marked this pull request as ready for review January 24, 2024 12:55
willmcgugan
willmcgugan requested changes Jan 25, 2024
View reviewed changes
Copy link
Collaborator

@willmcgugan willmcgugan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Some very minor suggestions.

docs/widgets/text_area.md Outdated Show resolved Hide resolved
docs/widgets/text_area.md Outdated Show resolved Hide resolved
src/textual/_wrap.py Show resolved Hide resolved
src/textual/document/_document.py Outdated Show resolved Hide resolved
src/textual/document/_document_navigator.py Outdated Show resolved Hide resolved
src/textual/widgets/_text_area.py Show resolved Hide resolved
src/textual/widgets/_text_area.py Outdated Show resolved Hide resolved
@darrenburns darrenburns linked an issue Jan 28, 2024 that may be closed by this pull request
Add a property to control how tab/shift-tab work in the TextArea #3466
Closed
@willmcgugan willmcgugan merged commit bf06f75 into main Jan 29, 2024
20 checks passed
@willmcgugan willmcgugan deleted the text-area-wrapping-widget-changes branch January 29, 2024 09:38
This was referenced Aug 30, 2024
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@willmcgugan willmcgugan willmcgugan approved these changes

@rodrigogiraoserrao rodrigogiraoserrao Awaiting requested review from rodrigogiraoserrao

@davep davep Awaiting requested review from davep

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add a property to control how tab/shift-tab work in the TextArea
2 participants
@darrenburns @willmcgugan