dataframe-textual 1.1.5__py3-none-any.whl → 1.3.9__py3-none-any.whl

dataframe_textual/data_frame_table.py

@@ -9,6 +9,7 @@ from typing import Any
 
 import polars as pl
 from rich.text import Text
+from textual import work
 from textual.coordinate import Coordinate
 from textual.events import Click
 from textual.widgets import DataTable, TabPane
@@ -30,9 +31,11 @@ from .common import (
     format_row,
     get_next_item,
     rindex,
+    sleep_async,
     tentative_expr,
     validate_expr,
 )
+from .sql_screen import AdvancedSqlScreen, SimpleSqlScreen
 from .table_screen import FrequencyScreen, RowDetailScreen, StatisticsScreen
 from .yes_no_screen import (
     AddColumnScreen,
@@ -104,8 +107,12 @@ class DataFrameTable(DataTable):
         - **F** - 📊 Show frequency distribution
         - **s** - 📈 Show statistics for current column
         - **S** - 📊 Show statistics for entire dataframe
-        - **K** - 🔄 Cycle cursor (cell → row → column → cell)
+        - **h** - 👁️ Hide current column
+        - **H** - 👀 Show all hidden rows/columns
+        - **z** - 📌 Freeze rows and columns
         - **~** - 🏷️ Toggle row labels
+        - **,** - 🔢 Toggle thousand separator for numeric display
+        - **K** - 🔄 Cycle cursor (cell → row → column → cell)
 
         ## ↕️ Sorting
         - **[** - 🔼 Sort column ascending
@@ -136,7 +143,11 @@ class DataFrameTable(DataTable):
         - **{** - ⬆️ Go to previous selected row
         - **}** - ⬇️ Go to next selected row
         - **"** - 📍 Filter to show only selected rows
-        - **T** - 🧹 Clear all selections
+        - **T** - 🧹 Clear all selections and matches
+
+        ## 🔍 SQL Interface
+        - **l** - 💬 Open simple SQL interface (select columns & WHERE clause)
+        - **L** - 🔎 Open advanced SQL interface (full SQL queries)
 
         ## ✏️ Edit & Modify
         - **Double-click** - ✍️ Edit cell or rename column header
@@ -144,13 +155,15 @@ class DataFrameTable(DataTable):
         - **E** - 📊 Edit entire column with expression
         - **a** - ➕ Add empty column after current
         - **A** - ➕ Add column with name and optional expression
-        - **x** - 🗑️ Delete current row
-        - **X** - ✨ Clear current cell (set to None)
-        - **D** - 📋 Duplicate current row
+        - **x** - ❌ Delete current row
+        - **X** - ❌ Delete row and those below
+        - **Ctrl+X** - ❌ Delete row and those above
+        - **delete** - ❌ Clear current cell (set to NULL)
         - **-** - ❌ Delete current column
+        - **_** - ❌ Delete column and those after
+        - **Ctrl+_** - ❌ Delete column and those before
         - **d** - 📋 Duplicate current column
-        - **h** - 👁️ Hide current column
-        - **H** - 👀 Show all hidden columns
+        - **D** - 📋 Duplicate current row
 
         ## 🎯 Reorder
         - **Shift+↑↓** - ⬆️⬇️ Move row up/down
@@ -166,32 +179,39 @@ class DataFrameTable(DataTable):
         - **@** - 🔗 Make URLs in current column clickable with Ctrl/Cmd
 
         ## 💾 Data Management
-        - **z** - 📌 Freeze rows and columns
-        - **,** - 🔢 Toggle thousand separator for numeric display
         - **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
         - **u** - ↩️ Undo last action
-        - **U** - 🔄 Reset to original data
+        - **U** - 🔄 Redo last undone action
+        - **Ctrl+U** - 🔁 Reset to initial state
     """).strip()
 
     # fmt: off
     BINDINGS = [
+        # Navigation
         ("g", "jump_top", "Jump to top"),
         ("G", "jump_bottom", "Jump to bottom"),
+        # Display
         ("h", "hide_column", "Hide column"),
-        ("H", "show_column", "Show columns"),
+        ("H", "show_hidden_rows_columns", "Show hidden rows/columns"),
+        ("tilde", "toggle_row_labels", "Toggle row labels"),  # `~`
+        ("K", "cycle_cursor_type", "Cycle cursor mode"),  # `K`
+        ("z", "freeze_row_column", "Freeze rows/columns"),
+        ("comma", "show_thousand_separator", "Toggle thousand separator"),  # `,`
+        # Copy
         ("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"),
+        # Detail, Frequency, and Statistics
         ("enter", "view_row_detail", "View row details"),
-        # Frequency & Statistics
         ("F", "show_frequency", "Show frequency"),
         ("s", "show_statistics", "Show statistics for column"),
         ("S", "show_statistics('dataframe')", "Show statistics for dataframe"),
-        # Sorting
+        # Sort
         ("left_square_bracket", "sort_ascending", "Sort ascending"),  # `[`
         ("right_square_bracket", "sort_descending", "Sort descending"),  # `]`
         # View
@@ -215,16 +235,23 @@ class DataFrameTable(DataTable):
         # Selection
         ("apostrophe", "make_selections", "Toggle row selection"),  # `'`
         ("t", "toggle_selections", "Toggle all row selections"),
-        ("T", "clear_selections", "Clear selections"),
+        ("T", "clear_selections_and_matches", "Clear selections"),
         ("quotation_mark", "filter_selected_rows", "Filter selected"),  # `"`
-        # Edit
+        # Delete
+        ("delete", "clear_cell", "Clear cell"),
         ("minus", "delete_column", "Delete column"),  # `-`
+        ("underscore", "delete_column_and_after", "Delete column and those after"),  # `_`
+        ("ctrl+underscore", "delete_column_and_before", "Delete column and those before"),  # `Ctrl+_`
         ("x", "delete_row", "Delete row"),
-        ("X", "clear_cell", "Clear cell"),
+        ("X", "delete_row_and_below", "Delete row and those below"),
+        ("ctrl+x", "delete_row_and_up", "Delete row and those up"),
+        # Duplicate
         ("d", "duplicate_column", "Duplicate column"),
         ("D", "duplicate_row", "Duplicate row"),
+        # Edit
         ("e", "edit_cell", "Edit cell"),
         ("E", "edit_column", "Edit column"),
+        # Add
         ("a", "add_column", "Add column"),
         ("A", "add_column_expr", "Add column with expression"),
         # Reorder
@@ -233,19 +260,18 @@ class DataFrameTable(DataTable):
         ("shift+up", "move_row_up", "Move row up"),
         ("shift+down", "move_row_down", "Move row down"),
         # Type Conversion
-        ("number_sign", "cast_column_dtype('int')", "Cast column dtype to int"),  # `#`
-        ("percent_sign", "cast_column_dtype('float')", "Cast column dtype to float"),  # `%`
-        ("exclamation_mark", "cast_column_dtype('bool')", "Cast column dtype to bool"),  # `!`
-        ("dollar_sign", "cast_column_dtype('string')", "Cast column dtype to string"),  # `$`
+        ("number_sign", "cast_column_dtype('pl.Int64')", "Cast column dtype to integer"),  # `#`
+        ("percent_sign", "cast_column_dtype('pl.Float64')", "Cast column dtype to float"),  # `%`
+        ("exclamation_mark", "cast_column_dtype('pl.Boolean')", "Cast column dtype to bool"),  # `!`
+        ("dollar_sign", "cast_column_dtype('pl.String')", "Cast column dtype to string"),  # `$`
         ("at", "make_cell_clickable", "Make cell clickable"),  # `@`
-        # Misc
-        ("tilde", "toggle_row_labels", "Toggle row labels"),  # `~`
-        ("K", "cycle_cursor_type", "Cycle cursor mode"),  # `K`
-        ("z", "freeze_row_column", "Freeze rows/columns"),
-        ("comma", "show_thousand_separator", "Toggle thousand separator"),  # `,`
+        # Sql
+        ("l", "simple_sql", "Simple SQL interface"),
+        ("L", "advanced_sql", "Advanced SQL interface"),
         # Undo/Redo
         ("u", "undo", "Undo"),
-        ("U", "reset", "Reset to original"),
+        ("U", "redo", "Redo"),
+        ("ctrl+u", "reset", "Reset to initial state"),
     ]
     # fmt: on
 
@@ -287,8 +313,10 @@ class DataFrameTable(DataTable):
         self.fixed_rows = 0  # Number of fixed rows
         self.fixed_columns = 0  # Number of fixed columns
 
-        # History stack for undo/redo
+        # History stack for undo
         self.histories: deque[History] = deque()
+        # Current history state for redo
+        self.history: History = None
 
         # Pending filename for save operations
         self._pending_filename = ""
@@ -391,17 +419,27 @@ class DataFrameTable(DataTable):
                 matches.append((ridx, cidx))
         return matches
 
-    def on_mount(self) -> None:
-        """Initialize table display when the widget is mounted.
+    def get_row_key(self, row_idx: int) -> RowKey:
+        """Get the row key for a given table row index.
 
-        Called by Textual when the widget is first added to the display tree.
-        Currently a placeholder as table setup is deferred until first use.
+        Args:
+            row_idx: Row index in the table display.
 
         Returns:
-            None
+            Corresponding row key as string.
         """
-        # self._setup_table()
-        pass
+        return self._row_locations.get_key(row_idx)
+
+    def get_column_key(self, col_idx: int) -> ColumnKey:
+        """Get the column key for a given table column index.
+
+        Args:
+            col_idx: Column index in the table display.
+
+        Returns:
+            Corresponding column key as string.
+        """
+        return self._column_locations.get_key(col_idx)
 
     def _should_highlight(self, cursor: Coordinate, target_cell: Coordinate, type_of_cursor: CursorType) -> bool:
         """Determine if the given cell should be highlighted because of the cursor.
@@ -486,6 +524,30 @@ class DataFrameTable(DataTable):
             else:
                 self._scroll_cursor_into_view()
 
+    def move_cursor_to(self, ridx: int, cidx: int) -> None:
+        """Move cursor based on the dataframe indices.
+
+        Args:
+            ridx: Row index (0-based) in the dataframe.
+            cidx: Column index (0-based) in the dataframe.
+        """
+        row_key = str(ridx)
+        col_key = self.df.columns[cidx]
+        row_idx, col_idx = self.get_cell_coordinate(row_key, col_key)
+        self.move_cursor(row=row_idx, column=col_idx)
+
+    def on_mount(self) -> None:
+        """Initialize table display when the widget is mounted.
+
+        Called by Textual when the widget is first added to the display tree.
+        Currently a placeholder as table setup is deferred until first use.
+
+        Returns:
+            None
+        """
+        # self._setup_table()
+        pass
+
     def on_key(self, event) -> None:
         """Handle key press events for pagination.
 
@@ -544,13 +606,21 @@ class DataFrameTable(DataTable):
         """Delete the current column."""
         self._delete_column()
 
+    def action_delete_column_and_after(self) -> None:
+        """Delete the current column and those after."""
+        self._delete_column(more="after")
+
+    def action_delete_column_and_before(self) -> None:
+        """Delete the current column and those before."""
+        self._delete_column(more="before")
+
     def action_hide_column(self) -> None:
         """Hide the current column."""
         self._hide_column()
 
-    def action_show_column(self) -> None:
-        """Show all hidden columns."""
-        self._show_column()
+    def action_show_hidden_rows_columns(self) -> None:
+        """Show all hidden rows/columns."""
+        self._show_hidden_rows_columns()
 
     def action_sort_ascending(self) -> None:
         """Sort by current column in ascending order."""
@@ -656,6 +726,14 @@ class DataFrameTable(DataTable):
         """Delete the current row."""
         self._delete_row()
 
+    def action_delete_row_and_below(self) -> None:
+        """Delete the current row and those below."""
+        self._delete_row(more="below")
+
+    def action_delete_row_and_up(self) -> None:
+        """Delete the current row and those above."""
+        self._delete_row(more="above")
+
     def action_duplicate_column(self) -> None:
         """Duplicate the current column."""
         self._duplicate_column()
@@ -668,10 +746,14 @@ class DataFrameTable(DataTable):
         """Undo the last action."""
         self._undo()
 
+    def action_redo(self) -> None:
+        """Redo the last undone action."""
+        self._redo()
+
     def action_reset(self) -> None:
-        """Reset to the original data."""
+        """Reset to the initial state."""
         self._setup_table(reset=True)
-        self.notify("Restored original display", title="Reset")
+        self.notify("Restored initial state", title="Reset")
 
     def action_move_column_left(self) -> None:
         """Move the current column to the left."""
@@ -689,9 +771,9 @@ class DataFrameTable(DataTable):
         """Move the current row down."""
         self._move_row("down")
 
-    def action_clear_selections(self) -> None:
-        """Clear all row selections."""
-        self._clear_selections()
+    def action_clear_selections_and_matches(self) -> None:
+        """Clear all row selections and matches."""
+        self._clear_selections_and_matches()
 
     def action_cycle_cursor_type(self) -> None:
         """Cycle through cursor types."""
@@ -781,40 +863,13 @@ class DataFrameTable(DataTable):
         """Go to the previous selected row."""
         self._previous_selected_row()
 
-    def _make_cell_clickable(self) -> None:
-        """Make cells with URLs in the current column clickable.
-
-        Scans all loaded rows in the current column for cells containing URLs
-        (starting with 'http://' or 'https://') and applies Textual link styling
-        to make them clickable. Does not modify the dataframe.
+    def action_simple_sql(self) -> None:
+        """Open the SQL interface screen."""
+        self._simple_sql()
 
-        Returns:
-            None
-        """
-        cidx = self.cursor_col_idx
-        col_key = self.cursor_col_key
-        dtype = self.df.dtypes[cidx]
-
-        # Only process string columns
-        if dtype != pl.String:
-            return
-
-        # Count how many URLs were made clickable
-        url_count = 0
-
-        # Iterate through all loaded rows and make URLs clickable
-        for row in self.ordered_rows:
-            cell_text: Text = self.get_cell(row.key, col_key)
-            if cell_text.plain.startswith(("http://", "https://")):
-                cell_text.style = f"#00afff link {cell_text.plain}"  # sky blue
-                self.update_cell(row.key, col_key, cell_text)
-                url_count += 1
-
-        if url_count:
-            self.notify(
-                f"Made [$accent]{url_count}[/] cell(s) clickable in column [$success]{col_key.value}[/]",
-                title="Make Clickable",
-            )
+    def action_advanced_sql(self) -> None:
+        """Open the advanced SQL interface screen."""
+        self._advanced_sql()
 
     def on_mouse_scroll_down(self, event) -> None:
         """Load more rows when scrolling down with mouse."""
@@ -827,6 +882,9 @@ class DataFrameTable(DataTable):
         Row keys are 0-based indices, which map directly to dataframe row indices.
         Column keys are header names from the dataframe.
         """
+        self.loaded_rows = 0
+        self.show_row_labels = True
+
         # Reset to original dataframe
         if reset:
             self.df = self.lazyframe.collect()
@@ -849,12 +907,15 @@ class DataFrameTable(DataTable):
                 stop = row_idx + 1
                 break
 
+        # Ensure all selected rows or matches are loaded
+        stop = max(stop, rindex(self.selected_rows, True) + 1)
+        stop = max(stop, max(self.matches.keys(), default=0) + 1)
+
         # Save current cursor position before clearing
         row_idx, col_idx = self.cursor_coordinate
 
         self._setup_columns()
         self._load_rows(stop)
-        self._do_highlight()
 
         # Restore cursor position
         if row_idx < len(self.rows) and col_idx < len(self.columns):
@@ -866,9 +927,7 @@ class DataFrameTable(DataTable):
         Column keys are header names from the dataframe.
         Column labels contain column names from the dataframe, with sort indicators if applicable.
         """
-        self.loaded_rows = 0
         self.clear(columns=True)
-        self.show_row_labels = True
 
         # Add columns with justified headers
         for col, dtype in zip(self.df.columns, self.df.dtypes):
@@ -906,23 +965,33 @@ class DataFrameTable(DataTable):
         start = self.loaded_rows
         df_slice = self.df.slice(start, stop - start)
 
-        for row_idx, row in enumerate(df_slice.rows(), start):
-            if not self.visible_rows[row_idx]:
+        for ridx, row in enumerate(df_slice.rows(), start):
+            if not self.visible_rows[ridx]:
                 continue  # Skip hidden rows
-            vals, dtypes = [], []
+
+            is_selected = self.selected_rows[ridx]
+            match_cols = self.matches.get(ridx, set())
+
+            vals, dtypes, styles = [], [], []
             for val, col, dtype in zip(row, self.df.columns, self.df.dtypes):
                 if col in self.hidden_columns:
                     continue  # Skip hidden columns
+
                 vals.append(val)
                 dtypes.append(dtype)
-            formatted_row = format_row(vals, dtypes, thousand_separator=self.thousand_separator)
+                # Highlight entire row if selected or has matches
+                styles.append("red" if is_selected or col in match_cols else None)
+
+            formatted_row = format_row(vals, dtypes, styles=styles, thousand_separator=self.thousand_separator)
+
             # Always add labels so they can be shown/hidden via CSS
-            self.add_row(*formatted_row, key=str(row_idx), label=str(row_idx + 1))
+            self.add_row(*formatted_row, key=str(ridx), label=str(ridx + 1))
 
         # Update loaded rows count
         self.loaded_rows = stop
 
         # self.notify(f"Loaded [$accent]{stop}/{len(self.df)}[/] rows from [$success]{self.name}[/]", title="Load")
+        # self.log(f"Loaded {stop}/{len(self.df)} rows from {self.name}")
 
     def _check_and_load_more(self) -> None:
         """Check if we need to load more rows and load them."""
@@ -937,51 +1006,116 @@ class DataFrameTable(DataTable):
         if bottom_visible_row >= self.loaded_rows - 10:
             self._load_rows(self.loaded_rows + self.BATCH_SIZE)
 
-    def _do_highlight(self, clear: bool = False) -> None:
+    def _do_highlight(self, force: bool = False) -> None:
         """Update all rows, highlighting selected ones and restoring others to default.
 
         Args:
-            clear: If True, clear all highlights.
+            force: If True, clear all highlights and restore default styles.
         """
-        if clear:
-            self.selected_rows = [False] * len(self.df)
-            self.matches = defaultdict(set)
-
         # Ensure all selected rows or matches are loaded
         stop = rindex(self.selected_rows, True) + 1
         stop = max(stop, max(self.matches.keys(), default=0) + 1)
 
         self._load_rows(stop)
-        self._highlight_table()
+        self._highlight_table(force)
 
-    def _highlight_table(self) -> None:
+    def _highlight_table(self, force: bool = False) -> None:
         """Highlight selected rows/cells in red."""
+        if not force and not any(self.selected_rows) and not self.matches:
+            return  # Nothing to highlight
+
         # Update all rows based on selected state
         for row in self.ordered_rows:
-            row_idx = int(row.key.value)  # 0-based index
-            is_selected = self.selected_rows[row_idx]
-            match_cols = self.matches.get(row_idx, set())
+            ridx = int(row.key.value)  # 0-based index
+            is_selected = self.selected_rows[ridx]
+            match_cols = self.matches.get(ridx, set())
+
+            if not force and not is_selected and not match_cols:
+                continue  # No highlight needed for this row
 
             # Update all cells in this row
             for col_idx, col in enumerate(self.ordered_columns):
-                cell_text: Text = self.get_cell(row.key, col.key)
+                if not force and not is_selected and col_idx not in match_cols:
+                    continue  # No highlight needed for this cell
 
-                # Get style config based on dtype
-                dtype = self.df.dtypes[col_idx]
-                dc = DtypeConfig(dtype)
-                cell_text.style = "red" if is_selected or col_idx in match_cols else dc.style
+                cell_text: Text = self.get_cell(row.key, col.key)
+                need_update = False
+
+                if is_selected or col_idx in match_cols:
+                    cell_text.style = "red"
+                    need_update = True
+                elif force:
+                    # Restore original style based on dtype
+                    dtype = self.df.schema[col.key.value]
+                    dc = DtypeConfig(dtype)
+                    cell_text.style = dc.style
+                    need_update = True
 
                 # Update the cell in the table
-                self.update_cell(row.key, col.key, cell_text)
+                if need_update:
+                    self.update_cell(row.key, col.key, cell_text)
 
-    # History & Undo
-    def _add_history(self, description: str) -> None:
-        """Add the current state to the history stack.
+    @work(exclusive=True, description="Loading rows asynchronously...")
+    async def _load_rows_async(self, stop: int | None = None) -> None:
+        """Asynchronously load a batch of rows into the table.
 
         Args:
-            description: Description of the action for this history entry.
+            stop: Stop loading rows when this index is reached. If None, load until the end of the dataframe.
         """
-        history = History(
+        if stop >= (total := len(self.df)):
+            stop = total
+
+        if stop > self.loaded_rows:
+            # Load incrementally with smaller chunks to prevent UI freezing
+            chunk_size = min(100, stop - self.loaded_rows)  # Load max 100 rows at a time
+            next_stop = min(self.loaded_rows + chunk_size, stop)
+            self._load_rows(next_stop)
+
+            # If there's more to load, schedule the next chunk with longer delay
+            if next_stop < stop:
+                # Use longer delay and call work method instead of set_timer
+                await sleep_async(0.1)  # 100ms delay to yield to UI
+                self._load_rows_async(stop)  # Recursive call within work context
+
+            # self.log(f"Async loaded {stop}/{len(self.df)} rows from {self.name}")
+
+    @work(exclusive=True, description="Doing highlight...")
+    async def _do_highlight_async(self) -> None:
+        """Perform the highlighting preparation in a worker."""
+        try:
+            # Calculate what needs to be loaded without actually loading
+            stop = rindex(self.selected_rows, True) + 1
+            stop = max(stop, max(self.matches.keys(), default=0) + 1)
+
+            # Call the highlighting method (runs in background worker)
+            self._highlight_async(stop)
+
+        except Exception as e:
+            self.notify(f"Error preparing highlight: {str(e)}", title="Search", severity="error")
+
+    @work(exclusive=True, description="Highlighting matches...")
+    async def _highlight_async(self, stop: int) -> None:
+        """Perform highlighting with async loading to avoid blocking."""
+        # Load rows in smaller chunks to avoid blocking
+        if stop > self.loaded_rows:
+            # Load incrementally to avoid one big block
+            chunk_size = min(100, stop - self.loaded_rows)  # Load max 100 rows at a time
+            next_stop = min(self.loaded_rows + chunk_size, stop)
+            self._load_rows(next_stop)
+
+            # If there's more to load, yield to event loop with delay
+            if next_stop < stop:
+                await sleep_async(0.05)  # 50ms delay to allow UI updates
+                self._highlight_async(stop)
+                return
+
+        # Now do the actual highlighting
+        self._highlight_table(force=False)
+
+    # History & Undo
+    def _create_history(self, description: str) -> None:
+        """Create the initial history state."""
+        return History(
             description=description,
             df=self.df,
             filename=self.filename,
@@ -995,16 +1129,12 @@ class DataFrameTable(DataTable):
             cursor_coordinate=self.cursor_coordinate,
             matches={k: v.copy() for k, v in self.matches.items()},
         )
-        self.histories.append(history)
 
-    def _undo(self) -> None:
-        """Undo the last action."""
-        if not self.histories:
-            self.notify("No actions to undo", title="Undo", severity="warning")
+    def _apply_history(self, history: History) -> None:
+        """Apply the current history state to the table."""
+        if history is None:
             return
 
-        history = self.histories.pop()
-
         # Restore state
         self.df = history.df
         self.filename = history.filename
@@ -1016,12 +1146,55 @@ class DataFrameTable(DataTable):
         self.fixed_rows = history.fixed_rows
         self.fixed_columns = history.fixed_columns
         self.cursor_coordinate = history.cursor_coordinate
-        self.matches = {k: v.copy() for k, v in history.matches.items()}
+        self.matches = {k: v.copy() for k, v in history.matches.items()} if history.matches else defaultdict(set)
 
         # Recreate the table for display
         self._setup_table()
 
-        # self.notify(f"Reverted: {history.description}", title="Undo")
+    def _add_history(self, description: str) -> None:
+        """Add the current state to the history stack.
+
+        Args:
+            description: Description of the action for this history entry.
+        """
+        history = self._create_history(description)
+        self.histories.append(history)
+
+    def _undo(self) -> None:
+        """Undo the last action."""
+        if not self.histories:
+            self.notify("No actions to undo", title="Undo", severity="warning")
+            return
+
+        # Pop the last history state for undo
+        history = self.histories.pop()
+
+        # Save current state for redo
+        self.history = self._create_history(history.description)
+
+        # Restore state
+        self._apply_history(history)
+
+        self.notify(f"Reverted: {history.description}", title="Undo")
+
+    def _redo(self) -> None:
+        """Redo the last undone action."""
+        if self.history is None:
+            self.notify("No actions to redo", title="Redo", severity="warning")
+            return
+
+        description = self.history.description
+
+        # Save current state for undo
+        self._add_history(description)
+
+        # Restore state
+        self._apply_history(self.history)
+
+        # Clear redo state
+        self.history = None
+
+        self.notify(f"Reapplied: {description}", title="Redo")
 
     # View
     def _view_row_detail(self) -> None:
@@ -1071,49 +1244,77 @@ class DataFrameTable(DataTable):
         self._add_history(f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns")
 
         # Apply the pin settings to the table
-        if fixed_rows > 0:
+        if fixed_rows >= 0:
             self.fixed_rows = fixed_rows
-        if fixed_columns > 0:
+        if fixed_columns >= 0:
             self.fixed_columns = fixed_columns
 
-        self.notify(
-            f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns",
-            title="Pin",
-        )
+        # self.notify(f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns", title="Pin")
 
     # Delete & Move
-    def _delete_column(self) -> None:
+    def _delete_column(self, more: str = None) -> None:
         """Remove the currently selected column from the table."""
         # Get the column to remove
         col_idx = self.cursor_column
         col_name = self.cursor_col_name
         col_key = self.cursor_col_key
 
+        col_names_to_remove = []
+        col_keys_to_remove = []
+
+        # Remove all columns before the current column
+        if more == "before":
+            for i in range(col_idx + 1):
+                col_key = self.get_column_key(i)
+                col_names_to_remove.append(col_key.value)
+                col_keys_to_remove.append(col_key)
+
+            message = f"Removed column [$success]{col_name}[/] and all columns before"
+
+        # Remove all columns after the current column
+        elif more == "after":
+            for i in range(col_idx, len(self.columns)):
+                col_key = self.get_column_key(i)
+                col_names_to_remove.append(col_key.value)
+                col_keys_to_remove.append(col_key)
+
+            message = f"Removed column [$success]{col_name}[/] and all columns after"
+
+        # Remove only the current column
+        else:
+            col_names_to_remove.append(col_name)
+            col_keys_to_remove.append(col_key)
+            message = f"Removed column [$success]{col_name}[/]"
+
         # Add to history
-        self._add_history(f"Removed column [$success]{col_name}[/]")
+        self._add_history(message)
 
-        # Remove the column from the table display using the column name as key
-        self.remove_column(col_key)
+        # Remove the columns from the table display using the column names as keys
+        for ck in col_keys_to_remove:
+            self.remove_column(ck)
 
-        # Move cursor left if we deleted the last column
-        if col_idx >= len(self.columns):
-            self.move_cursor(column=len(self.columns) - 1)
+        # Move cursor left if we deleted the last column(s)
+        last_col_idx = len(self.columns) - 1
+        if col_idx > last_col_idx:
+            self.move_cursor(column=last_col_idx)
 
         # Remove from sorted columns if present
-        if col_name in self.sorted_columns:
-            del self.sorted_columns[col_name]
+        for col_name in col_names_to_remove:
+            if col_name in self.sorted_columns:
+                del self.sorted_columns[col_name]
 
         # Remove from matches
+        col_indices_to_remove = set(self.df.columns.index(name) for name in col_names_to_remove)
         for row_idx in list(self.matches.keys()):
-            self.matches[row_idx].discard(col_idx)
+            self.matches[row_idx].difference_update(col_indices_to_remove)
             # Remove empty entries
             if not self.matches[row_idx]:
                 del self.matches[row_idx]
 
         # Remove from dataframe
-        self.df = self.df.drop(col_name)
+        self.df = self.df.drop(col_names_to_remove)
 
-        self.notify(f"Removed column [$success]{col_name}[/]", title="Delete")
+        self.notify(message, title="Delete")
 
     def _hide_column(self) -> None:
         """Hide the currently selected column from the table display."""
@@ -1136,28 +1337,32 @@ class DataFrameTable(DataTable):
 
         # self.notify(f"Hid column [$accent]{col_name}[/]. Press [$success]H[/] to show hidden columns", title="Hide")
 
-    def _show_column(self) -> None:
-        """Show all hidden columns by recreating the table with all dataframe columns."""
+    def _show_hidden_rows_columns(self) -> None:
+        """Show all hidden rows/columns by recreating the table."""
         # Get currently visible columns
         visible_cols = set(col.key for col in self.ordered_columns)
 
-        # Find hidden columns (in dataframe but not in table)
-        hidden_cols = [col for col in self.df.columns if col not in visible_cols]
+        hidden_row_count = sum(0 if visible else 1 for visible in self.visible_rows)
+        hidden_col_count = sum(0 if col in visible_cols else 1 for col in self.df.columns)
 
-        if not hidden_cols:
-            self.notify("No hidden columns to show", title="Column", severity="warning")
+        if not hidden_row_count and not hidden_col_count:
+            self.notify("No hidden columns or rows to show", title="Show", severity="warning")
             return
 
         # Add to history
-        self._add_history(f"Showed {len(hidden_cols)} hidden column(s)")
+        self._add_history("Showed hidden rows/columns")
 
-        # Clear hidden columns tracking
+        # Clear hidden rows/columns tracking
+        self.visible_rows = [True] * len(self.df)
         self.hidden_columns.clear()
 
-        # Recreate table with all columns
+        # Recreate table for display
         self._setup_table()
 
-        self.notify(f"Showed [$accent]{len(hidden_cols)}[/] hidden column(s)", title="Column")
+        self.notify(
+            f"Showed [$accent]{hidden_row_count}[/] hidden row(s) and/or [$accent]{hidden_col_count}[/] column(s)",
+            title="Show",
+        )
 
     def _duplicate_column(self) -> None:
         """Duplicate the currently selected column, inserting it right after the current column."""
@@ -1179,18 +1384,27 @@ class DataFrameTable(DataTable):
             list(cols_before) + [new_col_name] + list(cols_after)
         )
 
+        # Update matches to account for new column
+        new_matches = defaultdict(set)
+        for row_idx, cols in self.matches.items():
+            new_cols = set()
+            for col_idx_in_set in cols:
+                if col_idx_in_set <= cidx:
+                    new_cols.add(col_idx_in_set)
+                else:
+                    new_cols.add(col_idx_in_set + 1)
+            new_matches[row_idx] = new_cols
+        self.matches = new_matches
+
         # Recreate the table for display
         self._setup_table()
 
         # Move cursor to the new duplicated column
         self.move_cursor(column=col_idx + 1)
 
-        self.notify(
-            f"Duplicated column [$accent]{col_name}[/] as [$success]{new_col_name}[/]",
-            title="Duplicate",
-        )
+        # self.notify(f"Duplicated column [$accent]{col_name}[/] as [$success]{new_col_name}[/]", title="Duplicate")
 
-    def _delete_row(self) -> None:
+    def _delete_row(self, more: str = None) -> None:
         """Delete rows from the table and dataframe.
 
         Supports deleting multiple selected rows. If no rows are selected, deletes the row at the cursor.
@@ -1206,11 +1420,27 @@ class DataFrameTable(DataTable):
                 if selected:
                     predicates[ridx] = False
 
+        # Delete current row and those above
+        elif more == "above":
+            ridx = self.cursor_row_idx
+            history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those above"
+            for i in range(ridx + 1):
+                predicates[i] = False
+
+        # Delete current row and those below
+        elif more == "below":
+            ridx = self.cursor_row_idx
+            history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those below"
+            for i in range(ridx, len(self.df)):
+                if self.visible_rows[i]:
+                    predicates[i] = False
+
         # Delete the row at the cursor
         else:
             ridx = self.cursor_row_idx
             history_desc = f"Deleted row [$success]{ridx + 1}[/]"
-            predicates[ridx] = False
+            if self.visible_rows[ridx]:
+                predicates[ridx] = False
 
         # Add to history
         self._add_history(history_desc)
@@ -1237,8 +1467,8 @@ class DataFrameTable(DataTable):
         self._setup_table()
 
         deleted_count = old_count - len(self.df)
-        if deleted_count > 1:
-            self.notify(f"Deleted {deleted_count} row(s)", title="Delete")
+        if deleted_count > 0:
+            self.notify(f"Deleted [$accent]{deleted_count}[/] row(s)", title="Delete")
 
     def _duplicate_row(self) -> None:
         """Duplicate the currently selected row, inserting it right after the current row."""
@@ -1263,8 +1493,14 @@ class DataFrameTable(DataTable):
         self.selected_rows = new_selected_rows
         self.visible_rows = new_visible_rows
 
-        # Clear all matches since row indices have changed
-        self.matches = defaultdict(set)
+        # Update matches to account for new row
+        new_matches = defaultdict(set)
+        for row_idx, cols in self.matches.items():
+            if row_idx <= ridx:
+                new_matches[row_idx] = cols
+            else:
+                new_matches[row_idx + 1] = cols
+        self.matches = new_matches
 
         # Recreate the table display
         self._setup_table()
@@ -1349,7 +1585,7 @@ class DataFrameTable(DataTable):
                 return
             swap_idx = row_idx + 1
         else:
-            self.notify(f"Invalid direction: {direction}", title="Move", severity="error")
+            # Invalid direction
             return
 
         row_key = self.coordinate_to_cell_key((row_idx, 0)).row_key
@@ -1499,7 +1735,7 @@ class DataFrameTable(DataTable):
             col_key = col_name
             self.update_cell(row_key, col_key, formatted_value, update_width=True)
 
-            self.notify(f"Cell updated to [$success]{cell_value}[/]", title="Edit")
+            # self.notify(f"Cell updated to [$success]{cell_value}[/]", title="Edit")
         except Exception as e:
             self.notify(f"Failed to update cell: {str(e)}", title="Edit", severity="error")
 
@@ -1528,7 +1764,7 @@ class DataFrameTable(DataTable):
         # Check if term is a valid expression
         elif tentative_expr(term):
             try:
-                expr = validate_expr(term, self.df, cidx)
+                expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
                 self.notify(f"Error validating expression [$error]{term}[/]: {str(e)}", title="Edit", severity="error")
                 return
@@ -1541,7 +1777,7 @@ class DataFrameTable(DataTable):
                 expr = pl.lit(value)
             except Exception:
                 self.notify(
-                    f"Unable to convert [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
+                    f"Error converting [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
                     title="Edit",
                     severity="error",
                 )
@@ -1554,16 +1790,13 @@ class DataFrameTable(DataTable):
             # Apply the expression to the column
             self.df = self.df.with_columns(expr.alias(col_name))
         except Exception as e:
-            self.notify(f"Failed to apply expression: [$error]{str(e)}[/]", title="Edit", severity="error")
+            self.notify(f"Error applying expression: [$error]{str(e)}[/]", title="Edit", severity="error")
             return
 
         # Recreate the table for display
         self._setup_table()
 
-        self.notify(
-            f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]",
-            title="Edit",
-        )
+        # self.notify(f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]", title="Edit")
 
     def _rename_column(self) -> None:
         """Open modal to rename the selected column."""
@@ -1610,10 +1843,7 @@ class DataFrameTable(DataTable):
         # Move cursor to the renamed column
         self.move_cursor(column=col_idx)
 
-        self.notify(
-            f"Renamed column [$success]{col_name}[/] to [$success]{new_name}[/]",
-            title="Column",
-        )
+        # self.notify(f"Renamed column [$success]{col_name}[/] to [$success]{new_name}[/]", title="Column")
 
     def _clear_cell(self) -> None:
         """Clear the current cell by setting its value to None."""
@@ -1641,9 +1871,9 @@ class DataFrameTable(DataTable):
 
             self.update_cell(row_key, col_key, formatted_value)
 
-            self.notify(f"Cell cleared to [$success]{NULL_DISPLAY}[/]", title="Clear")
+            # self.notify(f"Cell cleared to [$success]{NULL_DISPLAY}[/]", title="Clear")
         except Exception as e:
-            self.notify(f"Failed to clear cell: {str(e)}", title="Clear", severity="error")
+            self.notify(f"Error clearing cell: {str(e)}", title="Clear", severity="error")
             raise e
 
     def _add_column(self, col_name: str = None, col_value: pl.Expr = None) -> None:
@@ -1686,9 +1916,9 @@ class DataFrameTable(DataTable):
             # Move cursor to the new column
             self.move_cursor(column=cidx + 1)
 
-            self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
+            # self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
         except Exception as e:
-            self.notify(f"Failed to add column: {str(e)}", title="Add Column", severity="error")
+            self.notify(f"Error adding column: {str(e)}", title="Add Column", severity="error")
             raise e
 
     def _add_column_expr(self) -> None:
@@ -1730,53 +1960,32 @@ class DataFrameTable(DataTable):
 
             # self.notify(f"Added column [$success]{col_name}[/]", title="Add Column")
         except Exception as e:
-            self.notify(f"Failed to add column: [$error]{str(e)}[/]", title="Add Column", severity="error")
+            self.notify(f"Error adding column: [$error]{str(e)}[/]", title="Add Column", severity="error")
             raise e
 
-    def _string_to_polars_dtype(self, dtype_str: str) -> pl.DataType:
-        """Convert string type name to Polars DataType.
-
-        Args:
-            dtype_str: String representation of the type ("string", "int", "float", "bool")
-
-        Returns:
-            Corresponding Polars DataType
-
-        Raises:
-            ValueError: If the type string is not recognized
-        """
-        dtype_map = {
-            "string": pl.String,
-            "int": pl.Int64,
-            "float": pl.Float64,
-            "bool": pl.Boolean,
-        }
-
-        dtype_lower = dtype_str.lower().strip()
-        return dtype_map.get(dtype_lower)
-
-    def _cast_column_dtype(self, dtype: str | pl.DataType = pl.String) -> None:
+    def _cast_column_dtype(self, dtype: str) -> None:
         """Cast the current column to a different data type.
 
         Args:
-            dtype: Target data type (string like "int", "float", "bool", "string" or Polars DataType)
+            dtype: Target data type (string representation, e.g., "pl.String", "pl.Int64")
         """
         cidx = self.cursor_col_idx
         col_name = self.cursor_col_name
         current_dtype = self.df.dtypes[cidx]
 
-        # Convert string dtype to Polars DataType if needed
-        if isinstance(dtype, str):
-            target_dtype = self._string_to_polars_dtype(dtype)
-            if target_dtype is None:
-                self.notify(
-                    f"Use string for unknown data type: {dtype}. Supported types: {', '.join(self._string_to_polars_dtype.keys())}",
-                    title="Cast",
-                    severity="warning",
-                )
-                target_dtype = pl.String
-        else:
-            target_dtype = dtype
+        try:
+            target_dtype = eval(dtype)
+        except Exception:
+            self.notify(f"Invalid target data type: [$error]{dtype}[/]", title="Cast", severity="error")
+            return
+
+        if current_dtype == target_dtype:
+            self.notify(
+                f"Column [$accent]{col_name}[/] is already of type [$success]{target_dtype}[/]",
+                title="Cast",
+                severity="warning",
+            )
+            return  # No change needed
 
         # Add to history
         self._add_history(
@@ -1790,13 +1999,13 @@ class DataFrameTable(DataTable):
             # Recreate the table display
             self._setup_table()
 
+            self.notify(f"Cast column [$accent]{col_name}[/] to [$success]{target_dtype}[/]", title="Cast")
+        except Exception as e:
             self.notify(
-                f"Cast column [$accent]{col_name}[/] to [$success]{target_dtype}[/]",
+                f"Error casting column [$accent]{col_name}[/] to [$success]{target_dtype}[/]: {str(e)}",
                 title="Cast",
+                severity="error",
             )
-        except Exception as e:
-            self.notify(f"Failed to cast column: {str(e)}", title="Cast", severity="error")
-            raise e
 
     def _search_cursor_value(self) -> None:
         """Search with cursor value in current column."""
@@ -1805,7 +2014,7 @@ class DataFrameTable(DataTable):
         # Get the value of the currently selected cell
         term = NULL if self.cursor_value is None else str(self.cursor_value)
 
-        self._do_search((term, cidx, False, False))
+        self._do_search((term, cidx, False, True))
 
     def _search_expr(self) -> None:
         """Search by expression."""
@@ -1824,6 +2033,7 @@ class DataFrameTable(DataTable):
         """Search for a term."""
         if result is None:
             return
+
         term, cidx, match_nocase, match_whole = result
         col_name = self.df.columns[cidx]
 
@@ -1833,12 +2043,10 @@ class DataFrameTable(DataTable):
         # Support for polars expressions
         elif tentative_expr(term):
             try:
-                expr = validate_expr(term, self.df, cidx)
+                expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
                 self.notify(
-                    f"Failed to validate Polars expression [$error]{term}[/]: {str(e)}",
-                    title="Search",
-                    severity="error",
+                    f"Error validating expression [$error]{term}[/]: {str(e)}", title="Search", severity="error"
                 )
                 return
 
@@ -1862,7 +2070,7 @@ class DataFrameTable(DataTable):
                         term = f"(?i){term}"
                     expr = pl.col(col_name).cast(pl.String).str.contains(term)
                     self.notify(
-                        f"Unable to convert [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
+                        f"Error converting [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
                         title="Search",
                         severity="warning",
                     )
@@ -1877,7 +2085,7 @@ class DataFrameTable(DataTable):
             matches = set(lf.filter(expr).select(RIDX).collect().to_series().to_list())
         except Exception as e:
             self.notify(
-                f"Error applying search filter: [$error]{str(e)}[/]",
+                f"Error applying search filter [$accent]{term}[/]: [$error]{str(e)}[/]",
                 title="Search",
                 severity="error",
             )
@@ -1886,7 +2094,7 @@ class DataFrameTable(DataTable):
         match_count = len(matches)
         if match_count == 0:
             self.notify(
-                f"No matches found for [$warning]{term}[/]. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for [$accent]{term}[/]. Try [$warning](?i)abc[/] for case-insensitive search.",
                 title="Search",
                 severity="warning",
             )
@@ -1899,11 +2107,12 @@ class DataFrameTable(DataTable):
         for m in matches:
             self.selected_rows[m] = True
 
-        # Highlight matches
-        self._do_highlight()
-
+        # Show notification immediately, then start highlighting
         self.notify(f"Found [$accent]{match_count}[/] matches for [$success]{term}[/]", title="Search")
 
+        # Start highlighting in a worker to avoid blocking the UI
+        self._do_highlight_async()
+
     def _find_matches(
         self, term: str, cidx: int | None = None, match_nocase: bool = False, match_whole: bool = False
     ) -> dict[int, set[int]]:
@@ -1941,7 +2150,7 @@ class DataFrameTable(DataTable):
                 expr = pl.col(col_name).is_null()
             elif tentative_expr(term):
                 try:
-                    expr = validate_expr(term, self.df, col_idx)
+                    expr = validate_expr(term, self.df.columns, col_idx)
                 except Exception as e:
                     raise Exception(f"Error validating Polars expression: {str(e)}")
             else:
@@ -1973,9 +2182,9 @@ class DataFrameTable(DataTable):
 
         if scope == "column":
             cidx = self.cursor_col_idx
-            self._do_find((term, cidx, False, False))
+            self._do_find((term, cidx, False, True))
         else:
-            self._do_find_global((term, None, False, False))
+            self._do_find_global((term, None, False, True))
 
     def _find_expr(self, scope="column") -> None:
         """Open screen to find by expression.
@@ -2004,16 +2213,12 @@ class DataFrameTable(DataTable):
         try:
             matches = self._find_matches(term, cidx, match_nocase, match_whole)
         except Exception as e:
-            self.notify(
-                f"Error finding matches: [$error]{str(e)}[/]",
-                title="Find",
-                severity="error",
-            )
+            self.notify(f"Error finding matches for [$error]{term}[/]: {str(e)}", title="Find", severity="error")
             return
 
         if not matches:
             self.notify(
-                f"No matches found for [$warning]{term}[/] in current column. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for [$accent]{term}[/] in current column. Try [$warning](?i)abc[/] for case-insensitive search.",
                 title="Find",
                 severity="warning",
             )
@@ -2027,11 +2232,11 @@ class DataFrameTable(DataTable):
         for ridx, col_idxs in matches.items():
             self.matches[ridx].update(col_idxs)
 
-        # Highlight matches
-        self._do_highlight()
-
         self.notify(f"Found [$accent]{match_count}[/] matches for [$success]{term}[/]", title="Find")
 
+        # Start highlighting in a worker to avoid blocking the UI
+        self._do_highlight_async()
+
     def _do_find_global(self, result) -> None:
         """Global find a term across all columns."""
         if result is None:
@@ -2041,16 +2246,12 @@ class DataFrameTable(DataTable):
         try:
             matches = self._find_matches(term, cidx=None, match_nocase=match_nocase, match_whole=match_whole)
         except Exception as e:
-            self.notify(
-                f"Error finding matches: [$error]{str(e)}[/]",
-                title="Find",
-                severity="error",
-            )
+            self.notify(f"Error finding matches for [$error]{term}[/]: {str(e)}", title="Find", severity="error")
             return
 
         if not matches:
             self.notify(
-                f"No matches found for [$warning]{term}[/] in any column. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for [$accent]{term}[/] in any column. Try [$warning](?i)abc[/] for case-insensitive search.",
                 title="Global Find",
                 severity="warning",
             )
@@ -2064,25 +2265,12 @@ class DataFrameTable(DataTable):
         for ridx, col_idxs in matches.items():
             self.matches[ridx].update(col_idxs)
 
-        # Highlight matches
-        self._do_highlight()
-
         self.notify(
-            f"Found [$accent]{match_count}[/] matches for [$success]{term}[/] across all columns",
-            title="Global Find",
+            f"Found [$accent]{match_count}[/] matches for [$success]{term}[/] across all columns", title="Global Find"
         )
 
-    def _move_cursor(self, ridx: int, cidx: int) -> None:
-        """Move cursor based on the dataframe indices.
-
-        Args:
-            ridx: Row index (0-based) in the dataframe.
-            cidx: Column index (0-based) in the dataframe.
-        """
-        row_key = str(ridx)
-        col_key = self.df.columns[cidx]
-        row_idx, col_idx = self.get_cell_coordinate(row_key, col_key)
-        self.move_cursor(row=row_idx, column=col_idx)
+        # Start highlighting in a worker to avoid blocking the UI
+        self._do_highlight_async()
 
     def _next_match(self) -> None:
         """Move cursor to the next match."""
@@ -2099,12 +2287,12 @@ class DataFrameTable(DataTable):
         # Find the next match after current position
         for ridx, cidx in ordered_matches:
             if (ridx, cidx) > current_pos:
-                self._move_cursor(ridx, cidx)
+                self.move_cursor_to(ridx, cidx)
                 return
 
         # If no next match, wrap around to the first match
         first_ridx, first_cidx = ordered_matches[0]
-        self._move_cursor(first_ridx, first_cidx)
+        self.move_cursor_to(first_ridx, first_cidx)
 
     def _previous_match(self) -> None:
         """Move cursor to the previous match."""
@@ -2149,12 +2337,12 @@ class DataFrameTable(DataTable):
         # Find the next selected row after current position
         for ridx in selected_row_indices:
             if ridx > current_ridx:
-                self._move_cursor(ridx, self.cursor_col_idx)
+                self.move_cursor_to(ridx, self.cursor_col_idx)
                 return
 
         # If no next selected row, wrap around to the first selected row
         first_ridx = selected_row_indices[0]
-        self._move_cursor(first_ridx, self.cursor_col_idx)
+        self.move_cursor_to(first_ridx, self.cursor_col_idx)
 
     def _previous_selected_row(self) -> None:
         """Move cursor to the previous selected row."""
@@ -2171,12 +2359,12 @@ class DataFrameTable(DataTable):
         # Find the previous selected row before current position
         for ridx in reversed(selected_row_indices):
             if ridx < current_ridx:
-                self._move_cursor(ridx, self.cursor_col_idx)
+                self.move_cursor_to(ridx, self.cursor_col_idx)
                 return
 
         # If no previous selected row, wrap around to the last selected row
         last_ridx = selected_row_indices[-1]
-        self._move_cursor(last_ridx, self.cursor_col_idx)
+        self.move_cursor_to(last_ridx, self.cursor_col_idx)
 
     def _replace(self) -> None:
         """Open replace screen for current column."""
@@ -2222,16 +2410,12 @@ class DataFrameTable(DataTable):
         matches = self._find_matches(term_find, cidx, match_nocase, match_whole)
 
         if not matches:
-            self.notify(
-                f"No matches found for [$warning]{term_find}[/]",
-                title="Replace",
-                severity="warning",
-            )
+            self.notify(f"No matches found for [$warning]{term_find}[/]", title="Replace", severity="warning")
             return
 
         # Add to history
         self._add_history(
-            f"Replacing [$accent]{term_find}[/] with [$success]{term_replace}[/] in column [$accent]{col_name}[/]"
+            f"Replaced [$accent]{term_find}[/] with [$success]{term_replace}[/] in column [$accent]{col_name}[/]"
         )
 
         # Update matches
@@ -2454,13 +2638,10 @@ class DataFrameTable(DataTable):
 
         # Check if we're highlighting or un-highlighting
         if new_selected_count := self.selected_rows.count(True):
-            self.notify(
-                f"Toggled selection for [$accent]{new_selected_count}[/] rows",
-                title="Toggle",
-            )
+            self.notify(f"Toggled selection for [$accent]{new_selected_count}[/] rows", title="Toggle")
 
-        # Refresh the highlighting (also restores default styles for unselected rows)
-        self._do_highlight()
+        # Refresh the highlighting
+        self._do_highlight(force=True)
 
     def _make_selections(self) -> None:
         """Make selections based on current matches or toggle current row selection."""
@@ -2481,10 +2662,10 @@ class DataFrameTable(DataTable):
             self.notify(f"Selected [$accent]{new_selected_count}[/] rows", title="Toggle")
 
         # Refresh the highlighting (also restores default styles for unselected rows)
-        self._do_highlight()
+        self._do_highlight(force=True)
 
-    def _clear_selections(self) -> None:
-        """Clear all selected rows without removing them from the dataframe."""
+    def _clear_selections_and_matches(self) -> None:
+        """Clear all selected rows and matches without removing them from the dataframe."""
         # Check if any selected rows or matches
         if not any(self.selected_rows) and not self.matches:
             self.notify("No selections to clear", title="Clear", severity="warning")
@@ -2497,8 +2678,12 @@ class DataFrameTable(DataTable):
         # Save current state to history
         self._add_history("Cleared all selected rows")
 
-        # Clear all selections and refresh highlighting
-        self._do_highlight(clear=True)
+        # Clear all selections
+        self.selected_rows = [False] * len(self.df)
+        self.matches = defaultdict(set)
+
+        # Refresh the highlighting to remove all highlights
+        self._do_highlight(force=True)
 
         self.notify(f"Cleared selections for [$accent]{row_count}[/] rows", title="Clear")
 
@@ -2519,15 +2704,12 @@ class DataFrameTable(DataTable):
         # Recreate the table for display
         self._setup_table()
 
-        self.notify(
-            f"Removed unselected rows. Now showing [$accent]{selected_count}[/] rows",
-            title="Filter",
-        )
+        self.notify(f"Removed unselected rows. Now showing [$accent]{selected_count}[/] rows", title="Filter")
 
     def _view_rows(self) -> None:
         """View rows.
 
-        If there are selected rows, view those rows.
+        If there are selected rows or matches, view those rows.
         Otherwise, view based on the value of the currently selected cell.
         """
 
@@ -2543,7 +2725,7 @@ class DataFrameTable(DataTable):
             ridx = self.cursor_row_idx
             term = str(self.df.item(ridx, cidx))
 
-        self._do_view_rows((term, cidx, False, False))
+        self._do_view_rows((term, cidx, False, True))
 
     def _view_rows_expr(self) -> None:
         """Open the filter screen to enter an expression."""
@@ -2572,10 +2754,10 @@ class DataFrameTable(DataTable):
         elif tentative_expr(term):
             # Support for polars expressions
             try:
-                expr = validate_expr(term, self.df, cidx)
+                expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
                 self.notify(
-                    f"Error validating Polars expression [$error]{term}[/]: {str(e)}", title="Filter", severity="error"
+                    f"Error validating expression [$error]{term}[/]: {str(e)}", title="Filter", severity="error"
                 )
                 return
         else:
@@ -2597,9 +2779,7 @@ class DataFrameTable(DataTable):
                         term = f"(?i){term}"
                     expr = pl.col(col_name).cast(pl.String).str.contains(term)
                     self.notify(
-                        f"Unknown column type [$warning]{dtype}[/]. Cast to string.",
-                        title="Filter",
-                        severity="warning",
+                        f"Unknown column type [$warning]{dtype}[/]. Cast to string.", title="Filter", severity="warning"
                     )
 
         # Lazyframe with row indices
@@ -2613,17 +2793,13 @@ class DataFrameTable(DataTable):
         try:
             df_filtered = lf.filter(expr).collect()
         except Exception as e:
-            self.notify(f"Failed to apply filter [$error]{expr}[/]: {str(e)}", title="Filter", severity="error")
+            self.notify(f"Error applying filter [$error]{expr}[/]: {str(e)}", title="Filter", severity="error")
             self.histories.pop()  # Remove last history entry
             return
 
         matched_count = len(df_filtered)
         if not matched_count:
-            self.notify(
-                f"No rows match the expression: [$success]{expr}[/]",
-                title="Filter",
-                severity="warning",
-            )
+            self.notify(f"No rows match the expression: [$success]{expr}[/]", title="Filter", severity="warning")
             return
 
         # Add to history
@@ -2638,11 +2814,9 @@ class DataFrameTable(DataTable):
 
         # Recreate the table for display
         self._setup_table()
+        self._do_highlight()
 
-        self.notify(
-            f"Filtered to [$accent]{matched_count}[/] matching rows",
-            title="Filter",
-        )
+        self.notify(f"Filtered to [$accent]{matched_count}[/] matching rows", title="Filter")
 
     def _cycle_cursor_type(self) -> None:
         """Cycle through cursor types: cell -> row -> column -> cell."""
@@ -2716,6 +2890,9 @@ class DataFrameTable(DataTable):
         filepath = Path(filename)
         ext = filepath.suffix.lower()
 
+        # Add to history
+        self._add_history(f"Saved dataframe to [$success]{filename}[/]")
+
         try:
             if ext in (".xlsx", ".xls"):
                 self._do_save_excel(filename)
@@ -2732,12 +2909,9 @@ class DataFrameTable(DataTable):
             self.filename = filename  # Update current filename
             if not self._all_tabs:
                 extra = "current tab with " if len(self.app.tabs) > 1 else ""
-                self.notify(
-                    f"Saved {extra}[$accent]{len(self.df)}[/] rows to [$success]{filename}[/]",
-                    title="Save",
-                )
+                self.notify(f"Saved {extra}[$accent]{len(self.df)}[/] rows to [$success]{filename}[/]", title="Save")
         except Exception as e:
-            self.notify(f"Failed to save: {str(e)}", title="Save", severity="error")
+            self.notify(f"Error saving [$error]{filename}[/]: {str(e)}", title="Save", severity="error")
             raise e
 
     def _do_save_excel(self, filename: str) -> None:
@@ -2757,12 +2931,103 @@ class DataFrameTable(DataTable):
 
         # From ConfirmScreen callback, so notify accordingly
         if self._all_tabs is True:
+            self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save")
+        else:
             self.notify(
-                f"Saved all tabs to [$success]{filename}[/]",
-                title="Save",
+                f"Saved current tab with [$accent]{len(self.df)}[/] rows to [$success]{filename}[/]", title="Save"
             )
-        else:
+
+    def _make_cell_clickable(self) -> None:
+        """Make cells with URLs in the current column clickable.
+
+        Scans all loaded rows in the current column for cells containing URLs
+        (starting with 'http://' or 'https://') and applies Textual link styling
+        to make them clickable. Does not modify the dataframe.
+
+        Returns:
+            None
+        """
+        cidx = self.cursor_col_idx
+        col_key = self.cursor_col_key
+        dtype = self.df.dtypes[cidx]
+
+        # Only process string columns
+        if dtype != pl.String:
+            return
+
+        # Count how many URLs were made clickable
+        url_count = 0
+
+        # Iterate through all loaded rows and make URLs clickable
+        for row in self.ordered_rows:
+            cell_text: Text = self.get_cell(row.key, col_key)
+            if cell_text.plain.startswith(("http://", "https://")):
+                cell_text.style = f"#00afff link {cell_text.plain}"  # sky blue
+                self.update_cell(row.key, col_key, cell_text)
+                url_count += 1
+
+        if url_count:
             self.notify(
-                f"Saved current tab with [$accent]{len(self.df)}[/] rows to [$success]{filename}[/]",
-                title="Save",
+                f"Use Ctrl/Cmd click to open the links in column [$success]{col_key.value}[/]", title="Hyperlink"
             )
+
+    def _simple_sql(self) -> None:
+        """Open the SQL interface screen."""
+        self.app.push_screen(
+            SimpleSqlScreen(self),
+            callback=self._do_simple_sql,
+        )
+
+    def _do_simple_sql(self, result) -> None:
+        """Handle SQL result result from SimpleSqlScreen."""
+        if result is None:
+            return
+        columns, where = result
+
+        sql = f"SELECT {columns} FROM self"
+        if where:
+            sql += f" WHERE {where}"
+
+        self._do_sql(sql)
+
+    def _advanced_sql(self) -> None:
+        """Open the advanced SQL interface screen."""
+        self.app.push_screen(
+            AdvancedSqlScreen(self),
+            callback=self._do_advanced_sql,
+        )
+
+    def _do_advanced_sql(self, result) -> None:
+        """Handle SQL result result from AdvancedSqlScreen."""
+        if result is None:
+            return
+
+        self._do_sql(result)
+
+    def _do_sql(self, sql: str) -> None:
+        """Execute a SQL query directly.
+
+        Args:
+            sql: The SQL query string to execute.
+        """
+        # Add to history
+        self._add_history(f"SQL Query:\n[$accent]{sql}[/]")
+
+        # Execute the SQL query
+        try:
+            self.df = self.df.sql(sql)
+        except Exception as e:
+            self.notify(f"Error executing SQL query [$error]{sql}[/]: {str(e)}", title="SQL Query", severity="error")
+            return
+
+        if not len(self.df):
+            self.notify(f"SQL query returned no results for [$warning]{sql}[/]", title="SQL Query", severity="warning")
+            return
+
+        # Recreate the table display
+        self._setup_table()
+
+        self.notify(
+            f"SQL query executed successfully. Now showing [$accent]{len(self.df)}[/] rows and [$accent]{len(self.df.columns)}[/] columns.",
+            title="SQL Query",
+        )