tksheet 7.4.1__py3-none-any.whl → 7.4.3__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.4.1"
+__version__ = "7.4.3"
 
 from .colors import (
     color_map,
@@ -93,6 +93,7 @@ from .other_classes import (
 from .row_index import RowIndex
 from .sheet import Dropdown, Sheet
 from .sheet_options import new_sheet_options
+from .sorting import natural_sort_key
 from .text_editor import (
     TextEditor,
     TextEditorTkText,

tksheet/column_headers.py

@@ -915,14 +915,14 @@ class ColumnHeaders(tk.Canvas):
         key: Callable | None = None,
         undo: bool = True,
     ) -> EventDataDict:
-        event_data = self.MT.new_event_dict("sort_rows", state=True)
+        event_data = self.MT.new_event_dict("move_rows", state=True)
         if not self.MT.data:
             return event_data
         if column is None:
             if not self.MT.selected:
                 return event_data
             column = self.MT.selected.column
-        if try_binding(self.ch_extra_begin_sort_rows_func, event_data, "begin_sort_rows"):
+        if try_binding(self.ch_extra_begin_sort_rows_func, event_data, "begin_move_rows"):
             disp_new_idxs, disp_row_ctr = {}, 0
             if self.ops.treeview:
                 new_nodes_order, data_new_idxs = sort_tree_view(
@@ -973,7 +973,7 @@ class ColumnHeaders(tk.Canvas):
             }
             if undo and self.MT.undo_enabled:
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            try_binding(self.ch_extra_end_sort_rows_func, event_data, "end_sort_rows")
+            try_binding(self.ch_extra_end_sort_rows_func, event_data, "end_move_rows")
             self.MT.sheet_modified(event_data)
             self.PAR.emit_event("<<SheetModified>>", event_data)
             self.MT.refresh()

tksheet/functions.py

@@ -8,6 +8,7 @@ import tkinter as tk
 from bisect import bisect_left
 from collections import deque
 from collections.abc import Callable, Generator, Hashable, Iterable, Iterator, Sequence
+from difflib import SequenceMatcher
 from itertools import islice, repeat
 from typing import Literal
 
@@ -231,50 +232,45 @@ def event_opens_dropdown_or_checkbox(event=None) -> bool:
     )
 
 
-def dropdown_search_function(
-    search_for: object,
-    data: Sequence[object],
-) -> None | int:
+def dropdown_search_function(search_for: str, data: Iterable[object]) -> None | int:
+    search_for = search_for.lower()
     search_len = len(search_for)
-    # search_for in data
-    match_rn = float("inf")
+    if not search_len:
+        return next((i for i, v in enumerate(data) if not str(v)), None)
+
+    matcher = SequenceMatcher(None, search_for, "", autojunk=False)
+
+    match_rn = None
     match_st = float("inf")
     match_len_diff = float("inf")
-    # data in search_for in case no match
-    match_data_rn = float("inf")
-    match_data_st = float("inf")
-    match_data_numchars = 0
-    for rn, row in enumerate(data):
-        dd_val = rf"{row[0]}".lower()
-        # checking if search text is in dropdown row
-        st = dd_val.find(search_for)
-        if st > -1:
-            # priority is start index
-            # if there's already a matching start
-            # then compare the len difference
-            len_diff = len(dd_val) - search_len
+
+    fallback_rn = None
+    fallback_match_length = 0
+    fallback_st = float("inf")
+
+    for rn, value in enumerate(data):
+        value = str(value).lower()
+        if not value:
+            continue
+        st = value.find(search_for)
+        if st != -1:
+            len_diff = len(value) - search_len
             if st < match_st or (st == match_st and len_diff < match_len_diff):
                 match_rn = rn
                 match_st = st
                 match_len_diff = len_diff
-        # fall back in case of no existing match
-        elif match_rn == float("inf"):
-            for numchars in range(2, search_len - 1):
-                for from_idx in range(search_len - 1):
-                    if from_idx + numchars > search_len:
-                        break
-                    st = dd_val.find(search_for[from_idx : from_idx + numchars])
-                    if st > -1 and (
-                        numchars > match_data_numchars or (numchars == match_data_numchars and st < match_data_st)
-                    ):
-                        match_data_rn = rn
-                        match_data_st = st
-                        match_data_numchars = numchars
-    if match_rn != float("inf"):
-        return match_rn
-    elif match_data_rn != float("inf"):
-        return match_data_rn
-    return None
+
+        elif match_rn is None:
+            matcher.set_seq2(value)
+            match = matcher.find_longest_match(0, search_len, 0, len(value))
+            match_length = match.size
+            start = match.b if match_length > 0 else -1
+            if match_length > fallback_match_length or (match_length == fallback_match_length and start < fallback_st):
+                fallback_rn = rn
+                fallback_match_length = match_length
+                fallback_st = start
+
+    return match_rn if match_rn is not None else fallback_rn
 
 
 def float_to_int(f: int | float) -> int | float:
@@ -409,12 +405,22 @@ def push_n(num: int, sorted_seq: Sequence[int]) -> int:
     if num < sorted_seq[0]:
         return num
     else:
-        for e in sorted_seq:
-            if num >= e:
-                num += 1
-            else:
-                return num
-        return num
+        if (hi := len(sorted_seq)) < 5:
+            for e in sorted_seq:
+                if num >= e:
+                    num += 1
+                else:
+                    return num
+            return num
+        else:
+            lo = 0
+            while lo < hi:
+                mid = (lo + hi) // 2
+                if sorted_seq[mid] < num + mid + 1:
+                    lo = mid + 1
+                else:
+                    hi = mid
+            return num + lo
 
 
 def get_dropdown_kwargs(
@@ -615,14 +621,18 @@ def consecutive_chunks(seq: list[int]) -> Generator[list[int]]:
 
 
 def consecutive_ranges(seq: Sequence[int]) -> Generator[tuple[int, int]]:
-    start = 0
-    for index, value in enumerate(seq, 1):
-        try:
-            if seq[index] > value + 1:
-                yield seq[start], seq[index - 1] + 1
-                start = index
-        except Exception:
-            yield seq[start], seq[-1] + 1
+    seq_iter = iter(seq)
+    try:
+        start = next(seq_iter)
+    except StopIteration:
+        return
+    prev = start
+    for curr in seq_iter:
+        if curr > prev + 1:
+            yield start, prev + 1
+            start = curr
+        prev = curr
+    yield start, prev + 1
 
 
 def is_contiguous(iterable: Iterable[int]) -> bool:

tksheet/main_table.py

@@ -1973,7 +1973,7 @@ class MainTable(tk.Canvas):
             event_data = self.delete_rows_displayed(
                 rows=tuple(reversed(modification["added"]["rows"]["row_heights"])),
                 event_data=event_data,
-                restored_state=True,
+                from_undo=True,
             )
 
         if modification["added"]["columns"]:
@@ -1985,7 +1985,7 @@ class MainTable(tk.Canvas):
             event_data = self.delete_columns_displayed(
                 cols=tuple(reversed(modification["added"]["columns"]["column_widths"])),
                 event_data=event_data,
-                restored_state=True,
+                from_undo=True,
             )
 
         if modification["deleted"]["rows"] or modification["deleted"]["row_heights"]:
@@ -1998,7 +1998,7 @@ class MainTable(tk.Canvas):
                 create_ops=False,
                 create_selections=False,
                 add_col_positions=False,
-                restored_state=True,
+                from_undo=True,
             )
 
         if modification["deleted"]["columns"] or modification["deleted"]["column_widths"]:
@@ -2010,7 +2010,7 @@ class MainTable(tk.Canvas):
                 create_ops=False,
                 create_selections=False,
                 add_row_positions=False,
-                restored_state=True,
+                from_undo=True,
             )
 
         if modification["eventname"].startswith(("edit", "move")):
