tksheet 7.5.1__tar.gz → 7.5.2__tar.gz

{tksheet-7.5.1/tksheet.egg-info → tksheet-7.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tksheet
-Version: 7.5.1
+Version: 7.5.2
 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.5.1 → tksheet-7.5.2}/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.5.1"
+version = "7.5.2"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.5.1 → tksheet-7.5.2}/tksheet/__init__.py

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

{tksheet-7.5.1 → tksheet-7.5.2}/tksheet/column_headers.py

@@ -2245,17 +2245,18 @@ class ColumnHeaders(tk.Canvas):
                 self.MT._headers[datacn] = value
 
     def input_valid_for_cell(self, datacn: int, value: Any, check_readonly: bool = True) -> bool:
-        kwargs = self.get_cell_kwargs(datacn, key=None)
-        if check_readonly and "readonly" in kwargs:
+        if check_readonly and self.get_cell_kwargs(datacn, key="readonly"):
             return False
-        elif "checkbox" in kwargs:
+        elif self.get_cell_kwargs(datacn, key="checkbox"):
             return is_bool_like(value)
         else:
             return not (
                 self.cell_equal_to(datacn, value)
-                or (kwargs := kwargs.get("dropdown", {}))
-                and kwargs["validate_input"]
-                and value not in kwargs["values"]
+                or (
+                    (kwargs := self.get_cell_kwargs(datacn, key="dropdown"))
+                    and kwargs["validate_input"]
+                    and value not in kwargs["values"]
+                )
             )
 
     def cell_equal_to(self, datacn: int, value: Any) -> bool:
@@ -2311,11 +2312,14 @@ class ColumnHeaders(tk.Canvas):
         return value
 
     def get_value_for_empty_cell(self, datacn: int, c_ops: bool = True) -> Any:
-        kwargs = self.get_cell_kwargs(datacn, key=None, cell=c_ops)
-        if "checkbox" in kwargs:
+        if self.get_cell_kwargs(datacn, key="checkbox", cell=c_ops):
             return False
-        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
-            return kwargs["dropdown"]["values"][0]
+        elif (
+            (kwargs := self.get_cell_kwargs(datacn, key="dropdown", cell=c_ops))
+            and kwargs["validate_input"]
+            and kwargs["values"]
+        ):
+            return kwargs["values"][0]
         else:
             return ""
 

{tksheet-7.5.1 → tksheet-7.5.2}/tksheet/main_table.py

@@ -189,7 +189,7 @@ class MainTable(tk.Canvas):
         self.min_row_height = 0
         self.min_header_height = 0
         self.being_drawn_item = None
-        self.extra_motion_func = None
+        self.extra_enter_func = None
         self.extra_b1_press_func = None
         self.extra_b1_motion_func = None
         self.extra_b1_release_func = None
@@ -389,7 +389,7 @@ class MainTable(tk.Canvas):
 
     def basic_bindings(self, enable: bool = True) -> None:
         bindings = (
-            ("<Enter>", self, self.mouse_motion),
+            ("<Enter>", self, self.enter),
             ("<Configure>", self, self.window_configured),
             ("<ButtonPress-1>", self, self.b1_press),
             ("<B1-Motion>", self, self.b1_motion),
@@ -3662,11 +3662,11 @@ class MainTable(tk.Canvas):
         self.CH.rsz_w = None
         self.CH.rsz_h = None
 
-    def mouse_motion(self, event: Any) -> None:
+    def enter(self, event: Any) -> None:
         self.config(cursor="")
         self.current_cursor = ""
         self.reset_resize_vars()
-        try_binding(self.extra_motion_func, event)
+        try_binding(self.extra_enter_func, event)
 
     def not_currently_resizing(self) -> bool:
         return all(v is None for v in (self.RI.rsz_h, self.RI.rsz_w, self.CH.rsz_h, self.CH.rsz_w))
@@ -8218,18 +8218,30 @@ class MainTable(tk.Canvas):
             return value
 
     def get_value_for_empty_cell(self, datarn: int, datacn: int, r_ops: bool = True, c_ops: bool = True) -> Any:
-        kwargs = self.get_cell_kwargs(
+        if self.get_cell_kwargs(
             datarn,
             datacn,
-            key=None,
+            key="checkbox",
             cell=r_ops and c_ops,
             row=r_ops,
             column=c_ops,
-        )
-        if "checkbox" in kwargs:
+        ):
             return False
-        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
-            return kwargs["dropdown"]["values"][0]
+        elif (
+            (
+                kwargs := self.get_cell_kwargs(
+                    datarn,
+                    datacn,
+                    key="dropdown",
+                    cell=r_ops and c_ops,
+                    row=r_ops,
+                    column=c_ops,
+                )
+            )
+            and kwargs["validate_input"]
+            and kwargs["values"]
+        ):
+            return kwargs["values"][0]
         else:
             return self.format_value(datarn, datacn, "")
 
@@ -8415,16 +8427,17 @@ class MainTable(tk.Canvas):
         check_readonly: bool = True,
         ignore_empty: bool = False,
     ) -> bool:
