tksheet 7.4.8__py3-none-any.whl → 7.4.10__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.4.8"
+__version__ = "7.4.10"
 
 from .colors import (
     color_map,

tksheet/column_headers.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import tkinter as tk
 from collections import defaultdict
-from collections.abc import Callable, Hashable, Sequence
+from collections.abc import Callable, Hashable, Iterator, Sequence
 from functools import partial
 from itertools import cycle, islice, repeat
 from math import ceil, floor
@@ -37,9 +37,8 @@ from .functions import (
 )
 from .other_classes import DotDict, DraggedRowColumn, DropdownStorage, EventDataDict, TextEditorStorage
 from .row_index import RowIndex
-from .sorting import sort_column, sort_rows_by_column, sort_tree_view
+from .sorting import sort_column, sort_rows_by_column, sort_tree_rows_by_column
 from .text_editor import TextEditor
-from .tksheet_types import AnyIter
 
 
 class ColumnHeaders(tk.Canvas):
@@ -861,7 +860,7 @@ class ColumnHeaders(tk.Canvas):
     def _sort_columns(
         self,
         event: tk.Event | None = None,
-        columns: AnyIter[int] | None = None,
+        columns: Iterator[int] | None = None,
         reverse: bool = False,
         validation: bool = True,
         key: Callable | None = None,
@@ -923,26 +922,30 @@ class ColumnHeaders(tk.Canvas):
         if column is None:
             if not self.MT.selected:
                 return event_data
-            column = self.MT.selected.column
+            column = self.MT.datacn(self.MT.selected.column)
         if try_binding(self.ch_extra_begin_sort_rows_func, event_data, "begin_move_rows"):
             if key is None:
                 key = self.PAR.ops.sort_key
             disp_new_idxs, disp_row_ctr = {}, 0
             if self.ops.treeview:
-                new_nodes_order, data_new_idxs = sort_tree_view(
-                    _row_index=self.MT._row_index,
-                    tree_rns=self.RI.tree_rns,
-                    tree=self.RI.tree,
-                    key=key,
+                new_nodes_order, data_new_idxs = sort_tree_rows_by_column(
+                    data=self.MT.data,
+                    column=column,
+                    index=self.MT._row_index,
+                    rns=self.RI.rns,
                     reverse=reverse,
+                    key=key,
                 )
                 for node in new_nodes_order:
-                    if (idx := try_b_index(self.MT.displayed_rows, self.RI.tree_rns[node.iid])) is not None:
+                    if (idx := try_b_index(self.MT.displayed_rows, self.RI.rns[node.iid])) is not None:
                         disp_new_idxs[idx] = disp_row_ctr
                         disp_row_ctr += 1
             else:
                 new_rows_order, data_new_idxs = sort_rows_by_column(
-                    self.MT.data, column=column, reverse=reverse, key=key
+                    self.MT.data,
+                    column=column,
+                    reverse=reverse,
+                    key=key,
                 )
                 if self.MT.all_rows_displayed:
                     disp_new_idxs = data_new_idxs
@@ -1013,7 +1016,7 @@ class ColumnHeaders(tk.Canvas):
 
     def select_col(
         self,
-        c: int | AnyIter[int],
+        c: int | Iterator[int],
         redraw: bool = False,
         run_binding_func: bool = True,
         ext: bool = False,
@@ -1094,7 +1097,7 @@ class ColumnHeaders(tk.Canvas):
             self.itemconfig(item, state="hidden")
 
     def get_cell_dimensions(self, datacn: int) -> tuple[int, int]:
-        txt = self.get_valid_cell_data_as_str(datacn, fix=False)
+        txt = self.cell_str(datacn, fix=False)
         if txt:
             self.MT.txt_measure_canvas.itemconfig(
                 self.MT.txt_measure_canvas_text,
@@ -1150,7 +1153,7 @@ class ColumnHeaders(tk.Canvas):
             elif isinstance(self.MT._headers, int):
                 datarn = self.MT._headers
                 for datacn in iterable:
-                    if txt := self.MT.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True):
+                    if txt := self.MT.cell_str(datarn, datacn, get_displayed=True):
                         qconf(qtxtm, text=txt, font=qfont)
                         b = qbbox(qtxtm)
                         th = b[3] - b[1] + 5
@@ -1197,7 +1200,7 @@ class ColumnHeaders(tk.Canvas):
             qtxth = self.MT.table_txt_height
             qfont = self.ops.table_font
             for datarn in iterable:
-                if txt := self.MT.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True):
+                if txt := self.MT.cell_str(datarn, datacn, get_displayed=True):
                     qconf(qtxtm, text=txt, font=qfont)
                     b = qbbox(qtxtm)
                     if (
@@ -1629,7 +1632,7 @@ class ColumnHeaders(tk.Canvas):
                 or (align.endswith("n") and cleftgridln + 5 > scrollpos_right)
             ):
                 continue
-            text = self.get_valid_cell_data_as_str(datacn, fix=False)
+            text = self.cell_str(datacn, fix=False)
             if not text:
                 continue
             max_lines = int((self.current_height - top - 2) / txt_h)
@@ -2223,7 +2226,7 @@ class ColumnHeaders(tk.Canvas):
                 edited = True
         if edited and cell_resize and self.ops.cell_auto_resize_enabled:
             if self.height_resizing_enabled:
-                self.set_height_of_header_to_text(self.get_valid_cell_data_as_str(datacn, fix=False))
+                self.set_height_of_header_to_text(self.cell_str(datacn, fix=False))
             self.set_col_width_run_binding(c)
         if redraw:
             self.MT.refresh()
@@ -2270,7 +2273,7 @@ class ColumnHeaders(tk.Canvas):
         redirect_int: bool = False,
     ) -> Any:
         if get_displayed:
-            return self.get_valid_cell_data_as_str(datacn, fix=False)
+            return self.cell_str(datacn, fix=False)
         if redirect_int and isinstance(self.MT._headers, int):  # internal use
             return self.MT.get_cell_data(self.MT._headers, datacn, none_to_empty_str=True)
         if (
@@ -2282,7 +2285,7 @@ class ColumnHeaders(tk.Canvas):
             return ""
         return self.MT._headers[datacn]
 
-    def get_valid_cell_data_as_str(self, datacn: int, fix: bool = True) -> str:
+    def cell_str(self, datacn: int, fix: bool = True) -> str:
         kwargs = self.get_cell_kwargs(datacn, key="dropdown")
         if kwargs:
             if kwargs["text"] is not None:
@@ -2292,7 +2295,7 @@ class ColumnHeaders(tk.Canvas):
             if kwargs:
                 return f"{kwargs['text']}"
         if isinstance(self.MT._headers, int):
-            return self.MT.get_valid_cell_data_as_str(self.MT._headers, datacn, get_displayed=True)
+            return self.MT.cell_str(self.MT._headers, datacn, get_displayed=True)
         if fix:
             self.fix_header(datacn)
         try:

tksheet/functions.py

@@ -16,7 +16,6 @@ from .colors import color_map
 from .constants import align_value_error, symbols_set
 from .formatters import to_bool
 from .other_classes import DotDict, EventDataDict, Highlight, Loc, Span
-from .tksheet_types import AnyIter
 
 unpickle_obj = pickle.loads
 lines_re = re.compile(r"[^\n]+")
@@ -356,6 +355,8 @@ def event_dict(
         sheet_state=DotDict() if sheet_state is None else sheet_state,
         treeview=DotDict(
             nodes={},
+            renamed={},
+            text={},
         )
         if treeview is None
         else treeview,
@@ -511,19 +512,19 @@ def is_iterable(o: Any) -> bool:
         return False
 
 
-def int_x_iter(i: AnyIter[int] | int) -> AnyIter[int]:
+def int_x_iter(i: Iterator[int] | int) -> Iterator[int]:
     if isinstance(i, int):
         return (i,)
     return i
 
 
-def int_x_tuple(i: AnyIter[int] | int) -> tuple[int]:
+def int_x_tuple(i: Iterator[int] | int) -> tuple[int]:
     if isinstance(i, int):
         return (i,)
     return tuple(i)
 
 
-def unpack(t: tuple[Any] | tuple[AnyIter[Any]]) -> tuple[Any]:
+def unpack(t: tuple[Any] | tuple[Iterator[Any]]) -> tuple[Any]:
     if not len(t):
         return t
     if is_iterable(t[0]) and len(t) == 1:
@@ -725,7 +726,7 @@ def cell_right_within_box(
 
 
 def get_last(
-    it: AnyIter[Any],
+    it: Iterator[Any],
 ) -> Any:
     if hasattr(it, "__reversed__"):
         try:
@@ -748,8 +749,8 @@ def index_exists(seq: Sequence[Any], index: int) -> bool:
 
 
 def add_to_displayed(displayed: list[int], to_add: Iterable[int]) -> list[int]:
-    # assumes to_add is sorted in reverse
-    for i in reversed(to_add):
+    # assumes to_add is sorted
+    for i in to_add:
         ins = bisect_left(displayed, i)
         displayed[ins:] = [i] + [e + 1 for e in islice(displayed, ins, None)]
     return displayed
@@ -820,13 +821,13 @@ def insert_items(
 ) -> list[Any]:
     """
     seq: list[Any]
-    to_insert: keys are ints sorted in reverse, representing list indexes to insert items.
+    to_insert: keys are ints sorted, representing list indexes to insert items.
                Values are any, e.g. {1: 200, 0: 200}
     """
     if to_insert:
-        if seq_len_func and next(iter(to_insert)) >= len(seq) + len(to_insert):
-            seq_len_func(next(iter(to_insert)) - len(to_insert))
-        for idx, v in reversed(to_insert.items()):
+        if seq_len_func and next(reversed(to_insert)) >= len(seq) + len(to_insert):
+            seq_len_func(next(reversed(to_insert)) - len(to_insert))
+        for idx, v in to_insert.items():
             seq[idx:idx] = [v]
     return seq
 
@@ -1040,7 +1041,7 @@ def is_last_cell(
     return row == end_row - 1 and col == end_col - 1
 
 
-def zip_fill_2nd_value(x: AnyIter[Any], o: Any) -> Generator[Any, Any]:
+def zip_fill_2nd_value(x: Iterator[Any], o: Any) -> Generator[Any, Any]:
     return zip(x, repeat(o))
 
 
@@ -1465,13 +1466,15 @@ def span_froms(
     return from_r, from_c
 
 
-def del_named_span_options(options: dict, itr: AnyIter[Hashable], type_: str) -> None:
+def del_named_span_options(options: dict, itr: Iterator[Hashable], type_: str) -> None:
     for k in itr:
         if k in options and type_ in options[k]:
             del options[k][type_]
 
 
-def del_named_span_options_nested(options: dict, itr1: AnyIter[Hashable], itr2: AnyIter[Hashable], type_: str) -> None:
+def del_named_span_options_nested(
+    options: dict, itr1: Iterator[Hashable], itr2: Iterator[Hashable], type_: str
+) -> None:
     for k1 in itr1:
         for k2 in itr2:
             k = (k1, k2)
@@ -1552,7 +1555,7 @@ def set_align(
 def del_from_options(
     options: dict,
     key: str,
-    coords: int | AnyIter[int | tuple[int, int]] | None = None,
+    coords: int | Iterator[int | tuple[int, int]] | None = None,
 ) -> dict:
     if isinstance(coords, int):
         if coords in options and key in options[coords]: