tksheet 7.2.11__py3-none-any.whl → 7.2.12__py3-none-any.whl

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/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/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/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/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/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.dist-info → tksheet-7.2.12.dist-info}/METADATA

@@ -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.12.dist-info/RECORD

@@ -0,0 +1,20 @@
+tksheet/__init__.py,sha256=5utL7_7hWEF1rltV8vnjbzRcT0pUIFoi3BcQ7yMK6gU,2145
+tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
+tksheet/column_headers.py,sha256=rqebiS9z6iKIsHk9yIATgqZ3gUF4uSWLsXVv5iiPxl0,102334
+tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
+tksheet/functions.py,sha256=u-m4p7AfRnLLgtX95AJ4QoRBerBAyi2t1JXTfOQNpS8,41118
+tksheet/main_table.py,sha256=XTqqmigEzTiqVArfo0CHYwVKpMkieFUXBNCKGcYRB4k,328744
+tksheet/other_classes.py,sha256=HIKIDNXJRv0H5qbftcCtLVWW8NKSBAwyNXQOlmPWTDQ,15633
+tksheet/row_index.py,sha256=zfBLQ5npuaun9UOQgG3B97q9yp57K3YEcit-MIZuBNc,109062
+tksheet/sheet.py,sha256=9meeBpTm5WNNU5g8vYAuYpnV3Zce20o8gYFFNPcJUKk,274973
+tksheet/sheet_options.py,sha256=Azo7_-H0e0ssYEoU7Mq_OWy3S-U05rp4_6Q2E2Ffuu8,12262
+tksheet/text_editor.py,sha256=aRm1Y5GfORiEAJthtN1uQ30CT3VoF8mRWvR-SIXPrJU,6548
+tksheet/themes.py,sha256=ZO4RqnAhEpApsoA5ZGUkYvb7huaNHSmrV_ug2TWWzOE,14474
+tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
+tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
+tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
+tksheet-7.2.12.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.2.12.dist-info/METADATA,sha256=UZJSAJ17UMGSqqX32lFm0jvYDjAI4s-Z2lGHGpWRI3M,6285
+tksheet-7.2.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.2.12.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.2.12.dist-info/RECORD,,

tksheet-7.2.11.dist-info/RECORD

@@ -1,20 +0,0 @@
-tksheet/__init__.py,sha256=CDNQyyZaOcN--biH6npJTIkTxJYsarIsJwA8dPzaLbY,2145
-tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=ey_7SNmbxoV-r_a6rLTvgD1y_RoTzyJUBo9jRFQyY8U,102062
-tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
-tksheet/functions.py,sha256=PgigHSO_cnQoWSXFSfJ5YlPbyOVd2BYUHU4UBbUCCFE,40706
-tksheet/main_table.py,sha256=HazCfFKiI0XbXahcYxsrWqWHoumgPe4rUwb9LumNOVU,328126
-tksheet/other_classes.py,sha256=HIKIDNXJRv0H5qbftcCtLVWW8NKSBAwyNXQOlmPWTDQ,15633
-tksheet/row_index.py,sha256=g6YVYXIEp-YQxa1C5YsBvqOC8gABDewq_yZEl3S9kPg,108800
-tksheet/sheet.py,sha256=S9bNBOozxiJNxv8s8Ae7fGuhBapFmm_c8QmZycdpXUE,274981
-tksheet/sheet_options.py,sha256=Azo7_-H0e0ssYEoU7Mq_OWy3S-U05rp4_6Q2E2Ffuu8,12262
-tksheet/text_editor.py,sha256=aRm1Y5GfORiEAJthtN1uQ30CT3VoF8mRWvR-SIXPrJU,6548
-tksheet/themes.py,sha256=ZO4RqnAhEpApsoA5ZGUkYvb7huaNHSmrV_ug2TWWzOE,14474
-tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
-tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
-tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
-tksheet-7.2.11.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.2.11.dist-info/METADATA,sha256=nwyvMmO2XHZC6oPfHuYD2vtN-mLf3jX3KAFnFwV4Ars,6285
-tksheet-7.2.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.2.11.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.2.11.dist-info/RECORD,,