-        kwargs = self.get_cell_kwargs(datarn, datacn, key=None)
-        if check_readonly and "readonly" in kwargs:
+        if check_readonly and self.get_cell_kwargs(datarn, datacn, key="readonly"):
             return False
-        elif "format" in kwargs:
+        elif self.get_cell_kwargs(datarn, datacn, key="format"):
             return True
         elif self.cell_equal_to(datarn, datacn, value, ignore_empty=ignore_empty, check_fmt=False) or (
-            "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and value not in kwargs["dropdown"]["values"]
+            (kwargs := self.get_cell_kwargs(datarn, datacn, key="dropdown"))
+            and kwargs["validate_input"]
+            and value not in kwargs["values"]
         ):
             return False
-        elif "checkbox" in kwargs:
+        elif self.get_cell_kwargs(datarn, datacn, key="checkbox"):
             return is_bool_like(value)
         else:
             return True

{tksheet-7.5.1 → tksheet-7.5.2}/tksheet/row_index.py

@@ -2414,17 +2414,18 @@ class RowIndex(tk.Canvas):
                 self.MT._row_index[datarn] = value
 
     def input_valid_for_cell(self, datarn: int, value: Any, check_readonly: bool = True) -> bool:
-        kwargs = self.get_cell_kwargs(datarn, key=None)
-        if check_readonly and "readonly" in kwargs:
+        if check_readonly and self.get_cell_kwargs(datarn, key="readonly"):
             return False
-        elif "checkbox" in kwargs:
+        elif self.get_cell_kwargs(datarn, key="checkbox"):
             return is_bool_like(value)
         else:
             return not (
                 self.cell_equal_to(datarn, value)
-                or (kwargs := kwargs.get("dropdown", {}))
-                and kwargs["validate_input"]
-                and value not in kwargs["values"]
+                or (
+                    (kwargs := self.get_cell_kwargs(datarn, key="dropdown"))
+                    and kwargs["validate_input"]
+                    and value not in kwargs["values"]
+                )
             )
 
     def cell_equal_to(self, datarn: int, value: Any) -> bool:
@@ -2487,11 +2488,14 @@ class RowIndex(tk.Canvas):
         if self.ops.treeview:
             iid = self.new_iid()
             return Node(text=iid, iid=iid, parent=self.get_row_parent(datarn))
-        kwargs = self.get_cell_kwargs(datarn, key=None, cell=r_ops)
-        if "checkbox" in kwargs:
+        if self.get_cell_kwargs(datarn, key="checkbox", cell=r_ops):
             return False
-        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
-            return kwargs["dropdown"]["values"][0]
+        elif (
+            (kwargs := self.get_cell_kwargs(datarn, key="dropdown", cell=r_ops))
+            and kwargs["validate_input"]
+            and kwargs["values"]
+        ):
+            return kwargs["values"][0]
         else:
             return ""
 

{tksheet-7.5.1 → tksheet-7.5.2}/tksheet/sheet.py

@@ -703,7 +703,7 @@ class Sheet(tk.Frame):
             self.RI.extra_double_b1_func = func
             self.TL.extra_double_b1_func = func
         elif binding == "<Motion>":
-            self.MT.extra_motion_func = func
+            self.MT.bind("<Motion>", func, add=add)
             self.CH.extra_motion_func = func
             self.RI.extra_motion_func = func
             self.TL.extra_motion_func = func
@@ -718,7 +718,10 @@ class Sheet(tk.Frame):
             else:
                 self.bound_events[binding] = [func]
         else:
-            self.MT.bind(binding, func, add=add)
+            if binding == "<Enter>":
+                self.MT.extra_enter_func = func
+            else:
+                self.MT.bind(binding, func, add=add)
             self.CH.bind(binding, func, add=add)
             self.RI.bind(binding, func, add=add)
             self.TL.bind(binding, func, add=add)

{tksheet-7.5.1 → tksheet-7.5.2/tksheet.egg-info}/PKG-INFO

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