tksheet 7.2.9__tar.gz → 7.2.10__tar.gz

{tksheet-7.2.9/tksheet.egg-info → tksheet-7.2.10}/PKG-INFO

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

{tksheet-7.2.9 → tksheet-7.2.10}/pyproject.toml

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

{tksheet-7.2.9 → tksheet-7.2.10}/tksheet/__init__.py

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

{tksheet-7.2.9 → tksheet-7.2.10}/tksheet/column_headers.py

@@ -1760,8 +1760,7 @@ class ColumnHeaders(tk.Canvas):
         if self.text_editor.open and c == self.text_editor.column:
             self.text_editor.set_text(self.text_editor.get() + "" if not isinstance(text, str) else text)
             return
-        if self.text_editor.open:
-            self.hide_text_editor()
+        self.hide_text_editor()
         if not self.MT.see(r=0, c=c, keep_yscroll=True, check_cell_visibility=True):
             self.MT.refresh()
         x = self.MT.col_positions[c] + 1
@@ -1907,14 +1906,12 @@ class ColumnHeaders(tk.Canvas):
                 )
                 # self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
 
-    def hide_text_editor(self, reason: None | str = None) -> None:
+    def hide_text_editor(self) -> None:
         if self.text_editor.open:
             for binding in text_editor_to_unbind:
                 self.text_editor.tktext.unbind(binding)
             self.itemconfig(self.text_editor.canvas_id, state="hidden")
             self.text_editor.open = False
-        if reason == "Escape":
-            self.focus_set()
 
     # c is displayed col
     def close_text_editor(self, event: tk.Event) -> Literal["break"] | None:
@@ -1933,6 +1930,7 @@ class ColumnHeaders(tk.Canvas):
             return "break"
         if event.keysym == "Escape":
             self.hide_text_editor_and_dropdown()
+            self.focus_set()
             return
         # setting cell data with text editor value
         text_editor_value = self.text_editor.get()
@@ -2011,7 +2009,7 @@ class ColumnHeaders(tk.Canvas):
         dd_window.search_and_see(event)
 
     def open_dropdown_window(self, c: int, event: object = None) -> None:
-        self.hide_text_editor("Escape")
+        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):
@@ -2075,8 +2073,9 @@ class ColumnHeaders(tk.Canvas):
                 return
             redraw = False
         else:
-            self.dropdown.window.bind("<FocusOut>", lambda _x: self.close_dropdown_window(c))
             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()
             redraw = True
         self.dropdown.open = True
@@ -2116,12 +2115,12 @@ class ColumnHeaders(tk.Canvas):
                 edited = self.set_cell_data_undo(c, datacn=datacn, value=selection, redraw=not redraw)
             if edited:
                 try_binding(self.extra_end_edit_cell_func, event_data)
-            self.focus_set()
             self.MT.recreate_all_selection_boxes()
+        self.focus_set()
         self.hide_text_editor_and_dropdown(redraw=redraw)
 
     def hide_text_editor_and_dropdown(self, redraw: bool = True) -> None:
-        self.hide_text_editor("Escape")
+        self.hide_text_editor()
         self.hide_dropdown_window()
         if redraw:
             self.MT.refresh()

{tksheet-7.2.9 → tksheet-7.2.10}/tksheet/main_table.py

@@ -1796,9 +1796,7 @@ class MainTable(tk.Canvas):
     def cell_visible(self, r: int = 0, c: int = 0) -> bool:
         cx1, cy1, cx2, cy2 = self.get_canvas_visible_area()
         x1, y1, x2, y2 = self.get_cell_coords(r, c)
-        if x1 <= cx2 or y1 <= cy2 or x2 >= cx1 or y2 >= cy1:
-            return True
-        return False
+        return x1 <= cx2 or y1 <= cy2 or x2 >= cx1 or y2 >= cy1
 
     def select_all(self, redraw: bool = True, run_binding_func: bool = True) -> None:
         selected = self.selected