@@ -4893,16 +4893,18 @@ class MainTable(tk.Canvas):
         add_row_positions: bool = True,
         push_ops: bool = True,
         mod_event_boxes: bool = True,
-        restored_state: bool = False,
-    ) -> EventDataDict:
+        from_undo: bool = False,
+    ) -> EventDataDict | None:
+        if not from_undo and not try_binding(self.extra_begin_insert_cols_rc_func, event_data, "begin_add_columns"):
+            return
         self.saved_column_widths = {}
-        if not restored_state and not self.all_columns_displayed:
+        if not from_undo and not self.all_columns_displayed:
             self.displayed_columns = add_to_displayed(self.displayed_columns, columns)
         cws = self.get_column_widths()
         if column_widths and next(reversed(column_widths)) > len(cws):
             for i in reversed(range(len(cws), len(cws) + next(reversed(column_widths)) - len(cws))):
                 column_widths[i] = self.PAR.ops.default_column_width
-        if not restored_state:
+        if not from_undo:
             self.set_col_positions(
                 itr=insert_items(
                     cws,
@@ -4928,7 +4930,7 @@ class MainTable(tk.Canvas):
                 "index": {},
                 "row_heights": {rn: default_height for rn in range(len(self.row_positions) - 1, maxrn + 1)},
             }
-            if not restored_state:
+            if not from_undo:
                 self.set_row_positions(
                     itr=chain(
                         self.gen_row_heights(),
@@ -4961,9 +4963,11 @@ class MainTable(tk.Canvas):
             "header": header,
             "column_widths": column_widths,
         }
+        if not from_undo:
+            try_binding(self.extra_end_insert_cols_rc_func, event_data, "end_add_columns")
         return event_data
 
-    def rc_add_columns(self, event: object = None):
+    def rc_add_columns(self, event: object = None) -> None:
         rowlen = self.equalize_data_row_lengths()
         selcols = sorted(self.get_selected_cols())
         if (
@@ -4997,8 +5001,6 @@ class MainTable(tk.Canvas):
             if numcols < 1:
                 return
         event_data = self.new_event_dict("add_columns", state=True)
-        if not try_binding(self.extra_begin_insert_cols_rc_func, event_data, "begin_add_columns"):
-            return
         columns, headers, widths = self.get_args_for_add_columns(data_ins_col, displayed_ins_col, numcols)
         event_data = self.add_columns(
             columns=columns,
@@ -5006,11 +5008,11 @@ class MainTable(tk.Canvas):
             column_widths=widths,
             event_data=event_data,
         )
-        if self.undo_enabled:
-            self.undo_stack.append(stored_event_dict(event_data))
-        self.refresh()
-        try_binding(self.extra_end_insert_cols_rc_func, event_data, "end_add_columns")
-        self.sheet_modified(event_data)
+        if event_data:
+            if self.undo_enabled:
+                self.undo_stack.append(stored_event_dict(event_data))
+            self.refresh()
+            self.sheet_modified(event_data)
 
     def add_rows(
         self,
@@ -5024,17 +5026,19 @@ class MainTable(tk.Canvas):
         push_ops: bool = True,
         tree: bool = True,
         mod_event_boxes: bool = True,
-        restored_state: bool = False,
-    ) -> EventDataDict:
+        from_undo: bool = False,
+    ) -> EventDataDict | None:
+        if not from_undo and not try_binding(self.extra_begin_insert_rows_rc_func, event_data, "begin_add_rows"):
+            return
         self.saved_row_heights = {}
-        if not restored_state and not self.all_rows_displayed:
+        if not from_undo and not self.all_rows_displayed:
             self.displayed_rows = add_to_displayed(self.displayed_rows, rows)
         rhs = self.get_row_heights()
         if row_heights and next(reversed(row_heights)) > len(rhs):
             default_row_height = self.get_default_row_height()
             for i in reversed(range(len(rhs), len(rhs) + next(reversed(row_heights)) - len(rhs))):
                 row_heights[i] = default_row_height
-        if not restored_state:
+        if not from_undo:
             self.set_row_positions(
                 itr=insert_items(
                     rhs,
@@ -5060,7 +5064,7 @@ class MainTable(tk.Canvas):
                 "header": {},
                 "column_widths": {cn: default_width for cn in range(len(self.col_positions) - 1, maxcn + 1)},
             }
-            if not restored_state:
+            if not from_undo:
                 self.set_col_positions(
                     itr=chain(
                         self.gen_column_widths(),
@@ -5093,9 +5097,11 @@ class MainTable(tk.Canvas):
         }
         if tree and self.PAR.ops.treeview:
             event_data = self.RI.tree_add_rows(event_data=event_data)
+        if not from_undo:
+            try_binding(self.extra_end_insert_rows_rc_func, event_data, "end_add_rows")
         return event_data
 
-    def rc_add_rows(self, event: object = None):
+    def rc_add_rows(self, event: object = None) -> None:
         total_data_rows = self.total_data_rows()
         selrows = sorted(self.get_selected_rows())
         if (
@@ -5129,8 +5135,6 @@ class MainTable(tk.Canvas):
             if numrows < 1:
                 return
         event_data = self.new_event_dict("add_rows", state=True)
-        if not try_binding(self.extra_begin_insert_rows_rc_func, event_data, "begin_add_rows"):
-            return
         rows, index, heights = self.get_args_for_add_rows(data_ins_row, displayed_ins_row, numrows)
         event_data = self.add_rows(
             rows=rows,
@@ -5138,11 +5142,11 @@ class MainTable(tk.Canvas):
             row_heights=heights,
             event_data=event_data,
         )
-        if self.undo_enabled:
-            self.undo_stack.append(stored_event_dict(event_data))
-        self.refresh()
-        try_binding(self.extra_end_insert_rows_rc_func, event_data, "end_add_rows")
-        self.sheet_modified(event_data)
+        if event_data:
+            if self.undo_enabled:
+                self.undo_stack.append(stored_event_dict(event_data))
+            self.refresh()
+            self.sheet_modified(event_data)
 
     def get_args_for_add_columns(
         self,
@@ -5311,7 +5315,7 @@ class MainTable(tk.Canvas):
         self,
         cols: list[int],
         event_data: EventDataDict | None = None,
-        restored_state: bool = False,
+        from_undo: bool = False,
     ) -> EventDataDict:
         if not event_data:
             event_data = self.new_event_dict("delete_columns", state=True)
@@ -5320,7 +5324,7 @@ class MainTable(tk.Canvas):
             for c in reversed(cols):
                 if len(self.col_positions) > c + 1:
                     event_data["deleted"]["column_widths"][c] = self.col_positions[c + 1] - self.col_positions[c]
-            if not restored_state:
+            if not from_undo:
                 cols_set = set(cols)
                 self.set_col_positions(
                     itr=(width for c, width in enumerate(self.gen_column_widths()) if c not in cols_set)
@@ -5334,13 +5338,12 @@ class MainTable(tk.Canvas):
         data_indexes: bool = False,
         undo: bool = True,
         emit_event: bool = True,
-        ext: bool = False,
     ) -> EventDataDict:
         event_data = self.new_event_dict("delete_columns", state=True)
         if not columns:
             if not (columns := sorted(self.get_selected_cols())):
                 return event_data
-        if not ext and not try_binding(self.extra_begin_del_cols_rc_func, event_data, "begin_delete_columns"):
+        if not try_binding(self.extra_begin_del_cols_rc_func, event_data, "begin_delete_columns"):
             return
         if self.all_columns_displayed:
             data_columns = columns
@@ -5362,8 +5365,7 @@ class MainTable(tk.Canvas):
         )
         if undo and self.undo_enabled:
             self.undo_stack.append(stored_event_dict(event_data))
-        if not ext:
-            try_binding(self.extra_end_del_cols_rc_func, event_data, "end_delete_columns")
+        try_binding(self.extra_end_del_cols_rc_func, event_data, "end_delete_columns")
         if emit_event:
             self.sheet_modified(event_data)
         self.deselect("all")
@@ -5400,7 +5402,7 @@ class MainTable(tk.Canvas):
         self,
         rows: list[int],
         event_data: EventDataDict | None = None,
-        restored_state: bool = False,
+        from_undo: bool = False,
     ) -> EventDataDict:
         if not event_data:
             event_data = self.new_event_dict("delete_rows", state=True)
@@ -5409,7 +5411,7 @@ class MainTable(tk.Canvas):
             for r in reversed(rows):
                 if len(self.row_positions) > r + 1:
                     event_data["deleted"]["row_heights"][r] = self.row_positions[r + 1] - self.row_positions[r]
-            if not restored_state:
+            if not from_undo:
                 rows_set = set(rows)
                 self.set_row_positions(
                     itr=(height for r, height in enumerate(self.gen_row_heights()) if r not in rows_set)
@@ -5423,13 +5425,12 @@ class MainTable(tk.Canvas):
         data_indexes: bool = False,
         undo: bool = True,
         emit_event: bool = True,
-        ext: bool = False,
     ) -> EventDataDict:
         event_data = self.new_event_dict("delete_rows", state=True)
         if not rows:
             if not (rows := sorted(self.get_selected_rows())):
                 return
-        if not ext and not try_binding(self.extra_begin_del_rows_rc_func, event_data, "begin_delete_rows"):
+        if not try_binding(self.extra_begin_del_rows_rc_func, event_data, "begin_delete_rows"):
             return
         if self.all_rows_displayed:
             data_rows = rows
@@ -5462,8 +5463,7 @@ class MainTable(tk.Canvas):
         )
         if undo and self.undo_enabled:
             self.undo_stack.append(stored_event_dict(event_data))
-        if not ext:
-            try_binding(self.extra_end_del_rows_rc_func, event_data, "end_delete_rows")
+        try_binding(self.extra_end_del_rows_rc_func, event_data, "end_delete_rows")
         if emit_event:
             self.sheet_modified(event_data)
         self.deselect("all")

tksheet/row_index.py

@@ -19,7 +19,6 @@ from .constants import (
 )
 from .formatters import is_bool_like, try_to_bool
 from .functions import (
-    consecutive_chunks,
     consecutive_ranges,
     del_placeholder_dict_key,
     event_dict,
@@ -686,10 +685,10 @@ class RowIndex(tk.Canvas):
             tag="move_rows",
         )
         self.MT.create_resize_line(x1, ypos, x2, ypos, width=3, fill=self.ops.drag_and_drop_bg, tag="move_rows")
-        for chunk in consecutive_chunks(rows):
+        for boxst, boxend in consecutive_ranges(rows):
             self.MT.show_ctrl_outline(
-                start_cell=(0, chunk[0]),
-                end_cell=(len(self.MT.col_positions) - 1, chunk[-1] + 1),
+                start_cell=(0, boxst),
+                end_cell=(len(self.MT.col_positions) - 1, boxend),
                 dash=(),
                 outline=self.ops.drag_and_drop_bg,
                 delete_on_timer=False,
@@ -936,14 +935,14 @@ class RowIndex(tk.Canvas):
         key: Callable | None = None,
         undo: bool = True,
     ) -> EventDataDict:
-        event_data = self.MT.new_event_dict("sort_columns", state=True)
+        event_data = self.MT.new_event_dict("move_columns", state=True)
         if not self.MT.data:
             return event_data
         if row is None:
             if not self.MT.selected:
                 return event_data
             row = self.MT.selected.row
-        if try_binding(self.ri_extra_begin_sort_cols_func, event_data, "begin_sort_columns"):
+        if try_binding(self.ri_extra_begin_sort_cols_func, event_data, "begin_move_columns"):
             sorted_indices, data_new_idxs = sort_columns_by_row(self.MT.data, row=row, reverse=reverse, key=key)
             disp_new_idxs = {}
             if self.MT.all_columns_displayed:
@@ -970,7 +969,7 @@ class RowIndex(tk.Canvas):
             }
             if undo and self.MT.undo_enabled:
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            try_binding(self.ri_extra_end_sort_cols_func, event_data, "end_sort_columns")
+            try_binding(self.ri_extra_end_sort_cols_func, event_data, "end_move_columns")
             self.MT.sheet_modified(event_data)
             self.PAR.emit_event("<<SheetModified>>", event_data)
             self.MT.refresh()

tksheet/sheet.py

@@ -84,7 +84,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,
@@ -429,14 +429,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 +732,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 +1035,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 +1057,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 +2334,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 +2355,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
@@ -4365,19 +4369,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 +4403,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()
@@ -7241,7 +7235,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

@@ -254,6 +254,6 @@ 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,
         }
     )

