tksheet 7.4.18__py3-none-any.whl → 7.4.20__py3-none-any.whl

tksheet/__init__.py

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

tksheet/column_headers.py

@@ -4,7 +4,7 @@ import tkinter as tk
 from collections import defaultdict
 from collections.abc import Callable, Hashable, Iterator, Sequence
 from functools import partial
-from itertools import cycle, islice, repeat
+from itertools import islice, repeat
 from math import ceil
 from operator import itemgetter
 from typing import Any, Literal
@@ -54,11 +54,10 @@ class ColumnHeaders(tk.Canvas):
         self.MT = None  # is set from within MainTable() __init__
         self.RI: RowIndex | None = None  # is set from within MainTable() __init__
         self.TL = None  # is set from within TopLeftRectangle() __init__
+        self.current_cursor = ""
         self.popup_menu_loc = None
         self.extra_begin_edit_cell_func = None
         self.extra_end_edit_cell_func = None
-        self.centre_alignment_text_mod_indexes = (slice(1, None), slice(None, -1))
-        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
         self.b1_pressed_loc = None
         self.closed_dropdown = None
         self.being_drawn_item = None
@@ -327,14 +326,13 @@ 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:
                     self.rsz_w, mouse_over_resize = c, True
-                    if self.MT.current_cursor != "sb_h_double_arrow":
+                    if self.current_cursor != "sb_h_double_arrow":
                         self.config(cursor="sb_h_double_arrow")
-                        self.MT.current_cursor = "sb_h_double_arrow"
+                        self.current_cursor = "sb_h_double_arrow"
                 else:
                     self.rsz_w = None
             if self.height_resizing_enabled and not mouse_over_resize:
@@ -347,20 +345,23 @@ class ColumnHeaders(tk.Canvas):
                     )
                     if x >= x1 and y >= y1 and x <= x2 and y <= y2:
                         self.rsz_h, mouse_over_resize = True, True
-                        if self.MT.current_cursor != "sb_v_double_arrow":
+                        if self.current_cursor != "sb_v_double_arrow":
                             self.config(cursor="sb_v_double_arrow")
-                            self.MT.current_cursor = "sb_v_double_arrow"
+                            self.current_cursor = "sb_v_double_arrow"
                     else:
                         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.MT.current_cursor != "hand2":
-                    self.config(cursor="hand2")
-                    self.MT.current_cursor = "hand2"
-            if not mouse_over_resize and not mouse_over_selected:
-                self.MT.reset_mouse_motion_creations()
+            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/main_table.py

@@ -7,7 +7,7 @@ from bisect import bisect_left, bisect_right
 from collections import defaultdict, deque
 from collections.abc import Callable, Generator, Hashable, Iterator, Sequence
 from functools import partial
-from itertools import accumulate, chain, cycle, filterfalse, islice, repeat
+from itertools import accumulate, chain, filterfalse, islice, repeat
 from operator import itemgetter
 from re import IGNORECASE, escape, sub
 from tkinter import TclError
@@ -130,8 +130,6 @@ class MainTable(tk.Canvas):
         self.ctrl_b1_pressed = False
         self.b1_pressed_loc = None
         self.closed_dropdown = None
-        self.centre_alignment_text_mod_indexes = (slice(1, None), slice(None, -1))
-        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
         self.allow_auto_resize_columns = True
         self.allow_auto_resize_rows = True
         self.span = self.PAR.span
@@ -387,8 +385,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),
@@ -1390,25 +1388,25 @@ class MainTable(tk.Canvas):
                 )
         selboxr = selected_r + new_data_numrows if added_rows else selected_r_adjusted_new_data_numrows
         selboxc = selected_c + new_data_numcols if added_cols else selected_c_adjusted_new_data_numcols
-        self.deselect("all", redraw=False)
-        self.set_currently_selected(
-            *curr_coords,
-            item=self.create_selection_box(
-                selected_r,
-                selected_c,
-                selboxr,
-                selboxc,
-                type_="cells",
-                set_current=False,
-                run_binding=True,
-            ),
-        )
-        event_data["selection_boxes"] = self.get_boxes()
-        event_data["selected"] = self.selected
-        self.see(selected_r, selected_c, redraw=False)
-        self.refresh()
         event_data = self.bulk_edit_validation(event_data)
         if event_data["cells"]["table"] or event_data["added"]["rows"] or event_data["added"]["columns"]:
