tksheet 7.2.21__py3-none-any.whl → 7.2.23__py3-none-any.whl

tksheet/main_table.py

@@ -51,7 +51,9 @@ from .formatters import (
 from .functions import (
     add_to_displayed,
     b_index,
+    box_is_single_cell,
     cell_right_within_box,
+    color_tup,
     consecutive_ranges,
     diff_gen,
     diff_list,
@@ -72,9 +74,9 @@ from .functions import (
     mod_span_widget,
     move_elements_by_mapping,
     new_tk_event,
-    stored_event_dict,
     rounded_box_coords,
     span_idxs_post_move,
+    stored_event_dict,
     try_binding,
     unpickle_obj,
 )
@@ -1512,25 +1514,49 @@ class MainTable(tk.Canvas):
             self.purge_redo_stack()
 
     def edit_cells_using_modification(self, modification: dict, event_data: dict) -> EventDataDict:
+        # row index
         if self.PAR.ops.treeview:
             for datarn, v in modification["cells"]["index"].items():
-                self._row_index[datarn].text = v
+                if not self.edit_validation_func or (
+                    self.edit_validation_func
+                    and (v := self.edit_validation_func(mod_event_val(event_data, v, row=datarn))) is not None
+                ):
+                    self._row_index[datarn].text = v
         else:
             for datarn, v in modification["cells"]["index"].items():
-                self._row_index[datarn] = v
+                if not self.edit_validation_func or (
+                    self.edit_validation_func
+                    and (v := self.edit_validation_func(mod_event_val(event_data, v, row=datarn))) is not None
+                ):
+                    self._row_index[datarn] = v
+
+        # header
         for datacn, v in modification["cells"]["header"].items():
-            self._headers[datacn] = v
-        for (datarn, datacn), v in modification["cells"]["table"].items():
-            self.set_cell_data(datarn, datacn, v)
+            if not self.edit_validation_func or (
+                self.edit_validation_func
+                and (v := self.edit_validation_func(mod_event_val(event_data, v, column=datacn))) is not None
+            ):
+                self._headers[datacn] = v
+
+        # table
+        for k, v in modification["cells"]["table"].items():
+            if not self.edit_validation_func or (
+                self.edit_validation_func
+                and (v := self.edit_validation_func(mod_event_val(event_data, v, loc=k))) is not None
+            ):
+                self.set_cell_data(k[0], k[1], v)
+
         return event_data
 
     def save_cells_using_modification(self, modification: EventDataDict, event_data: EventDataDict) -> EventDataDict:
-        for datarn, v in modification["cells"]["index"].items():
+        for datarn in modification["cells"]["index"]:
             event_data["cells"]["index"][datarn] = self.RI.get_cell_data(datarn)
-        for datacn, v in modification["cells"]["header"].items():
+
+        for datacn in modification["cells"]["header"]:
             event_data["cells"]["header"][datacn] = self.CH.get_cell_data(datacn)
-        for (datarn, datacn), v in modification["cells"]["table"].items():
-            event_data["cells"]["table"][(datarn, datacn)] = self.get_cell_data(datarn, datacn)
+
+        for k in modification["cells"]["table"]:
+            event_data["cells"]["table"][k] = self.get_cell_data(k[0], k[1])
         return event_data
 
     def restore_options_named_spans(self, modification: EventDataDict) -> None:
@@ -2760,7 +2786,7 @@ class MainTable(tk.Canvas):
             self.rc_insert_row_enabled = True
             self.rc_popup_menus_enabled = True
             self.rc_select_enabled = True
-        if binding in ("all", "right_click_popup_menu", "rc_popup_menu"):
+        if binding in ("all", "right_click_popup_menu", "rc_popup_menu", "rc_menu"):
             self.rc_popup_menus_enabled = True
             self.rc_select_enabled = True
         if binding in ("all", "right_click_select", "rc_select"):
@@ -2823,7 +2849,7 @@ class MainTable(tk.Canvas):
             self.rc_insert_column_enabled = False
         if binding in bind_add_rows:
             self.rc_insert_row_enabled = False
-        if binding in ("all", "right_click_popup_menu", "rc_popup_menu"):
+        if binding in ("all", "right_click_popup_menu", "rc_popup_menu", "rc_menu"):
             self.rc_popup_menus_enabled = False
         if binding in ("all", "right_click_select", "rc_select"):
             self.rc_select_enabled = False
@@ -3165,9 +3191,10 @@ class MainTable(tk.Canvas):
             self.b1_motion(event)
 
     def b1_release(self, event=None):
+        to_hide = self.being_drawn_item
         if self.being_drawn_item is not None and (to_sel := self.coords_and_type(self.being_drawn_item)):
             r_to_sel, c_to_sel = self.selected.row, self.selected.column
-            self.hide_selection_box(self.being_drawn_item)
+            self.being_drawn_item = None
             self.set_currently_selected(
                 r_to_sel,
                 c_to_sel,
@@ -3180,12 +3207,9 @@ class MainTable(tk.Canvas):
                     ),
                     set_current=False,
                 ),
+                run_binding=False,
             )
