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

tksheet/other_classes.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 import pickle
+import tkinter as tk
 from collections import namedtuple
 from collections.abc import Callable, Generator, Hashable, Iterator
 from functools import partial
 from typing import Literal
-import tkinter as tk
 
 pickle_obj = partial(pickle.dumps, protocol=pickle.HIGHEST_PROTOCOL)
 

tksheet/row_index.py

@@ -2,42 +2,16 @@ from __future__ import annotations
 
 import tkinter as tk
 from collections import defaultdict
-from collections.abc import (
-    Generator,
-    Hashable,
-    Sequence,
-)
-from functools import (
-    partial,
-)
-from itertools import (
-    chain,
-    cycle,
-    islice,
-    repeat,
-)
-from math import (
-    ceil,
-    floor,
-)
-from operator import (
-    itemgetter,
-)
+from collections.abc import Generator, Hashable, Sequence
+from functools import partial
+from itertools import chain, cycle, islice, repeat
+from math import ceil, floor
+from operator import itemgetter
 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 .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,
@@ -53,19 +27,9 @@ from .functions import (
     stored_event_dict,
     try_binding,
 )
-from .other_classes import (
-    DotDict,
-    DraggedRowColumn,
-    DropdownStorage,
-    Node,
-    TextEditorStorage,
-)
-from .text_editor import (
-    TextEditor,
-)
-from .types import (
-    AnyIter,
-)
+from .other_classes import DotDict, DraggedRowColumn, DropdownStorage, Node, TextEditorStorage
+from .text_editor import TextEditor
+from .types import AnyIter
 
 
 class RowIndex(tk.Canvas):
@@ -472,9 +436,9 @@ class RowIndex(tk.Canvas):
                 y,
                 width=1,
                 fill=self.PAR.ops.resizing_line_fg,
-                tag="rhl",
+                tag=("rh", "rhl"),
             )
