tksheet 7.2.11__tar.gz → 7.2.12__tar.gz

{tksheet-7.2.11/tksheet.egg-info → tksheet-7.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.11
+Version: 7.2.12
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

{tksheet-7.2.11 → tksheet-7.2.12}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.2.11"
+version = "7.2.12"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.2.11 → tksheet-7.2.12}/tksheet/__init__.py

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

{tksheet-7.2.11 → tksheet-7.2.12}/tksheet/column_headers.py

@@ -599,7 +599,7 @@ class ColumnHeaders(tk.Canvas):
             if need_redraw:
                 self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=False)
         try_binding(self.extra_b1_motion_func, event)
-        
+
     def drag_height_resize(self) -> None:
         self.set_height(self.new_col_height, set_TL=True)
         self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
@@ -2176,7 +2176,16 @@ class ColumnHeaders(tk.Canvas):
         )
         edited = False
         if isinstance(self.MT._headers, int):
-            edited = self.MT.set_cell_data_undo(r=self.MT._headers, c=c, datacn=datacn, value=value, undo=True)
+            disprn = self.MT.try_disprn(self.MT._headers)
+            edited = self.MT.set_cell_data_undo(
+                r=disprn if isinstance(disprn, int) else 0,
+                c=c,
+                datarn=self.MT._headers,
+                datacn=datacn,
+                value=value,
+                undo=True,
+                cell_resize=isinstance(disprn, int),
+            )
         else:
             self.fix_header(datacn)
             if not check_input_valid or self.input_valid_for_cell(datacn, value):

{tksheet-7.2.11 → tksheet-7.2.12}/tksheet/functions.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
-import bisect
 import csv
 import io
 import pickle
 import re
 import tkinter as tk
 import zlib
+from bisect import (
+    bisect_left,
+)
 from collections import deque
 from collections.abc import (
     Callable,
@@ -208,6 +210,16 @@ def len_to_idx(n: int) -> int:
     return n - 1
 
 
+def b_index(sorted_seq: Sequence[int], num_to_index: int) -> int:
+    """
+    Designed to be a faster way of finding the index of an int
+    in a sorted list of ints than list.index()
+    """
+    if (idx := bisect_left(sorted_seq, num_to_index)) == len(sorted_seq) or sorted_seq[idx] != num_to_index:
+        raise ValueError(f"{num_to_index} is not in Sequence")
+    return idx
+
+
 def get_dropdown_kwargs(
     values: list = [],
     set_value: object = None,
@@ -379,7 +391,7 @@ def get_seq_without_gaps_at_index(
     position: int,
     get_st_end: bool = False,
 ) -> tuple[int, int] | list[int]:
-    start_idx = bisect.bisect_left(seq, position)
+    start_idx = bisect_left(seq, position)
     forward_gap = get_index_of_gap_in_sorted_integer_seq_forward(seq, start_idx)
     reverse_gap = get_index_of_gap_in_sorted_integer_seq_reverse(seq, start_idx)
     if forward_gap is not None:

{tksheet-7.2.11 → tksheet-7.2.12}/tksheet/main_table.py

@@ -49,6 +49,7 @@ from .formatters import (
     try_to_bool,
 )
 from .functions import (
+    b_index,
     consecutive_ranges,
     decompress_load,
     diff_gen,
@@ -7460,3 +7461,21 @@ class MainTable(tk.Canvas):
 
     def datarn(self, r: int) -> int:
         return r if self.all_rows_displayed else self.displayed_rows[r]
+
+    def dispcn(self, datacn: int) -> int:
+        return datacn if self.all_columns_displayed else b_index(self.displayed_columns, datacn)
+
+    def try_dispcn(self, datacn: int) -> int | None:
+        try:
+            return self.dispcn(datacn)
+        except Exception:
+            return None
+
+    def disprn(self, datarn: int) -> int:
+        return datarn if self.all_rows_displayed else b_index(self.displayed_rows, datarn)
+
+    def try_disprn(self, datarn: int) -> int | None:
+        try:
+            return self.disprn(datarn)
+        except Exception:
+            return None

{tksheet-7.2.11 → tksheet-7.2.12}/tksheet/row_index.py

@@ -780,7 +780,7 @@ class RowIndex(tk.Canvas):
             and self.get_cell_kwargs(datarn, key="checkbox")
             and event.x < self.MT.index_txt_height + 4
         )
-        
+
     def drag_width_resize(self) -> None:
         self.set_width(self.new_row_width, set_TL=True)
         self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
@@ -2296,7 +2296,16 @@ class RowIndex(tk.Canvas):
         )
         edited = False
         if isinstance(self.MT._row_index, int):
-            edited = self.MT.set_cell_data_undo(r=r, c=self.MT._row_index, datarn=datarn, value=value, undo=True)
+            dispcn = self.MT.try_dispcn(self.MT._row_index)
+            edited = self.MT.set_cell_data_undo(
+                r=r,
+                c=dispcn if isinstance(dispcn, int) else 0,
+                datarn=datarn,
+                datacn=self.MT._row_index,
+                value=value,
+                undo=True,
+                cell_resize=isinstance(dispcn, int),
+            )
         else:
             self.fix_index(datarn)
             if not check_input_valid or self.input_valid_for_cell(datarn, value):
@@ -2431,7 +2440,7 @@ class RowIndex(tk.Canvas):
             elif isinstance(self.MT._row_index, int):
                 value = (
                     not self.MT.data[datarn][self.MT._row_index]
-                    if type(self.MT.data[datarn][self.MT._row_index], bool)
+                    if isinstance(self.MT.data[datarn][self.MT._row_index], bool)
                     else False
                 )
             else:
@@ -2476,8 +2485,7 @@ class RowIndex(tk.Canvas):
                 if iid not in self.tree_open_ids:
                     return False
             return True
-        else:
-            return all(iid in self.tree_open_ids for iid in self.get_iid_ancestors(iid))
+        return all(map(self.tree_open_ids.__contains__, self.get_iid_ancestors(iid)))
 
     def get_iid_ancestors(self, iid: str) -> Generator[str]:
         if self.tree[iid].parent:

{tksheet-7.2.11 → tksheet-7.2.12}/tksheet/sheet.py

@@ -1556,7 +1556,7 @@ class Sheet(tk.Frame):
     @data.setter
     def data(self, value: list[list[object]]) -> None:
         self.data_reference(value)
-        
+
     def new_tksheet_event(self) -> EventDataDict:
         return event_dict(
             name="",

{tksheet-7.2.11 → tksheet-7.2.12/tksheet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.11
+Version: 7.2.12
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors