tksheet 7.4.19__tar.gz → 7.4.21__tar.gz

{tksheet-7.4.19/tksheet.egg-info → tksheet-7.4.21}/PKG-INFO

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

{tksheet-7.4.19 → tksheet-7.4.21}/pyproject.toml

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

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/__init__.py

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

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/column_headers.py

@@ -326,7 +326,6 @@ class ColumnHeaders(tk.Canvas):
             x = self.canvasx(event.x)
             y = self.canvasy(event.y)
             mouse_over_resize = False
-            mouse_over_selected = False
             if self.width_resizing_enabled:
                 c = self.check_mouse_position_width_resizers(x, y)
                 if c is not None:
@@ -353,16 +352,16 @@ class ColumnHeaders(tk.Canvas):
                         self.rsz_h = None
                 except Exception:
                     self.rsz_h = None
-            if not mouse_over_resize and self.MT.col_selected(self.MT.identify_col(event, allow_end=False)):
-                mouse_over_selected = True
-                if self.current_cursor != "hand2":
-                    self.config(cursor="hand2")
-                    self.current_cursor = "hand2"
-            if not mouse_over_resize and not mouse_over_selected:
-                if self.current_cursor != "":
-                    self.config(cursor="")
-                    self.current_cursor = ""
-                self.MT.reset_resize_vars()
+            if not mouse_over_resize:
+                if self.MT.col_selected(self.MT.identify_col(event, allow_end=False)):
+                    if self.current_cursor != "hand2":
+                        self.config(cursor="hand2")
+                        self.current_cursor = "hand2"
+                else:
+                    if self.current_cursor != "":
+                        self.config(cursor="")
+                        self.current_cursor = ""
+                    self.MT.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
     def double_b1(self, event: Any) -> None:

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/functions.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import csv
 import io
-import pickle
 import re
 import tkinter as tk
 from bisect import bisect_left
@@ -17,7 +16,6 @@ from .constants import align_value_error, symbols_set
 from .formatters import to_bool
 from .other_classes import DotDict, EventDataDict, Highlight, Loc, Span
 
-unpickle_obj = pickle.loads
 lines_re = re.compile(r"[^\n]+")
 ORD_A = ord("A")
 

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/main_table.py