@@ -5457,7 +5455,7 @@ class MainTable(tk.Canvas):
         if self.PAR.ops.auto_resize_row_index and redraw_row_index and self.show_index:
             changed_w = self.RI.auto_set_index_width(
                 end_row=grid_end_row,
-                only_rows=[self.datarn(r) for r in range(text_start_row, text_end_row)],
+                only_rows=map(self.datarn, range(text_start_row, text_end_row)),
             )
         if resized_cols or resized_rows or changed_w:
             self.recreate_all_selection_boxes()
@@ -6572,8 +6570,7 @@ class MainTable(tk.Canvas):
         if self.text_editor.open and (r, c) == self.text_editor.coords:
             self.text_editor.window.set_text(self.text_editor.get() + "" if not isinstance(text, str) else text)
             return
-        if self.text_editor.open:
-            self.hide_text_editor()
+        self.hide_text_editor()
         if not self.see(r=r, c=c, check_cell_visibility=True):
             self.refresh()
         x = self.col_positions[c]
@@ -6707,14 +6704,12 @@ class MainTable(tk.Canvas):
                 )
                 # self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
 
-    def hide_text_editor(self, reason: None | str = None) -> None:
+    def hide_text_editor(self) -> None:
         if self.text_editor.open:
             for binding in text_editor_to_unbind:
                 self.text_editor.tktext.unbind(binding)
             self.itemconfig(self.text_editor.canvas_id, state="hidden")
             self.text_editor.open = False
-        if reason == "Escape":
-            self.focus_set()
 
     def close_text_editor(self, event: tk.Event) -> Literal["break"] | None:
         # checking if text editor should be closed or not
@@ -6732,6 +6727,7 @@ class MainTable(tk.Canvas):
             return "break"
         if event.keysym == "Escape":
             self.hide_text_editor_and_dropdown()
+            self.focus_set()
             return
         # setting cell data with text editor value
         text_editor_value = self.text_editor.get()
@@ -6944,7 +6940,7 @@ class MainTable(tk.Canvas):
         c: int,
         event: object = None,
     ) -> None:
-        self.hide_text_editor("Escape")
+        self.hide_text_editor()
         datarn = self.datarn(r)
         datacn = self.datacn(c)
         kwargs = self.get_cell_kwargs(datarn, datacn, key="dropdown")
@@ -7019,7 +7015,8 @@ class MainTable(tk.Canvas):
         else:
             self.update_idletasks()
             self.dropdown.window.bind("<FocusOut>", lambda _: self.close_dropdown_window(r, c))
-            self.dropdown.window.focus()
+            self.dropdown.window.bind("<Escape>", self.close_dropdown_window)
+            self.dropdown.window.focus_set()
             redraw = True
         self.dropdown.open = True
         if redraw:
@@ -7075,12 +7072,12 @@ class MainTable(tk.Canvas):
                 )
             if edited:
                 try_binding(self.extra_end_edit_cell_func, event_data)
-            self.focus_set()
             self.recreate_all_selection_boxes()
+        self.focus_set()
         self.hide_text_editor_and_dropdown(redraw=redraw)
 
     def hide_text_editor_and_dropdown(self, redraw: bool = True) -> None:
-        self.hide_text_editor("Escape")
+        self.hide_text_editor()
         self.hide_dropdown_window()
         if redraw:
             self.refresh()

{tksheet-7.2.9 → tksheet-7.2.10}/tksheet/row_index.py

@@ -358,7 +358,16 @@ class RowIndex(tk.Canvas):
                         self.MT.current_cursor = "sb_v_double_arrow"
                 else:
                     self.rsz_h = None
