dataframe-textual 2.10.0__py3-none-any.whl → 2.11.0__py3-none-any.whl

dataframe_textual/data_frame_table.py

@@ -242,7 +242,7 @@ class DataFrameTable(DataTable):
         ("ctrl+u", "reset", "Reset to initial state"),
         # Display
         ("h", "hide_column", "Hide column"),
-        ("H", "show_hidden_rows_columns", "Show hidden rows/columns"),
+        ("H", "show_hidden_columns", "Show hidden column(s)"),
         ("tilde", "toggle_row_labels", "Toggle row labels"),  # `~`
         ("K", "cycle_cursor_type", "Cycle cursor mode"),  # `K`
         ("z", "freeze_row_column", "Freeze rows/columns"),
@@ -731,9 +731,9 @@ class DataFrameTable(DataTable):
         """Set cursor row as the new header row."""
         self.do_set_cursor_row_as_header()
 
-    def action_show_hidden_rows_columns(self) -> None:
-        """Show all hidden rows/columns."""
-        self.do_show_hidden_rows_columns()
+    def action_show_hidden_columns(self) -> None:
+        """Show all hidden columns."""
+        self.do_show_hidden_columns()
 
     def action_sort_ascending(self) -> None:
         """Sort by current column in ascending order."""
@@ -1847,27 +1847,22 @@ class DataFrameTable(DataTable):
 
         # self.notify(f"Set row [$success]{ridx + 1}[/] as header", title="Set Row as Header")
 
-    def do_show_hidden_rows_columns(self) -> None:
-        """Show all hidden rows/columns by recreating the table."""
-        if not self.hidden_columns and self.df_view is None:
-            # self.notify("No hidden rows or columns to show", title="Show Hidden Rows/Columns", severity="warning")
+    def do_show_hidden_columns(self) -> None:
+        """Show all hidden columns by recreating the table."""
+        if not self.hidden_columns:
+            # self.notify("No hidden columns to show", title="Show Hidden Column(s)", severity="warning")
             return
 
         # Add to history
-        self.add_history("Showed hidden rows/columns")
+        self.add_history("Showed hidden column(s)")
 
-        # If in a filtered view, restore the full dataframe
-        if self.df_view is not None:
-            self.df = self.df_view
-            self.df_view = None
-
-        # Clear hidden rows/columns tracking
+        # Clear hidden columns tracking
         self.hidden_columns.clear()
 
         # Recreate table for display
         self.setup_table()
 
-        # self.notify("Showed hidden row(s) and/or hidden column(s)", title="Show Hidden Rows/Columns")
+        # self.notify("Showed hidden column(s)", title="Show Hidden Column(s)")
 
     # Sort
     def do_sort_by_column(self, descending: bool = False) -> None:

dataframe_textual/data_frame_viewer.py

@@ -58,8 +58,8 @@ class DataFrameViewer(App):
     """).strip()
 
     BINDINGS = [
-        ("q", "close_tab", "Close current tab"),
-        ("Q", "close_all_tabs", "Close all tabs and quit app"),
+        ("q", "quit", "Quit from view or close current tab"),
+        ("Q", "quit_all", "Quit app after closing all tabs"),
         ("B", "toggle_tab_bar", "Toggle Tab Bar"),
         ("f1", "toggle_help_panel", "Help"),
         ("ctrl+o", "open_file", "Open File"),
@@ -242,21 +242,21 @@ class DataFrameViewer(App):
         """
         self.push_screen(OpenFileScreen(), self.do_open_file)
 
-    def action_close_tab(self) -> None:
-        """Close the current tab.
+    def action_quit(self) -> None:
+        """Quit from the view or the current tab.
 
         Checks for unsaved changes and prompts the user to save if needed.
         If this is the last tab, exits the app.
         """
-        self.do_close_tab()
+        self.do_quit()
 
-    def action_close_all_tabs(self) -> None:
-        """Close all tabs and exit the app.
+    def action_quit_all(self) -> None:
+        """Quit app after closing all tabs.
 
         Checks if any tabs have unsaved changes. If yes, opens a confirmation dialog.
         Otherwise, quits immediately.
         """
-        self.do_close_all_tabs()
+        self.do_quit_all()
 
     def action_save_current_tab(self) -> None:
         """Open a save dialog to save current tab to file."""
@@ -486,16 +486,33 @@ class DataFrameViewer(App):
         self.tabbed.active = tab.id
         table.focus()
 
-    def do_close_tab(self) -> None:
-        """Close the currently active tab.
+    def do_quit(self) -> None:
+        """Quit from the view or the current tab.
 
-        Removes the active tab from the interface. If only one tab remains and no more
-        can be closed, the application exits instead.
+        When in a view, return to main table. Otherwise, close the active tab.
+        If only one tab remains and no more tabs can be closed, exits the application.
         """
         try:
             if not (table := self.active_table):
                 return
 
+            # In a view - return to main table
+            if table.df_view is not None:
+                # Remove from history
+                while table.histories_undo:
+                    h = table.histories_undo[-1]
+                    if h.description.startswith("Viewed rows by expression"):
+                        table.histories_undo.pop()
+                    else:
+                        break
+
+                table.add_history("Return to main table")
+                table.df = table.df_view
+                table.df_view = None
+                table.setup_table()
+
+                return
+
             def _on_save_confirm(result: bool) -> None:
                 """Handle the "save before closing?" confirmation."""
                 if result:
@@ -540,7 +557,7 @@ class DataFrameViewer(App):
         except Exception:
             pass
 
-    def do_close_all_tabs(self) -> None:
+    def do_quit_all(self) -> None:
         """Close all tabs and quit the app.
 
         Checks if any tabs have unsaved changes. If yes, opens a confirmation dialog.