-            self.MT.create_resize_line(x1, y, x2, y, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rhl")
+            self.MT.create_resize_line(x1, y, x2, y, width=1, fill=self.PAR.ops.resizing_line_fg, tag=("rh", "rhl"))
             self.create_resize_line(
                 0,
                 line2y,
@@ -482,9 +446,11 @@ class RowIndex(tk.Canvas):
                 line2y,
                 width=1,
                 fill=self.PAR.ops.resizing_line_fg,
-                tag="rhl2",
+                tag=("rh", "rhl2"),
+            )
+            self.MT.create_resize_line(
+                x1, line2y, x2, line2y, width=1, fill=self.PAR.ops.resizing_line_fg, tag=("rh", "rhl2")
             )
-            self.MT.create_resize_line(x1, line2y, x2, line2y, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rhl2")
         elif self.width_resizing_enabled and self.rsz_h is None and self.rsz_w is True:
             self.currently_resizing_width = True
         elif self.MT.identify_row(y=event.y, allow_end=False) is None:
@@ -525,9 +491,9 @@ class RowIndex(tk.Canvas):
                     y,
                     width=1,
                     fill=self.PAR.ops.resizing_line_fg,
-                    tag="rhl",
+                    tag=("rh", "rhl"),
                 )
-                self.MT.create_resize_line(x1, y, x2, y, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rhl")
+                self.MT.create_resize_line(x1, y, x2, y, width=1, fill=self.PAR.ops.resizing_line_fg, tag=("rh", "rhl"))
                 self.create_resize_line(
                     0,
                     line2y,
@@ -535,7 +501,7 @@ class RowIndex(tk.Canvas):
                     line2y,
                     width=1,
                     fill=self.PAR.ops.resizing_line_fg,
-                    tag="rhl2",
+                    tag=("rh", "rhl2"),
                 )
                 self.MT.create_resize_line(
                     x1,
@@ -544,7 +510,7 @@ class RowIndex(tk.Canvas):
                     line2y,
                     width=1,
                     fill=self.PAR.ops.resizing_line_fg,
-                    tag="rhl2",
+                    tag=("rh", "rhl2"),
                 )
                 self.drag_height_resize()
         elif self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
@@ -1308,6 +1274,7 @@ class RowIndex(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
@@ -1562,39 +1529,12 @@ class RowIndex(tk.Canvas):
         self.hidd_tree_arrow.update(self.disp_tree_arrow)
         self.disp_tree_arrow = {}
         self.visible_row_dividers = {}
-        xend = self.current_width - 6
         self.row_width_resize_bbox = (
             self.current_width - 2,
             scrollpos_top,
             self.current_width,
             scrollpos_bot,
         )
-        if (self.PAR.ops.show_horizontal_grid or self.height_resizing_enabled) and row_pos_exists:
-            points = [
-                self.current_width - 1,
-                y_stop - 1,
-                self.current_width - 1,
-                scrollpos_top - 1,
-                -1,
-                scrollpos_top - 1,
-            ]
-            for r in range(grid_start_row, grid_end_row):
-                draw_y = self.MT.row_positions[r]
-                if r and self.height_resizing_enabled:
-                    self.visible_row_dividers[r] = (1, draw_y - 2, xend, draw_y + 2)
-                points.extend(
-                    (
-                        -1,
-                        draw_y,
-                        self.current_width,
-                        draw_y,
-                        -1,
-                        draw_y,
-                        -1,
-                        self.MT.row_positions[r + 1] if len(self.MT.row_positions) - 1 > r else draw_y,
-                    )
-                )
-            self.redraw_gridline(points=points, fill=self.PAR.ops.index_grid_fg, width=1, tag="h")
         sel_cells_bg = (
             self.PAR.ops.index_selected_cells_bg
             if self.PAR.ops.index_selected_cells_bg.startswith("#")
@@ -1615,6 +1555,7 @@ class RowIndex(tk.Canvas):
             rbotgridln = self.MT.row_positions[r + 1]
             if rbotgridln - rtopgridln < self.MT.index_txt_height:
                 continue
+            checkbox_kwargs = {}
             datarn = r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
             fill, tree_arrow_fg, dd_drawn = self.redraw_highlight_get_text_fg(
                 fr=rtopgridln,
@@ -1625,99 +1566,70 @@ class RowIndex(tk.Canvas):
                 selections=selections,
                 datarn=datarn,
             )
-
             if datarn in self.cell_options and "align" in self.cell_options[datarn]:
                 align = self.cell_options[datarn]["align"]
             else:
                 align = self.align
-            dropdown_kwargs = self.get_cell_kwargs(datarn, key="dropdown")
-            if align == "w":
-                draw_x = 3
-                if dropdown_kwargs:
-                    mw = self.current_width - self.MT.index_txt_height - 2
-                    self.redraw_dropdown(
-                        0,
-                        rtopgridln,
-                        self.current_width - 1,
-                        rbotgridln - 1,
-                        fill=fill if dropdown_kwargs["state"] != "disabled" else self.PAR.ops.index_grid_fg,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=not dd_drawn,
-                        draw_arrow=True,
-                        open_=dd_coords == r,
-                    )
-                else:
-                    mw = self.current_width - 2
-
-            elif align == "e":
-                if dropdown_kwargs:
-                    mw = self.current_width - self.MT.index_txt_height - 2
+            if dropdown_kwargs := self.get_cell_kwargs(datarn, key="dropdown"):
+                mw = self.current_width - self.MT.index_txt_height - 2
+                if align == "w":
+                    draw_x = 3
+                elif align == "e":
                     draw_x = self.current_width - 5 - self.MT.index_txt_height
-                    self.redraw_dropdown(
-                        0,
-                        rtopgridln,
-                        self.current_width - 1,
-                        rbotgridln - 1,
-                        fill=fill if dropdown_kwargs["state"] != "disabled" else self.PAR.ops.index_grid_fg,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=not dd_drawn,
-                        draw_arrow=True,
-                        open_=dd_coords == r,
-                    )
-                else:
-                    mw = self.current_width - 2
-                    draw_x = self.current_width - 3
-
-            elif align == "center":
-                if dropdown_kwargs:
-                    mw = self.current_width - self.MT.index_txt_height - 2
+                elif align == "center":
                     draw_x = ceil((self.current_width - self.MT.index_txt_height) / 2)
-                    self.redraw_dropdown(
-                        0,
-                        rtopgridln,
-                        self.current_width - 1,
-                        rbotgridln - 1,
-                        fill=fill if dropdown_kwargs["state"] != "disabled" else self.PAR.ops.index_grid_fg,
-                        outline=fill,
-                        tag="dd",
-                        draw_outline=not dd_drawn,
-                        draw_arrow=True,
-                        open_=dd_coords == r,
-                    )
-                else:
-                    mw = self.current_width - 1
-                    draw_x = floor(self.current_width / 2)
-            checkbox_kwargs = self.get_cell_kwargs(datarn, key="checkbox")
-            if checkbox_kwargs and not dropdown_kwargs and mw > self.MT.index_txt_height + 1:
-                box_w = self.MT.index_txt_height + 1
+                self.redraw_dropdown(
+                    0,
+                    rtopgridln,
+                    self.current_width - 1,
+                    rbotgridln - 1,
+                    fill=fill if dropdown_kwargs["state"] != "disabled" else self.PAR.ops.index_grid_fg,
+                    outline=fill,
+                    tag="dd",
+                    draw_outline=not dd_drawn,
+                    draw_arrow=True,
+                    open_=dd_coords == r,
+                )
+            else:
+                mw = self.current_width - 2
                 if align == "w":
-                    draw_x += box_w + 3
-                    mw -= box_w + 3
+                    draw_x = 3
+                elif align == "e":
+                    draw_x = self.current_width - 3
                 elif align == "center":
-                    draw_x += ceil(box_w / 2) + 1
-                    mw -= box_w + 2
-                else:
-                    mw -= box_w + 1
-                try:
-                    draw_check = (
-                        self.MT._row_index[datarn]
-                        if isinstance(self.MT._row_index, (list, tuple))
-                        else self.MT.data[datarn][self.MT._row_index]
+                    draw_x = floor(self.current_width / 2)
+                if (
+                    (checkbox_kwargs := self.get_cell_kwargs(datarn, key="checkbox"))
+                    and not dropdown_kwargs
+                    and mw > self.MT.index_txt_height + 1
+                ):
+                    box_w = self.MT.index_txt_height + 1
+                    if align == "w":
+                        draw_x += box_w + 3
+                        mw -= box_w + 3
+                    elif align == "center":
+                        draw_x += ceil(box_w / 2) + 1
+                        mw -= box_w + 2
+                    else:
+                        mw -= box_w + 1
+                    try:
+                        draw_check = (
+                            self.MT._row_index[datarn]
+                            if isinstance(self.MT._row_index, (list, tuple))
+                            else self.MT.data[datarn][self.MT._row_index]
+                        )
+                    except Exception:
+                        draw_check = False
+                    self.redraw_checkbox(
+                        2,
+                        rtopgridln + 2,
+                        self.MT.index_txt_height + 3,
+                        rtopgridln + self.MT.index_txt_height + 3,
+                        fill=fill if checkbox_kwargs["state"] == "normal" else self.PAR.ops.index_grid_fg,
+                        outline="",
+                        tag="cb",
+                        draw_check=draw_check,
                     )
-                except Exception:
-                    draw_check = False
-                self.redraw_checkbox(
-                    2,
-                    rtopgridln + 2,
-                    self.MT.index_txt_height + 3,
-                    rtopgridln + self.MT.index_txt_height + 3,
-                    fill=fill if checkbox_kwargs["state"] == "normal" else self.PAR.ops.index_grid_fg,
-                    outline="",
-                    tag="cb",
-                    draw_check=draw_check,
-                )
             if treeview and isinstance(self.MT._row_index, list) and len(self.MT._row_index) > datarn:
                 iid = self.MT._row_index[datarn].iid
                 mw -= self.MT.index_txt_height
@@ -1736,84 +1648,108 @@ class RowIndex(tk.Canvas):
                     open_=self.MT._row_index[datarn].iid in self.tree_open_ids,
                     level=level,
                 )
-            lns = self.get_valid_cell_data_as_str(datarn, fix=False)
-            if not lns:
+            if mw < 5:
                 continue
-            draw_y = rtopgridln + self.MT.index_first_ln_ins
-            if mw > 5:
-                draw_y = rtopgridln + self.MT.index_first_ln_ins
-                start_ln = int((scrollpos_top - rtopgridln) / self.MT.index_xtra_lines_increment)
-                if start_ln < 0:
-                    start_ln = 0
-                draw_y += start_ln * self.MT.index_xtra_lines_increment
-                lns = lns.split("\n")
-                if draw_y + self.MT.index_half_txt_height - 1 <= rbotgridln and len(lns) > start_ln:
-                    for txt in islice(lns, start_ln, None):
-                        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)
-                        else:
-                            iid = self.create_text(
-                                draw_x,
-                                draw_y,
-                                text=txt,
-                                fill=fill,
-                                font=font,
-                                anchor=align,
-                                tag="t",
-                            )
-                        self.disp_text[iid] = True
+            lines = self.get_valid_cell_data_as_str(datarn, fix=False)
+            if not lines:
+                continue
+            start_ln = max(0, int((scrollpos_top - rtopgridln) / self.MT.index_xtra_lines_increment))
+            draw_y = rtopgridln + self.MT.index_first_ln_ins + (start_ln * self.MT.index_xtra_lines_increment)
+            lines = lines.split("\n")
+            if len(lines) <= start_ln or draw_y + self.MT.index_half_txt_height - 1 > rbotgridln:
+                continue
+            for txt in islice(lines, start_ln, None):
+                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)
+                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" and dropdown_kwargs:
+                        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)
+                    elif align == "e" and checkbox_kwargs:
+                        txt = txt[len(txt) - int(len(txt) * (mw / wd)) :]
+                        self.itemconfig(iid, text=txt)
                         wd = self.bbox(iid)
-                        wd = wd[2] - wd[0]
-                        if wd > mw:
-                            if align == "w" and dropdown_kwargs:
-                                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)
-                            elif align == "e" and checkbox_kwargs:
-                                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)
-                            elif align == "center" and (dropdown_kwargs or checkbox_kwargs):
-                                tmod = ceil((len(txt) - int(len(txt) * (mw / wd))) / 2)
-                                txt = txt[tmod - 1 : -tmod]
-                                self.itemconfig(iid, text=txt)
-                                wd = self.bbox(iid)
-                                self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
-                                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.index_xtra_lines_increment
-                        if draw_y + self.MT.index_half_txt_height - 1 > rbotgridln:
-                            break
+                        while wd[2] - wd[0] > mw:
+                            txt = txt[1:]
+                            self.itemconfig(iid, text=txt)
+                            wd = self.bbox(iid)
+                    elif align == "center" and (dropdown_kwargs or checkbox_kwargs):
+                        tmod = ceil((len(txt) - int(len(txt) * (mw / wd))) / 2)
+                        txt = txt[tmod - 1 : -tmod]
+                        self.itemconfig(iid, text=txt)
+                        wd = self.bbox(iid)
+                        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
+                        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.index_xtra_lines_increment
+                if draw_y + self.MT.index_half_txt_height - 1 > rbotgridln:
+                    break
+        xend = self.current_width - 6
+        if (self.PAR.ops.show_horizontal_grid or self.height_resizing_enabled) and row_pos_exists:
+            points = [
+                self.current_width - 1,
+                y_stop - 1,
+                self.current_width - 1,
+                scrollpos_top - 1,
+                -1,
+                scrollpos_top - 1,
+            ]
+            for r in range(grid_start_row, grid_end_row):
+                draw_y = self.MT.row_positions[r]
+                if r and self.height_resizing_enabled:
+                    self.visible_row_dividers[r] = (1, draw_y - 2, xend, draw_y + 2)
+                points.extend(
+                    (
+                        -1,
+                        draw_y,
+                        self.current_width,
+                        draw_y,
+                        -1,
+                        draw_y,
+                        -1,
+                        self.MT.row_positions[r + 1] if len(self.MT.row_positions) - 1 > r else draw_y,
+                    )
+                )
+            self.redraw_gridline(points=points, fill=self.PAR.ops.index_grid_fg, width=1, tag="h")
         for dct in (
             self.hidd_text,
             self.hidd_high,
@@ -1826,6 +1762,8 @@ class RowIndex(tk.Canvas):
                 if showing:
                     self.itemconfig(iid, state="hidden")
                     dct[iid] = False
+        if self.disp_resize_lines:
+            self.tag_raise("rh")
         return True
 
     def get_redraw_selections(self, startr: int, endr: int) -> dict[str, set[int]]:
@@ -2116,8 +2054,7 @@ class RowIndex(tk.Canvas):
                 win_h += self.MT.min_row_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(r, text_editor_h)
         space_top = int(self.MT.row_positions[r])
         anchor = "nw"
@@ -2200,7 +2137,7 @@ class RowIndex(tk.Canvas):
             self.coords(self.dropdown.canvas_id, 0, 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="r",
@@ -2244,13 +2181,11 @@ class RowIndex(tk.Canvas):
         if r is not None and selection is not None:
             datarn = r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
             kwargs = self.get_cell_kwargs(datarn, key="dropdown")
-            pre_edit_value = self.get_cell_data(datarn)
-            edited = False
             event_data = event_dict(
                 name="end_edit_index",
                 sheet=self.PAR.name,
                 widget=self,
-                cells_header={datarn: pre_edit_value},
+                cells_header={datarn: self.get_cell_data(datarn)},
                 key="??",
                 value=selection,
                 loc=r,
@@ -2258,16 +2193,12 @@ class RowIndex(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(r, datarn=datarn, 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(r, datarn=datarn, 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)