dataframe-textual 2.4.3__tar.gz → 2.6.0__tar.gz

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 2.4.3
+Version: 2.6.0
 Summary: Interactive terminal viewer/editor for tabular data
 Project-URL: Homepage, https://github.com/need47/dataframe-textual
 Project-URL: Repository, https://github.com/need47/dataframe-textual.git
@@ -250,7 +250,7 @@ zcat compressed_data.csv.gz | dv -f csv
 | `Q` | Close all tabs and app (prompts to save unsaved changes) |
 | `Ctrl+Q` | Force to quit app (regardless of unsaved changes) |
 | `Ctrl+T` | Save current tab to file |
-| `Ctrl+A` | Save all tabs to a Excel file |
+| `Ctrl+S` | Save all tabs to file |
 | `w` | Save current tab to file (overwrite without prompt) |
 | `W` | Save all tabs to file (overwrite without prompt) |
 | `Ctrl+D` | Duplicate current tab |
@@ -314,7 +314,8 @@ zcat compressed_data.csv.gz | dv -f csv
 | Key | Action |
 |-----|--------|
 | `Double-click` | Edit cell or rename column header |
-| `delete` | Clear current cell (set to NULL) |
+| `Delete` | Clear current cell (set to NULL) |
+| `Shift+Delete` | Clear current column (set matching cells to NULL) |
 | `e` | Edit current cell (respects data type) |
 | `E` | Edit entire column with value/expression |
 | `a` | Add empty column after current |
@@ -391,14 +392,13 @@ zcat compressed_data.csv.gz | dv -f csv
 | `!` | Cast current column to boolean |
 | `$` | Cast current column to string |
 
-#### Copy & Save
+#### Copy
 
 | Key | Action |
 |-----|--------|
 | `c` | Copy current cell to clipboard |
 | `Ctrl+C` | Copy column to clipboard |
 | `Ctrl+R` | Copy row to clipboard (tab-separated) |
-| `Ctrl+S` | Save to file |
 
 ## Features in Detail
 
@@ -820,7 +820,7 @@ Manage multiple files and dataframes simultaneously with tabs.
 - **`Double-click`** - Rename the tab
 - **`Ctrl+D`** - Duplicate current tab (creates a copy with same data and state)
 - **`Ctrl+T`** - Save current tab to file
-- **`Ctrl+A`** - Save all tabs in a single Excel file
+- **`Ctrl+S`** - Save all tabs to file
 - **`w`** - Save current tab to file (overwrite without prompt)
 - **`W`** - Save all tabs to file (overwrite without prompt)
 - **`q`** - Close current tab (closes tab, prompts to save if unsaved changes)

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/README.md

@@ -211,7 +211,7 @@ zcat compressed_data.csv.gz | dv -f csv
 | `Q` | Close all tabs and app (prompts to save unsaved changes) |
 | `Ctrl+Q` | Force to quit app (regardless of unsaved changes) |
 | `Ctrl+T` | Save current tab to file |
-| `Ctrl+A` | Save all tabs to a Excel file |
+| `Ctrl+S` | Save all tabs to file |
 | `w` | Save current tab to file (overwrite without prompt) |
 | `W` | Save all tabs to file (overwrite without prompt) |
 | `Ctrl+D` | Duplicate current tab |
@@ -275,7 +275,8 @@ zcat compressed_data.csv.gz | dv -f csv
 | Key | Action |
 |-----|--------|
 | `Double-click` | Edit cell or rename column header |
-| `delete` | Clear current cell (set to NULL) |
+| `Delete` | Clear current cell (set to NULL) |
+| `Shift+Delete` | Clear current column (set matching cells to NULL) |
 | `e` | Edit current cell (respects data type) |
 | `E` | Edit entire column with value/expression |
 | `a` | Add empty column after current |
@@ -352,14 +353,13 @@ zcat compressed_data.csv.gz | dv -f csv
 | `!` | Cast current column to boolean |
 | `$` | Cast current column to string |
 
-#### Copy & Save
+#### Copy
 
 | Key | Action |
 |-----|--------|
 | `c` | Copy current cell to clipboard |
 | `Ctrl+C` | Copy column to clipboard |
 | `Ctrl+R` | Copy row to clipboard (tab-separated) |
-| `Ctrl+S` | Save to file |
 
 ## Features in Detail
 
@@ -781,7 +781,7 @@ Manage multiple files and dataframes simultaneously with tabs.
 - **`Double-click`** - Rename the tab
 - **`Ctrl+D`** - Duplicate current tab (creates a copy with same data and state)
 - **`Ctrl+T`** - Save current tab to file