@@ -73,7 +73,6 @@ from .functions import (
     len_to_idx,
     mod_event_val,
     mod_span,
-    mod_span_widget,
     move_elements_by_mapping_gen,
     move_fast,
     new_tk_event,
@@ -83,7 +82,6 @@ from .functions import (
     span_idxs_post_move,
     stored_event_dict,
     try_binding,
-    unpickle_obj,
     wrap_text,
 )
 from .other_classes import (
@@ -385,8 +383,8 @@ class MainTable(tk.Canvas):
 
     def basic_bindings(self, enable: bool = True) -> None:
         bindings = (
+            ("<Enter>", self, self.mouse_motion),
             ("<Configure>", self, self.window_configured),
-            ("<Motion>", self, self.mouse_motion),
             ("<ButtonPress-1>", self, self.b1_press),
             ("<B1-Motion>", self, self.b1_motion),
             ("<ButtonRelease-1>", self, self.b1_release),
@@ -1528,7 +1526,7 @@ class MainTable(tk.Canvas):
                 "displayed": {} if disp_new_idxs is None else disp_new_idxs,
             }
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
 
         if move_widths and disp_new_idxs:
             self.set_col_positions(
@@ -1787,7 +1785,7 @@ class MainTable(tk.Canvas):
                 "displayed": {} if disp_new_idxs is None else disp_new_idxs,
             }
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
 
         if move_data:
             maxidx = len_to_idx(totalrows)
@@ -2081,9 +2079,7 @@ class MainTable(tk.Canvas):
         if "tagged_columns" in modification["options"]:
             self.tagged_columns = modification["options"]["tagged_columns"]
         if modification["named_spans"]:
-            self.named_spans = {
-                k: mod_span_widget(unpickle_obj(v), self.PAR) for k, v in modification["named_spans"].items()
-            }
+            self.named_spans = modification["named_spans"]
         if modification["sheet_state"]:
             self.RI.tree_open_ids = modification["sheet_state"]["tree_open_ids"]
             self.row_positions = modification["sheet_state"]["row_positions"]
@@ -3559,9 +3555,8 @@ class MainTable(tk.Canvas):
         self.CH.rsz_h = None
 
     def mouse_motion(self, event: Any) -> None:
-        if self.current_cursor != "":
-            self.config(cursor="")
-            self.current_cursor = ""
+        self.config(cursor="")
+        self.current_cursor = ""
         self.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
@@ -5468,7 +5463,7 @@ class MainTable(tk.Canvas):
         if not event_data:
             event_data = self.new_event_dict("delete_columns", state=True)
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
         for i, datacn in enumerate(cols):
             for rn in range(len(self.data)):
                 if datacn not in event_data["deleted"]["columns"]:
@@ -5558,7 +5553,7 @@ class MainTable(tk.Canvas):
         if not event_data:
             event_data = self.new_event_dict("delete_rows", state=True)
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
 
         for i, datarn in enumerate(rows):
             event_data["deleted"]["rows"][datarn] = self.data.pop(datarn - i)
@@ -6183,7 +6178,7 @@ class MainTable(tk.Canvas):
             and can_width >= self.col_positions[-1] + self.PAR.ops.empty_horizontal
             and self.PAR.xscroll_showing
         ):
-            self.PAR.xscroll.grid_forget()
+            self.PAR.xscroll.grid_remove()
             self.PAR.xscroll_showing = False
         elif (
             can_width < self.col_positions[-1] + self.PAR.ops.empty_horizontal
@@ -6191,10 +6186,10 @@ class MainTable(tk.Canvas):
             and not self.PAR.xscroll_disabled
             and can_height > 40
         ):
-            self.PAR.xscroll.grid(row=2, column=0, columnspan=2, sticky="nswe")
+            self.PAR.xscroll.grid()
             self.PAR.xscroll_showing = True
         if can_height >= self.row_positions[-1] + self.PAR.ops.empty_vertical and self.PAR.yscroll_showing:
-            self.PAR.yscroll.grid_forget()
+            self.PAR.yscroll.grid_remove()
             self.PAR.yscroll_showing = False
         elif (
             can_height < self.row_positions[-1] + self.PAR.ops.empty_vertical
@@ -6202,7 +6197,7 @@ class MainTable(tk.Canvas):
             and not self.PAR.yscroll_disabled
             and can_width > 40
         ):
-            self.PAR.yscroll.grid(row=0, column=2, rowspan=3, sticky="nswe")
+            self.PAR.yscroll.grid()
             self.PAR.yscroll_showing = True
 
     def _overflow(

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/other_classes.py

@@ -1,14 +1,11 @@
 from __future__ import annotations
 
-import pickle
+import copy
 import tkinter as tk
 from collections import namedtuple
 from collections.abc import Callable, Hashable, Iterator
-from functools import partial
 from typing import Any, Literal
 
-pickle_obj = partial(pickle.dumps, protocol=pickle.HIGHEST_PROTOCOL)
-
 FontTuple = namedtuple("FontTuple", "family size style")
 Box_nt = namedtuple(
     "Box_nt",
@@ -423,12 +420,45 @@ class Span(dict):
         cols = self.columns
         return Box_nt(rows.from_, cols.from_, rows.upto_, cols.upto_)
 
-    def pickle_self(self) -> bytes:
-        x = self["widget"]
-        self["widget"] = None
-        p = pickle_obj(self)
-        self["widget"] = x
-        return p
+    def copy_self(self) -> "Span":
+        # Create a new Span instance
+        span = Span()
+
+        # Iterate over all dictionary items to capture all attributes
+        for key, value in self.items():
+            if key == "widget":
+                # Tkinter widget: retain reference (do not copy)
+                span[key] = value
+            elif key == "kwargs":
+                # Handle kwargs, which may contain functions or lambdas
+                span[key] = {}
+                for k, v in value.items():
+                    if callable(v):
+                        # Functions/lambdas: shallow copy (immutable, but check for safety)
+                        span[key][k] = v
+                    else:
+                        try:
+                            # Deep copy non-callable items in kwargs
+                            span[key][k] = copy.deepcopy(v)
+                        except (TypeError, AttributeError):
+                            # Handle non-copyable objects (e.g., complex closures or objects)
+                            span[key][k] = v  # Fallback to shallow copy
+            elif key == "convert" and callable(value):
+                # Convert is a callable: shallow copy (immutable)
+                span[key] = value
+            else:
+                # Deep copy other values to handle nested objects like DotDict
+                try:
+                    span[key] = copy.deepcopy(value)
+                except (TypeError, AttributeError):
+                    # Fallback for non-copyable objects
+                    span[key] = value  # Shallow copy as fallback
+
+        # Ensure widget is set if not already present (edge case)
+        if "widget" not in span and hasattr(self, "widget"):
+            span["widget"] = self["widget"]
+
+        return span
 
     __setattr__ = __setitem__
     __getattr__ = __getitem__

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/row_index.py

@@ -322,8 +322,7 @@ class RowIndex(tk.Canvas):
             x = self.canvasx(event.x)
             y = self.canvasy(event.y)
             mouse_over_resize = False
-            mouse_over_selected = False
-            if self.height_resizing_enabled and not mouse_over_resize:
+            if self.height_resizing_enabled:
                 r = self.check_mouse_position_height_resizers(x, y)
                 if r is not None:
                     self.rsz_h, mouse_over_resize = r, True
@@ -358,19 +357,19 @@ class RowIndex(tk.Canvas):
                         self.rsz_w = None
                 except Exception:
                     self.rsz_w = None
-            if not mouse_over_resize and self.MT.row_selected(self.MT.identify_row(event, allow_end=False)):
-                mouse_over_selected = True
-                if self.current_cursor != "hand2":
-                    self.config(cursor="hand2")
-                    self.current_cursor = "hand2"
-            if not mouse_over_resize and not mouse_over_selected:
-                if self.current_cursor != "":
-                    self.config(cursor="")
-                    self.current_cursor = ""
-                self.MT.reset_resize_vars()
+            if not mouse_over_resize:
+                if self.MT.row_selected(self.MT.identify_row(event, allow_end=False)):
+                    if self.current_cursor != "hand2":
+                        self.config(cursor="hand2")
+                        self.current_cursor = "hand2"
+                else:
+                    if self.current_cursor != "":
+                        self.config(cursor="")
+                        self.current_cursor = ""
+                    self.MT.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
-    def double_b1(self, event: Any):
+    def double_b1(self, event: Any) -> None:
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
         self.focus_set()
         if (
@@ -416,7 +415,7 @@ class RowIndex(tk.Canvas):
         self.mouse_motion(event)
         try_binding(self.extra_double_b1_func, event)
 
-    def b1_press(self, event: Any):
+    def b1_press(self, event: Any) -> None:
         self.MT.unbind("<MouseWheel>")
         self.focus_set()
         self.closed_dropdown = self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -485,7 +484,7 @@ class RowIndex(tk.Canvas):
                         self.toggle_select_row(r, redraw=True)
         try_binding(self.extra_b1_press_func, event)
 
-    def b1_motion(self, event: Any):
+    def b1_motion(self, event: Any) -> None:
         x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
         if self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
             y = self.canvasy(event.y)

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/sheet.py

@@ -446,7 +446,6 @@ class Sheet(tk.Frame):
             style=f"Sheet{self.unique_id}.Vertical.TScrollbar",
         )
         self.MT["yscrollcommand"] = self.yscroll.set
-        self.RI["yscrollcommand"] = self.yscroll.set
         self.xscroll = ttk.Scrollbar(
             self,
             command=self.MT._xscrollbar,
@@ -454,7 +453,6 @@ class Sheet(tk.Frame):
             style=f"Sheet{self.unique_id}.Horizontal.TScrollbar",
         )
         self.MT["xscrollcommand"] = self.xscroll.set
-        self.CH["xscrollcommand"] = self.xscroll.set
         self.show()
         if show_top_left is False or (show_top_left is None and (not show_row_index or not show_header)):
             self.hide("top_left")

{tksheet-7.4.19 → tksheet-7.4.21}/tksheet/top_left_rectangle.py

@@ -4,6 +4,7 @@ import tkinter as tk
 from typing import Any
 
 from .constants import rc_binding
+from .functions import try_binding
 
 
 class TopLeftRectangle(tk.Canvas):
@@ -198,10 +199,8 @@ class TopLeftRectangle(tk.Canvas):
         )
         self.coords(self.select_all_box, 0, 0, w - 5, h - 5)
 
-    def mouse_motion(self, event: Any = None) -> None:
-        self.MT.reset_mouse_motion_creations()
-        if self.extra_motion_func is not None:
-            self.extra_motion_func(event)
+    def mouse_motion(self, event: Any) -> None:
+        try_binding(self.extra_motion_func, event)
 
     def b1_press(self, event: Any = None) -> None:
         self.focus_set()

{tksheet-7.4.19 → tksheet-7.4.21/tksheet.egg-info}/PKG-INFO

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