tksheet 7.2.21__tar.gz → 7.2.23__tar.gz

{tksheet-7.2.21/tksheet.egg-info → tksheet-7.2.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.21
+Version: 7.2.23
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -46,7 +46,7 @@ License-File: LICENSE.txt
 
 # <div align="center">tksheet - python tkinter table widget</div>
 
-[![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.8|3.9|3.10|3.11|3.12-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt)
+[![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.8|3.9|3.10|3.11|3.12|3.13-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt)
 
 [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
 

{tksheet-7.2.21 → tksheet-7.2.23}/README.md

@@ -4,7 +4,7 @@
 
 # <div align="center">tksheet - python tkinter table widget</div>
 
-[![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.8|3.9|3.10|3.11|3.12-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt)
+[![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.8|3.9|3.10|3.11|3.12|3.13-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt)
 
 [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
 

{tksheet-7.2.21 → tksheet-7.2.23}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.2.21"
+version = "7.2.23"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.2.21 → tksheet-7.2.23}/tksheet/__init__.py

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

{tksheet-7.2.21 → tksheet-7.2.23}/tksheet/column_headers.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import tkinter as tk
 from collections import defaultdict
 from collections.abc import (
-    Callable,
     Hashable,
     Sequence,
 )
@@ -805,19 +804,17 @@ class ColumnHeaders(tk.Canvas):
             )
 
     def b1_release(self, event: object) -> None:
+        to_hide = self.being_drawn_item
         if self.being_drawn_item is not None and (to_sel := self.MT.coords_and_type(self.being_drawn_item)):
             r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
-            self.MT.hide_selection_box(self.being_drawn_item)
+            self.being_drawn_item = None
             self.MT.set_currently_selected(
                 r_to_sel,
                 c_to_sel,
                 item=self.MT.create_selection_box(*to_sel, set_current=False),
+                run_binding=False,
             )
-            sel_event = self.MT.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.MT.hide_selection_box(to_hide)
         self.MT.bind("<MouseWheel>", self.MT.mousewheel)
         if self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
             self.drag_width_resize()
@@ -1190,45 +1187,44 @@ class ColumnHeaders(tk.Canvas):
         fc: float,
         sc: float,
         c: int,
-        c_2: str,
-        c_3: str,
+        sel_cells_bg: str,
+        sel_cols_bg: str,
         selections: dict,
         datacn: int,
     ) -> tuple[str, bool]:
         redrawn = False
         kwargs = self.get_cell_kwargs(datacn, key="highlight")
         if kwargs:
-            if kwargs[0] is not None:
-                c_1 = kwargs[0] if kwargs[0].startswith("#") else color_map[kwargs[0]]
+            fill = kwargs[0]
+            if fill and not fill.startswith("#"):
+                fill = color_map[fill]
             if "columns" in selections and c in selections["columns"]:
-                tf = (
+                txtfg = (
                     self.PAR.ops.header_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) + int(c_3[1:3], 16)) / 2):02X}"
-                        + f"{int((int(c_1[3:5], 16) + int(c_3[3:5], 16)) / 2):02X}"
-                        + f"{int((int(c_1[5:], 16) + int(c_3[5:], 16)) / 2):02X}"
+                        f"#{int((int(fill[1:3], 16) + int(sel_cols_bg[1:3], 16)) / 2):02X}"
+                        + f"{int((int(fill[3:5], 16) + int(sel_cols_bg[3:5], 16)) / 2):02X}"
+                        + f"{int((int(fill[5:], 16) + int(sel_cols_bg[5:], 16)) / 2):02X}"
                     )
             elif "cells" in selections and c in selections["cells"]:
-                tf = (
+                txtfg = (
                     self.PAR.ops.header_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) + int(c_2[1:3], 16)) / 2):02X}"
-                        + f"{int((int(c_1[3:5], 16) + int(c_2[3:5], 16)) / 2):02X}"
-                        + f"{int((int(c_1[5:], 16) + int(c_2[5:], 16)) / 2):02X}"
+                        f"#{int((int(fill[1:3], 16) + int(sel_cells_bg[1:3], 16)) / 2):02X}"
+                        + f"{int((int(fill[3:5], 16) + int(sel_cells_bg[3:5], 16)) / 2):02X}"
+                        + f"{int((int(fill[5:], 16) + int(sel_cells_bg[5:], 16)) / 2):02X}"
                     )
             else:
-                tf = self.PAR.ops.header_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.header_fg if kwargs[1] is None else kwargs[1]
+            if fill:
                 redrawn = self.redraw_highlight(
                     fc + 1,
                     0,
@@ -1244,12 +1240,12 @@ class ColumnHeaders(tk.Canvas):
                 )
         elif not kwargs:
             if "columns" in selections and c in selections["columns"]:
-                tf = self.PAR.ops.header_selected_columns_fg
+                txtfg = self.PAR.ops.header_selected_columns_fg
             elif "cells" in selections and c in selections["cells"]:
-                tf = self.PAR.ops.header_selected_cells_fg
+                txtfg = self.PAR.ops.header_selected_cells_fg
             else:
-                tf = self.PAR.ops.header_fg
-        return tf, redrawn
+                txtfg = self.PAR.ops.header_fg
+        return txtfg, redrawn
 
     def redraw_highlight(
         self,
@@ -1463,12 +1459,12 @@ class ColumnHeaders(tk.Canvas):
                 )
             self.redraw_gridline(points=points, fill=self.PAR.ops.header_grid_fg, width=1, tag="v")
         top = self.canvasy(0)
-        c_2 = (
+        sel_cols_bg = (
             self.PAR.ops.header_selected_cells_bg
             if self.PAR.ops.header_selected_cells_bg.startswith("#")
             else color_map[self.PAR.ops.header_selected_cells_bg]
         )
-        c_3 = (
+        sel_cells_bg = (
             self.PAR.ops.header_selected_columns_bg
             if self.PAR.ops.header_selected_columns_bg.startswith("#")
             else color_map[self.PAR.ops.header_selected_columns_bg]
@@ -1482,7 +1478,13 @@ class ColumnHeaders(tk.Canvas):
             crightgridln = self.MT.col_positions[c + 1]
             datacn = c if self.MT.all_columns_displayed else self.MT.displayed_columns[c]
             fill, dd_drawn = self.redraw_highlight_get_text_fg(
-                cleftgridln, crightgridln, c, c_2, c_3, selections, datacn
+                fc=cleftgridln,
+                sc=crightgridln,
+                c=c,
+                sel_cells_bg=sel_cells_bg,
+                sel_cols_bg=sel_cols_bg,
+                selections=selections,
+                datacn=datacn,
             )
 
             if datacn in self.cell_options and "align" in self.cell_options[datacn]:
@@ -1500,7 +1502,7 @@ class ColumnHeaders(tk.Canvas):
                         0,
                         crightgridln,
                         self.current_height - 1,
-                        fill=fill,
+                        fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
                         outline=fill,
                         tag="dd",
                         draw_outline=not dd_drawn,
@@ -1519,7 +1521,7 @@ class ColumnHeaders(tk.Canvas):
                         0,
                         crightgridln,
                         self.current_height - 1,
-                        fill=fill,
+                        fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
                         outline=fill,
                         tag="dd",
                         draw_outline=not dd_drawn,
@@ -1539,7 +1541,7 @@ class ColumnHeaders(tk.Canvas):
                         0,
                         crightgridln,
                         self.current_height - 1,
-                        fill=fill,
+                        fill=fill if kwargs["state"] != "disabled" else self.PAR.ops.header_grid_fg,
                         outline=fill,
                         tag="dd",
                         draw_outline=not dd_drawn,
@@ -1768,7 +1770,6 @@ class ColumnHeaders(tk.Canvas):
         h = self.current_height + 1
         if text is None:
             text = self.get_cell_data(self.MT.datacn(c), none_to_empty_str=True, redirect_int=True)
-        bg, fg = self.PAR.ops.header_bg, self.PAR.ops.header_fg
         kwargs = {
             "menu_kwargs": DotDict(
                 {
@@ -1786,8 +1787,10 @@ class ColumnHeaders(tk.Canvas):
             "width": w,
             "height": h,
             "show_border": True,
-            "bg": bg,
-            "fg": fg,
+            "bg": self.PAR.ops.header_editor_bg,
+            "fg": self.PAR.ops.header_editor_fg,
+            "select_bg": self.PAR.ops.header_editor_select_bg,
+            "select_fg": self.PAR.ops.header_editor_select_fg,
             "align": self.get_cell_align(c),
             "c": c,
         }
@@ -1999,26 +2002,46 @@ class ColumnHeaders(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)
+        c = self.dropdown.get_coords()
+        event_data = event_dict(
+            name="table_dropdown_modified",
+            sheet=self.PAR.name,
+            value=self.text_editor.get(),
+            loc=c,
+            row=0,
+            column=c,
+            boxes=self.MT.get_boxes(),
+            selected=self.MT.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"
 
     def open_dropdown_window(self, c: int, event: object = None) -> None:
         self.hide_text_editor()
         kwargs = self.get_cell_kwargs(self.MT.datacn(c), key="dropdown")
-        if kwargs["state"] == "normal":
-            if not self.open_text_editor(event=event, c=c, dropdown=True):
-                return
+        if kwargs["state"] == "disabled":
+            return
+        if kwargs["state"] == "normal" and not self.open_text_editor(event=event, c=c, dropdown=True):
+            return
         win_h, anchor = self.get_dropdown_height_anchor(c)
         win_w = self.MT.col_positions[c + 1] - self.MT.col_positions[c] + 1
         ypos = self.current_height - 1
         reset_kwargs = {
             "r": 0,
             "c": c,
+            "bg": self.PAR.ops.header_editor_bg,
+            "fg": self.PAR.ops.header_editor_fg,
+            "select_bg": self.PAR.ops.header_editor_select_bg,
+            "select_fg": self.PAR.ops.header_editor_select_fg,
             "width": win_w,
             "height": win_h,
             "font": self.PAR.ops.header_font,
@@ -2026,6 +2049,8 @@ class ColumnHeaders(tk.Canvas):
             "outline_color": self.PAR.ops.header_selected_columns_bg,
             "align": self.get_cell_align(c),
             "values": kwargs["values"],
+            "search_function": kwargs["search_function"],
+            "modified_function": kwargs["modified_function"],
         }
         if self.dropdown.window:
             self.dropdown.window.reset(**reset_kwargs)
@@ -2038,7 +2063,6 @@ class ColumnHeaders(tk.Canvas):
                 **reset_kwargs,
                 single_index="c",
                 close_dropdown_window=self.close_dropdown_window,
-                search_function=kwargs["search_function"],
                 arrowkey_RIGHT=self.MT.arrowkey_RIGHT,
                 arrowkey_LEFT=self.MT.arrowkey_LEFT,
             )
@@ -2047,24 +2071,12 @@ class ColumnHeaders(tk.Canvas):
                 window=self.dropdown.window,
                 anchor=anchor,
             )
+        self.update_idletasks()
         if kwargs["state"] == "normal":
             self.text_editor.tktext.bind(
-                "<<TextModified>>",
-                lambda _x: self.dropdown_text_editor_modified(
-                    self.dropdown.window,
-                    event_dict(
-                        name="header_dropdown_modified",
-                        sheet=self.PAR.name,
-                        value=self.text_editor.get(),
-                        loc=c,
-                        column=c,
-                        boxes=self.MT.get_boxes(),
-                        selected=self.MT.selected,
-                    ),
-                    kwargs["modified_function"],
-                ),
+                "<KeyRelease>",
+                self.dropdown_text_editor_modified,
             )
-            self.update_idletasks()
             try:
                 self.after(1, lambda: self.text_editor.tktext.focus())
                 self.after(2, self.text_editor.window.scroll_to_bottom())
@@ -2072,7 +2084,6 @@ class ColumnHeaders(tk.Canvas):
                 return
             redraw = False
         else:
-            self.update_idletasks()
             self.dropdown.window.bind("<FocusOut>", lambda _x: self.close_dropdown_window(c))
             self.dropdown.window.bind("<Escape>", self.close_dropdown_window)
             self.dropdown.window.focus_set()

{tksheet-7.2.21 → tksheet-7.2.23}/tksheet/functions.py

@@ -18,6 +18,7 @@ from collections.abc import (
 from itertools import islice, repeat
 from typing import Literal
 
+from .colors import color_map
 from .formatters import (
     to_bool,
 )
@@ -426,6 +427,20 @@ def is_contiguous(iterable: Iterator[int]) -> bool:
     return all(i == (prev := prev + 1) for i in itr)
 
 
+def box_is_single_cell(
+    r1: int,
+    c1: int,
+    r2: int,
+    c2: int,
+) -> bool:
+    return r2 - r1 == 1 and c2 - c1 == 1
+
+
+def color_tup(color: str) -> tuple[int, int, int]:
+    res = color if color.startswith("#") else color_map[color]
+    return int(res[1:3], 16), int(res[3:5], 16), int(res[5:], 16)
+
+
 def down_cell_within_box(
     r: int,
     c: int,
@@ -1400,12 +1415,24 @@ def mod_span_widget(span: Span, widget: object) -> Span:
 def mod_event_val(
     event_data: EventDataDict,
     val: object,
-    loc: Loc | int,
+    loc: Loc | None = None,
+    row: int | None = None,
+    column: int | None = None,
 ) -> EventDataDict:
     event_data.value = val
-    event_data.loc = Loc(*loc)
-    event_data.row = loc[0]
-    event_data.column = loc[1]
+    if isinstance(loc, tuple):
+        event_data.loc = Loc(*loc)
+        event_data.row = loc[0]
+        event_data.column = loc[1]
+
+    elif isinstance(row, int):
+        event_data.loc = Loc(row=row)
+        event_data.row = row
+
+    elif isinstance(column, int):
+        event_data.loc = Loc(column=column)
+        event_data.column = column
+
     return event_data