-- **`Ctrl+A`** - Save all tabs in a single Excel file
+- **`Ctrl+S`** - Save all tabs to file
 - **`w`** - Save current tab to file (overwrite without prompt)
 - **`W`** - Save all tabs to file (overwrite without prompt)
 - **`q`** - Close current tab (closes tab, prompts to save if unsaved changes)

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dataframe-textual"
-version = "2.4.3"
+version = "2.6.0"
 description = "Interactive terminal viewer/editor for tabular data"
 readme = "README.md"
 requires-python = ">=3.11"

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/src/dataframe_textual/data_frame_table.py

@@ -16,7 +16,7 @@ from textual.coordinate import Coordinate
 from textual.events import Click
 from textual.reactive import reactive
 from textual.render import measure
-from textual.widgets import DataTable, TabPane
+from textual.widgets import DataTable
 from textual.widgets._data_table import (
     CellDoesNotExist,
     CellKey,
@@ -35,7 +35,6 @@ from .common import (
     NULL_DISPLAY,
     RID,
     SUBSCRIPT_DIGITS,
-    SUPPORTED_FORMATS,
     DtypeConfig,
     format_row,
     get_next_item,
@@ -56,7 +55,6 @@ from .yes_no_screen import (
     FindReplaceScreen,
     FreezeScreen,
     RenameColumnScreen,
-    SaveFileScreen,
     SearchScreen,
 )
 
@@ -209,6 +207,7 @@ class DataFrameTable(DataTable):
         - **X** - ❌ Delete row and those below
         - **Ctrl+X** - ❌ Delete row and those above
         - **delete** - ❌ Clear current cell (set to NULL)
+        - **Shift+Delete** - ❌ Clear current column (set matching cells to NULL)
         - **-** - ❌ Delete current column
         - **d** - 📋 Duplicate current column
         - **D** - 📋 Duplicate current row
@@ -223,11 +222,10 @@ class DataFrameTable(DataTable):
         - **!** - ✅ Cast column to boolean
         - **$** - 📝 Cast column to string
 
-        ## 💾 Copy & Save
+        ## 💾 Copy
         - **c** - 📋 Copy cell to clipboard
         - **Ctrl+c** - 📊 Copy column to clipboard
         - **Ctrl+r** - 📝 Copy row to clipboard (tab-separated)
-        - **Ctrl+s** - 💾 Save current tab to file
     """).strip()
 
     # fmt: off
@@ -255,8 +253,6 @@ class DataFrameTable(DataTable):
         ("c", "copy_cell", "Copy cell to clipboard"),
         ("ctrl+c", "copy_column", "Copy column to clipboard"),
         ("ctrl+r", "copy_row", "Copy row to clipboard"),
-        # Save
-        ("ctrl+s", "save_to_file", "Save to file"),
         # Metadata, Detail, Frequency, and Statistics
         ("m", "metadata_shape", "Show metadata for row count and column count"),
         ("M", "metadata_column", "Show metadata for column"),
@@ -290,6 +286,7 @@ class DataFrameTable(DataTable):
         ("R", "replace_global", "Replace global"),  # `Shift+R`
         # Delete
         ("delete", "clear_cell", "Clear cell"),
+        ("shift+delete", "clear_column", "Clear cells in current column that match cursor value"),  # `Shift+Delete`
         ("minus", "delete_column", "Delete column"),  # `-`
         ("x", "delete_row", "Delete row"),
         ("X", "delete_row_and_below", "Delete row and those below"),
@@ -744,10 +741,6 @@ class DataFrameTable(DataTable):
         """Sort by current column in descending order."""
         self.do_sort_by_column(descending=True)
 
-    def action_save_to_file(self) -> None:
-        """Save the current dataframe to a file."""
-        self.do_save_to_file()
-
     def action_show_frequency(self) -> None:
         """Show frequency distribution for the current column."""
         self.do_show_frequency()
@@ -804,6 +797,10 @@ class DataFrameTable(DataTable):
         """Clear the current cell (set to None)."""
         self.do_clear_cell()
 
+    def action_clear_column(self) -> None:
+        """Clear cells in the current column that match the cursor value."""
+        self.do_clear_column()
+
     def action_select_row(self) -> None:
         """Select rows with cursor value in the current column."""
         self.do_select_row()
@@ -2052,25 +2049,10 @@ class DataFrameTable(DataTable):
             # Also update the view if applicable
             # Update the value of col_name in df_view using the value of col_name from df based on RID mapping between them
             if self.df_view is not None:
-                # Get updated column from df for rows that exist in df_view
-                col_updated = f"^_{col_name}_^"
-                col_exists = "^_exists_^"
-                lf_updated = self.df.lazy().select(
-                    RID, pl.col(col_name).alias(col_updated), pl.lit(True).alias(col_exists)
-                )
-                # Join and use when/then/otherwise to handle all updates including NULLs
-                self.df_view = (
-                    self.df_view.lazy()
-                    .join(lf_updated, on=RID, how="left")
-                    .with_columns(
-                        pl.when(pl.col(col_exists))
-                        .then(pl.col(col_updated))
-                        .otherwise(pl.col(col_name))
-                        .alias(col_name)
-                    )
-                    .drop(col_updated, col_exists)
-                    .collect()
-                )
+                # Get updated column from df
+                lf_updated = self.df.lazy().select(RID, pl.col(col_name))
+                # Update df_view by joining on RID
+                self.df_view = self.df_view.lazy().update(lf_updated, on=RID, include_nulls=True).collect()
         except Exception as e:
             self.notify(
                 f"Error applying expression: [$error]{term}[/] to column [$accent]{col_name}[/]",
@@ -2156,18 +2138,26 @@ class DataFrameTable(DataTable):
 
         # Update the cell to None in the dataframe
         try:
-            self.df = self.df.with_columns(
-                pl.when(pl.arange(0, len(self.df)) == ridx)
-                .then(pl.lit(None))
-                .otherwise(pl.col(col_name))
-                .alias(col_name)
+            self.df = (
+                self.df.lazy()
+                .with_columns(
+                    pl.when(pl.arange(0, len(self.df)) == ridx)
+                    .then(pl.lit(None))
+                    .otherwise(pl.col(col_name))
+                    .alias(col_name)
+                )
+                .collect()
             )
 
             # Also update the view if applicable
             if self.df_view is not None:
                 ridx_view = self.df.item(ridx, self.df.columns.index(RID))
-                self.df_view = self.df_view.with_columns(
-                    pl.when(pl.col(RID) == ridx_view).then(pl.lit(None)).otherwise(pl.col(col_name)).alias(col_name)
+                self.df_view = (
+                    self.df_view.lazy()
+                    .with_columns(
+                        pl.when(pl.col(RID) == ridx_view).then(pl.lit(None)).otherwise(pl.col(col_name)).alias(col_name)
+                    )
+                    .collect()
                 )
 
             # Update the display
@@ -2186,7 +2176,44 @@ class DataFrameTable(DataTable):
                 timeout=10,
             )
             self.log(f"Error clearing cell ({ridx}, {col_name}): {str(e)}")
-            raise e
+
+    def do_clear_column(self) -> None:
+        """Clear the current column by setting all its values to None."""
+        col_idx = self.cursor_column
+        col_name = self.cursor_col_name
+        value = self.cursor_value
+
+        # Add to history
+        self.add_history(f"Cleared column [$success]{col_name}[/]", dirty=True)
+
+        try:
+            # Update the entire column to None in the dataframe
+            self.df = (
+                self.df.lazy()
+                .with_columns(
+                    pl.when(pl.col(col_name) == value).then(pl.lit(None)).otherwise(pl.col(col_name)).alias(col_name)
+                )
+                .collect()
+            )
+
+            # Also update the view if applicable
+            if self.df_view is not None:
+                self.df_view = self.df_view.with_columns(
+                    pl.when(pl.col(col_name) == value).then(pl.lit(None)).otherwise(pl.col(col_name)).alias(col_name)
+                )
+
+            # Recreate table for display
+            self.setup_table()
+
+            # Move cursor to the cleared column
+            self.move_cursor(column=col_idx)
+
+            # self.notify(f"Cleared column [$success]{col_name}[/]", title="Clear Column")
+        except Exception as e:
+            self.notify(
+                f"Error clearing column [$error]{col_name}[/]", title="Clear Column", severity="error", timeout=10
+            )
+            self.log(f"Error clearing column `{col_name}`: {str(e)}")
 
     def do_add_column(self, col_name: str = None) -> None:
         """Add acolumn after the current column."""
@@ -3394,18 +3421,23 @@ class DataFrameTable(DataTable):
             # Only applicable to string columns for substring matches
             if dtype == pl.String and not state.match_whole:
                 term_find = f"(?i){state.term_find}" if state.match_nocase else state.term_find
+                new_value = (
+                    pl.lit(None)
+                    if state.term_replace == NULL
+                    else pl.col(col_name).str.replace_all(term_find, state.term_replace)
+                )
                 self.df = self.df.with_columns(
-                    pl.when(mask)
-                    .then(pl.col(col_name).str.replace_all(term_find, state.term_replace))
-                    .otherwise(pl.col(col_name))
-                    .alias(col_name)
+                    pl.when(mask).then(new_value).otherwise(pl.col(col_name)).alias(col_name)
                 )
             else:
-                # Try to convert replacement value to column dtype
-                try:
-                    value = DtypeConfig(dtype).convert(state.term_replace)
-                except Exception:
-                    value = state.term_replace
+                if state.term_replace == NULL:
+                    value = None
+                else:
+                    # Try to convert replacement value to column dtype
+                    try:
+                        value = DtypeConfig(dtype).convert(state.term_replace)
+                    except Exception:
+                        value = state.term_replace
 
                 self.df = self.df.with_columns(
                     pl.when(mask).then(pl.lit(value)).otherwise(pl.col(col_name)).alias(col_name)
@@ -3413,15 +3445,8 @@ class DataFrameTable(DataTable):
 
             # Also update the view if applicable
             if self.df_view is not None:
-                col_updated = f"^_{col_name}_^"
-                lf_updated = self.df.lazy().filter(mask).select(pl.col(col_name).alias(col_updated), pl.col(RID))
-                self.df_view = (
-                    self.df_view.lazy()
-                    .join(lf_updated, on=RID, how="left")
-                    .with_columns(pl.coalesce(pl.col(col_updated), pl.col(col_name)).alias(col_name))
-                    .drop(col_updated)
-                    .collect()
-                )
+                lf_updated = self.df.lazy().filter(mask).select(pl.col(RID), pl.col(col_name))
+                self.df_view = self.df_view.lazy().update(lf_updated, on=RID, include_nulls=True).collect()
 
             state.replaced_occurrence += len(ridxs)
 
@@ -3500,9 +3525,14 @@ class DataFrameTable(DataTable):
             # Only applicable to string columns for substring matches
             if dtype == pl.String and not state.match_whole:
                 term_find = f"(?i){state.term_find}" if state.match_nocase else state.term_find
+                new_value = (
+                    pl.lit(None)
+                    if state.term_replace == NULL
+                    else pl.col(col_name).str.replace_all(term_find, state.term_replace)
+                )
                 self.df = self.df.with_columns(
                     pl.when(pl.arange(0, len(self.df)) == ridx)
-                    .then(pl.col(col_name).str.replace_all(term_find, state.term_replace))
+                    .then(new_value)
                     .otherwise(pl.col(col_name))
                     .alias(col_name)
                 )
@@ -3516,11 +3546,14 @@ class DataFrameTable(DataTable):
                         .alias(col_name)
                     )
             else:
-                # try to convert replacement value to column dtype
-                try:
-                    value = DtypeConfig(dtype).convert(state.term_replace)
-                except Exception:
-                    value = state.term_replace
+                if state.term_replace == NULL:
+                    value = None
+                else:
+                    # try to convert replacement value to column dtype
+                    try:
+                        value = DtypeConfig(dtype).convert(state.term_replace)
+                    except Exception:
+                        value = state.term_replace
 
                 self.df = self.df.with_columns(
                     pl.when(pl.arange(0, len(self.df)) == ridx)
@@ -3548,6 +3581,8 @@ class DataFrameTable(DataTable):
         if not state.done:
             # Get the new value of the current cell after replacement
             new_cell_value = self.df.item(ridx, cidx)
+            if new_cell_value is None:
+                new_cell_value = NULL_DISPLAY
             row_key = str(ridx)
             col_key = col_name
             self.update_cell(
@@ -3755,7 +3790,7 @@ class DataFrameTable(DataTable):
 
         self.notify(f"{message}. Now showing [$success]{len(self.df)}[/] rows.", title="Filter Rows")
 
-    # Copy & Save
+    # Copy
     def do_copy_to_clipboard(self, content: str, message: str) -> None:
         """Copy content to clipboard using pbcopy (macOS) or xclip (Linux).
 
@@ -3779,132 +3814,6 @@ class DataFrameTable(DataTable):
         except FileNotFoundError:
             self.notify("Error copying to clipboard", title="Copy to Clipboard", severity="error", timeout=10)
 
-    def do_save_to_file(self, all_tabs: bool | None = None, task_after_save: str | None = None) -> None:
-        """Open screen to save file."""
-        self._task_after_save = task_after_save
-        tab_count = len(self.app.tabs)
-        save_all = all_tabs is not False
-
-        filepath = Path(self.filename)
-        if save_all:
-            ext = filepath.suffix.lower()
-            if ext in (".xlsx", ".xls"):
-                filename = self.filename
-            else:
-                filename = "all-tabs.xlsx"
-        else:
-            filename = str(filepath.with_stem(self.tabname))
-
-        self.app.push_screen(
-            SaveFileScreen(filename, save_all=save_all, tab_count=tab_count),
-            callback=self.save_to_file,
-        )
-
-    def save_to_file(self, result) -> None:
-        """Handle result from SaveFileScreen."""
-        if result is None:
-            return
-        filename, save_all, overwrite_prompt = result
-        self._save_all = save_all
-
-        # Check if file exists
-        if overwrite_prompt and Path(filename).exists():
-            self._pending_filename = filename
-            self.app.push_screen(
-                ConfirmScreen("File already exists. Overwrite?"),
-                callback=self.confirm_overwrite,
-            )
-        else:
-            self.save_file(filename)
-
-    def confirm_overwrite(self, should_overwrite: bool) -> None:
-        """Handle result from ConfirmScreen."""
-        if should_overwrite:
-            self.save_file(self._pending_filename)
-        else:
-            # Go back to SaveFileScreen to allow user to enter a different name
-            self.app.push_screen(
-                SaveFileScreen(self._pending_filename, save_all=self._save_all),
-                callback=self.save_to_file,
-            )
-
-    def save_file(self, filename: str) -> None:
-        """Actually save the dataframe to a file."""
-        filepath = Path(filename)
-        ext = filepath.suffix.lower()
-        if ext == ".gz":
-            ext = Path(filename).with_suffix("").suffix.lower()
-
-        fmt = ext.removeprefix(".")
-        if fmt not in SUPPORTED_FORMATS:
-            self.notify(
-                f"Unsupported file format [$success]{fmt}[/]. Use [$accent]CSV[/] as fallback. Supported formats: {', '.join(SUPPORTED_FORMATS)}",
-                title="Save to File",
-                severity="warning",
-            )
-            fmt = "csv"
-
-        df = (self.df if self.df_view is None else self.df_view).select(pl.exclude(RID))
-        try:
-            if fmt == "csv":
-                df.write_csv(filename)
-            elif fmt in ("tsv", "tab"):
-                df.write_csv(filename, separator="\t")
-            elif fmt in ("xlsx", "xls"):
-                self.save_excel(filename)
-            elif fmt == "json":
-                df.write_json(filename)
-            elif fmt == "ndjson":
-                df.write_ndjson(filename)
-            elif fmt == "parquet":
-                df.write_parquet(filename)
-            else:  # Fallback to CSV
-                df.write_csv(filename)
-
-            # Update current filename
-            self.filename = filename
-
-            # Reset dirty flag after save
-            if self._save_all:
-                tabs: dict[TabPane, DataFrameTable] = self.app.tabs
-                for table in tabs.values():
-                    table.dirty = False
-            else:
-                self.dirty = False
-
-            if hasattr(self, "_task_after_save"):
-                if self._task_after_save == "close_tab":
-                    self.app.do_close_tab()
-                elif self._task_after_save == "quit_app":
-                    self.app.exit()
-
-            # From ConfirmScreen callback, so notify accordingly
-            if self._save_all:
-                self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save to File")
-            else:
-                self.notify(f"Saved current tab to [$success]{filename}[/]", title="Save to File")
-
-        except Exception as e:
-            self.notify(f"Error saving [$error]{filename}[/]", title="Save to File", severity="error", timeout=10)
-            self.log(f"Error saving file `{filename}`: {str(e)}")
-
-    def save_excel(self, filename: str) -> None:
-        """Save to an Excel file."""
-        import xlsxwriter
-
-        if not self._save_all or len(self.app.tabs) == 1:
-            # Single tab - save directly
-            df = (self.df if self.df_view is None else self.df_view).select(pl.exclude(RID))
-            df.write_excel(filename, worksheet=self.tabname)
-        else:
-            # Multiple tabs - use xlsxwriter to create multiple sheets
-            with xlsxwriter.Workbook(filename) as wb:
-                tabs: dict[TabPane, DataFrameTable] = self.app.tabs
-                for table in tabs.values():
-                    worksheet = wb.add_worksheet(table.tabname)
-                    df = (table.df if table.df_view is None else table.df_view).select(pl.exclude(RID))
-                    df.write_excel(workbook=wb, worksheet=worksheet)
-
     # SQL Interface
     def do_simple_sql(self) -> None:
         """Open the SQL interface screen."""

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/src/dataframe_textual/data_frame_viewer.py

@@ -12,10 +12,10 @@ from textual.theme import BUILTIN_THEMES
 from textual.widgets import TabbedContent, TabPane
 from textual.widgets.tabbed_content import ContentTab, ContentTabs
 
-from .common import Source, get_next_item, load_file
+from .common import RID, SUPPORTED_FORMATS, Source, get_next_item, load_file
 from .data_frame_help_panel import DataFrameHelpPanel
 from .data_frame_table import DataFrameTable
-from .yes_no_screen import ConfirmScreen, OpenFileScreen, RenameTabScreen
+from .yes_no_screen import ConfirmScreen, OpenFileScreen, RenameTabScreen, SaveFileScreen
 
 
 class DataFrameViewer(App):
@@ -34,7 +34,7 @@ class DataFrameViewer(App):
         - **Ctrl+Q** - 🚪 Force to quit app (discards unsaved changes)
         - **Ctrl+T** - 💾 Save current tab to file
         - **w** - 💾 Save current tab to file (overwrite without prompt)
-        - **Ctrl+A** - 💾 Save all tabs to file
+        - **Ctrl+S** - 💾 Save all tabs to file
         - **W** - 💾 Save all tabs to file (overwrite without prompt)
         - **Ctrl+D** - 📋 Duplicate current tab
         - **Ctrl+O** - 📁 Open a file
@@ -64,7 +64,7 @@ class DataFrameViewer(App):
         ("f1", "toggle_help_panel", "Help"),
         ("ctrl+o", "open_file", "Open File"),
         ("ctrl+t", "save_current_tab", "Save Current Tab"),
-        ("ctrl+a", "save_all_tabs", "Save All Tabs"),
+        ("ctrl+s", "save_all_tabs", "Save All Tabs"),
         ("w", "save_current_tab_overwrite", "Save Current Tab (overwrite)"),
         ("W", "save_all_tabs_overwrite", "Save All Tabs (overwrite)"),
         ("ctrl+d", "duplicate_tab", "Duplicate Tab"),
@@ -102,6 +102,22 @@ class DataFrameViewer(App):
         self.tabs: dict[TabPane, DataFrameTable] = {}
         self.help_panel = None
 
+    @property
+    def active_table(self) -> DataFrameTable | None:
+        """Get the currently active DataFrameTable widget.
+
+        Returns:
+            The active DataFrameTable widget, or None if not found.
+        """
+        try:
+            tabbed: TabbedContent = self.query_one(TabbedContent)
+            if active_pane := tabbed.active_pane:
+                return active_pane.query_one(DataFrameTable)
+        except (NoMatches, AttributeError):
+            self.notify("No active table found", title="Locate Table", severity="error", timeout=10)
+
+        return None
+
     def compose(self) -> ComposeResult:
         """Compose the application widget structure.
 
@@ -151,7 +167,7 @@ class DataFrameViewer(App):
         """
         if len(self.tabs) == 1:
             self.query_one(ContentTabs).display = False
-            self.get_active_table().focus()
+            self.active_table.focus()
 
     def on_ready(self) -> None:
         """Called when the app is ready."""
@@ -201,13 +217,11 @@ class DataFrameViewer(App):
             event: The tab activated event containing the activated tab pane.
         """
         # Focus the table in the newly activated tab
-        if table := self.get_active_table():
+        if table := self.active_table:
             table.focus()
-        else:
-            return
 
-        if table.loaded_rows == 0:
-            table.setup_table()
+            if table.loaded_rows == 0:
+                table.setup_table()
 
     def action_toggle_help_panel(self) -> None:
         """Toggle the help panel on or off.
@@ -245,41 +259,43 @@ class DataFrameViewer(App):
         self.do_close_all_tabs()
 
     def action_save_current_tab(self) -> None:
-        """Save the currently active tab to file.
-
-        Opens the save dialog for the active tab's DataFrameTable to save its data.
-        """
-        if table := self.get_active_table():
-            table.do_save_to_file(all_tabs=False)
+        """Open a save dialog to save current tab to file."""
+        self.do_save_to_file(all_tabs=False)
 
     def action_save_all_tabs(self) -> None:
-        """Save all open tabs to their respective files.
-
-        Iterates through all DataFrameTable widgets and opens the save dialog for each.
-        """
-        if table := self.get_active_table():
-            table.do_save_to_file(all_tabs=True)
+        """Open a save dialog to save all tabs to file."""
+        self.do_save_to_file(all_tabs=True)
 
     def action_save_current_tab_overwrite(self) -> None:
-        """Save the currently active tab to file, overwriting if it exists."""
-        if table := self.get_active_table():
+        """Save current tab to file, overwrite if exists."""
+        if table := self.active_table:
             if len(self.tabs) > 1:
-                filepath = Path(table.filename)
-                filename = filepath.with_stem(table.tabname)
+                filenames = {t.filename for t in self.tabs.values()}
+                if len(filenames) > 1:
+                    # Different filenames across tabs
+                    filepath = Path(table.filename)
+                    filename = filepath.with_stem(table.tabname)
+                else:
+                    filename = table.filename
             else:
                 filename = table.filename
-            table.save_to_file((filename, False, False))
+
+            self.save_to_file((filename, False, False))
 
     def action_save_all_tabs_overwrite(self) -> None:
-        """Save all open tabs to their respective files, overwriting if they exist."""
-        if table := self.get_active_table():
-            filepath = Path(table.filename)
-            if filepath.suffix.lower() in [".xlsx", ".xls"]:
-                filename = table.filename
+        """Save all tabs to file, overwrite if exists."""
+        if table := self.active_table:
+            if len(self.tabs) > 1:
+                filenames = {t.filename for t in self.tabs.values()}
+                if len(filenames) > 1:
+                    # Different filenames across tabs - use generic name
+                    filename = "all-tabs.xlsx"
+                else:
+                    filename = table.filename
             else:
-                filename = "all-tabs.xlsx"
+                filename = table.filename
 
-            table.save_to_file((filename, True, False))
+            self.save_to_file((filename, True, False))
 
     def action_duplicate_tab(self) -> None:
         """Duplicate the currently active tab.
@@ -295,7 +311,7 @@ class DataFrameViewer(App):
         Creates a copy of the current tab with the same data and filename.
         The new tab is named with '_copy' suffix and inserted after the current tab.
         """
-        if not (table := self.get_active_table()):
+        if not (table := self.active_table):
             return
 
         # Get current tab info
@@ -367,24 +383,6 @@ class DataFrameViewer(App):
         # status = "shown" if tabs.display else "hidden"
         # self.notify(f"Tab bar [$success]{status}[/]", title="Toggle Tab Bar")
 
-    def get_active_table(self) -> DataFrameTable | None:
-        """Get the currently active DataFrameTable widget.
-
-        Retrieves the table from the currently active tab. Returns None if no
-        table is found or an error occurs.
-
-        Returns:
-            The active DataFrameTable widget, or None if not found.
-        """
-        try:
-            tabbed: TabbedContent = self.query_one(TabbedContent)
-            if active_pane := tabbed.active_pane:
-                return active_pane.query_one(DataFrameTable)
-        except (NoMatches, AttributeError):
-            self.notify("No active table found", title="Locate Table", severity="error", timeout=10)
-
-        return None
-
     def get_unique_tabname(self, tab_name: str) -> str:
         """Generate a unique tab name based on the given base name.
 
@@ -495,17 +493,14 @@ class DataFrameViewer(App):
         can be closed, the application exits instead.
         """
         try:
-            if not (active_pane := self.tabbed.active_pane):
-                return
-
-            if not (active_table := self.tabs.get(active_pane)):
+            if not (table := self.active_table):
                 return
 
             def _on_save_confirm(result: bool) -> None:
                 """Handle the "save before closing?" confirmation."""
                 if result:
                     # User wants to save - close after save dialog opens
-                    active_table.do_save_to_file(task_after_save="close_tab")
+                    self.do_save_to_file(all_tabs=False, task_after_save="close_tab")
                 elif result is None:
                     # User cancelled - do nothing
                     return
@@ -513,7 +508,7 @@ class DataFrameViewer(App):
                     # User wants to discard - close immediately
                     self.close_tab()
 
-            if active_table.dirty:
+            if table.dirty:
                 self.push_screen(
                     ConfirmScreen(
                         "Close Tab",
@@ -560,7 +555,7 @@ class DataFrameViewer(App):
 
             def _save_and_quit(result: bool) -> None:
                 if result:
-                    self.get_active_table()._save_to_file(task_after_save="quit_app")
+                    self.do_save_to_file(all_tabs=True, task_after_save="quit_app")
                 elif result is None:
                     # User cancelled - do nothing
                     return
@@ -568,15 +563,17 @@ class DataFrameViewer(App):
                     # User wants to discard - quit immediately
                     self.exit()
 
+            tab_count = len(self.tabs)
             tab_list = "\n".join(f"  - [$warning]{name}[/]" for name in dirty_tabnames)
             label = (
                 f"The following tabs have unsaved changes:\n\n{tab_list}\n\nSave all changes?"
                 if len(dirty_tabnames) > 1
                 else f"The tab [$warning]{dirty_tabnames[0]}[/] has unsaved changes.\n\nSave changes?"
             )
+
             self.push_screen(
                 ConfirmScreen(
-                    "Close All Tabs" if len(self.tabs) > 1 else "Close Tab",
+                    f"Close {tab_count} Tabs" if tab_count > 1 else "Close Tab",
                     label=label,
                     yes="Save",
                     maybe="Discard",
@@ -631,3 +628,141 @@ class DataFrameViewer(App):
                 break
 
         # self.notify(f"Renamed tab [$accent]{old_name}[/] to [$success]{new_name}[/]", title="Rename Tab")
+
+    def do_save_to_file(self, all_tabs: bool = True, task_after_save: str | None = None) -> None:
+        """Open screen to save file."""
+        if not (table := self.active_table):
+            return
+
+        self._task_after_save = task_after_save
+        tab_count = len(self.tabs)
+        save_all = all_tabs is True and tab_count > 1
+
+        if save_all:
+            filenames = {t.filename for t in self.tabs.values()}
+            if len(filenames) > 1:
+                # Different filenames across tabs - use generic name
+                filename = "all-tabs.xlsx"
+            else:
+                filename = table.filename
+        elif tab_count == 1:
+            filename = table.filename
+        else:
+            filepath = Path(table.filename)
+            filename = str(filepath.with_stem(table.tabname))
+
+        self.push_screen(
+            SaveFileScreen(filename, save_all=save_all, tab_count=tab_count),
+            callback=self.save_to_file,
+        )
+
+    def save_to_file(self, result) -> None:
+        """Handle result from SaveFileScreen."""
+        if result is None:
+            return
+        filename, save_all, overwrite_prompt = result
+        self._save_all = save_all
+
+        # Check if file exists
+        if overwrite_prompt and Path(filename).exists():
+            self._pending_filename = filename
+            self.push_screen(
+                ConfirmScreen("File already exists. Overwrite?"),
+                callback=self.confirm_overwrite,
+            )
+        else:
+            self.save_file(filename)
+
+    def confirm_overwrite(self, should_overwrite: bool) -> None:
+        """Handle result from ConfirmScreen."""
+        if should_overwrite:
+            self.save_file(self._pending_filename)
+        else:
+            # Go back to SaveFileScreen to allow user to enter a different name
+            self.push_screen(
+                SaveFileScreen(self._pending_filename, save_all=self._save_all),
+                callback=self.save_to_file,
+            )
+
+    def save_file(self, filename: str) -> None:
+        """Actually save to a file."""
+        if not (table := self.active_table):
+            return
+
+        filepath = Path(filename)
+        ext = filepath.suffix.lower()
+        if ext == ".gz":
+            ext = Path(filename).with_suffix("").suffix.lower()
+
+        fmt = ext.removeprefix(".")
+        if fmt not in SUPPORTED_FORMATS:
+            self.notify(
+                f"Unsupported file format [$success]{fmt}[/]. Use [$accent]CSV[/] as fallback. Supported formats: {', '.join(SUPPORTED_FORMATS)}",
+                title="Save to File",
+                severity="warning",
+            )
+            fmt = "csv"
+
+        df = (table.df if table.df_view is None else table.df_view).select(pl.exclude(RID))
+        try:
+            if fmt == "csv":
+                df.write_csv(filename)
+            elif fmt in ("tsv", "tab"):
+                df.write_csv(filename, separator="\t")
+            elif fmt == "psv":
+                df.write_csv(filename, separator="|")
+            elif fmt in ("xlsx", "xls"):
+                self.save_excel(filename)
+            elif fmt == "json":
+                df.write_json(filename)
+            elif fmt == "ndjson":
+                df.write_ndjson(filename)
+            elif fmt == "parquet":
+                df.write_parquet(filename)
+            else:  # Fallback to CSV
+                df.write_csv(filename)
+
+            # Reset dirty flag and update filename after save
+            if self._save_all:
+                for table in self.tabs.values():
+                    table.dirty = False
+                    table.filename = filename
+            else:
+                table.dirty = False
+                table.filename = filename
+
+            # From ConfirmScreen callback, so notify accordingly
+            if self._save_all:
+                self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save to File")
+            else:
+                self.notify(f"Saved current tab to [$success]{filename}[/]", title="Save to File")
+
+            if hasattr(self, "_task_after_save"):
+                if self._task_after_save == "close_tab":
+                    self.do_close_tab()
+                elif self._task_after_save == "quit_app":
+                    self.exit()
+
+        except Exception as e:
+            self.notify(f"Error saving [$error]{filename}[/]", title="Save to File", severity="error", timeout=10)
+            self.log(f"Error saving file `{filename}`: {str(e)}")
+
+    def save_excel(self, filename: str) -> None:
+        """Save to an Excel file."""
+        import xlsxwriter
+
+        if not self._save_all or len(self.tabs) == 1:
+            # Single tab - save directly
+            if not (table := self.active_table):
+                return
+
+            df = (table.df if table.df_view is None else table.df_view).select(pl.exclude(RID))
+            df.write_excel(filename, worksheet=table.tabname)
+        else:
+            # Multiple tabs - use xlsxwriter to create multiple sheets
+            with xlsxwriter.Workbook(filename) as wb:
+                tabs: dict[TabPane, DataFrameTable] = self.tabs
+                for table in tabs.values():
+                    worksheet = wb.add_worksheet(table.tabname)
+                    df = (table.df if table.df_view is None else table.df_view).select(pl.exclude(RID))
+                    df.write_excel(workbook=wb, worksheet=worksheet)

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/src/dataframe_textual/yes_no_screen.py

@@ -298,7 +298,7 @@ class SaveFileScreen(YesNoScreen):
             title="Save to File",
             label="Filename",
             input=filename,
-            yes=f"Save {tab_count} Tab(s)" if self.save_all else "Save Current Tab" if tab_count > 1 else "Save",
+            yes=f"Save {tab_count} Tabs" if self.save_all else "Save Current Tab" if tab_count > 1 else "Save",
             no="Cancel",
             on_yes_callback=self.handle_save,
         )

{dataframe_textual-2.4.3 → dataframe_textual-2.6.0}/uv.lock

@@ -171,7 +171,7 @@ wheels = [
 
 [[package]]
 name = "dataframe-textual"
-version = "2.4.3"
+version = "2.6.0"
 source = { editable = "." }
 dependencies = [
     { name = "polars" },