resolve changelog conflict

CHANGELOG.md

@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
-- Fixed `DataTable.update_cell` not raising an error with an invalid column key.
+- Fixed `DataTable` not updating component styles on hot-reloading https://github.com/Textualize/textual/issues/3312
+- Fixed `DataTable.update_cell` not raising an error with an invalid column key https://github.com/Textualize/textual/issues/3335
 
 ## [0.37.1] - 2023-09-16
 
@@ -18,7 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed the command palette crashing with a `TimeoutError` in any Python before 3.11 https://github.com/Textualize/textual/issues/3320
 - Fixed `Input` event leakage from `CommandPalette` to `App`.
 
-## [0.36.0] - 2023-09-15
+## [0.37.0] - 2023-09-15
 
 ### Added
 
@@ -46,6 +47,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Breaking change: Widget.notify and App.notify now return None https://github.com/Textualize/textual/pull/3275
 - App.unnotify is now private (renamed to App._unnotify) https://github.com/Textualize/textual/pull/3275
 - `Markdown.load` will now attempt to scroll to a related heading if an anchor is provided https://github.com/Textualize/textual/pull/3244
+- `ProgressBar` explicitly supports being set back to its indeterminate state https://github.com/Textualize/textual/pull/3286
 
 ## [0.36.0] - 2023-09-05
 
@@ -63,6 +65,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Callbacks scheduled with `call_next` will now have the same prevented messages as when the callback was scheduled https://github.com/Textualize/textual/pull/3065
 - Added `cursor_type` to the `DataTable` constructor.
 - Fixed `push_screen` not updating Screen.CSS styles https://github.com/Textualize/textual/issues/3217
+- `DataTable.add_row` accepts `height=None` to automatically compute optimal height for a row https://github.com/Textualize/textual/pull/3213
 
 ### Fixed
 

CONTRIBUTING.md

@@ -1,120 +1,103 @@
-# Contributing Guidelines
+# Contributing to Textual
 
-🎉 **First of all, thanks for taking the time to contribute!** 🎉
+First of all, thanks for taking the time to contribute to Textual!
 
-## 🤔 How can I contribute?
+## How can I contribute?
 
-**1.** Fix issue
+You can contribute to Textual in many ways:
 
