tksheet 7.4.22__tar.gz → 7.4.24__tar.gz

{tksheet-7.4.22/tksheet.egg-info → tksheet-7.4.24}/PKG-INFO

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

{tksheet-7.4.22 → tksheet-7.4.24}/tksheet/__init__.py

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

{tksheet-7.4.22 → tksheet-7.4.24}/tksheet/main_table.py

@@ -1324,7 +1324,7 @@ class MainTable(tk.Canvas):
                             and self.input_valid_for_cell(r, datacn, val, ignore_empty=True)
                         )
                     ):
-                        rows[r][datacn] = self.format_value(datarn, datacn, val)
+                        rows[r][datacn] = self.format_value(r, datacn, val)
                         ctr += 1
             if ctr:
                 event_data = self.add_rows(
@@ -1374,7 +1374,7 @@ class MainTable(tk.Canvas):
                             and self.input_valid_for_cell(datarn, c, val, ignore_empty=True)
                         )
                     ):
-                        columns[c][datarn] = self.format_value(datarn, datacn, val)
+                        columns[c][datarn] = self.format_value(datarn, c, val)
                         ctr += 1
             if ctr:
                 event_data = self.add_columns(
@@ -1796,6 +1796,9 @@ class MainTable(tk.Canvas):
                     disp_new_idxs=disp_new_idxs,
                     maxidx=maxidx,
                     event_data=event_data,
+                    # undo_modification is the old saved stuff
+                    # event_data is the new event
+                    # node change only comes from Sheet.move()
                     undo_modification=undo_modification,
                     node_change=node_change,
                 )
@@ -2020,8 +2023,9 @@ class MainTable(tk.Canvas):
         self.PAR.emit_event("<<Redo>>", event_data)
         return event_data
 
-    def sheet_modified(self, event_data: EventDataDict, purge_redo: bool = True) -> None:
-        self.PAR.emit_event("<<SheetModified>>", event_data)
+    def sheet_modified(self, event_data: EventDataDict, purge_redo: bool = True, emit_event: bool = True) -> None:
+        if emit_event:
+            self.PAR.emit_event("<<SheetModified>>", event_data)
         if purge_redo:
             self.purge_redo_stack()
 
@@ -7603,9 +7607,30 @@ class MainTable(tk.Canvas):
             return
         if numcols == 1 and numrows == 1:
             if direction == "right":
-                self.select_right(r, c)
+                new_r, new_c = cell_right_within_box(
+                    r,
+                    c,
+                    0,
+                    0,
+                    len(self.row_positions) - 1,
+                    len(self.col_positions) - 1,
+                    len(self.row_positions) - 1,
+                    len(self.col_positions) - 1,
+                )
             elif direction == "down":
-                self.select_down(r, c)
+                new_r, new_c = cell_down_within_box(
+                    r,
+                    c,
+                    0,
+                    0,
+                    len(self.row_positions) - 1,
+                    len(self.col_positions) - 1,
+                    len(self.row_positions) - 1,
+                    len(self.col_positions) - 1,
+                )
+            if direction in ("right", "down"):
+                self.select_cell(new_r, new_c)
+                self.see(new_r, new_c)
         else:
             if direction == "right":
                 new_r, new_c = cell_right_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
@@ -7631,28 +7656,34 @@ class MainTable(tk.Canvas):
                 value = None
         return value, event_data
 
-    def select_right(self, r: int, c: int) -> None:
-        self.select_cell(r, c + 1 if c < len(self.col_positions) - 2 else c)
-        self.see(
-            r,
-            c + 1 if c < len(self.col_positions) - 2 else c,
-            bottom_right_corner=True,
-        )
-
-    def select_down(self, r: int, c: int) -> None:
-        self.select_cell(r + 1 if r < len(self.row_positions) - 2 else r, c)
-        self.see(r + 1 if r < len(self.row_positions) - 2 else r, c)
-
     def tab_key(self, event: Any = None) -> str:
