tksheet 7.4.2__py3-none-any.whl → 7.4.4__py3-none-any.whl

tksheet/sheet.py

@@ -54,6 +54,7 @@ from .functions import (
 )
 from .main_table import MainTable
 from .other_classes import (
+    Box_nt,
     DotDict,
     EventDataDict,
     FontTuple,
@@ -66,6 +67,7 @@ from .other_classes import (
 )
 from .row_index import RowIndex
 from .sheet_options import new_sheet_options
+from .sorting import fast_sort_key, natural_sort_key, version_sort_key  # noqa: F401
 from .themes import (
     theme_black,
     theme_dark,
@@ -84,7 +86,7 @@ class Sheet(tk.Frame):
         parent: tk.Misc,
         name: str = "!sheet",
         show_table: bool = True,
-        show_top_left: bool = False,
+        show_top_left: bool | None = None,
         show_row_index: bool = True,
         show_header: bool = True,
         show_x_scrollbar: bool = True,
@@ -187,6 +189,7 @@ class Sheet(tk.Frame):
         table_wrap: Literal["", "w", "c"] = "c",
         index_wrap: Literal["", "w", "c"] = "c",
         header_wrap: Literal["", "w", "c"] = "c",
+        sort_key: Callable = natural_sort_key,
         # colors
         outline_thickness: int = 0,
         theme: str = "light blue",
@@ -429,14 +432,18 @@ class Sheet(tk.Frame):
             orient="vertical",
             style=f"Sheet{self.unique_id}.Vertical.TScrollbar",
         )
+        self.MT["yscrollcommand"] = self.yscroll.set
+        self.RI["yscrollcommand"] = self.yscroll.set
         self.xscroll = ttk.Scrollbar(
             self,
             command=self.MT._xscrollbar,
             orient="horizontal",
             style=f"Sheet{self.unique_id}.Horizontal.TScrollbar",
         )
+        self.MT["xscrollcommand"] = self.xscroll.set
+        self.CH["xscrollcommand"] = self.xscroll.set
         self.show()
-        if not show_top_left and not (show_row_index and show_header):
+        if show_top_left is False or (show_top_left is None and (not show_row_index or not show_header)):
             self.hide("top_left")
         if not show_row_index:
             self.hide("row_index")
@@ -728,9 +735,9 @@ class Sheet(tk.Frame):
         - "begin_rc_delete_column", "begin_delete_columns"
         - "rc_delete_column", "end_rc_delete_column","end_delete_columns", "delete_columns"
         - "begin_rc_insert_column", "begin_insert_column", "begin_insert_columns", "begin_add_column","begin_rc_add_column", "begin_add_columns"
-        - "rc_insert_column", "end_rc_insert_column", "end_insert_column", "end_insert_columns", "rc_add_column", "end_rc_add_column", "end_add_column", "end_add_columns"
+        - "rc_insert_column", "end_rc_insert_column", "end_insert_column", "end_insert_columns", "rc_add_column", "end_rc_add_column", "end_add_column", "end_add_columns", "add_columns"
         - "begin_rc_insert_row", "begin_insert_row", "begin_insert_rows", "begin_rc_add_row", "begin_add_row", "begin_add_rows"
-        - "rc_insert_row", "end_rc_insert_row", "end_insert_row", "end_insert_rows", "rc_add_row", "end_rc_add_row", "end_add_row", "end_add_rows"
+        - "rc_insert_row", "end_rc_insert_row", "end_insert_row", "end_insert_rows", "rc_add_row", "end_rc_add_row", "end_add_row", "end_add_rows", "add_rows"
         - "row_height_resize"
         - "column_width_resize"
         - "cell_select"
@@ -1031,6 +1038,7 @@ class Sheet(tk.Frame):
                 "end_rc_add_column",
                 "end_add_column",
                 "end_add_columns",
+                "add_columns",
             ):
                 self.MT.extra_end_insert_cols_rc_func = f
 
@@ -1052,6 +1060,7 @@ class Sheet(tk.Frame):
                 "end_rc_add_row",
                 "end_add_row",
                 "end_add_rows",
+                "add_rows",
             ):
                 self.MT.extra_end_insert_rows_rc_func = f
 
@@ -2328,7 +2337,6 @@ class Sheet(tk.Frame):
             data_indexes=data_indexes,
             undo=undo,
             emit_event=emit_event,
-            ext=True,
         )
         self.set_refresh_timer(redraw)
         return event_data
@@ -2350,7 +2358,6 @@ class Sheet(tk.Frame):
             data_indexes=data_indexes,
             undo=undo,
             emit_event=emit_event,
-            ext=True,
         )
         self.set_refresh_timer(redraw)
         return event_data
@@ -2582,7 +2589,7 @@ class Sheet(tk.Frame):
 
     def sort(
         self,
-        boxes: AnyIter[Sequence[int, int, int, int]] | Span | None = None,
+        *box: CreateSpanTypes,
         reverse: bool = False,
         row_wise: bool = False,
         validation: bool = True,
@@ -2595,17 +2602,11 @@ class Sheet(tk.Frame):
         This method sorts the data within one or multiple box regions defined by their coordinates. Each box's columns are sorted independently.
 
         Args:
-            boxes (AnyIter[Sequence[int, int, int, int]] | Span | None): An iterable of box coordinates. Each box is defined by:
-                - From Row (inclusive)
-                - From Column (inclusive)
-                - Up To Row (exclusive)
-                - Up To Column (exclusive)
-                If None, it will sort the currently selected boxes or the entire table.
-                If Span, it will use the span coordinates.
+            boxes (CreateSpanTypes): A type that can create a Span.
 
             reverse (bool): If True, sorts in descending order. Default is False (ascending).
 
-            row_wise (bool): if True sorts cells row-wise. Default is column-wise
+            row_wise (bool): if True sorts cells row-wise. Default is column-wise.
 
             validation (bool): If True, checks if the new cell values are valid according to any restrictions
                 (e.g., dropdown validations) before applying the sort. Default is True.
@@ -2622,19 +2623,21 @@ class Sheet(tk.Frame):
             ValueError: If the input boxes are not in the expected format or if the data cannot be sorted.
 
         Note:
-            - Sorting is performed column-wise within each box.
             - If validation is enabled, any cell content that fails validation will not be updated.
             - Any cell options attached to cells will not be moved. Event data can be used to re-locate them.
         """
-        if isinstance(boxes, Span):
-            boxes = [boxes.coords]
         return self.MT.sort_boxes(
-            boxes=boxes, reverse=reverse, row_wise=row_wise, validation=validation, key=key, undo=undo
+            boxes={Box_nt(*self.span_from_key(*box).coords): "cells"},
+            reverse=reverse,
+            row_wise=row_wise,
+            validation=validation,
+            key=key,
+            undo=undo,
         )
 
     def sort_rows(
         self,
-        rows: AnyIter[int] | Span | None = None,
+        rows: AnyIter[int] | Span | int | None = None,
         reverse: bool = False,
         validation: bool = True,
         key: Callable | None = None,
@@ -2642,11 +2645,13 @@ class Sheet(tk.Frame):
     ) -> EventDataDict:
         if isinstance(rows, Span):
             rows = rows.rows
+        elif isinstance(rows, int):
+            rows = (rows,)
         return self.RI._sort_rows(rows=rows, reverse=reverse, validation=validation, key=key, undo=undo)
 
     def sort_columns(
         self,
-        columns: AnyIter[int] | Span | None = None,
+        columns: AnyIter[int] | Span | int | None = None,
         reverse: bool = False,
         validation: bool = True,
         key: Callable | None = None,
@@ -2654,6 +2659,8 @@ class Sheet(tk.Frame):
     ) -> EventDataDict:
         if isinstance(columns, Span):
             columns = columns.columns
+        elif isinstance(columns, int):
+            columns = (columns,)
         return self.CH._sort_columns(columns=columns, reverse=reverse, validation=validation, key=key, undo=undo)
 
     def sort_rows_by_column(
@@ -4365,19 +4372,13 @@ class Sheet(tk.Frame):
             self.MT.grid(row=1, column=1, sticky="nswe")
         if canvas in ("all", "row_index", "index"):
             self.RI.grid(row=1, column=0, sticky="nswe")
-            self.MT["yscrollcommand"] = self.yscroll.set
-            self.RI["yscrollcommand"] = self.yscroll.set
             self.MT.show_index = True
-            if self.MT.show_header:
-                self.show("top_left")
         if canvas in ("all", "header"):
             self.CH.grid(row=0, column=1, sticky="nswe")
-            self.MT["xscrollcommand"] = self.xscroll.set
-            self.CH["xscrollcommand"] = self.xscroll.set
             self.MT.show_header = True
-            if self.MT.show_index:
-                self.show("top_left")
-        if canvas in ("all", "top_left"):
+        if canvas in ("all", "top_left") or (
+            self.ops.show_top_left is not False and self.MT.show_header and self.MT.show_index
+        ):
             self.TL.grid(row=0, column=0)
         if canvas in ("all", "x_scrollbar"):
             self.xscroll.grid(row=2, column=0, columnspan=2, sticky="nswe")
@@ -4405,17 +4406,13 @@ class Sheet(tk.Frame):
     ) -> Sheet:
         if canvas in ("all", "row_index"):
             self.RI.grid_remove()
-            self.RI["yscrollcommand"] = 0
             self.MT.show_index = False
-            if not self.ops.show_top_left:
-                self.hide("top_left")
         if canvas in ("all", "header"):
             self.CH.grid_remove()
-            self.CH["xscrollcommand"] = 0
             self.MT.show_header = False
-            if not self.ops.show_top_left:
-                self.hide("top_left")
-        if canvas in ("all", "top_left"):
+        if canvas in ("all", "top_left") or (
+            not self.ops.show_top_left and (not self.MT.show_index or not self.MT.show_header)
+        ):
             self.TL.grid_remove()
         if canvas in ("all", "x_scrollbar"):
             self.xscroll.grid_remove()
@@ -4668,24 +4665,14 @@ class Sheet(tk.Frame):
         Also retrieves any row or column options
         impacting that cell
         """
-        if isinstance(column, str):
-            column = alpha2idx(column)
-        if key is not None:
-            return self.MT.get_cell_kwargs(
-                datarn=row,
-                datacn=column,
-                key=key,
-                cell=cellops,
-                row=rowops,
-                column=columnops,
-            )
-        if cellops and (row, column) in self.MT.cell_options:
-            return self.MT.cell_options[(row, column)]
-        if rowops and row in self.MT.row_options:
-            return self.MT.row_options[row]
-        if columnops and column in self.MT.col_options:
-            return self.MT.col_options[column]
-        return {}
+        return self.MT.get_cell_kwargs(
+            datarn=row,
+            datacn=alpha2idx(column) if isinstance(column, str) else column,
+            key=key,
+            cell=cellops,
+            row=rowops,
+            column=columnops,
+        )
 
     def index_props(
         self,
@@ -4696,12 +4683,10 @@ class Sheet(tk.Frame):
         Retrieve options (properties - props)
         from a cell in the index
         """
-        if key is not None:
-            return self.RI.get_cell_kwargs(
-                datarn=row,
-                key=key,
-            )
-        return self.RI.cell_options[row] if row in self.RI.cell_options else {}
+        return self.RI.get_cell_kwargs(
+            datarn=row,
+            key=key,
+        )
 
     def header_props(
         self,
@@ -4712,14 +4697,10 @@ class Sheet(tk.Frame):
         Retrieve options (properties - props)
         from a cell in the header
         """
-        if isinstance(column, str):
-            column = alpha2idx(column)
-        if key is not None:
-            return self.CH.get_cell_kwargs(
-                datacn=column,
-                key=key,
-            )
-        return self.CH.cell_options[column] if column in self.CH.cell_options else {}
+        return self.CH.get_cell_kwargs(
+            datacn=alpha2idx(column) if isinstance(column, str) else column,
+            key=key,
+        )
 
     def get_cell_options(
         self,
@@ -7241,7 +7222,7 @@ class Dropdown(Sheet):
 
     def search_and_see(self, event: object = None) -> str:
         if self.search_function is not None:
-            rn = self.search_function(search_for=rf"{event['value']}".lower(), data=self.MT.data)
+            rn = self.search_function(search_for=rf"{event['value']}", data=(r[0] for r in self.MT.data))
             if isinstance(rn, int):
                 self.row = rn
                 self.see(self.row, 0, redraw=False)

tksheet/sheet_options.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from .constants import USER_OS, ctrl_key
 from .other_classes import DotDict, FontTuple
+from .sorting import fast_sort_key, natural_sort_key, version_sort_key  # noqa: F401
 from .themes import theme_light_blue
 
 
@@ -254,6 +255,7 @@ def new_sheet_options() -> DotDict:
             "max_header_height": float("inf"),
             "max_row_height": float("inf"),
             "max_index_width": float("inf"),
-            "show_top_left": False,
+            "show_top_left": None,
+            "sort_key": natural_sort_key,
         }
     )