-**2.** Report bug
+ 1. [Report a bug](https://github.com/textualize/textual/issues/new?title=%5BBUG%5D%20short%20bug%20description&template=bug_report.md)
+ 2. Add a new feature
+ 3. Fix a bug
+ 4. Improve the documentation
 
-**3.** Improve Documentation
 
+## Setup
 
-## Setup 🚀
-You need to set up Textualize to make your contribution. Textual requires Python 3.7 or later (if you have a choice, pick the most recent Python). Textual runs on Linux, macOS, Windows, and probably any OS where Python also runs.
+To make a code or documentation contribution you will need to set up Textual locally.
+You can follow these steps:
 
-### Installation
+ 1. Make sure you have Poetry installed ([see instructions here](https://python-poetry.org))
+ 2. Clone the Textual repository
+ 3. Run `poetry shell` to create a virtual environment for the dependencies
+ 4. Run `poetry install` to install all dependencies
+ 5. Make sure the latest version of Textual was installed by running the command `textual --version`
+ 6. Install the pre-commit hooks with the command `pre-commit install`
 
-**Install Texualize via pip:**
-```bash
-pip install textual
-```
-**Install [Poetry](https://python-poetry.org/)**
-```bash
-curl -sSL https://install.python-poetry.org | python3 -
-```
-**To install all dependencies, run:**
-```bash
-poetry install --all 
-```
-**Make sure everything works fine:**
-```bash
-textual --version
-```
-### Demo
+## Demo
 
-Once you have Textual installed, run the following to get an impression of what it can do:
+Once you have Textual installed, run the Textual demo to get an impression of what Textual can do and to double check that everything was installed correctly:
 
 ```bash
 python -m textual
 ```
-If Texualize is installed, you should see this:
-<img width="848" alt="demo" src="https://github.com/clairecharles/textual/assets/67120042/62fd53c0-7ad6-4429-8751-5a713180b836">
 
-## Make contribution
-**1.** Fork [this](repo) repository.
+## Guidelines
 
-**2.** Clone the forked repository.
+- Read any issue instructions carefully. Feel free to ask for clarification if any details are missing.
 
-```bash
-git clone https://github.com/<your-username>/textual.git
-```
+- Add docstrings to all of your code (functions, methods, classes, ...). The codebase should have enough examples for you to copy from.
 
-**3.** Navigate to the project directory.
+- Write tests for your code.
+  - If you are fixing a bug, make sure to add regression tests that link to the original issue.
+  - If you are implementing a visual element, make sure to add _snapshot tests_. [See below](#snapshot-testing) for more details.
 
-```bash
-cd textual
-```
+## Before opening a PR
+
+Before you open your PR, please go through this checklist and make sure you've checked all the items that apply:
 
-**4.** Create a new [pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
+ - [ ] Update the `CHANGELOG.md`
+ - [ ] Format your code with black (`make format`)
+ - [ ] All your code has docstrings in the style of the rest of the codebase
+ - [ ] Your code passes all tests (`make test`)
 
+([Read this](#makefile-commands) if the command `make` doesn't work for you.)
 
-### 📣 Pull Requests(PRs)
+## Updating and building the documentation
 
-The process described here should check off these goals:
+If you change the documentation, you will want to build the documentation to make sure everything looks like it should.
+The command `make docs-serve-offline` should start a server that will let you preview the documentation locally and that should reload whenever you save changes to the documentation or the code files.
 
-- [x] Maintain the project's quality.
-- [x] Fix problems that are important to users.
-- [x] The CHANGELOG.md was updated;
-- [x] Your code was formatted with black (make format);
-- [x] All of your code has docstrings in the style of the rest of the codebase;
-- [x]  your code passes all tests (make test); and
-- [x] You added documentation when needed.
+([Read this](#makefile-commands) if the command `make` doesn't work for you.)
+
+## After opening a PR
 
-### After the PR 🥳
 When you open a PR, your code will be reviewed by one of the Textual maintainers.
 In that review process,
 
-- We will take a look at all of the changes you are making;
-- We might ask for clarifications (why did you do X or Y?);
-- We might ask for more tests/more documentation; and
-- We might ask for some code changes.
+- We will take a look at all of the changes you are making
+- We might ask for clarifications (why did you do X or Y?)
+- We might ask for more tests/more documentation
+- We might ask for some code changes
 
 The sole purpose of those interactions is to make sure that, in the long run, everyone has the best experience possible with Textual and with the feature you are implementing/fixing.
 
 Don't be discouraged if a reviewer asks for code changes.
 If you go through our history of pull requests, you will see that every single one of the maintainers has had to make changes following a review.
 
+## Snapshot testing
 
+Snapshot tests ensure that visual things (like widgets) look like they are supposed to.
+PR [#1969](https://github.com/Textualize/textual/pull/1969) is a good example of what adding snapshot tests looks like: it amounts to a change in the file `tests/snapshot_tests/test_snapshots.py` that should run an app that you write and compare it against a historic snapshot of what that app should look like.
 
-## 🛑 Important
-
-- Make sure to read the issue instructions carefully. If you are a newbie you should look out for some good first issues because they should be clear enough and sometimes even provide some hints. If something isn't clear, ask for clarification!
-
-- Add docstrings to all of your code (functions, methods, classes, ...). The codebase should have enough examples for you to copy from.
-
-- Write tests for your code.
-
-- If you are fixing a bug, make sure to add regression tests that link to the original issue.
-
-- If you are implementing a visual element, make sure to add snapshot tests. See below for more details.
-
-
-### Snapshot Testing
-Snapshot tests ensure that things like widgets look like they are supposed to.
-PR [#1969](https://github.com/Textualize/textual/pull/1969) is a good example of what adding snapshot tests means: it amounts to a change in the file ```tests/snapshot_tests/test_snapshots.py```, that should run an app that you write and compare it against a historic snapshot of what that app should look like.
-
-When you create a new snapshot test, run it with ```pytest -vv tests/snapshot_tests/test_snapshots.py.```
-Because you just created this snapshot test, there is no history to compare against and the test will fail automatically.
+When you create a new snapshot test, run it with `pytest -vv tests/snapshot_tests/test_snapshots.py`.
+Because you just created this snapshot test, there is no history to compare against and the test will fail.
 After running the snapshot tests, you should see a link that opens an interface in your browser.
-This interface should show all failing snapshot tests and a side-by-side diff between what the app looked like when it ran VS the historic snapshot.
+This interface should show all failing snapshot tests and a side-by-side diff between what the app looked like when the test ran versus the historic snapshot.
 
 Make sure your snapshot app looks like it is supposed to and that you didn't break any other snapshot tests.
-If that's the case, you can run ```make test-snapshot-update``` to update the snapshot history with your new snapshot.
-This will write to the file ```tests/snapshot_tests/__snapshots__/test_snapshots.ambr```, that you should NOT modify by hand
+If everything looks fine, you can run `make test-snapshot-update` to update the snapshot history with your new snapshot.
+This will write to the file `tests/snapshot_tests/__snapshots__/test_snapshots.ambr`, which you should NOT modify by hand.
+
+([Read this](#makefile-commands) if the command `make` doesn't work for you.)
+
+## Join the community
 
+Seems a little overwhelming?
+Join our community on [Discord](https://discord.gg/uNRPEGCV) to get help!
 
-### 📈Join the community
+## Makefile commands
 
-- 😕 Seems a little overwhelming? Join our community on [Discord](https://discord.gg/uNRPEGCV) to get help.
+Textual has a `Makefile` file that contains the most common commands used when developing Textual.
+([Read about Make and makefiles on Wikipedia.](https://en.wikipedia.org/wiki/Make_(software)))
+If you don't have Make and you're on Windows, you may want to [install Make](https://stackoverflow.com/q/32127524/2828287).

docs/api/logger.md

@@ -1 +1,5 @@
+# Logger
+
+A [logger class](/guide/devtools/#logging-handler) that logs to the Textual [console](/guide/devtools#console).
+
 ::: textual.Logger

docs/guide/command_palette.md

@@ -57,7 +57,7 @@ The following example will display a blank screen initially, but if you bring up
     If you are running that example from the repository, you may want to add some additional Python files to see how the examples works with multiple files.
 
 
-  ```python title="command01.py" hl_lines="11-39 45"
+  ```python title="command01.py" hl_lines="14-42 45"
   --8<-- "docs/examples/guide/command_palette/command01.py"
   ```
 

docs/index.md

@@ -1,4 +1,11 @@
-# Introduction
+---
+hide:
+  - toc
+  - navigation
+---
+
+
+# Welcome
 
 Welcome to the [Textual](https://github.com/Textualize/textual) framework documentation.
 
@@ -16,7 +23,7 @@ Welcome to the [Textual](https://github.com/Textualize/textual) framework docume
 Textual is a *Rapid Application Development* framework for Python, built by [Textualize.io](https://www.textualize.io).
 
 
-Build sophisticated user interfaces with a simple Python API. Run your apps in the terminal and (*coming soon*) a web browser.
+Build sophisticated user interfaces with a simple Python API. Run your apps in the terminal *or* a web browser (with [textual-web](https://github.com/Textualize/textual-web))!
 
 
 

docs/roadmap.md

@@ -19,9 +19,8 @@ High-level features we plan on implementing.
     * [x] Monochrome mode
     * [ ] High contrast theme
     * [ ] Color-blind themes
-- [ ] Command interface
-    * [ ] Command menu
-    * [ ] Fuzzy search
+- [X] Command palette
+    * [X] Fuzzy search
 - [ ] Configuration (.toml based extensible configuration format)
 - [x] Console
 - [ ] Devtools

docs/widgets/_template.md

@@ -30,7 +30,7 @@ Example app showing the widget:
     ```
 
 
-## Reactive attributes
+## Reactive Attributes
 
 
 ## Bindings

docs/widgets/button.md

@@ -41,6 +41,14 @@ Clicking any of the non-disabled buttons in the example app below will result in
 
 - [Button.Pressed][textual.widgets.Button.Pressed]
 
+## Bindings
+
+This widget has no bindings.
+
+## Component Classes
+
+This widget has no component classes.
+
 ## Additional Notes
 
 - The spacing between the text and the edges of a button are _not_ due to padding. The default styling for a `Button` has the `height` set to 3 lines and a `min-width` of 16 columns. To create a button with zero visible padding, you will need to change these values and also remove the border with `border: none;`.

docs/widgets/checkbox.md

@@ -34,6 +34,10 @@ The example below shows check boxes in various states.
 | ------- | ------ | ------- | -------------------------- |
 | `value` | `bool` | `False` | The value of the checkbox. |
 
+## Messages
+
+- [Checkbox.Changed][textual.widgets.Checkbox.Changed]
+
 ## Bindings
 
 The checkbox widget defines the following bindings:
@@ -45,17 +49,13 @@ The checkbox widget defines the following bindings:
 
 ## Component Classes
 
-The checkbox widget provides the following component classes:
+The checkbox widget inherits the following component classes:
 
 ::: textual.widgets._toggle_button.ToggleButton.COMPONENT_CLASSES
     options:
       show_root_heading: false
       show_root_toc_entry: false
 
-## Messages
-
-- [Checkbox.Changed][textual.widgets.Checkbox.Changed]
-
 
 ---
 

docs/widgets/collapsible.md

@@ -120,12 +120,29 @@ The following example shows `Collapsible` widgets with custom expand/collapse sy
     --8<-- "docs/examples/widgets/collapsible_custom_symbol.py"
     ```
 
-## Reactive attributes
+## Reactive Attributes
 
 | Name        | Type   | Default | Description                                          |
 | ----------- | ------ | ------- | ---------------------------------------------------- |
 | `collapsed` | `bool` | `True`  | Controls the collapsed/expanded state of the widget. |
 
+## Messages
+
+This widget posts no messages.
+
+## Bindings
+
+The collapsible widget defines the following binding on its title:
+
+::: textual.widgets._collapsible.CollapsibleTitle.BINDINGS
+    options:
+      show_root_heading: false
+      show_root_toc_entry: false
+
+## Component Classes
+
+This widget has no component classes.
+
 
 ::: textual.widgets.Collapsible
     options:

docs/widgets/content_switcher.md

@@ -50,6 +50,18 @@ When the user presses the "Markdown" button the view is switched:
 | --------- | --------------- | ------- | ----------------------------------------------------------------------- |
 | `current` | `str` \| `None` | `None`  | The ID of the currently-visible child. `None` means nothing is visible. |
 
+## Messages
+
+This widget posts no messages.
+
+## Bindings
+
+This widget has no bindings.
+
+## Component Classes
+
+This widget has no component classes.
+
 
 ---
 

docs/widgets/digits.md

@@ -44,15 +44,19 @@ Here's another example which uses `Digits` to display the current time:
     --8<-- "docs/examples/widgets/clock.py"
     ```
 
-## Reactive attributes
+## Reactive Attributes
 
 This widget has no reactive attributes.
 
+## Messages
+
+This widget posts no messages.
+
 ## Bindings
 
 This widget has no bindings.
 
-## Component classes
+## Component Classes
 
 This widget has no component classes.