-            if self.width_resizing_enabled and not mouse_over_resize:
+            if (
+                self.width_resizing_enabled
+                and not mouse_over_resize
+                and self.PAR.ops.auto_resize_row_index is not True
+                and not (
+                    self.PAR.ops.auto_resize_row_index == "empty"
+                    and not isinstance(self.MT._row_index, int)
+                    and not self.MT._row_index
+                )
+            ):
                 try:
                     x1, y1, x2, y2 = (
                         self.row_width_resize_bbox[0],
@@ -761,22 +770,18 @@ class RowIndex(tk.Canvas):
             self.MT.set_yviews("moveto", 1)
 
     def event_over_dropdown(self, r: int, datarn: int, event: object, canvasy: float) -> bool:
-        if (
+        return (
             canvasy < self.MT.row_positions[r] + self.MT.index_txt_height
             and self.get_cell_kwargs(datarn, key="dropdown")
             and event.x > self.current_width - self.MT.index_txt_height - 4
-        ):
-            return True
-        return False
+        )
 
     def event_over_checkbox(self, r: int, datarn: int, event: object, canvasy: float) -> bool:
-        if (
+        return (
             canvasy < self.MT.row_positions[r] + self.MT.index_txt_height
             and self.get_cell_kwargs(datarn, key="checkbox")
             and event.x < self.MT.index_txt_height + 4
-        ):
-            return True
-        return False
+        )
 
     def b1_release(self, event: object) -> None:
         if self.being_drawn_item is not None and (to_sel := self.MT.coords_and_type(self.being_drawn_item)):
@@ -1891,8 +1896,7 @@ class RowIndex(tk.Canvas):
         if self.text_editor.open and r == self.text_editor.row:
             self.text_editor.set_text(self.text_editor.get() + "" if not isinstance(text, str) else text)
             return
-        if self.text_editor.open:
-            self.hide_text_editor()
+        self.hide_text_editor()
         if not self.MT.see(r=r, c=0, keep_yscroll=True, check_cell_visibility=True):
             self.MT.refresh()
         x = 0
@@ -2025,14 +2029,12 @@ class RowIndex(tk.Canvas):
                 )
                 # self.itemconfig(self.dropdown.canvas_id, anchor=anchor, height=win_h)
 
-    def hide_text_editor(self, reason: None | str = None) -> None:
+    def hide_text_editor(self) -> None:
         if self.text_editor.open:
             for binding in text_editor_to_unbind:
                 self.text_editor.tktext.unbind(binding)
             self.itemconfig(self.text_editor.canvas_id, state="hidden")
             self.text_editor.open = False
-        if reason == "Escape":
-            self.focus_set()
 
     # r is displayed row
     def close_text_editor(self, event: tk.Event) -> Literal["break"] | None:
@@ -2051,6 +2053,7 @@ class RowIndex(tk.Canvas):
             return "break"
         if event.keysym == "Escape":
             self.hide_text_editor_and_dropdown()
+            self.focus_set()
             return
         text_editor_value = self.text_editor.get()
         r = self.text_editor.row
@@ -2132,7 +2135,7 @@ class RowIndex(tk.Canvas):
 
     # r is displayed row
     def open_dropdown_window(self, r: int, event: object = None) -> None:
-        self.hide_text_editor("Escape")
+        self.hide_text_editor()
         kwargs = self.get_cell_kwargs(self.MT.datarn(r), key="dropdown")
         if kwargs["state"] == "normal":
             if not self.open_text_editor(event=event, r=r, dropdown=True):
@@ -2203,8 +2206,9 @@ class RowIndex(tk.Canvas):
                 return
             redraw = False
         else:
-            self.dropdown.window.bind("<FocusOut>", lambda _x: self.close_dropdown_window(r))
             self.update_idletasks()
+            self.dropdown.window.bind("<FocusOut>", lambda _x: self.close_dropdown_window(r))
+            self.dropdown.window.bind("<Escape>", self.close_dropdown_window)
             self.dropdown.window.focus_set()
             redraw = True
         self.dropdown.open = True
@@ -2245,12 +2249,12 @@ class RowIndex(tk.Canvas):
                 edited = self.set_cell_data_undo(r, datarn=datarn, value=selection, redraw=not redraw)
             if edited:
                 try_binding(self.extra_end_edit_cell_func, event_data)
-            self.focus_set()
             self.MT.recreate_all_selection_boxes()