dataframe_textual/table_screen.py

@@ -134,8 +134,10 @@ class TableScreen(ModalScreen):
         else:
             self.dftable.view_rows((expr, cidx, False, True))
 
-        # Dismiss the current modal screen
-        self.app.pop_screen()
+        # Dismiss modal screen(s) to return to main table
+        while len(self.app._screen_stack) > 1:
+            self.app.pop_screen()
+            break
 
     def show_frequency(self, cidx_name_value: tuple[int, str, Any] | None) -> None:
         """Show frequency by the selected value.

{dataframe_textual-2.10.0.dist-info → dataframe_textual-2.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 2.10.0
+Version: 2.11.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
@@ -247,8 +247,8 @@ zcat compressed_data.csv.gz | dv -f csv
 | `<` | Move to previous tab |
 | `b` | Cycle through tabs |
 | `B` | Toggle tab bar visibility |
-| `q` | Close current tab (prompts to save unsaved changes) |
-| `Q` | Close all tabs and app (prompts to save unsaved changes) |
+| `q` | Quit current tab (prompts to save unsaved changes) |
+| `Q` | Quit 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+S` | Save all tabs to file |
@@ -308,7 +308,7 @@ zcat compressed_data.csv.gz | dv -f csv
 | `,` | Toggle thousand separator for numeric display |
 | `&` | Set current row as the new header row | 
 | `h` | Hide current column |
-| `H` | Show all hidden rows/columns |
+| `H` | Show all hidden columns |
 
 #### Editing
 
@@ -499,7 +499,7 @@ Both operations show selected rows but with fundamentally different effects:
 **When to use View** (`v` or `V`):
 - Exploring or analyzing data safely
 - Switching between different perspectives
-- Press `H` to restore hidden rows (and hidden columns)
+- Press `q` to return to main table
 
 **When to use Filter** (`"`):
 - Cleaning data (removing unwanted rows)
@@ -678,7 +678,7 @@ This is useful for:
 
 **Hide/Show Columns** (`h` / `H`):
 - `h` - Temporarily hide current column (data preserved)
-- `H` - Restore all hidden columns and rows
+- `H` - Restore all hidden columns
 
 ### 12. Column & Row Reordering
 

{dataframe_textual-2.10.0.dist-info → dataframe_textual-2.11.0.dist-info}/RECORD

@@ -2,13 +2,13 @@ dataframe_textual/__init__.py,sha256=E53fW1spQRA4jW9grxSqPEmoe9zofzr6twdveMbt_W8
 dataframe_textual/__main__.py,sha256=tJ6FjjV25ZQzaMdqD5XcDVRZfj8l6kgGvXyrn975rjo,3999
 dataframe_textual/common.py,sha256=CNRdHP3N1li2dy9OsTiW-zfpzf8zcrt2fW8mmYY-YVA,29073
 dataframe_textual/data_frame_help_panel.py,sha256=UEtj64XsVRdtLzuwOaITfoEQUkAfwFuvpr5Npip5WHs,3381
-dataframe_textual/data_frame_table.py,sha256=EAtUrzygpppdgEOk1FhSZWwDAwdKLpF-1s2iAE6EI3E,148529
-dataframe_textual/data_frame_viewer.py,sha256=_VwbCcRBgdTcrZmgS2mRwIJ-cFxOeJ55twDFvQUHMfk,28723
+dataframe_textual/data_frame_table.py,sha256=Vi02ombWWUV8lehj6vTNWakXpkRWWPJU4eUl6aCiG2o,148263
+dataframe_textual/data_frame_viewer.py,sha256=L1QEKS2L6g6ZtwXMznl1C632Ttqca-tXbo-glopHCRU,29352
 dataframe_textual/sql_screen.py,sha256=P3j1Fv45NIKEYo9adb7NPod54FaU-djFIvCUMMHbvjY,7534
-dataframe_textual/table_screen.py,sha256=aiMzI_kKiR2_3U1bqWHvaEkg4rqm62pXoMm_s1-19QU,21962
+dataframe_textual/table_screen.py,sha256=kk5dpVu-ExkMh7BunQdCNvHC1RmLl6nHLHHulWucloY,22046
 dataframe_textual/yes_no_screen.py,sha256=LC42DeJRIWb-PdpR3FDNvwxhnfZ6OXfU9Kxiu340BNE,26132
-dataframe_textual-2.10.0.dist-info/METADATA,sha256=iG9x8TSVdkXcoM3AuEyjCHdGa-4yfX63IRF1FlxoZnE,29825
-dataframe_textual-2.10.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dataframe_textual-2.10.0.dist-info/entry_points.txt,sha256=R_GoooOxcq6ab4RaHiVoZ4zrZJ-phMcGmlL2rwqncW8,107
-dataframe_textual-2.10.0.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
-dataframe_textual-2.10.0.dist-info/RECORD,,
+dataframe_textual-2.11.0.dist-info/METADATA,sha256=QaKrM5-fDhJcYnyQpS1m_7lTRmeHqKpXRYdyIag4dpI,29789
+dataframe_textual-2.11.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dataframe_textual-2.11.0.dist-info/entry_points.txt,sha256=R_GoooOxcq6ab4RaHiVoZ4zrZJ-phMcGmlL2rwqncW8,107
+dataframe_textual-2.11.0.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
+dataframe_textual-2.11.0.dist-info/RECORD,,