-        if not self.selected:
-            return
-        r, c = self.selected.row, self.selected.column
-        r1, c1, r2, c2 = self.selection_boxes[self.selected.fill_iid].coords
-        numcols = c2 - c1
-        numrows = r2 - r1
+        if self.selected:
+            r, c = self.selected.row, self.selected.column
+            r1, c1, r2, c2 = self.selection_boxes[self.selected.fill_iid].coords
+            numcols = c2 - c1
+            numrows = r2 - r1
+        else:
+            if (
+                self.row_positions == [0]
+                or self.col_positions == [0]
+                or not self.row_positions
+                or not self.col_positions
+            ):
+                return
+            r, c = len(self.row_positions) - 2, len(self.col_positions) - 2
+            r1, c1, r2, c2 = 0, 0, len(self.row_positions) - 1, len(self.col_positions) - 1
+            numcols, numrows = 1, 1
         if numcols == 1 and numrows == 1:
-            new_r = r
-            new_c = c + 1 if c < len(self.col_positions) - 2 else c
+            new_r, new_c = cell_right_within_box(
+                r,
+                c,
+                0,
+                0,
+                len(self.row_positions) - 1,
+                len(self.col_positions) - 1,
+                len(self.row_positions) - 1,
+                len(self.col_positions) - 1,
+            )
             self.select_cell(new_r, new_c)
         else:
             new_r, new_c = cell_right_within_box(r, c, r1, c1, r2, c2, numrows, numcols)

{tksheet-7.4.22 → tksheet-7.4.24}/tksheet/sheet.py

@@ -1565,8 +1565,9 @@ class Sheet(tk.Frame):
         ):
             if undo is True or (undo is None and span.undo):
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            if emit_event is True or (emit_event is None and span.emit_event):
-                self.emit_event("<<SheetModified>>", event_data)
+            self.MT.sheet_modified(
+                event_data, emit_event=emit_event is True or (emit_event is None and span.emit_event)
+            )
         self.set_refresh_timer(redraw)
         return event_data
 
@@ -1605,8 +1606,9 @@ class Sheet(tk.Frame):
         if event_data["cells"]["table"] or event_data["cells"]["header"] or event_data["cells"]["index"]:
             if undo is True or (undo is None and span.undo):
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            if emit_event is True or (emit_event is None and span.emit_event):
-                self.emit_event("<<SheetModified>>", event_data)
+            self.MT.sheet_modified(
+                event_data, emit_event=emit_event is True or (emit_event is None and span.emit_event)
+            )
         self.set_refresh_timer(redraw)
         return event_data
 
@@ -1743,8 +1745,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer(redraw)
         return event_data
 
@@ -1797,8 +1798,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer(redraw)
         return event_data
 
@@ -1939,8 +1939,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer(redraw)
         return data_idxs, disp_idxs, event_data
 
@@ -1974,8 +1973,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer(redraw)
         return data_idxs, disp_idxs, event_data
 
@@ -1999,8 +1997,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer(redraw)
         return data_idxs, disp_idxs, event_data
 
@@ -2026,8 +2023,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer(redraw)
         return data_idxs, disp_idxs, event_data
 
@@ -2242,7 +2238,6 @@ class Sheet(tk.Frame):
                 self.MT.undo_stack.append(stored_event_dict(event_data))
             try_binding(self.MT.extra_end_replace_all_func, event_data)
             self.MT.sheet_modified(event_data)
-            self.emit_event("<<SheetModified>>", event_data)
         return event_data
 
     # Highlighting Cells
@@ -4872,8 +4867,7 @@ class Sheet(tk.Frame):
         if event_data:
             if undo and self.MT.undo_enabled:
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            if emit_event:
-                self.emit_event("<<SheetModified>>", event_data)
+            self.MT.sheet_modified(event_data, emit_event=emit_event)
 
         self.set_refresh_timer(redraw=not get_only and redraw)
         if get_only:
@@ -4973,8 +4967,7 @@ class Sheet(tk.Frame):
         )
         if undo:
             self.MT.undo_stack.append(stored_event_dict(event_data))
-        if emit_event:
-            self.emit_event("<<SheetModified>>", event_data)
+        self.MT.sheet_modified(event_data, emit_event=emit_event)
         self.set_refresh_timer()
         return data_new_idxs, disp_new_idxs, event_data
 

{tksheet-7.4.22 → tksheet-7.4.24/tksheet.egg-info}/PKG-INFO

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