-            sel_event = self.get_select_event(being_drawn_item=self.being_drawn_item)
-            try_binding(self.drag_selection_binding_func, sel_event)
-            self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
-        else:
-            self.being_drawn_item = None
+        self.hide_selection_box(to_hide)
         if self.RI.width_resizing_enabled and self.RI.rsz_w is not None and self.RI.currently_resizing_width:
             self.delete_resize_lines()
             self.RI.delete_resize_lines()
@@ -5157,69 +5181,82 @@ class MainTable(tk.Canvas):
         fr: int | float,
         sc: int | float,
         sr: int | float,
-        c_2_: tuple[int, int, int],
-        c_3_: tuple[int, int, int],
-        c_4_: tuple[int, int, int],
+        sel_cells_bg: tuple[int, int, int],
+        sel_cols_bg: tuple[int, int, int],
+        sel_rows_bg: tuple[int, int, int],
         selections: dict,
         datarn: int,
         datacn: int,
         can_width: int | None,
+        dont_blend: bool,
+        alternate_color: Highlight | None,
     ) -> str:
         redrawn = False
         if (datarn, datacn) in self.progress_bars:
             kwargs = self.progress_bars[(datarn, datacn)]
         else:
             kwargs = self.get_cell_kwargs(datarn, datacn, key="highlight")
-        if not kwargs and (self.PAR.ops.alternate_color and r % 2):
-            kwargs = Highlight(
-                bg=self.PAR.ops.alternate_color,
-                fg=None,
-                end=False,
-            )
+        if alt := bool(not kwargs and alternate_color and r % 2):
+            kwargs = alternate_color
+
         if kwargs:
-            if kwargs[0] is not None:
-                c_1 = kwargs[0] if kwargs[0].startswith("#") else color_map[kwargs[0]]
-            if "cells" in selections and (r, c) in selections["cells"]:
-                tf = (
+            fill = kwargs[0]
+            if fill and not fill.startswith("#"):
+                fill = color_map[fill]
+
+            # cell is a single currently selected cell box
+            #         not highlighted
+            #         on an alternate row color
+            if alt and dont_blend:
+                txtfg = self.PAR.ops.table_fg
+
+            # cell is highlighted and cell selected
+            elif "cells" in selections and (r, c) in selections["cells"]:
+                txtfg = (
                     self.PAR.ops.table_selected_cells_fg
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
                 )
-                if kwargs[0] is not None:
+                if fill:
                     fill = (
-                        f"#{int((int(c_1[1:3], 16) + c_2_[0]) / 2):02X}"
-                        + f"{int((int(c_1[3:5], 16) + c_2_[1]) / 2):02X}"
-                        + f"{int((int(c_1[5:], 16) + c_2_[2]) / 2):02X}"
+                        f"#{int((int(fill[1:3], 16) + sel_cells_bg[0]) / 2):02X}"
+                        + f"{int((int(fill[3:5], 16) + sel_cells_bg[1]) / 2):02X}"
+                        + f"{int((int(fill[5:], 16) + sel_cells_bg[2]) / 2):02X}"
                     )
+
+            # cell is highlighted and row selected
             elif "rows" in selections and r in selections["rows"]:
-                tf = (
+                txtfg = (
                     self.PAR.ops.table_selected_rows_fg
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
                 )
-                if kwargs[0] is not None:
+                if fill:
                     fill = (
-                        f"#{int((int(c_1[1:3], 16) + c_4_[0]) / 2):02X}"
-                        + f"{int((int(c_1[3:5], 16) + c_4_[1]) / 2):02X}"
-                        + f"{int((int(c_1[5:], 16) + c_4_[2]) / 2):02X}"
+                        f"#{int((int(fill[1:3], 16) + sel_rows_bg[0]) / 2):02X}"
+                        + f"{int((int(fill[3:5], 16) + sel_rows_bg[1]) / 2):02X}"
+                        + f"{int((int(fill[5:], 16) + sel_rows_bg[2]) / 2):02X}"
                     )
+
+            # cell is highlighted and column selected
             elif "columns" in selections and c in selections["columns"]:
-                tf = (
+                txtfg = (
                     self.PAR.ops.table_selected_columns_fg
                     if kwargs[1] is None or self.PAR.ops.display_selected_fg_over_highlights
                     else kwargs[1]
                 )
-                if kwargs[0] is not None:
+                if fill:
                     fill = (
-                        f"#{int((int(c_1[1:3], 16) + c_3_[0]) / 2):02X}"
-                        + f"{int((int(c_1[3:5], 16) + c_3_[1]) / 2):02X}"
-                        + f"{int((int(c_1[5:], 16) + c_3_[2]) / 2):02X}"
+                        f"#{int((int(fill[1:3], 16) + sel_cols_bg[0]) / 2):02X}"
+                        + f"{int((int(fill[3:5], 16) + sel_cols_bg[1]) / 2):02X}"
+                        + f"{int((int(fill[5:], 16) + sel_cols_bg[2]) / 2):02X}"
                     )
+
+            # cell is just highlighted
             else:
-                tf = self.PAR.ops.table_fg if kwargs[1] is None else kwargs[1]
-                if kwargs[0] is not None:
-                    fill = kwargs[0]
-            if kwargs[0] is not None:
+                txtfg = self.PAR.ops.table_fg if kwargs[1] is None else kwargs[1]
+
+            if fill:
                 highlight_fn = partial(
                     self.redraw_highlight,
                     x1=fc + 1,
@@ -5249,14 +5286,14 @@ class MainTable(tk.Canvas):
                     )
         elif not kwargs:
             if "cells" in selections and (r, c) in selections["cells"]:
-                tf = self.PAR.ops.table_selected_cells_fg
+                txtfg = self.PAR.ops.table_selected_cells_fg
             elif "rows" in selections and r in selections["rows"]:
-                tf = self.PAR.ops.table_selected_rows_fg
+                txtfg = self.PAR.ops.table_selected_rows_fg
             elif "columns" in selections and c in selections["columns"]:
-                tf = self.PAR.ops.table_selected_columns_fg
+                txtfg = self.PAR.ops.table_selected_columns_fg
             else:
-                tf = self.PAR.ops.table_fg
-        return tf, redrawn
+                txtfg = self.PAR.ops.table_fg
+        return txtfg, redrawn
 
     def redraw_highlight(self, x1, y1, x2, y2, fill, outline, tag, can_width=None, pc=None):
         if not is_type_int(pc) or pc >= 100:
@@ -5638,24 +5675,36 @@ class MainTable(tk.Canvas):
                 )
         if redraw_table:
             selections = self.get_redraw_selections(text_start_row, grid_end_row, text_start_col, grid_end_col)
-            c_2 = (
-                self.PAR.ops.table_selected_cells_bg
-                if self.PAR.ops.table_selected_cells_bg.startswith("#")
-                else color_map[self.PAR.ops.table_selected_cells_bg]
-            )
-            c_2_ = (int(c_2[1:3], 16), int(c_2[3:5], 16), int(c_2[5:], 16))
-            c_3 = (
-                self.PAR.ops.table_selected_columns_bg
-                if self.PAR.ops.table_selected_columns_bg.startswith("#")
-                else color_map[self.PAR.ops.table_selected_columns_bg]
-            )
-            c_3_ = (int(c_3[1:3], 16), int(c_3[3:5], 16), int(c_3[5:], 16))
-            c_4 = (
-                self.PAR.ops.table_selected_rows_bg
-                if self.PAR.ops.table_selected_rows_bg.startswith("#")
-                else color_map[self.PAR.ops.table_selected_rows_bg]
-            )
-            c_4_ = (int(c_4[1:3], 16), int(c_4[3:5], 16), int(c_4[5:], 16))
+            sel_cells_bg = color_tup(self.PAR.ops.table_selected_cells_bg)
+            sel_cols_bg = color_tup(self.PAR.ops.table_selected_columns_bg)
+            sel_rows_bg = color_tup(self.PAR.ops.table_selected_rows_bg)
+            if self.selected:
+                current_loc = (self.selected.row, self.selected.column)
+            else:
+                current_loc = tuple()
+            if self.PAR.ops.alternate_color:
+                alternate_color = Highlight(
+                    bg=self.PAR.ops.alternate_color,
+                    fg=None,
+                    end=False,
+                )
+                if self.selected and box_is_single_cell(*self.selected.box) and self.PAR.ops.show_selected_cells_border:
+                    dont_blend = current_loc
+                else:
+                    dont_blend = tuple()
+            else:
+                alternate_color = None
+                dont_blend = tuple()
+
+            if not self.PAR.ops.show_selected_cells_border:
+                override = (
+                    color_tup(self.PAR.ops.table_selected_cells_fg),
+                    color_tup(self.PAR.ops.table_selected_columns_fg),
+                    color_tup(self.PAR.ops.table_selected_rows_fg),
+                )
+            else:
+                override = tuple()
+
             rows_ = tuple(range(text_start_row, text_end_row))
             font = self.PAR.ops.table_font
             dd_coords = self.dropdown.get_coords()
@@ -5672,19 +5721,21 @@ class MainTable(tk.Canvas):
                     datacn = self.datacn(c)
 
                     fill, dd_drawn = self.redraw_highlight_get_text_fg(
-                        r,
-                        c,
-                        cleftgridln,
-                        rtopgridln,
-                        crightgridln,
-                        rbotgridln,
-                        c_2_,
-                        c_3_,
-                        c_4_,
-                        selections,
-                        datarn,
-                        datacn,
-                        can_width,
+                        r=r,
+                        c=c,
+                        fc=cleftgridln,
+                        fr=rtopgridln,
+                        sc=crightgridln,
+                        sr=rbotgridln,
+                        sel_cells_bg=override[0] if override and (r, c) == current_loc else sel_cells_bg,
+                        sel_cols_bg=override[1] if override and (r, c) == current_loc else sel_cols_bg,
+                        sel_rows_bg=override[2] if override and (r, c) == current_loc else sel_rows_bg,
+                        selections=selections,
+                        datarn=datarn,
+                        datacn=datacn,
+                        can_width=can_width,
+                        dont_blend=(r, c) == dont_blend,
+                        alternate_color=alternate_color,
                     )
                     align = self.get_cell_kwargs(datarn, datacn, key="align")
                     if align:
@@ -5701,7 +5752,7 @@ class MainTable(tk.Canvas):
                                 rtopgridln,
                                 crightgridln,
                                 self.row_positions[r + 1],
-                                fill=fill,
+                                fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.table_grid_fg,
                                 outline=fill,
                                 tag=f"dd_{r}_{c}",
                                 draw_outline=not dd_drawn,
@@ -5719,7 +5770,7 @@ class MainTable(tk.Canvas):
                                 rtopgridln,
                                 crightgridln,
                                 self.row_positions[r + 1],
-                                fill=fill,
+                                fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.table_grid_fg,
                                 outline=fill,
                                 tag=f"dd_{r}_{c}",
                                 draw_outline=not dd_drawn,
@@ -5738,7 +5789,7 @@ class MainTable(tk.Canvas):
                                 rtopgridln,
                                 crightgridln,
                                 self.row_positions[r + 1],
-                                fill=fill,
+                                fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.table_grid_fg,
                                 outline=fill,
                                 tag=f"dd_{r}_{c}",
                                 draw_outline=not dd_drawn,
@@ -6107,7 +6158,7 @@ class MainTable(tk.Canvas):
             self.itemconfig(item, state="hidden")
 
     def hide_selection_box(self, item: int | None) -> bool:
-        if item is None or item is True:
+        if item is None or item is True or item not in self.selection_boxes:
             return
         box = self.selection_boxes.pop(item)
         self.hide_box(box.fill_iid)
@@ -6681,7 +6732,6 @@ class MainTable(tk.Canvas):
         h = self.row_positions[r + 1] - y + 1
         if text is None:
             text = f"{self.get_cell_data(self.datarn(r), self.datacn(c), none_to_empty_str = True)}"
-        bg, fg = self.PAR.ops.table_bg, self.PAR.ops.table_fg
         kwargs = {
             "menu_kwargs": DotDict(
                 {
@@ -6699,8 +6749,10 @@ class MainTable(tk.Canvas):
             "width": w,
             "height": h,
             "show_border": True,
-            "bg": bg,
-            "fg": fg,
+            "bg": self.PAR.ops.table_editor_bg,
+            "fg": self.PAR.ops.table_editor_fg,
+            "select_bg": self.PAR.ops.table_editor_select_bg,
+            "select_fg": self.PAR.ops.table_editor_select_fg,
             "align": self.get_cell_align(r, c),
             "r": r,
             "c": c,
@@ -6904,6 +6956,8 @@ class MainTable(tk.Canvas):
                         new_r, new_c = down_cell_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
                     else:
                         new_r, new_c = None, None
+                else:
+                    new_r, new_c = None, None
                 if isinstance(new_r, int):
                     self.set_currently_selected(new_r, new_c, item=self.selected.fill_iid)
                     self.see(
@@ -6958,6 +7012,8 @@ class MainTable(tk.Canvas):
             bottom_right_corner=True,
             check_cell_visibility=True,
         )
+        if not self.PAR.ops.show_selected_cells_border:
+            self.refresh()
         return "break"
 
     def get_space_bot(self, r: int, text_editor_h: int | None = None) -> int:
@@ -7015,15 +7071,29 @@ class MainTable(tk.Canvas):
 
     def dropdown_text_editor_modified(
         self,
-        dd_window: object,
-        event: dict,
-        modified_func: Callable | None,
+        event: tk.Misc,
     ) -> None:
-        if modified_func:
-            modified_func(event)
-        dd_window.search_and_see(event)
+        r, c = self.dropdown.get_coords()
+        event_data = event_dict(
+            name="table_dropdown_modified",
+            sheet=self.PAR.name,
+            value=self.text_editor.get(),
+            loc=Loc(r, c),
+            row=r,
+            column=c,
+            boxes=self.get_boxes(),
+            selected=self.selected,
+        )
+        try_binding(self.dropdown.window.modified_function, event_data)
+        # return to tk.Text action if control/command is held down
+        # or keysym was not a character
+        if (hasattr(event, "state") and event.state & (0x0004 | 0x00000010)) or (
+            hasattr(event, "keysym") and len(event.keysym) > 2 and event.keysym != "space"
+        ):
+            return
+        self.text_editor.autocomplete(self.dropdown.window.search_and_see(event_data))
+        return "break"
 
-    # c is displayed col
     def open_dropdown_window(
         self,
         r: int,
@@ -7034,9 +7104,10 @@ class MainTable(tk.Canvas):
         datarn = self.datarn(r)
         datacn = self.datacn(c)
         kwargs = self.get_cell_kwargs(datarn, datacn, key="dropdown")
-        if kwargs["state"] == "normal":
-            if not self.open_text_editor(event=event, r=r, c=c, dropdown=True):
-                return
+        if kwargs["state"] == "disabled":
+            return
+        if kwargs["state"] == "normal" and not self.open_text_editor(event=event, r=r, c=c, dropdown=True):
+            return
         win_h, anchor = self.get_dropdown_height_anchor(r, c)
         win_w = self.col_positions[c + 1] - self.col_positions[c] + 1
         if anchor == "nw":
@@ -7050,6 +7121,10 @@ class MainTable(tk.Canvas):
         reset_kwargs = {
             "r": r,
             "c": c,
+            "bg": self.PAR.ops.table_editor_bg,
+            "fg": self.PAR.ops.table_editor_fg,
+            "select_bg": self.PAR.ops.table_editor_select_bg,
+            "select_fg": self.PAR.ops.table_editor_select_fg,
             "width": win_w,
             "height": win_h,
             "font": self.PAR.ops.table_font,
@@ -7057,6 +7132,8 @@ class MainTable(tk.Canvas):
             "outline_color": self.get_selected_box_bg_fg(type_="cells")[1],
             "align": self.get_cell_align(r, c),
             "values": kwargs["values"],
+            "search_function": kwargs["search_function"],
+            "modified_function": kwargs["modified_function"],
         }
         if self.dropdown.window:
             self.dropdown.window.reset(**reset_kwargs)
@@ -7068,7 +7145,6 @@ class MainTable(tk.Canvas):
                 self.winfo_toplevel(),
                 **reset_kwargs,
                 close_dropdown_window=self.close_dropdown_window,
-                search_function=kwargs["search_function"],
                 arrowkey_RIGHT=self.arrowkey_RIGHT,
                 arrowkey_LEFT=self.arrowkey_LEFT,
             )
@@ -7077,25 +7153,12 @@ class MainTable(tk.Canvas):
                 window=self.dropdown.window,
                 anchor=anchor,
             )
+        self.update_idletasks()
         if kwargs["state"] == "normal":
             self.text_editor.tktext.bind(
-                "<<TextModified>>",
-                lambda _: self.dropdown.window.search_and_see(
-                    event_dict(
-                        name="table_dropdown_modified",
-                        sheet=self.PAR.name,
-                        value=self.text_editor.get(),
-                        loc=Loc(r, c),
-                        row=r,
-                        column=c,
-                        boxes=self.get_boxes(),
-                        selected=self.selected,
-                    )
-                ),
+                "<KeyRelease>",
+                self.dropdown_text_editor_modified,
             )
-            if kwargs["modified_function"] is not None:
-                self.dropdown.window.modified_function = kwargs["modified_function"]
-            self.update_idletasks()
             try:
                 self.after(1, lambda: self.text_editor.tktext.focus())
                 self.after(2, self.text_editor.window.scroll_to_bottom())
@@ -7103,7 +7166,6 @@ class MainTable(tk.Canvas):
                 return
             redraw = False
         else:
-            self.update_idletasks()
             self.dropdown.window.bind("<FocusOut>", lambda _: self.close_dropdown_window(r, c))
             self.dropdown.window.bind("<Escape>", self.close_dropdown_window)
             self.dropdown.window.focus_set()

tksheet/other_classes.py

@@ -5,6 +5,7 @@ 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)
 
@@ -18,7 +19,7 @@ Box_t = namedtuple(
     "from_r from_c upto_r upto_c type_",
 )
 Box_st = namedtuple("Box_st", "coords type_")
-Loc = namedtuple("Loc", "row column")
+Loc = namedtuple("Loc", "row column", defaults=(None, None))
 
 Highlight = namedtuple(
     "Highlight",
@@ -490,6 +491,25 @@ class TextEditorStorage:
             return self.window.get()
         return ""
 
+    def set(self, value: str) -> None:
+        if not self.window:
+            return
+        self.window.set_text(value)
+
+    def highlight_from(self, index: tk.Misc, r: int | str, c: int | str) -> None:
+        self.window.tktext.tag_add("sel", index, "end")
+        self.window.tktext.mark_set("insert", f"{r}.{c}")
+
+    def autocomplete(self, value: str | None) -> None:
+        current_val = self.get()
+        if not value or len(current_val) >= len(value) or current_val != value[: len(current_val)]:
+            return
+        cursor_pos = self.tktext.index("insert")
+        line, column = cursor_pos.split(".")
+        index = self.window.tktext.index(f"{line}.{column}")
+        self.tktext.insert(index, value[len(current_val) :])
+        self.highlight_from(index, line, column)
+
     @property
     def tktext(self) -> object:
         if self.window: