dataframe-textual 1.9.0__py3-none-any.whl → 2.2.2__py3-none-any.whl

dataframe_textual/yes_no_screen.py

@@ -119,9 +119,6 @@ class YesNoScreen(ModalScreen):
             maybe: Optional Maybe button text/dict. Defaults to None.
             no: Text or dict for the No button. If None, hides the No button. Defaults to "No".
             on_yes_callback: Optional callable that takes no args and returns the value to dismiss with when Yes is pressed. Defaults to None.
-
-        Returns:
-            None
         """
         super().__init__()
         self.title = title
@@ -295,32 +292,26 @@ class SaveFileScreen(YesNoScreen):
 
     CSS = YesNoScreen.DEFAULT_CSS.replace("YesNoScreen", "SaveFileScreen")
 
-    def __init__(
-        self, filename: str, title: str = "Save to File", all_tabs: bool | None = None, multi_tab: bool = False
-    ):
-        self.all_tabs = all_tabs or (all_tabs is None and multi_tab)
+    def __init__(self, filename: str, save_all: bool = False, tab_count: int = 1):
+        self.save_all = save_all
         super().__init__(
-            title=title,
-            label="Enter filename",
+            title="Save to File",
+            label="Filename",
             input=filename,
-            yes="Save",
-            maybe="Save All Tabs" if self.all_tabs else None,
+            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,
-            on_maybe_callback=self.handle_save,
         )
 
     def handle_save(self):
         if self.input:
             input_filename = self.input.value.strip()
             if input_filename:
-                return input_filename, self.all_tabs
+                return input_filename, self.save_all, True  # Overwrite prompt
             else:
                 self.notify("Filename cannot be empty", title="Save", severity="error")
                 return None
 
-        return None
-
 
 class ConfirmScreen(YesNoScreen):
     """Modal screen to ask for confirmation."""
@@ -359,7 +350,7 @@ class EditCellScreen(YesNoScreen):
 
         # Input
         df_value = df.item(ridx, cidx)
-        self.input_value = "" if df_value is None else str(df_value).strip()
+        self.input_value = NULL if df_value is None else str(df_value)
 
         super().__init__(
             title="Edit Cell",
@@ -373,20 +364,20 @@ class EditCellScreen(YesNoScreen):
 
     def _validate_input(self) -> None:
         """Validate and save the edited value."""
-        new_value_str = self.input.value.strip()
+        new_value_str = self.input.value  # Do not strip to preserve spaces
 
         # Handle empty input
         if not new_value_str:
-            new_value = None
+            new_value = ""
             self.notify(
-                "Empty value provided. If you want to clear the cell, press [$accent]x[/].",
-                title="Edit",
+                "Empty value provided. If you want to clear the cell, press [$accent]Delete[/].",
+                title="Edit Cell",
                 severity="warning",
             )
         # Check if value changed
         elif new_value_str == self.input_value:
             new_value = None
-            self.notify("No changes made", title="Edit", severity="warning")
+            self.notify("No changes made", title="Edit Cell", severity="warning")
         else:
             # Parse and validate based on column dtype
             try:
@@ -394,7 +385,7 @@ class EditCellScreen(YesNoScreen):
             except Exception as e:
                 self.notify(
                     f"Failed to convert [$accent]{new_value_str}[/] to [$error]{self.dtype}[/]: {str(e)}",
-                    title="Edit",
+                    title="Edit Cell",
                     severity="error",
                 )
                 return None
@@ -477,7 +468,7 @@ class SearchScreen(YesNoScreen):
 
     def _validate_input(self) -> tuple[str, int, bool, bool]:
         """Validate the input and return it."""
-        term = self.input.value.strip()
+        term = self.input.value  # Do not strip to preserve spaces
 
         if not term:
             self.notify("Term cannot be empty", title=self.title, severity="error")
@@ -494,13 +485,13 @@ class FilterScreen(YesNoScreen):
 
     CSS = YesNoScreen.DEFAULT_CSS.replace("YesNoScreen", "FilterScreen")
 
-    def __init__(self, df: pl.DataFrame, cidx: int, input_value: str | None = None):
+    def __init__(self, df: pl.DataFrame, cidx: int, term: str | None = None):
         self.df = df
         self.cidx = cidx
         super().__init__(
             title="Filter by Expression",
             label="e.g., NULL, $1 > 50, $name == 'text', $_ > 100, $a < $b, $_.str.contains('sub')",
-            input=input_value,
+            input=term,
             checkbox="Match Nocase",
             checkbox2="Match Whole",
             on_yes_callback=self._get_input,
@@ -508,7 +499,7 @@ class FilterScreen(YesNoScreen):
 
     def _get_input(self) -> tuple[str, int, bool, bool]:
         """Get input."""
-        term = self.input.value.strip()
+        term = self.input.value  # Do not strip to preserve spaces
         match_nocase = self.checkbox.value
         match_whole = self.checkbox2.value
 
@@ -583,14 +574,14 @@ class EditColumnScreen(YesNoScreen):
         self.df = df
         super().__init__(
             title="Edit Column",
-            label=f"by value or Polars expression, e.g., abc, pl.lit(7), {NULL}, $_ * 2, $1 + $2, $_.str.to_uppercase(), pl.arange(0, pl.len())",
+            label=f"By value or Polars expression, e.g., abc, pl.lit(7), {NULL}, $_ * 2, $1 + $2, $_.str.to_uppercase(), pl.arange(0, pl.len())",
             input="$_",
             on_yes_callback=self._get_input,
         )
 
     def _get_input(self) -> tuple[str, int]:
         """Get input."""
-        term = self.input.value.strip()
+        term = self.input.value  # Do not strip to preserve spaces
         return term, self.cidx
 
 
@@ -606,19 +597,19 @@ class AddColumnScreen(YesNoScreen):
         self.existing_columns = set(df.columns)
         super().__init__(
             title="Add Column",
-            label="Enter column name",
-            input="Link" if link else "Column name",
-            label2="Enter link template, e.g., https://example.com/$_/id/$1, PC/compound/$cid"
+            label="Column name",
+            input="Link" if link else "New column",
+            label2="Link template, e.g., https://example.com/$1/id/$_, PC/compound/$cid"
             if link
-            else "Enter value or Polars expression, e.g., abc, pl.lit(123), NULL, $_ * 2, $1 + $total, $_.str.to_uppercase(), pl.concat_str($_, pl.lit('-suffix'))",
-            input2="Link template" if link else "Column value or expression",
+            else "Value or Polars expression, e.g., abc, pl.lit(123), NULL, $_ * 2, $1 + $total, $_ + '_suffix', $_.str.to_uppercase()",
+            input2="Link template" if link else "Value or expression",
             on_yes_callback=self._get_input,
         )
 
     def _get_input(self) -> tuple[int, str, str] | None:
         """Validate and return the new column configuration."""
         col_name = self.input.value.strip()
-        term = self.input2.value.strip()
+        term = self.input2.value  # Do not strip to preserve spaces
 
         # Validate column name
         if not col_name:
@@ -680,7 +671,11 @@ class FindReplaceScreen(YesNoScreen):
     CSS = YesNoScreen.DEFAULT_CSS.replace("YesNoScreen", "ReplaceScreen")
 
     def __init__(self, dftable: "DataFrameTable", title: str = "Find and Replace"):
-        term_find = str(dftable.cursor_value)
+        if (cursor_value := dftable.cursor_value) is None:
+            term_find = NULL
+        else:
+            term_find = str(cursor_value)
+
         super().__init__(
             title=title,
             label="Find",
@@ -698,8 +693,8 @@ class FindReplaceScreen(YesNoScreen):
 
     def _get_input(self) -> tuple[str, str, bool, bool, bool]:
         """Get input."""
-        term_find = self.input.value.strip()
-        term_replace = self.input2.value.strip()
+        term_find = self.input.value  # Do not strip to preserve spaces
+        term_replace = self.input2.value  # Do not strip to preserve spaces
         match_nocase = self.checkbox.value
         match_whole = self.checkbox2.value
         replace_all = False
@@ -708,8 +703,8 @@ class FindReplaceScreen(YesNoScreen):
 
     def _get_input_replace_all(self) -> tuple[str, str, bool, bool, bool]:
         """Get input for 'Replace All'."""
-        term_find = self.input.value.strip()
-        term_replace = self.input2.value.strip()
+        term_find = self.input.value  # Do not strip to preserve spaces
+        term_replace = self.input2.value  # Do not strip to preserve spaces
         match_nocase = self.checkbox.value
         match_whole = self.checkbox2.value
         replace_all = True