tksheet/sorting.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from collections.abc import Callable, Generator
+from collections.abc import Callable, Generator, Iterable, Iterator
 from datetime import datetime
+from pathlib import Path
 from re import finditer
 
-from .other_classes import Node
-from .tksheet_types import AnyIter
+AnyIter = Iterable | Iterator
 
 # Possible date formats to try for the entire string
 date_formats = [
@@ -45,24 +45,18 @@ date_formats = [
 ]
 
 
-def natural_sort_key(item: object) -> tuple[int, object]:
+def natural_sort_key(item: object) -> tuple[int, ...]:
     """
-    A key function for natural sorting that handles various Python types, including
-    date-like strings in multiple formats.
-
-    This function aims to sort elements in a human-readable order:
-    - None values first
-    - Booleans (False before True)
-    - Numbers (integers, floats combined)
-    - Datetime objects
-    - Strings with natural sorting for embedded numbers and dates
-    - Unknown types treated as strings or left at the end
-
-    Args:
-        item: Any Python object to be sorted.
-
-    Returns:
-        A tuple or value that can be used for sorting.
+    A key for natural sorting of various Python types.
+
+    0. None
+    1. bool
+    2. int, float
+    3. datetime
+    4. empty strings
+    5. strings (including paths as POSIX strings)
+    6. unknown objects with __str__
+    7. unknown objects
     """
     if item is None:
         return (0,)
@@ -77,26 +71,26 @@ def natural_sort_key(item: object) -> tuple[int, object]:
         return (3, item.timestamp())
 
     elif isinstance(item, str):
+        if not item:
+            return (4, item)
+
         for date_format in date_formats:
             try:
                 return (3, datetime.strptime(item, date_format).timestamp())
             except ValueError:
                 continue
-
         try:
             return (2, float(item))
         except Exception:
-            n = []
-            s = []
-            for match in finditer(r"\d+|[^\d\s]+", item):
-                if (m := match.group()).isdigit():
-                    n.append(int(m))
-                else:
-                    s.append(m.lower())
-            return (5, s, n)
+            pass
+
+        return (5, item.lower(), tuple(int(match.group()) for match in finditer(r"\d+", item)))
+
+    elif isinstance(item, Path):
+        posix_str = item.as_posix()
+        return (5, posix_str.lower(), tuple(int(match.group()) for match in finditer(r"\d+", posix_str)))
 
     else:
-        # For unknown types, attempt to convert to string, or place at end
         try:
             return (6, f"{item}".lower())
         except Exception:
@@ -233,11 +227,11 @@ def sort_columns_by_row(
 
 
 def _sort_node_children(
-    node: Node,
-    tree: dict[str, Node],
+    node: object,
+    tree: dict[str, object],
     reverse: bool,
     key: Callable,
-) -> Generator[Node, None, None]:
+) -> Generator[object, None, None]:
     sorted_children = sorted(
         (tree[child_iid] for child_iid in node.children if child_iid in tree),
         key=lambda child: key(child.text),
@@ -250,12 +244,12 @@ def _sort_node_children(
 
 
 def sort_tree_view(
-    _row_index: list[Node],
+    _row_index: list[object],
     tree_rns: dict[str, int],
-    tree: dict[str, Node],
+    tree: dict[str, object],
     key: Callable = natural_sort_key,
     reverse: bool = False,
-) -> tuple[list[Node], dict[int, int]]:
+) -> tuple[list[object], dict[int, int]]:
     if not _row_index or not tree_rns or not tree:
         return [], {}
 
@@ -285,3 +279,40 @@ def sort_tree_view(
             new_index += 1
 
     return sorted_nodes, mapping
+
+
+# def test_natural_sort_key():
+#     test_items = [
+#         None,
+#         False,
+#         True,
+#         5,
+#         3.14,
+#         datetime(2023, 1, 1),
+#         "abc123",
+#         "123abc",
+#         "abc123def",
+#         "998zzz",
+#         "10-01-2023",
+#         "01-10-2023",
+#         "fi1le_0.txt",
+#         "file_2.txt",
+#         "file_10.txt",
+#         "file_1.txt",
+#         "path/to/file_2.txt",
+#         "path/to/file_10.txt",
+#         "path/to/file_1.txt",
+#         "/another/path/file_2.log",
+#         "/another/path/file_10.log",
+#         "/another/path/file_1.log",
+#         "C:\\Windows\\System32\\file_2.dll",
+#         "C:\\Windows\\System32\\file_10.dll",
+#         "C:\\Windows\\System32\\file_1.dll",
+#     ]
+#     print("Sort objects:", [natural_sort_key(e) for e in test_items])
+#     sorted_items = sorted(test_items, key=natural_sort_key)
+#     print("\nNatural Sort Order:", sorted_items)
+
+
+# if __name__ == "__main__":
+#     test_natural_sort_key()

{tksheet-7.4.1.dist-info → tksheet-7.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.1
+Version: 7.4.3
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -77,7 +77,7 @@ License-File: LICENSE.txt
       <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues">Issues</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions and Contributors</a></td>
     </tr>
   </tbody>
 </table>
@@ -101,6 +101,8 @@ License-File: LICENSE.txt
 - [In-built natural sorting](https://github.com/ragardner/tksheet/wiki/Version-7#sorting-the-table)
 - [Optional built-in find window](https://github.com/ragardner/tksheet/wiki/Version-7#table-functionality-and-bindings)
 
+Note that due to the limitations of the Tkinter Canvas right-to-left (RTL) languages are not supported.
+
 ```python
 """
 Versions 7+ have succinct and easy to read syntax:

tksheet-7.4.3.dist-info/RECORD

@@ -0,0 +1,22 @@
+tksheet/__init__.py,sha256=6xbeTomYvgJaGjRKmHAS1YW24Tmc5ZcR7_YmeyJvDnY,2280
+tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
+tksheet/column_headers.py,sha256=ZfHLhXEKe8M9ggf3nzg252DBVH_NRtQichtTF7pisIc,103245
+tksheet/constants.py,sha256=PkvAtdYXSOiOO5zuxqrObvGIVV2sEE0enN8YLhI8zCc,3922
+tksheet/find_window.py,sha256=JfkgpGluSng3bKMBneDNQg-AJmBcmCW7JIhtYbSUZaE,8036
+tksheet/formatters.py,sha256=21ZkMaDIJNUtjvtlAbPl8Y19I9nDxue-JJegw6hblz8,10551
+tksheet/functions.py,sha256=BDCCKdOUF9FRDq9GF7HmRXaZ22PYRDySlo6WLvyZtVA,52806
+tksheet/main_table.py,sha256=ChMaI_t5rDwfc5pStG5pxKhqWwKnauJGxa_hoTXq478,357778
+tksheet/other_classes.py,sha256=ADybikLipEG4NABXx8bGVAovJJhWcomQOWTorzS1CPU,16581
+tksheet/row_index.py,sha256=R6tCsfXnPbblnSU1tvse_fCjx2DG0U-vx-XaiAPdZs0,133195
+tksheet/sheet.py,sha256=6hHI_W0rmuV6l2C2jd3fa9pgnNx3kW9k6rY0qqEq-Wg,284585
+tksheet/sheet_options.py,sha256=7q5T55sZe_elA3MCP0VnbX_f0Euo425aw4uSoPXteoA,9624
+tksheet/sorting.py,sha256=qLusdRmqDUBkcEgK3WcYbFjIJmXNBoDhR-D2yrWC-BI,9895
+tksheet/text_editor.py,sha256=ZLVF-0WxDin5qUAJ5r7dmsdwvhyEoxw0PlPvi_AGNPE,7328
+tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
+tksheet/tksheet_types.py,sha256=8JQVlA6N9jEZTEAytbcyuhOGuNE4fUPxYhTqoidxEE0,588
+tksheet/top_left_rectangle.py,sha256=KhTT-rBUwQTgaHjSwL83cL5_71k2L1B7gxkSxZlTSK8,8598
+tksheet-7.4.3.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.4.3.dist-info/METADATA,sha256=36JytEf6SmrgwlyWLnvv1SLYumrDvxH4wDERw-cxTXE,7839
+tksheet-7.4.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tksheet-7.4.3.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.4.3.dist-info/RECORD,,

tksheet-7.4.1.dist-info/RECORD

@@ -1,22 +0,0 @@
-tksheet/__init__.py,sha256=fR2C-xu9T3nD65tI8sKGFUjapge6Nev2Uy1n_K86b_4,2241
-tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
-tksheet/column_headers.py,sha256=kWCK1fTf0poj5vilqxh99r6gJ4-bBaIJfB-oNbH7oE8,103245
-tksheet/constants.py,sha256=PkvAtdYXSOiOO5zuxqrObvGIVV2sEE0enN8YLhI8zCc,3922
-tksheet/find_window.py,sha256=JfkgpGluSng3bKMBneDNQg-AJmBcmCW7JIhtYbSUZaE,8036
-tksheet/formatters.py,sha256=21ZkMaDIJNUtjvtlAbPl8Y19I9nDxue-JJegw6hblz8,10551
-tksheet/functions.py,sha256=tVwMLWsW4n5M-RCL8DrLMOXygDhBP26wz4nEQq1gkUo,52734
-tksheet/main_table.py,sha256=mK74o6VlN8EdM6iJt3XyLlJc4DvNGENyjmDJcNEIcX0,357780
-tksheet/other_classes.py,sha256=ADybikLipEG4NABXx8bGVAovJJhWcomQOWTorzS1CPU,16581
-tksheet/row_index.py,sha256=F64DrvSBmq89JVhYomSRzyQtS4nWAeWDcqnPL8cgsGI,133222
-tksheet/sheet.py,sha256=2_fMNnJqwvEkYsrDuyxFC68l6XZROzZVjG2FrSZc7IU,284689
-tksheet/sheet_options.py,sha256=RAQX9NF8Bvauj4fHW-8TGtZG6cRVSzwGxSUKplg3c28,9625
-tksheet/sorting.py,sha256=ttjPPJwbYKaiQ_uNDU8hXjPiGkCVeGp2Hfd6SWYIN8w,9181
-tksheet/text_editor.py,sha256=ZLVF-0WxDin5qUAJ5r7dmsdwvhyEoxw0PlPvi_AGNPE,7328
-tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
-tksheet/tksheet_types.py,sha256=8JQVlA6N9jEZTEAytbcyuhOGuNE4fUPxYhTqoidxEE0,588
-tksheet/top_left_rectangle.py,sha256=KhTT-rBUwQTgaHjSwL83cL5_71k2L1B7gxkSxZlTSK8,8598
-tksheet-7.4.1.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.4.1.dist-info/METADATA,sha256=bI-Stt1T78UK-_qsUjpFpWxsOHNwULQvAsMadKxP8ak,7717
-tksheet-7.4.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tksheet-7.4.1.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.4.1.dist-info/RECORD,,