+        self.focus_set()
         self.hide_text_editor_and_dropdown(redraw=redraw)
 
     def hide_text_editor_and_dropdown(self, redraw: bool = True) -> None:
-        self.hide_text_editor("Escape")
+        self.hide_text_editor()
         self.hide_dropdown_window()
         if redraw:
             self.MT.refresh()
@@ -2520,7 +2524,7 @@ class RowIndex(tk.Canvas):
             if not node.parent.children:
                 self.tree_open_ids.discard(node.parent)
 
-    def pid_causes_recursive_loop(self, iid: str, pid: str) -> bool:
+    def build_pid_causes_recursive_loop(self, iid: str, pid: str) -> bool:
         return any(
             i == pid
             for i in chain(
@@ -2528,3 +2532,8 @@ class RowIndex(tk.Canvas):
                 islice(self.get_iid_ancestors(iid), 1, None),
             )
         )
+
+    def move_pid_causes_recursive_loop(self, to_move_iid: str, move_to_parent: str) -> bool:
+        # if the parent the item is being moved under is one of the item's descendants
+        # then it is a recursive loop
+        return any(move_to_parent == diid for diid in self.get_iid_descendants(to_move_iid))

{tksheet-7.2.9 → tksheet-7.2.10}/tksheet/sheet.py

@@ -4711,7 +4711,7 @@ class Sheet(tk.Frame):
                 self.RI.tree[iid].text = row[text_column]
             else:
                 self.RI.tree[iid] = Node(row[text_column], iid, "")
-            if safety and (iid == pid or self.RI.pid_causes_recursive_loop(iid, pid)):
+            if safety and (iid == pid or self.RI.build_pid_causes_recursive_loop(iid, pid)):
                 row[parent_column] = ""
                 pid = ""
             if pid:
@@ -5041,7 +5041,8 @@ class Sheet(tk.Frame):
     def move(self, item: str, parent: str, index: int | None = None) -> Sheet:
         """
         Moves item to be under parent as child at index
-        'parent' can be empty string which will make item a top node
+        'parent' can be an empty str which will put the item at top level
+        Performance is not great
         """
         if (item := item.lower()) and item not in self.RI.tree:
             raise ValueError(f"Item '{item}' does not exist.")
@@ -5050,25 +5051,61 @@ class Sheet(tk.Frame):
         mapping = {}
         to_show = []
         item_node = self.RI.tree[item]
+        item_r = self.RI.tree_rns[item]
         if parent:
-            if self.RI.pid_causes_recursive_loop(item, parent):
+            if self.RI.move_pid_causes_recursive_loop(item, parent):
                 raise ValueError(f"iid '{item}' causes a recursive loop with parent '{parent}'.")
             parent_node = self.RI.tree[parent]
             if parent_node.children:
                 if index is None or index >= len(parent_node.children):
-                    index = len(parent_node.children) - 1
-                item_r = self.RI.tree_rns[item]
-                new_r = self.RI.tree_rns[parent_node.children[index].iid]
-                new_r_desc = sum(1 for _ in self.RI.get_iid_descendants(parent_node.children[index].iid))
-                item_desc = sum(1 for _ in self.RI.get_iid_descendants(item))
-                if item_r < new_r:
-                    r_ctr = new_r + new_r_desc - item_desc
+                    index = len(parent_node.children)
+                    new_r = self.RI.tree_rns[parent] + sum(1 for _ in self.RI.get_iid_descendants(parent))
+                    # new parent has children
+                    # index is on end
+                    # item row is less than move to row
+                    if item_r < new_r:
+                        r_ctr = new_r - sum(1 for _ in self.RI.get_iid_descendants(item))
+
+                    # new parent has children
+                    # index is on end
+                    # item row is greater than move to row
+                    else:
+                        r_ctr = new_r + 1
                 else:
-                    r_ctr = new_r
+                    new_r = self.RI.tree_rns[parent_node.children[index].iid]
+                    # new parent has children
+                    # index is not end
+                    # item row is less than move to row
+                    if item_r < new_r:
+                        if self.RI.items_parent(item) == parent:
+                            r_ctr = (
+                                new_r
+                                + sum(1 for _ in self.RI.get_iid_descendants(parent_node.children[index].iid))
+                                - sum(1 for _ in self.RI.get_iid_descendants(item))
+                            )
+                        else:
+                            r_ctr = new_r - sum(1 for _ in self.RI.get_iid_descendants(item)) - 1
+
+                    # new parent has children
+                    # index is not end
+                    # item row is greater than move to row
+                    else:
+                        r_ctr = new_r
             else:
-                if index is None:
-                    index = 0
-                r_ctr = self.RI.tree_rns[parent_node.iid] + 1
+                index = 0
+                new_r = self.RI.tree_rns[parent_node.iid]
+
+                # new parent doesn't have children
+                # index always start
+                # item row is less than move to row
+                if item_r < new_r:
+                    r_ctr = new_r - sum(1 for _ in self.RI.get_iid_descendants(item))
+
+                # new parent doesn't have children
+                # index always start
+                # item row is greater than move to row
+                else:
+                    r_ctr = new_r + 1
             mapping[item_r] = r_ctr
             if parent in self.RI.tree_open_ids and self.item_displayed(parent):
                 to_show.append(r_ctr)
@@ -5091,11 +5128,12 @@ class Sheet(tk.Frame):
             else:
                 if (new_r := self.top_index_row(index)) is None:
                     new_r = self.top_index_row((sum(1 for _ in self.RI.gen_top_nodes()) - 1))
-            item_r = self.RI.tree_rns[item]
             if item_r < new_r:
-                par_desc = sum(1 for _ in self.RI.get_iid_descendants(self.rowitem(new_r, data_index=True)))
-                item_desc = sum(1 for _ in self.RI.get_iid_descendants(item))
-                r_ctr = new_r + par_desc - item_desc
+                r_ctr = (
+                    new_r
+                    + sum(1 for _ in self.RI.get_iid_descendants(self.rowitem(new_r, data_index=True)))
+                    - sum(1 for _ in self.RI.get_iid_descendants(item))
+                )
             else:
                 r_ctr = new_r
             mapping[item_r] = r_ctr
@@ -6258,13 +6296,7 @@ class Sheet(tk.Frame):
     ) -> Sheet:
         kwargs = get_dropdown_kwargs(*args, **kwargs)
         d = get_dropdown_dict(**kwargs)
-        if kwargs["set_value"] is None:
-            if kwargs["values"] and (v := self.MT.get_cell_data(r, c)) not in kwargs["values"]:
-                v = kwargs["values"][0]
-            else:
-                v == ""
-        else:
-            v = kwargs["set_value"]
+        v = kwargs["set_value"] if kwargs["set_value"] is not None else kwargs["values"][0] if kwargs["values"] else ""
         if isinstance(r, str) and r.lower() == "all" and isinstance(c, int):
             for r_ in range(self.MT.total_data_rows()):
                 self._create_dropdown(r_, c, v, d)

{tksheet-7.2.9 → tksheet-7.2.10}/tksheet/top_left_rectangle.py

@@ -163,17 +163,16 @@ class TopLeftRectangle(tk.Canvas):
         recreate_selection_boxes: bool = True,
     ) -> None:
         try:
-            self.update_idletasks()
-            if new_h is None:
-                h = self.winfo_height()
-            if new_w is None:
-                w = self.winfo_width()
-            if new_w:
-                self.config(width=new_w)
-                w = new_w
-            if new_h:
-                self.config(height=new_h)
+            if isinstance(new_h, int):
                 h = new_h
+                self.config(height=h)
+            else:
+                h = self.CH.current_height
+            if isinstance(new_w, int):
+                w = new_w
+                self.config(width=w)
+            else:
+                w = self.RI.current_width
         except Exception:
             return
         self.coords(self.rw_box, 0, h - 5, w, h)

{tksheet-7.2.9 → tksheet-7.2.10/tksheet.egg-info}/PKG-INFO

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