tksheet 7.3.3__py3-none-any.whl → 7.3.4__py3-none-any.whl

tksheet/__init__.py

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

tksheet/colors.py

@@ -10,7 +10,7 @@ color_map: dict[str, str] = {
     "ANTIQUE WHITE": "#FAEBD7",
     "AntiqueWhite": "#FAEBD7",
     "antiquewhite": "#FAEBD7",
-    "#" "ANTIQUEWHITE": "#FAEBD7",
+    "#ANTIQUEWHITE": "#FAEBD7",
     "AntiqueWhite1": "#FFEFDB",
     "antiquewhite1": "#FFEFDB",
     "ANTIQUEWHITE1": "#FFEFDB",

tksheet/column_headers.py

@@ -2,27 +2,14 @@ from __future__ import annotations
 
 import tkinter as tk
 from collections import defaultdict
-from collections.abc import (
-    Hashable,
-    Sequence,
-)
-from functools import (
-    partial,
-)
-from itertools import (
-    cycle,
-    islice,
-    repeat,
-)
+from collections.abc import Hashable, Sequence
+from functools import partial
+from itertools import cycle, islice, repeat
 from math import ceil, floor
-from operator import (
-    itemgetter,
-)
+from operator import itemgetter
 from typing import Literal
 
-from .colors import (
-    color_map,
-)
+from .colors import color_map
 from .constants import (
     USER_OS,
     rc_binding,
@@ -44,18 +31,9 @@ from .functions import (
     stored_event_dict,
     try_binding,
 )
-from .other_classes import (
-    DotDict,
-    DraggedRowColumn,
-    DropdownStorage,
-    TextEditorStorage,
-)
-from .text_editor import (
-    TextEditor,
-)
-from .types import (
-    AnyIter,
-)
+from .other_classes import DotDict, DraggedRowColumn, DropdownStorage, TextEditorStorage
+from .text_editor import TextEditor
+from .types import AnyIter
 
 
 class ColumnHeaders(tk.Canvas):
@@ -464,9 +442,9 @@ class ColumnHeaders(tk.Canvas):
                 self.current_height,
                 width=1,
                 fill=self.PAR.ops.resizing_line_fg,
-                tag="rwl",
+                tag=("rw", "rwl"),
             )
-            self.MT.create_resize_line(x, y1, x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rwl")
+            self.MT.create_resize_line(x, y1, x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag=("rw", "rwl"))
             self.create_resize_line(
                 line2x,
                 0,
@@ -474,9 +452,11 @@ class ColumnHeaders(tk.Canvas):
                 self.current_height,
                 width=1,
                 fill=self.PAR.ops.resizing_line_fg,
-                tag="rwl2",
+                tag=("rw", "rwl2"),
+            )
+            self.MT.create_resize_line(
+                line2x, y1, line2x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag=("rw", "rwl2")
             )
-            self.MT.create_resize_line(line2x, y1, line2x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rwl2")
         elif self.height_resizing_enabled and self.rsz_w is None and self.rsz_h is not None:
             self.currently_resizing_height = True
         elif self.MT.identify_col(x=event.x, allow_end=False) is None:
@@ -516,9 +496,9 @@ class ColumnHeaders(tk.Canvas):
                     self.current_height,
                     width=1,
                     fill=self.PAR.ops.resizing_line_fg,
-                    tag="rwl",
+                    tag=("rw", "rwl"),
                 )
-                self.MT.create_resize_line(x, y1, x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rwl")
+                self.MT.create_resize_line(x, y1, x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag=("rw", "rwl"))
                 self.create_resize_line(
                     line2x,
                     0,
@@ -526,7 +506,7 @@ class ColumnHeaders(tk.Canvas):
                     self.current_height,
                     width=1,
                     fill=self.PAR.ops.resizing_line_fg,
-                    tag="rwl2",
+                    tag=("rw", "rwl2"),
                 )
                 self.MT.create_resize_line(
                     line2x,
@@ -535,7 +515,7 @@ class ColumnHeaders(tk.Canvas):
                     y2,
                     width=1,
                     fill=self.PAR.ops.resizing_line_fg,
-                    tag="rwl2",
+                    tag=("rw", "rwl2"),
                 )
                 self.drag_width_resize()
         elif self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
@@ -1271,6 +1251,7 @@ class ColumnHeaders(tk.Canvas):
                 self.itemconfig(iid, fill=fill, outline=outline)
             else:
                 self.itemconfig(iid, fill=fill, outline=outline, tag=tag, state="normal")
+            self.tag_raise(iid)
         else:
             iid = self.create_rectangle(coords, fill=fill, outline=outline, tag=tag)
         self.disp_high[iid] = True
@@ -1291,6 +1272,7 @@ class ColumnHeaders(tk.Canvas):
             else:
                 self.itemconfig(t, fill=fill, width=width, tag=tag, state="normal")
             self.disp_grid[t] = True
+            self.tag_raise(t)
         else:
             self.disp_grid[self.create_line(points, fill=fill, width=width, tag=tag)] = True
 
@@ -1437,33 +1419,6 @@ class ColumnHeaders(tk.Canvas):
             x_stop,
             self.current_height,
         )
-        yend = self.current_height - 5
-        if (self.PAR.ops.show_vertical_grid or self.width_resizing_enabled) and col_pos_exists:
-            points = [
-                x_stop - 1,
-                self.current_height - 1,
-                scrollpos_left - 1,
-                self.current_height - 1,
-                scrollpos_left - 1,
-                -1,
-            ]
-            for c in range(grid_start_col, grid_end_col):
-                draw_x = self.MT.col_positions[c]
-                if c and self.width_resizing_enabled:
-                    self.visible_col_dividers[c] = (draw_x - 2, 1, draw_x + 2, yend)
-                points.extend(
-                    (
-                        draw_x,
-                        -1,
-                        draw_x,
-                        self.current_height,
-                        draw_x,
-                        -1,
-                        self.MT.col_positions[c + 1] if len(self.MT.col_positions) - 1 > c else draw_x,
-                        -1,
-                    )
-                )
-            self.redraw_gridline(points=points, fill=self.PAR.ops.header_grid_fg, width=1, tag="v")
         top = self.canvasy(0)
         sel_cols_bg = (
             self.PAR.ops.header_selected_cells_bg
@@ -1492,74 +1447,39 @@ class ColumnHeaders(tk.Canvas):
                 selections=selections,
                 datacn=datacn,
             )
-
             if datacn in self.cell_options and "align" in self.cell_options[datacn]:
                 align = self.cell_options[datacn]["align"]
             else:
                 align = self.align
-
-            kwargs = self.get_cell_kwargs(datacn, key="dropdown")
-            if align == "w":
-                draw_x = cleftgridln + 3
-                if kwargs:
-                    mw = crightgridln - cleftgridln - self.MT.header_txt_height - 2
-                    self.redraw_dropdown(
-                        cleftgridln,
-                        0,
-                        crightgridln,
-                        self.current_height - 1,
-                        fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=not dd_drawn,
-                        draw_arrow=mw >= 5,
-                        open_=dd_coords == c,
-                    )
-                else:
-                    mw = crightgridln - cleftgridln - 1
-
-            elif align == "e":
-                if kwargs:
-                    mw = crightgridln - cleftgridln - self.MT.header_txt_height - 2
+            if kwargs := self.get_cell_kwargs(datacn, key="dropdown"):
+                mw = crightgridln - cleftgridln - self.MT.header_txt_height - 2
+                if align == "w":
+                    draw_x = cleftgridln + 3
+                elif align == "e":
                     draw_x = crightgridln - 5 - self.MT.header_txt_height
-                    self.redraw_dropdown(
-                        cleftgridln,
-                        0,
-                        crightgridln,
-                        self.current_height - 1,
-                        fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=not dd_drawn,
-                        draw_arrow=mw >= 5,
-                        open_=dd_coords == c,
-                    )
-                else:
-                    mw = crightgridln - cleftgridln - 1
-                    draw_x = crightgridln - 3
-
-            elif align == "center":
-                if kwargs:
-                    mw = crightgridln - cleftgridln - self.MT.header_txt_height - 2
+                elif align == "center":
                     draw_x = cleftgridln + ceil((crightgridln - cleftgridln - self.MT.header_txt_height) / 2)
-                    self.redraw_dropdown(
-                        cleftgridln,
-                        0,
-                        crightgridln,
-                        self.current_height - 1,
-                        fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=not dd_drawn,
-                        draw_arrow=mw >= 5,
-                        open_=dd_coords == c,
-                    )
-                else:
-                    mw = crightgridln - cleftgridln - 1
+                self.redraw_dropdown(
+                    cleftgridln,
+                    0,
+                    crightgridln,
+                    self.current_height - 1,
+                    fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
+                    outline=fill,
+                    tag="dd",
+                    draw_outline=not dd_drawn,
+                    draw_arrow=mw >= 5,
+                    open_=dd_coords == c,
+                )
+            else:
+                mw = crightgridln - cleftgridln - 1
+                if align == "w":
+                    draw_x = cleftgridln + 3
+                elif align == "e":
+                    draw_x = crightgridln - 3
+                elif align == "center":
                     draw_x = cleftgridln + floor((crightgridln - cleftgridln) / 2)
-            if not kwargs:
-                kwargs = self.get_cell_kwargs(datacn, key="checkbox")
-                if kwargs and mw > self.MT.header_txt_height + 1:
+                if (kwargs := self.get_cell_kwargs(datacn, key="checkbox")) and mw > self.MT.header_txt_height + 1:
                     box_w = self.MT.header_txt_height + 1
                     if align == "w":
                         draw_x += box_w + 3
@@ -1584,91 +1504,120 @@ class ColumnHeaders(tk.Canvas):
                         tag="cb",
                         draw_check=draw_check,
                     )
-            lns = self.get_valid_cell_data_as_str(datacn, fix=False)
-            if not lns:
-                continue
-            lns = lns.split("\n")
-            if mw > self.MT.header_txt_width and not (
-                (align == "w" and draw_x > scrollpos_right)
+            if (
+                mw < self.MT.header_txt_width
+                or (align == "w" and draw_x > scrollpos_right)
                 or (align == "e" and cleftgridln + 5 > scrollpos_right)
                 or (align == "center" and cleftgridln + 5 > scrollpos_right)
             ):
-                for txt in islice(
-                    lns,
-                    self.lines_start_at if self.lines_start_at < len(lns) else len(lns) - 1,
-                    None,
-                ):
-                    if draw_y > top:
-                        if self.hidd_text:
-                            iid, showing = self.hidd_text.popitem()
-                            self.coords(iid, draw_x, draw_y)
-                            if showing:
-                                self.itemconfig(
-                                    iid,
-                                    text=txt,
-                                    fill=fill,
-                                    font=font,
-                                    anchor=align,
-                                )
-                            else:
-                                self.itemconfig(
-                                    iid,
-                                    text=txt,
-                                    fill=fill,
-                                    font=font,
-                                    anchor=align,
-                                    state="normal",
-                                )
-                            self.tag_raise(iid)
+                continue
+            if not (lines := self.get_valid_cell_data_as_str(datacn, fix=False)):
+                continue
+            lines = lines.split("\n")
+            for txt in islice(
+                lines,
+                self.lines_start_at if self.lines_start_at < len(lines) else len(lines) - 1,
+                None,
+            ):
+                if draw_y > top:
+                    if self.hidd_text:
+                        iid, showing = self.hidd_text.popitem()
+                        self.coords(iid, draw_x, draw_y)
+                        if showing:
+                            self.itemconfig(
+                                iid,
+                                text=txt,
+                                fill=fill,
+                                font=font,
+                                anchor=align,
+                            )
                         else:
-                            iid = self.create_text(
-                                draw_x,
-                                draw_y,
+                            self.itemconfig(
+                                iid,
                                 text=txt,
                                 fill=fill,
                                 font=font,
                                 anchor=align,
-                                tag="t",
+                                state="normal",
                             )
-                        self.disp_text[iid] = True
-                        wd = self.bbox(iid)
-                        wd = wd[2] - wd[0]
-                        if wd > mw:
-                            if align == "w":
-                                txt = txt[: int(len(txt) * (mw / wd))]
+                        self.tag_raise(iid)
+                    else:
+                        iid = self.create_text(
+                            draw_x,
+                            draw_y,
+                            text=txt,
+                            fill=fill,
+                            font=font,
+                            anchor=align,
+                            tag="t",
+                        )
+                    self.disp_text[iid] = True
+                    wd = self.bbox(iid)
+                    if (wd := wd[2] - wd[0]) > mw:
+                        if align == "w":
+                            txt = txt[: int(len(txt) * (mw / wd))]
+                            self.itemconfig(iid, text=txt)
+                            wd = self.bbox(iid)
+                            while wd[2] - wd[0] > mw:
+                                txt = txt[:-1]
                                 self.itemconfig(iid, text=txt)
                                 wd = self.bbox(iid)
-                                while wd[2] - wd[0] > mw:
-                                    txt = txt[:-1]
-                                    self.itemconfig(iid, text=txt)
-                                    wd = self.bbox(iid)
-                            elif align == "e":
-                                txt = txt[len(txt) - int(len(txt) * (mw / wd)) :]
+                        elif align == "e":
+                            txt = txt[len(txt) - int(len(txt) * (mw / wd)) :]
+                            self.itemconfig(iid, text=txt)
+                            wd = self.bbox(iid)
+                            while wd[2] - wd[0] > mw:
+                                txt = txt[1:]
                                 self.itemconfig(iid, text=txt)
                                 wd = self.bbox(iid)
-                                while wd[2] - wd[0] > mw:
-                                    txt = txt[1:]
-                                    self.itemconfig(iid, text=txt)
-                                    wd = self.bbox(iid)
-                            elif align == "center":
-                                self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
-                                tmod = ceil((len(txt) - int(len(txt) * (mw / wd))) / 2)
-                                txt = txt[tmod - 1 : -tmod]
+                        elif align == "center":
+                            self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
+                            tmod = ceil((len(txt) - int(len(txt) * (mw / wd))) / 2)
+                            txt = txt[tmod - 1 : -tmod]
+                            self.itemconfig(iid, text=txt)
+                            wd = self.bbox(iid)
+                            while wd[2] - wd[0] > mw:
+                                txt = txt[next(self.c_align_cyc)]
                                 self.itemconfig(iid, text=txt)
                                 wd = self.bbox(iid)
-                                while wd[2] - wd[0] > mw:
-                                    txt = txt[next(self.c_align_cyc)]
-                                    self.itemconfig(iid, text=txt)
-                                    wd = self.bbox(iid)
-                                self.coords(iid, draw_x, draw_y)
-                    draw_y += self.MT.header_xtra_lines_increment
-                    if draw_y - 1 > self.current_height:
-                        break
+                            self.coords(iid, draw_x, draw_y)
+                draw_y += self.MT.header_xtra_lines_increment
+                if draw_y - 1 > self.current_height:
+                    break
+        yend = self.current_height - 5
+        if (self.PAR.ops.show_vertical_grid or self.width_resizing_enabled) and col_pos_exists:
+            points = [
+                x_stop - 1,
+                self.current_height - 1,
+                scrollpos_left - 1,
+                self.current_height - 1,
+                scrollpos_left - 1,
+                -1,
+            ]
+            for c in range(grid_start_col, grid_end_col):
+                draw_x = self.MT.col_positions[c]
+                if c and self.width_resizing_enabled:
+                    self.visible_col_dividers[c] = (draw_x - 2, 1, draw_x + 2, yend)
+                points.extend(
+                    (
+                        draw_x,
+                        -1,
+                        draw_x,
+                        self.current_height,
+                        draw_x,
+                        -1,
+                        self.MT.col_positions[c + 1] if len(self.MT.col_positions) - 1 > c else draw_x,
+                        -1,
+                    )
+                )
+            self.redraw_gridline(points=points, fill=self.PAR.ops.header_grid_fg, width=1, tag="v")
         for dct in (self.hidd_text, self.hidd_high, self.hidd_grid, self.hidd_dropdown, self.hidd_checkbox):
             for iid, showing in dct.items():
                 if showing:
                     self.itemconfig(iid, state="hidden")
                     dct[iid] = False
+        if self.disp_resize_lines:
+            self.tag_raise("rw")
         return True
 
     def get_redraw_selections(self, startc: int, endc: int) -> dict[str, set[int]]:
@@ -1979,8 +1928,7 @@ class ColumnHeaders(tk.Canvas):
                 win_h += self.MT.min_header_height
             if i == 5:
                 break
-        if win_h > 500:
-            win_h = 500
+        win_h = min(win_h, 500)
         space_bot = self.MT.get_space_bot(0, text_editor_h)
         win_h2 = int(win_h)
         if win_h > space_bot:
@@ -2049,7 +1997,7 @@ class ColumnHeaders(tk.Canvas):
             self.coords(self.dropdown.canvas_id, self.MT.col_positions[c], ypos)
             self.dropdown.window.tkraise()
         else:
-            self.dropdown.window = self.PAR.dropdown_class(
+            self.dropdown.window = self.PAR._dropdown_cls(
                 self.winfo_toplevel(),
                 **reset_kwargs,
                 single_index="c",
@@ -2092,13 +2040,11 @@ class ColumnHeaders(tk.Canvas):
         if c is not None and selection is not None:
             datacn = c if self.MT.all_columns_displayed else self.MT.displayed_columns[c]
             kwargs = self.get_cell_kwargs(datacn, key="dropdown")
-            pre_edit_value = self.get_cell_data(datacn)
-            edited = False
             event_data = event_dict(
                 name="end_edit_header",
                 sheet=self.PAR.name,
                 widget=self,
-                cells_header={datacn: pre_edit_value},
+                cells_header={datacn: self.get_cell_data(datacn)},
                 key="??",
                 value=selection,
                 loc=c,
@@ -2106,16 +2052,12 @@ class ColumnHeaders(tk.Canvas):
                 boxes=self.MT.get_boxes(),
                 selected=self.MT.selected,
             )
-            if kwargs["select_function"] is not None:
-                kwargs["select_function"](event_data)
-            if self.MT.edit_validation_func:
-                selection = self.MT.edit_validation_func(event_data)
-                if selection is not None:
-                    edited = self.set_cell_data_undo(c, datacn=datacn, value=selection, redraw=not redraw)
-            else:
+            try_binding(kwargs["select_function"], event_data)
+            selection = selection if not self.MT.edit_validation_func else self.MT.edit_validation_func(event_data)
+            if selection is not None:
                 edited = self.set_cell_data_undo(c, datacn=datacn, value=selection, redraw=not redraw)
-            if edited:
-                try_binding(self.extra_end_edit_cell_func, event_data)
+                if edited:
+                    try_binding(self.extra_end_edit_cell_func, event_data)
             self.MT.recreate_all_selection_boxes()
         self.focus_set()
         self.hide_text_editor_and_dropdown(redraw=redraw)

tksheet/find_window.py

@@ -1,21 +1,12 @@
 from __future__ import annotations
 
 import tkinter as tk
-from collections.abc import (
-    Callable,
-)
+from collections.abc import Callable
 from typing import Literal
 
-from .other_classes import (
-    DotDict,
-)
-from .constants import (
-    ctrl_key,
-    rc_binding,
-)
-from .functions import (
-    recursive_bind,
-)
+from .constants import ctrl_key, rc_binding
+from .functions import recursive_bind
+from .other_classes import DotDict
 
 
 class FindWindowTkText(tk.Text):

tksheet/functions.py

@@ -5,39 +5,17 @@ import io
 import pickle
 import re
 import tkinter as tk
-from bisect import (
-    bisect_left,
-)
+from bisect import bisect_left
 from collections import deque
-from collections.abc import (
-    Callable,
-    Generator,
-    Hashable,
-    Iterable,
-    Iterator,
-    Sequence,
-)
+from collections.abc import Callable, Generator, Hashable, Iterable, Iterator, Sequence
 from itertools import islice, repeat
 from typing import Literal
 
 from .colors import color_map
-from .constants import (
-    symbols_set,
-)
-from .formatters import (
-    to_bool,
-)
-from .other_classes import (
-    Box_nt,
-    DotDict,
-    EventDataDict,
-    Highlight,
-    Loc,
-    Span,
-)
-from .types import (
-    AnyIter,
-)
+from .constants import symbols_set
+from .formatters import to_bool
+from .other_classes import Box_nt, DotDict, EventDataDict, Highlight, Loc, Span
+from .types import AnyIter
 
 unpickle_obj = pickle.loads