tksheet 7.3.0__py3-none-any.whl → 7.3.2__py3-none-any.whl

tksheet/other_classes.py

@@ -457,7 +457,7 @@ class Node:
         return self.text
 
 
-class DropdownStorage:
+class StorageBase:
     __slots__ = ("canvas_id", "window", "open")
 
     def __init__(self) -> None:
@@ -465,6 +465,8 @@ class DropdownStorage:
         self.window = None
         self.open = False
 
+
+class DropdownStorage(StorageBase):
     def get_coords(self) -> int | tuple[int, int] | None:
         """
         Returns None if not open or window is None
@@ -474,14 +476,7 @@ class DropdownStorage:
         return None
 
 
-class TextEditorStorage:
-    __slots__ = ("canvas_id", "window", "open")
-
-    def __init__(self) -> None:
-        self.canvas_id = None
-        self.window = None
-        self.open = False
-
+class EditorStorageBase(StorageBase):
     def focus(self) -> None:
         if self.window:
             self.window.tktext.focus_set()
@@ -516,6 +511,8 @@ class TextEditorStorage:
             return self.window.tktext
         return self.window
 
+
+class TextEditorStorage(EditorStorageBase):
     @property
     def coords(self) -> tuple[int, int]:
         return self.window.r, self.window.c

tksheet/row_index.py

@@ -5,7 +5,6 @@ from collections import defaultdict
 from collections.abc import (
     Generator,
     Hashable,
-    Iterator,
     Sequence,
 )
 from functools import (
@@ -29,19 +28,29 @@ from typing import Literal
 from .colors import (
     color_map,
 )
+from .constants import (
+    rc_binding,
+    text_editor_close_bindings,
+    text_editor_newline_bindings,
+    text_editor_to_unbind,
+)
 from .formatters import (
     is_bool_like,
     try_to_bool,
 )
 from .functions import (
     consecutive_chunks,
+    consecutive_ranges,
     event_dict,
+    event_has_char_key,
+    event_opens_dropdown_or_checkbox,
     get_n2a,
+    int_x_tuple,
     is_contiguous,
     new_tk_event,
     num2alpha,
-    stored_event_dict,
     rounded_box_coords,
+    stored_event_dict,
     try_binding,
 )
 from .other_classes import (
@@ -54,12 +63,8 @@ from .other_classes import (
 from .text_editor import (
     TextEditor,
 )
-from .vars import (
-    rc_binding,
-    symbols_set,
-    text_editor_close_bindings,
-    text_editor_newline_bindings,
-    text_editor_to_unbind,
+from .types import (
+    AnyIter,
 )
 
 
@@ -944,20 +949,31 @@ class RowIndex(tk.Canvas):
 
     def select_row(
         self,
-        r: int,
+        r: int | AnyIter[int],
         redraw: bool = False,
         run_binding_func: bool = True,
         ext: bool = False,
     ) -> int:
         boxes_to_hide = tuple(self.MT.selection_boxes)
-        fill_iid = self.MT.create_selection_box(r, 0, r + 1, len(self.MT.col_positions) - 1, "rows", ext=ext)
+        fill_iids = [
+            self.MT.create_selection_box(
+                start,
+                0,
+                end,
+                len(self.MT.col_positions) - 1,
+                "rows",
+                set_current=True,
+                ext=ext,
+            )
+            for start, end in consecutive_ranges(int_x_tuple(r))
+        ]
         for iid in boxes_to_hide:
             self.MT.hide_selection_box(iid)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
             self.MT.run_selection_binding("rows")
-        return fill_iid
+        return fill_iids[0] if len(fill_iids) == 1 else fill_iids
 
     def add_selection(
         self,
@@ -1113,7 +1129,7 @@ class RowIndex(tk.Canvas):
 
     def get_index_text_width(
         self,
-        only_rows: Iterator[int] | None = None,
+        only_rows: AnyIter[int] | None = None,
     ) -> int:
         self.fix_index()
         w = self.PAR.ops.default_row_index_width
@@ -1199,6 +1215,8 @@ class RowIndex(tk.Canvas):
         if new_w is not None and (sheet_w_x := floor(self.PAR.winfo_width() * 0.7)) < new_w:
             new_w = sheet_w_x
         if new_w and (self.current_width - new_w > 20 or new_w - self.current_width > 3):
+            if self.MT.find_window.open:
+                self.MT.itemconfig(self.MT.find_window.canvas_id, state="hidden")
             self.set_width(new_w, set_TL=True, recreate_selection_boxes=False)
             return True
         return False
@@ -1812,8 +1830,8 @@ class RowIndex(tk.Canvas):
 
     def get_redraw_selections(self, startr: int, endr: int) -> dict[str, set[int]]:
         d = defaultdict(set)
-        for item, box in self.MT.get_selection_items():
-            r1, c1, r2, c2 = box.coords
+        for _, box in self.MT.get_selection_items():
+            r1, _, r2, _ = box.coords
             for r in range(startr, endr):
                 if r1 <= r and r2 > r:
                     d[box.type_ if box.type_ != "columns" else "cells"].add(r)
@@ -1829,7 +1847,7 @@ class RowIndex(tk.Canvas):
         if self.get_cell_kwargs(datarn, key="readonly"):
             return
         elif self.get_cell_kwargs(datarn, key="dropdown") or self.get_cell_kwargs(datarn, key="checkbox"):
-            if self.MT.event_opens_dropdown_or_checkbox(event):
+            if event_opens_dropdown_or_checkbox(event):
                 if self.get_cell_kwargs(datarn, key="dropdown"):
                     self.open_dropdown_window(r, event=event)
                 elif self.get_cell_kwargs(datarn, key="checkbox"):
@@ -1855,28 +1873,16 @@ class RowIndex(tk.Canvas):
         state: str = "normal",
         dropdown: bool = False,
     ) -> bool:
-        text = None
+        text = f"{self.get_cell_data(self.MT.datarn(r), none_to_empty_str=True, redirect_int=True)}"
         extra_func_key = "??"
-        if event is None or self.MT.event_opens_dropdown_or_checkbox(event):
-            if event is not None:
-                if hasattr(event, "keysym") and event.keysym == "Return":
-                    extra_func_key = "Return"
-                elif hasattr(event, "keysym") and event.keysym == "F2":
-                    extra_func_key = "F2"
-            text = self.get_cell_data(self.MT.datarn(r), none_to_empty_str=True, redirect_int=True)
-        elif event is not None and (
-            (hasattr(event, "keysym") and event.keysym == "BackSpace") or event.keycode in (8, 855638143)
-        ):
-            extra_func_key = "BackSpace"
-            text = ""
-        elif event is not None and (
-            (hasattr(event, "char") and event.char.isalpha())
-            or (hasattr(event, "char") and event.char.isdigit())
-            or (hasattr(event, "char") and event.char in symbols_set)
-        ):
-            extra_func_key = event.char
-            text = event.char
-        else:
+        if event_opens_dropdown_or_checkbox(event):
+            if hasattr(event, "keysym") and event.keysym in ("Return", "F2", "BackSpace"):
+                extra_func_key = event.keysym
+                if event.keysym == "BackSpace":
+                    text = ""
+        elif event_has_char_key(event):
+            extra_func_key = text = event.char
+        elif event is not None:
             return False
         if self.extra_begin_edit_cell_func:
             try:
@@ -1898,12 +1904,11 @@ class RowIndex(tk.Canvas):
                 return False
             else:
                 text = text if isinstance(text, str) else f"{text}"
-        text = "" if text is None else text
         if self.PAR.ops.cell_auto_resize_enabled:
             self.set_row_height_run_binding(r)
         if self.text_editor.open and r == self.text_editor.row:
             self.text_editor.set_text(self.text_editor.get() + "" if not isinstance(text, str) else text)
-            return
+            return False
         self.hide_text_editor()
         if not self.MT.see(r=r, c=0, keep_yscroll=True, check_cell_visibility=True):
             self.MT.refresh()
@@ -1911,8 +1916,6 @@ class RowIndex(tk.Canvas):
         y = self.MT.row_positions[r]
         w = self.current_width + 1
         h = self.MT.row_positions[r + 1] - y + 1
-        if text is None:
-            text = self.get_cell_data(self.MT.datarn(r), none_to_empty_str=True, redirect_int=True)
         kwargs = {
             "menu_kwargs": DotDict(
                 {