+            self.deselect("all", redraw=False)
+            self.set_currently_selected(
+                *curr_coords,
+                item=self.create_selection_box(
+                    selected_r,
+                    selected_c,
+                    selboxr,
+                    selboxc,
+                    type_="cells",
+                    set_current=False,
+                    run_binding=True,
+                ),
+            )
+            event_data["selection_boxes"] = self.get_boxes()
+            event_data["selected"] = self.selected
+            self.see(selected_r, selected_c, redraw=False)
+            self.refresh()
             if self.undo_enabled:
                 self.undo_stack.append(stored_event_dict(event_data))
             try_binding(self.extra_end_ctrl_v_func, event_data, "end_ctrl_v")
@@ -3554,19 +3552,16 @@ class MainTable(tk.Canvas):
                 for binding in self.PAR.ops[bindings_key]:
                     widget.unbind(binding)
 
-    def reset_mouse_motion_creations(self) -> None:
-        if self.current_cursor != "":
-            self.config(cursor="")
-            self.RI.config(cursor="")
-            self.CH.config(cursor="")
-            self.current_cursor = ""
+    def reset_resize_vars(self) -> None:
         self.RI.rsz_w = None
         self.RI.rsz_h = None
         self.CH.rsz_w = None
         self.CH.rsz_h = None
 
     def mouse_motion(self, event: Any) -> None:
-        self.reset_mouse_motion_creations()
+        self.config(cursor="")
+        self.current_cursor = ""
+        self.reset_resize_vars()
         try_binding(self.extra_motion_func, event)
 
     def not_currently_resizing(self) -> bool:
@@ -6187,7 +6182,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
@@ -6195,10 +6190,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
@@ -6206,7 +6201,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/row_index.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 from collections.abc import Callable, Generator, Hashable, Iterator, Sequence
 from contextlib import suppress
 from functools import partial
-from itertools import cycle, islice, repeat
+from itertools import islice, repeat
 from math import ceil
 from re import findall
 from typing import Any, Literal
@@ -56,6 +56,7 @@ class RowIndex(tk.Canvas):
         self.MT = None  # is set from within MainTable() __init__
         self.CH = None  # is set from within MainTable() __init__
         self.TL = None  # is set from within TopLeftRectangle() __init__
+        self.current_cursor = ""
         self.new_iid_ctr = -1
         self.current_width = None
         self.popup_menu_loc = None
@@ -63,8 +64,6 @@ class RowIndex(tk.Canvas):
         self.extra_end_edit_cell_func = None
         self.b1_pressed_loc = None
         self.closed_dropdown = None
-        self.centre_alignment_text_mod_indexes = (slice(1, None), slice(None, -1))
-        self.c_align_cyc = cycle(self.centre_alignment_text_mod_indexes)
         self.being_drawn_item = None
         self.extra_motion_func = None
         self.extra_b1_press_func = None
@@ -323,14 +322,13 @@ 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
-                    if self.MT.current_cursor != "sb_v_double_arrow":
+                    if self.current_cursor != "sb_v_double_arrow":
                         self.config(cursor="sb_v_double_arrow")
-                        self.MT.current_cursor = "sb_v_double_arrow"
+                        self.current_cursor = "sb_v_double_arrow"
                 else:
                     self.rsz_h = None
             if (
@@ -352,23 +350,26 @@ class RowIndex(tk.Canvas):
                     )
                     if x >= x1 and y >= y1 and x <= x2 and y <= y2:
                         self.rsz_w, mouse_over_resize = True, True
-                        if self.MT.current_cursor != "sb_h_double_arrow":
+                        if self.current_cursor != "sb_h_double_arrow":
                             self.config(cursor="sb_h_double_arrow")
-                            self.MT.current_cursor = "sb_h_double_arrow"
+                            self.current_cursor = "sb_h_double_arrow"
                     else:
                         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.MT.current_cursor != "hand2":
-                    self.config(cursor="hand2")
-                    self.MT.current_cursor = "hand2"
-            if not mouse_over_resize and not mouse_over_selected:
-                self.MT.reset_mouse_motion_creations()
+            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 (
@@ -414,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)
@@ -483,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/sheet.py

@@ -328,6 +328,7 @@ class Sheet(tk.Frame):
         if treeview:
             index_align = "w"
             auto_resize_row_index = True
+            paste_can_expand_y = False
         for k, v in locals().items():
             if (xk := backwards_compatibility_keys.get(k, k)) in self.ops and v != self.ops[xk]:
                 self.ops[xk] = v
