tksheet 7.2.11__tar.gz → 7.2.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.11
+Version: 7.2.13
 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.13}/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.13"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.2.11 → tksheet-7.2.13}/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,
@@ -37,6 +37,7 @@ from .functions import (
     alpha2num,
     consecutive_chunks,
     consecutive_ranges,
+    convert_align,
     data_to_displayed_idxs,
     displayed_to_data_idxs,
     dropdown_search_function,

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

@@ -128,7 +128,6 @@ class ColumnHeaders(tk.Canvas):
         self.hidd_checkbox = {}
         self.hidd_boxes = set()
 
-        self.default_header = kwargs["default_header"].lower()
         self.align = kwargs["header_align"]
         self.basic_bindings()
 
@@ -599,7 +598,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 +2175,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):
@@ -2261,7 +2269,7 @@ class ColumnHeaders(tk.Canvas):
         except Exception:
             value = ""
         if not value and self.PAR.ops.show_default_header_for_empty:
-            value = get_n2a(datacn, self.default_header)
+            value = get_n2a(datacn, self.PAR.ops.default_header)
         return value
 
     def get_value_for_empty_cell(self, datacn: int, c_ops: bool = True) -> object:

{tksheet-7.2.11 → tksheet-7.2.13}/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,
@@ -35,8 +37,17 @@ unpickle_obj = pickle.loads
 
 
 def get_csv_str_dialect(s: str, delimiters: str) -> csv.Dialect:
+    if len(s) > 6000:
+        try:
+            _upto = next(
+                match.start() + 1 for i, match in enumerate(re.finditer("\n", s), 1) if i == 300 or match.start() > 6000
+            )
+        except Exception:
+            _upto = len(s)
+    else:
+        _upto = len(s)
     try:
-        return csv.Sniffer().sniff(s[:5000] if len(s) > 5000 else s, delimiters=delimiters)
+        return csv.Sniffer().sniff(s[:_upto] if len(s) > 6000 else s, delimiters=delimiters)
     except Exception:
         return csv.excel_tab
 
@@ -208,6 +219,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 +400,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.13}/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,
@@ -6344,7 +6345,7 @@ class MainTable(tk.Canvas):
                 for r in range(box.coords.from_r, box.coords.upto_r)
             }
             if get_cells_as_rows:
-                return s | set(tup[0] for tup in self.get_selected_cells())
+                return s | set(map(itemgetter(0), self.gen_selected_cells()))
         return s
 
     def get_selected_cols(
@@ -6368,7 +6369,7 @@ class MainTable(tk.Canvas):
                 for c in range(box.coords.from_c, box.coords.upto_c)
             }
             if get_cells_as_cols:
-                return s | set(tup[1] for tup in self.get_selected_cells())
+                return s | set(map(itemgetter(1), self.gen_selected_cells()))
         return s
 
     def get_selected_cells(
@@ -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.13}/tksheet/row_index.py

@@ -140,7 +140,6 @@ class RowIndex(tk.Canvas):
         self.hidd_boxes = set()
 
         self.align = kwargs["row_index_align"]
-        self.default_index = kwargs["default_row_index"].lower()
 
         self.tree_reset()
         self.basic_bindings()
@@ -780,7 +779,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)
@@ -1200,11 +1199,11 @@ class RowIndex(tk.Canvas):
 
     def auto_set_index_width(self, end_row: int, only_rows: list) -> bool:
         if not isinstance(self.MT._row_index, int) and not self.MT._row_index:
-            if self.default_index == "letters":
+            if self.PAR.ops.default_row_index == "letters":
                 new_w = self.MT.get_txt_w(f"{num2alpha(end_row)}") + 20
-            elif self.default_index == "numbers":
+            elif self.PAR.ops.default_row_index == "numbers":
                 new_w = self.MT.get_txt_w(f"{end_row}") + 20
-            elif self.default_index == "both":
+            elif self.PAR.ops.default_row_index == "both":
                 new_w = self.MT.get_txt_w(f"{end_row + 1} {num2alpha(end_row)}") + 20
         elif self.PAR.ops.auto_resize_row_index is True:
             new_w = self.get_index_text_width(only_rows=only_rows)
@@ -1336,33 +1335,44 @@ class RowIndex(tk.Canvas):
         fill: str,
         tag: str | tuple[str],
         indent: float,
+        has_children: bool = False,
         open_: bool = False,
     ) -> None:
         mod = (self.MT.index_txt_height - 1) if self.MT.index_txt_height % 2 else self.MT.index_txt_height
         small_mod = int(mod / 5)
         mid_y = floor(self.MT.min_row_height / 2)
-        # up arrow
-        if open_:
-            points = (
-                # the left hand downward point
-                x1 + 5 + indent,
-                y1 + mid_y + small_mod,
-                # the middle upward point
-                x1 + 5 + indent + small_mod + small_mod,
-                y1 + mid_y - small_mod,
-                # the right hand downward point
-                x1 + 5 + indent + small_mod + small_mod + small_mod + small_mod,
-                y1 + mid_y + small_mod,
-            )
-        # right pointing arrow
+        if has_children:
+            # up arrow
+            if open_:
+                points = (
+                    # the left hand downward point
+                    x1 + 5 + indent,
+                    y1 + mid_y + small_mod,
+                    # the middle upward point
+                    x1 + 5 + indent + small_mod + small_mod,
+                    y1 + mid_y - small_mod,
+                    # the right hand downward point
+                    x1 + 5 + indent + small_mod + small_mod + small_mod + small_mod,
+                    y1 + mid_y + small_mod,
+                )
+            # right pointing arrow
+            else:
+                points = (
+                    # the upper point
+                    x1 + 5 + indent + small_mod + small_mod,
+                    y1 + mid_y - small_mod - small_mod,
+                    # the middle point
+                    x1 + 5 + indent + small_mod + small_mod + small_mod + small_mod,
+                    y1 + mid_y,
+                    # the bottom point
+                    x1 + 5 + indent + small_mod + small_mod,
+                    y1 + mid_y + small_mod + small_mod,
+                )
         else:
             points = (
                 # the upper point
                 x1 + 5 + indent + small_mod + small_mod,
                 y1 + mid_y - small_mod - small_mod,
-                # the middle point
-                x1 + 5 + indent + small_mod + small_mod + small_mod + small_mod,
-                y1 + mid_y,
                 # the bottom point
                 x1 + 5 + indent + small_mod + small_mod,
                 y1 + mid_y + small_mod + small_mod,
@@ -1371,14 +1381,14 @@ class RowIndex(tk.Canvas):
             t, sh = self.hidd_tree_arrow.popitem()
             self.coords(t, points)
             if sh:
-                self.itemconfig(t, fill=fill)
+                self.itemconfig(t, fill=fill if has_children else self.PAR.ops.index_grid_fg)
             else:
-                self.itemconfig(t, fill=fill, tag=tag, state="normal")
+                self.itemconfig(t, fill=fill if has_children else self.PAR.ops.index_grid_fg, tag=tag, state="normal")
             self.lift(t)
         else:
             t = self.create_line(
                 points,
-                fill=fill,
+                fill=fill if has_children else self.PAR.ops.index_grid_fg,
                 tag=tag,
                 width=2,
                 capstyle=tk.ROUND,
@@ -1689,16 +1699,16 @@ class RowIndex(tk.Canvas):
                     draw_x += self.MT.index_txt_height + 3
                 indent = self.get_treeview_indent(iid)
                 draw_x += indent + 5
-                if self.tree[iid].children:
-                    self.redraw_tree_arrow(
-                        2,
-                        rtopgridln,
-                        r=r,
-                        fill=tree_arrow_fg,
-                        tag="ta",
-                        indent=indent,
-                        open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
-                    )
+                self.redraw_tree_arrow(
+                    2,
+                    rtopgridln,
+                    r=r,
+                    fill=tree_arrow_fg,
+                    tag="ta",
+                    indent=indent,
+                    has_children=bool(self.tree[iid].children),
+                    open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
+                )
             lns = self.get_valid_cell_data_as_str(datarn, fix=False)
             if not lns:
                 continue
@@ -2296,7 +2306,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):
@@ -2379,7 +2398,7 @@ class RowIndex(tk.Canvas):
         except Exception:
             value = ""
         if not value and self.PAR.ops.show_default_index_for_empty:
-            value = get_n2a(datarn, self.default_index)
+            value = get_n2a(datarn, self.PAR.ops.default_row_index)
         return value
 
     def get_value_for_empty_cell(self, datarn: int, r_ops: bool = True) -> object:
@@ -2431,7 +2450,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 +2495,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.13}/tksheet/sheet.py

@@ -339,11 +339,9 @@ class Sheet(tk.Frame):
             row_index_align=(
                 convert_align(row_index_align) if row_index_align is not None else convert_align(index_align)
             ),
-            default_row_index=default_row_index,
         )
         self.CH = ColumnHeaders(
             parent=self,
-            default_header=default_header,
             header_align=convert_align(header_align),
         )
         self.MT = MainTable(
@@ -1502,6 +1500,8 @@ class Sheet(tk.Frame):
         if displayed_rows:
             self.MT.displayed_rows = []
             self.MT.all_rows_displayed = True
+        if selections:
+            self.MT.deselect(redraw=False)
         if row_heights:
             self.MT.saved_row_heights = {}
             self.MT.set_row_positions([])
@@ -1514,8 +1514,6 @@ class Sheet(tk.Frame):
             self.MT.reset_tags()
         if undo_stack:
             self.reset_undos()
-        if selections:
-            self.MT.deselect(redraw=False)
         if sheet_options:
             self.ops = new_sheet_options()
             self.change_theme(redraw=False)
@@ -1556,7 +1554,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="",
@@ -2924,7 +2922,7 @@ class Sheet(tk.Frame):
 
     def table_align(
         self,
-        align: str = None,
+        align: str | None = None,
         redraw: bool = True,
     ) -> str | Sheet:
         if align is None:
@@ -2937,7 +2935,7 @@ class Sheet(tk.Frame):
 
     def header_align(
         self,
-        align: str = None,
+        align: str | None = None,
         redraw: bool = True,
     ) -> str | Sheet:
         if align is None:
@@ -2950,7 +2948,7 @@ class Sheet(tk.Frame):
 
     def row_index_align(
         self,
-        align: str = None,
+        align: str | None = None,
         redraw: bool = True,
     ) -> str | Sheet:
         if align is None:
@@ -3461,6 +3459,17 @@ class Sheet(tk.Frame):
             return self.MT.row_positions
         return self.MT.get_row_heights()
 
+    def get_safe_row_heights(self) -> list[int]:
+        default_h = self.MT.get_default_row_height()
+        return [0 if e == default_h else e for e in self.MT.gen_row_heights()]
+
+    def set_safe_row_heights(self, heights: list[int]) -> Sheet:
+        default_h = self.MT.get_default_row_height()
+        self.MT.row_positions = list(
+            accumulate(chain([0], (self.valid_row_height(e) if e else default_h for e in heights)))
+        )
+        return self
+
     def get_row_text_height(
         self,
         row: int,
@@ -3823,8 +3832,14 @@ class Sheet(tk.Frame):
         return c if self.MT.all_columns_displayed else self.MT.displayed_columns[c]
 
     data_c = displayed_column_to_data
+    datacn = displayed_column_to_data
     dcol = displayed_column_to_data
 
+    def data_column_to_displayed(self, c: int) -> int:
+        return self.MT.dispcn(c)
+
+    dispcn = data_column_to_displayed
+
     def display_columns(
         self,
         columns: None | Literal["all"] | Iterator[int] = None,
@@ -3951,8 +3966,14 @@ class Sheet(tk.Frame):
         return r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
 
     data_r = displayed_row_to_data
+    datarn = displayed_row_to_data
     drow = displayed_row_to_data
 
+    def data_row_to_displayed(self, r: int) -> int:
+        return self.MT.disprn(r)
+
+    disprn = data_row_to_displayed
+
     def display_rows(
         self,
         rows: None | Literal["all"] | Iterator[int] = None,
@@ -4297,10 +4318,6 @@ class Sheet(tk.Frame):
             )
         if "default_row_height" in kwargs:
             self.default_row_height(kwargs["default_row_height"])
-        if "default_header" in kwargs:
-            self.CH.default_header = kwargs["default_header"].lower()
-        if "default_row_index" in kwargs:
-            self.RI.default_index = kwargs["default_row_index"].lower()
         if "max_column_width" in kwargs:
             self.MT.max_column_width = float(kwargs["max_column_width"])
         if "max_row_height" in kwargs:
@@ -6675,9 +6692,6 @@ class Sheet(tk.Frame):
         if self.RI.get_cell_kwargs(r, key="dropdown"):
             return self.MT._row_index[r]
 
-    def delete_all_formatting(self, clear_values: bool = False) -> None:
-        self.MT.delete_all_formatting(clear_values=clear_values)
-
     def format_cell(
         self,
         r: int | Literal["all"],

{tksheet-7.2.11 → tksheet-7.2.13}/tksheet/sheet_options.py

@@ -217,6 +217,8 @@ def new_sheet_options() -> DotDict:
             "default_row_height": "1",
             "default_column_width": 120,
             "default_row_index_width": 70,
+            "default_row_index": "numbers",
+            "default_header": "letters",
             "page_up_down_select_row": True,
             "paste_can_expand_x": False,
             "paste_can_expand_y": False,

{tksheet-7.2.11 → tksheet-7.2.13}/tksheet/text_editor.py

@@ -63,7 +63,7 @@ class TextEditorTkText(tk.Text):
             state=state,
         )
         self.align = align
-        self.rc_popup_menu.delete(0, None)
+        self.rc_popup_menu.delete(0, "end")
         self.rc_popup_menu.add_command(
             label=sheet_ops.select_all_label,
             accelerator=sheet_ops.select_all_accelerator,

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

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