@@ -445,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,
@@ -453,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")
@@ -4182,6 +4181,7 @@ class Sheet(tk.Frame):
         self.MT.create_rc_menus()
         if "treeview" in kwargs:
             self.index_align("nw", redraw=False)
+            self.ops.paste_can_expand_y = False
         return self.set_refresh_timer(redraw)
 
     def set_scrollbar_options(self) -> Sheet:

{tksheet-7.4.18.dist-info → tksheet-7.4.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tksheet
-Version: 7.4.18
+Version: 7.4.20
 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.18.dist-info → tksheet-7.4.20.dist-info}/RECORD

@@ -1,22 +1,22 @@
-tksheet/__init__.py,sha256=KzVp7ncwHA5rEgQ25NL2YzAyUIXskxZE-NXVco4xyCw,2327
+tksheet/__init__.py,sha256=PpkbN7xCe4kL9f_ReQmjZFSjqrJtjldKtRMpIJXWnZM,2327
 tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
-tksheet/column_headers.py,sha256=POoLTtR8qvrRYJl1c7WMc6UiDxfoNxhLUC2ikcEzt1M,103446
+tksheet/column_headers.py,sha256=cP0RImb-EgHdVLSfNmU42k5GwCol7akKgMH6xq1sZfY,103339
 tksheet/constants.py,sha256=aiDvUSaPtl_TSNtRRJ_p87c9iTBz9ksMd5IsSXzz4Hk,13316
 tksheet/find_window.py,sha256=w6S0FZFLRNHiM57Oq97avALT_PctIBPegSxnkNUwkwk,19982
 tksheet/formatters.py,sha256=DGcRiMsDJnySNpQcjfiX84oJ7TmOSMdU6u9injIhA4g,10095
 tksheet/functions.py,sha256=qks2dLqBE9GMAuEXaA4qiU-rrL-dzmz4-tkmkp6_ETk,53037
-tksheet/main_table.py,sha256=TLhm9kwmOmEAoA06ey37Jdm3e579JOUMMLJxdaYfj60,367118
+tksheet/main_table.py,sha256=_VFoj01R4mS-m7JoDLG_36zkprweFGh0TYMalRRK4rE,366788
 tksheet/other_classes.py,sha256=B2SrUAviztDUOPGoWkcu-AixqAaKwItshoVZPGe1_Tc,16662
-tksheet/row_index.py,sha256=a0W78zqZIXVxfzyF5yYfXu1iUXnnDcK0ESodLl6joiA,141720
-tksheet/sheet.py,sha256=MRk0Q_LzX_VjJnTVWq3bgIRRF4FrDChS2uFHqHTAZEE,269796
+tksheet/row_index.py,sha256=8zuNU00ATmz5oumEqSyB_nOUAIuCS23mUfTpq3R1WOM,141611
+tksheet/sheet.py,sha256=MXt-ebQJVx-l4lozRqCxhivMMaCC7JpOD7wzfVj0rRk,269777
 tksheet/sheet_options.py,sha256=ob-XYgGfBoi2TaFAvUUmlWUkw9xB-yXmJw17gu9__Lw,9948
 tksheet/sorting.py,sha256=zcZPpRtP1h_xJGtGkG3E43H7deKQFnh9cMwZ1B2-aGc,17502
 tksheet/text_editor.py,sha256=rU8Fz0-ltkM63W9io2DoZJPyzUGzCc9Z0qBtc4D1H40,7404
 tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
 tksheet/tksheet_types.py,sha256=1MjXR34EmvP1KfHlLTvKKVnf0VMz_LU_WOM2q4o5hfI,4598
 tksheet/top_left_rectangle.py,sha256=M52IrPIeMoYE3jSpooZmqw_0W5Fz_R-Yu1ZqA685EZ8,8557
-tksheet-7.4.18.dist-info/licenses/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.4.18.dist-info/METADATA,sha256=GNx2NJ-qfa0PEE1mxFbSR92Maq3yUMQpqRygY2ks19Y,8117
-tksheet-7.4.18.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-tksheet-7.4.18.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.4.18.dist-info/RECORD,,
+tksheet-7.4.20.dist-info/licenses/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.4.20.dist-info/METADATA,sha256=esWuLkorvJ4si2jups_4X0Qrvg60SVupWtLRG1D89Og,8117
+tksheet-7.4.20.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+tksheet-7.4.20.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.4.20.dist-info/RECORD,,