tksheet 7.1.2__tar.gz → 7.1.4__tar.gz

{tksheet-7.1.2/tksheet.egg-info → tksheet-7.1.4}/PKG-INFO

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

{tksheet-7.1.2 → tksheet-7.1.4}/pyproject.toml

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

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/__init__.py

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

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/column_headers.py

@@ -197,8 +197,7 @@ class ColumnHeaders(tk.Canvas):
                         self.toggle_select_col(c, redraw=True)
                     if self.MT.rc_popup_menus_enabled:
                         popup_menu = self.ch_rc_popup_menu
-        if self.extra_rc_func is not None:
-            self.extra_rc_func(event)
+        try_binding(self.extra_rc_func, event)
         if popup_menu is not None:
             self.popup_menu_loc = c
             popup_menu.tk_popup(event.x_root, event.y_root)
@@ -218,10 +217,9 @@ class ColumnHeaders(tk.Canvas):
                     self.being_drawn_item = True
                     self.being_drawn_item = self.add_selection(c, set_as_current=True, run_binding_func=False)
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.ctrl_selection_binding_func is not None:
-                        self.ctrl_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.ctrl_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif c_selected:
                     self.MT.deselect(c=c)
         elif not self.MT.ctrl_select_enabled:
@@ -252,10 +250,9 @@ class ColumnHeaders(tk.Canvas):
                             set_as_current=True,
                         )
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.ctrl_selection_binding_func is not None:
-                        self.ctrl_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.ctrl_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif c_selected:
                     self.dragged_col = DraggedRowColumn(
                         dragged=c,
@@ -275,15 +272,14 @@ class ColumnHeaders(tk.Canvas):
                     if self.MT.selected and self.MT.selected.type_ == "columns":
                         r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
                         self.MT.deselect("all", redraw=False)
-                        self.being_drawn_item = self.MT.create_selection_box(*self.get_shift_select_box(c, c_to_sel))
+                        self.being_drawn_item = self.MT.create_selection_box(*self.get_shift_select_box(c, c_to_sel), "columns")
                         self.MT.set_currently_selected(r_to_sel, c_to_sel, self.being_drawn_item)
                     else:
                         self.being_drawn_item = self.select_col(c, run_binding_func=False)
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.shift_selection_binding_func is not None:
-                        self.shift_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.shift_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif c_selected:
                     self.dragged_col = DraggedRowColumn(
                         dragged=c,
@@ -371,8 +367,7 @@ class ColumnHeaders(tk.Canvas):
                         self.MT.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
                 self.MT.reset_mouse_motion_creations()
-        if self.extra_motion_func is not None:
-            self.extra_motion_func(event)
+        try_binding(self.extra_motion_func, event)
 
     def double_b1(self, event: object):
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -412,8 +407,7 @@ class ColumnHeaders(tk.Canvas):
                     self.open_cell(event)
         self.rsz_w = None
         self.mouse_motion(event)
-        if self.extra_double_b1_func is not None:
-            self.extra_double_b1_func(event)
+        try_binding(self.extra_double_b1_func, event)
 
     def b1_press(self, event: object):
         self.MT.unbind("<MouseWheel>")
@@ -478,8 +472,7 @@ class ColumnHeaders(tk.Canvas):
                         self.being_drawn_item = self.select_col(c, redraw=True)
                     elif self.MT.toggle_selection_enabled:
                         self.toggle_select_col(c, redraw=True)
-        if self.extra_b1_press_func is not None:
-            self.extra_b1_press_func(event)
+        try_binding(self.extra_b1_press_func, event)
 
     def b1_motion(self, event: object):
         x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
@@ -570,16 +563,14 @@ class ColumnHeaders(tk.Canvas):
                         else:
                             self.being_drawn_item = self.select_col(self.MT.selected.column, run_binding_func=False)
                         need_redraw = True
-                        if self.drag_selection_binding_func is not None:
-                            self.drag_selection_binding_func(
-                                self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                            )
+                        sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                        try_binding(self.drag_selection_binding_func, sel_event)
+                        self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 if self.scroll_if_event_offscreen(event):
                     need_redraw = True
             if need_redraw:
                 self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=False)
-        if self.extra_b1_motion_func is not None:
-            self.extra_b1_motion_func(event)
+        try_binding(self.extra_b1_motion_func, event)
 
     def get_b1_motion_box(self, start_col, end_col):
         if end_col >= start_col:
@@ -631,10 +622,9 @@ class ColumnHeaders(tk.Canvas):
                             self.MT.hide_selection_box(self.MT.selected.fill_iid)
                             self.being_drawn_item = self.add_selection(box[1], run_binding_func=False)
                         need_redraw = True
-                        if self.drag_selection_binding_func is not None:
-                            self.drag_selection_binding_func(
-                                self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                            )
+                        sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                        try_binding(self.drag_selection_binding_func, sel_event)
+                        self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 if self.scroll_if_event_offscreen(event):
                     need_redraw = True
             if need_redraw:
@@ -770,10 +760,9 @@ class ColumnHeaders(tk.Canvas):
                 c_to_sel,
                 item=self.MT.create_selection_box(*to_sel, set_current=False),
             )
-            if self.drag_selection_binding_func is not None:
-                self.drag_selection_binding_func(
-                    self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                )
+            sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+            try_binding(self.drag_selection_binding_func, sel_event)
+            self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
         self.MT.bind("<MouseWheel>", self.MT.mousewheel)
         if self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
             self.currently_resizing_width = False
@@ -879,8 +868,7 @@ class ColumnHeaders(tk.Canvas):
         self.rsz_w = None
         self.rsz_h = None
         self.mouse_motion(event)
-        if self.extra_b1_release_func is not None:
-            self.extra_b1_release_func(event)
+        try_binding(self.extra_b1_release_func, event)
 
     def toggle_select_col(
         self,
@@ -1646,7 +1634,7 @@ class ColumnHeaders(tk.Canvas):
             text = event.char
         else:
             return False
-        if self.extra_begin_edit_cell_func is not None:
+        if self.extra_begin_edit_cell_func:
             try:
                 text = self.extra_begin_edit_cell_func(
                     event_dict(

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/functions.py

@@ -628,6 +628,7 @@ def span_dict(
     ndim: int | None = None,
     convert: Callable | None = None,
     undo: bool = False,
+    emit_event: bool = False,
     widget: object = None,
 ) -> Span:
     d: Span = Span(
@@ -648,6 +649,7 @@ def span_dict(
         ndim=ndim,
         convert=convert,
         undo=undo,
+        emit_event=emit_event,
         widget=widget,
     )
     return d

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/main_table.py

@@ -75,6 +75,7 @@ from .functions import (
 )
 from .other_classes import (
     Box_nt,
+    Box_st,
     Box_t,
     DotDict,
     DropdownStorage,
@@ -1908,11 +1909,11 @@ class MainTable(tk.Canvas):
     def page_UP(self, event=None):
         height = self.winfo_height()
         top = self.canvasy(0)
-        scrollto = top - height
-        if scrollto < 0:
-            scrollto = 0
+        scrollto_y = top - height
+        if scrollto_y < 0:
+            scrollto_y = 0
         if self.PAR.ops.page_up_down_select_row:
-            r = bisect_left(self.row_positions, scrollto)
+            r = bisect_left(self.row_positions, scrollto_y)
             if self.selected and self.selected.row == r:
                 r -= 1
             if r < 0:
@@ -1925,11 +1926,11 @@ class MainTable(tk.Canvas):
             elif (self.single_selection_enabled or self.toggle_selection_enabled) and self.anything_selected(
                 exclude_columns=True, exclude_rows=True
             ):
-                box = self.get_all_selection_boxes_with_types()[0][0]
-                self.see(r, box[1], keep_xscroll=True, check_cell_visibility=False)
-                self.select_cell(r, box[1])
+                c = next(reversed(self.selection_boxes.values())).coords.from_c
+                self.see(r, c, keep_xscroll=True, check_cell_visibility=False)
+                self.select_cell(r, c)
         else:
-            args = ("moveto", scrollto / (self.row_positions[-1] + 100))
+            args = ("moveto", scrollto_y / (self.row_positions[-1] + 100))
             self.yview(*args)
             self.RI.yview(*args)
             self.main_table_redraw_grid_and_text(redraw_row_index=True)
@@ -1952,9 +1953,9 @@ class MainTable(tk.Canvas):
             elif (self.single_selection_enabled or self.toggle_selection_enabled) and self.anything_selected(
                 exclude_columns=True, exclude_rows=True
             ):
-                box = self.get_all_selection_boxes_with_types()[0][0]
-                self.see(r, box[1], keep_xscroll=True, check_cell_visibility=False)
-                self.select_cell(r, box[1])
+                c = next(reversed(self.selection_boxes.values())).coords.from_c
+                self.see(r, c, keep_xscroll=True, check_cell_visibility=False)
+                self.select_cell(r, c)
         else:
             end = self.row_positions[-1]
             if scrollto > end + 100:
@@ -2699,42 +2700,22 @@ class MainTable(tk.Canvas):
         self.mouseclick_outside_editor_or_dropdown_all_canvases()
         self.focus_set()
         popup_menu = None
-        if self.single_selection_enabled and self.not_currently_resizing():
+        if (self.single_selection_enabled or self.toggle_selection_enabled) and self.not_currently_resizing():
             r = self.identify_row(y=event.y)
             c = self.identify_col(x=event.x)
             if r < len(self.row_positions) - 1 and c < len(self.col_positions) - 1:
-                if self.col_selected(c):
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.CH.ch_rc_popup_menu
-                elif self.row_selected(r):
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.RI.ri_rc_popup_menu
-                elif self.cell_selected(r, c):
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.rc_popup_menu
+                if self.col_selected(c) and self.rc_popup_menus_enabled:
+                    popup_menu = self.CH.ch_rc_popup_menu
+                elif self.row_selected(r) and self.rc_popup_menus_enabled:
+                    popup_menu = self.RI.ri_rc_popup_menu
+                elif self.cell_selected(r, c) and self.rc_popup_menus_enabled:
+                    popup_menu = self.rc_popup_menu
                 else:
                     if self.rc_select_enabled:
-                        self.select_cell(r, c, redraw=True)
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.rc_popup_menu
-            else:
-                popup_menu = self.empty_rc_popup_menu
-        elif self.toggle_selection_enabled and self.not_currently_resizing():
-            r = self.identify_row(y=event.y)
-            c = self.identify_col(x=event.x)
-            if r < len(self.row_positions) - 1 and c < len(self.col_positions) - 1:
-                if self.col_selected(c):
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.CH.ch_rc_popup_menu
-                elif self.row_selected(r):
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.RI.ri_rc_popup_menu
-                elif self.cell_selected(r, c):
-                    if self.rc_popup_menus_enabled:
-                        popup_menu = self.rc_popup_menu
-                else:
-                    if self.rc_select_enabled:
-                        self.toggle_select_cell(r, c, redraw=True)
+                        if self.single_selection_enabled:
+                            self.select_cell(r, c, redraw=True)
+                        elif self.toggle_selection_enabled:
+                            self.toggle_select_cell(r, c, redraw=True)
                     if self.rc_popup_menus_enabled:
                         popup_menu = self.rc_popup_menu
             else:
@@ -5603,6 +5584,9 @@ class MainTable(tk.Canvas):
         columns: bool = True,
         reverse: bool = False,
     ) -> Generator[int]:
+        """
+        Most recent selection box should be last
+        """
         itr = reversed(self.selection_boxes.items()) if reverse else self.selection_boxes.items()
         return tuple(
             (iid, box)
@@ -5610,7 +5594,7 @@ class MainTable(tk.Canvas):
             if cells and box.type_ == "cells" or rows and box.type_ == "rows" or columns and box.type_ == "columns"
         )
 
-    def get_boxes(self) -> dict:
+    def get_boxes(self) -> dict[Box_nt, Literal["cells", "rows", "columns"]]:
         return {box.coords: box.type_ for box in self.selection_boxes.values()}
 
     def reselect_from_get_boxes(
@@ -6236,7 +6220,7 @@ class MainTable(tk.Canvas):
         return tuple(box.coords for item, box in self.get_selection_items())
 
     def get_all_selection_boxes_with_types(self) -> list[tuple[tuple[int, int, int, int], str]]:
-        return [(box.coords, box.type) for item, box in self.get_selection_items()]
+        return [Box_st(box.coords, box.type_) for item, box in self.get_selection_items()]
 
     def all_selected(self) -> bool:
         return any(
@@ -6263,20 +6247,20 @@ class MainTable(tk.Canvas):
             )
         )
 
-    def col_selected(self, c: int) -> bool:
+    def col_selected(self, c: int, cells: bool = False) -> bool:
         return isinstance(c, int) and any(
             box.coords.from_c <= c and box.coords.upto_c > c
             for item, box in self.get_selection_items(
-                cells=False,
+                cells=cells,
                 rows=False,
             )
         )
 
-    def row_selected(self, r: int) -> bool:
+    def row_selected(self, r: int, cells: bool = False) -> bool:
         return isinstance(r, int) and any(
             box.coords.from_r <= r and box.coords.upto_r > r
             for item, box in self.get_selection_items(
-                cells=False,
+                cells=cells,
                 columns=False,
             )
         )

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/other_classes.py

@@ -17,6 +17,10 @@ Box_t = namedtuple(
     "Box_t",
     "from_r from_c upto_r upto_c type_",
 )
+Box_st = namedtuple(
+    "Box_st",
+    "coords type_"
+)
 
 Highlight = namedtuple(
     "Highlight",

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/row_index.py

@@ -191,8 +191,7 @@ class RowIndex(tk.Canvas):
                         self.toggle_select_row(r, redraw=True)
                     if self.MT.rc_popup_menus_enabled:
                         popup_menu = self.ri_rc_popup_menu
-        if self.extra_rc_func is not None:
-            self.extra_rc_func(event)
+        try_binding(self.extra_rc_func, event)
         if popup_menu is not None:
             self.popup_menu_loc = r
             popup_menu.tk_popup(event.x_root, event.y_root)
@@ -212,10 +211,9 @@ class RowIndex(tk.Canvas):
                     self.being_drawn_item = True
                     self.being_drawn_item = self.add_selection(r, set_as_current=True, run_binding_func=False)
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.ctrl_selection_binding_func is not None:
-                        self.ctrl_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.ctrl_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif r_selected:
                     self.MT.deselect(r=r)
         elif not self.MT.ctrl_select_enabled:
@@ -246,10 +244,9 @@ class RowIndex(tk.Canvas):
                             set_as_current=True,
                         )
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.ctrl_selection_binding_func is not None:
-                        self.ctrl_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.ctrl_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif r_selected:
                     self.dragged_row = DraggedRowColumn(
                         dragged=r,
@@ -269,15 +266,14 @@ class RowIndex(tk.Canvas):
                     if self.MT.selected and self.MT.selected.type_ == "rows":
                         r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
                         self.MT.deselect("all", redraw=False)
-                        self.being_drawn_item = self.MT.create_selection_box(*self.get_shift_select_box(r, r_to_sel))
+                        self.being_drawn_item = self.MT.create_selection_box(*self.get_shift_select_box(r, r_to_sel), "rows")
                         self.MT.set_currently_selected(r_to_sel, c_to_sel, self.being_drawn_item)
                     else:
                         self.being_drawn_item = self.select_row(r, run_binding_func=False)
                     self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
-                    if self.shift_selection_binding_func is not None:
-                        self.shift_selection_binding_func(
-                            self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                        )
+                    sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                    try_binding(self.shift_selection_binding_func, sel_event)
+                    self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 elif r_selected:
                     self.dragged_row = DraggedRowColumn(
                         dragged=r,
@@ -365,8 +361,7 @@ class RowIndex(tk.Canvas):
                         self.MT.current_cursor = "hand2"
             if not mouse_over_resize and not mouse_over_selected:
                 self.MT.reset_mouse_motion_creations()
-        if self.extra_motion_func is not None:
-            self.extra_motion_func(event)
+        try_binding(self.extra_motion_func, event)
 
     def double_b1(self, event: object):
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -410,8 +405,7 @@ class RowIndex(tk.Canvas):
                     self.PAR.item(iid, open_=iid not in self.tree_open_ids)
         self.rsz_h = None
         self.mouse_motion(event)
-        if self.extra_double_b1_func is not None:
-            self.extra_double_b1_func(event)
+        try_binding(self.extra_double_b1_func, event)
 
     def b1_press(self, event: object):
         self.MT.unbind("<MouseWheel>")
@@ -484,8 +478,7 @@ class RowIndex(tk.Canvas):
                         self.being_drawn_item = self.select_row(r, redraw=True)
                     elif self.MT.toggle_selection_enabled:
                         self.toggle_select_row(r, redraw=True)
-        if self.extra_b1_press_func is not None:
-            self.extra_b1_press_func(event)
+        try_binding(self.extra_b1_press_func, event)
 
     def b1_motion(self, event: object):
         x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
@@ -576,16 +569,14 @@ class RowIndex(tk.Canvas):
                         else:
                             self.being_drawn_item = self.select_row(self.MT.selected.row, run_binding_func=False)
                         need_redraw = True
-                        if self.drag_selection_binding_func is not None:
-                            self.drag_selection_binding_func(
-                                self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                            )
+                        sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                        try_binding(self.drag_selection_binding_func, sel_event)
+                        self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 if self.scroll_if_event_offscreen(event):
                     need_redraw = True
             if need_redraw:
                 self.MT.main_table_redraw_grid_and_text(redraw_header=False, redraw_row_index=True)
-        if self.extra_b1_motion_func is not None:
-            self.extra_b1_motion_func(event)
+        try_binding(self.extra_b1_motion_func, event)
 
     def get_b1_motion_box(self, start_row, end_row):
         if end_row >= start_row:
@@ -637,10 +628,9 @@ class RowIndex(tk.Canvas):
                             self.MT.hide_selection_box(self.MT.selected.fill_iid)
                             self.being_drawn_item = self.add_selection(box[0], run_binding_func=False)
                         need_redraw = True
-                        if self.drag_selection_binding_func is not None:
-                            self.drag_selection_binding_func(
-                                self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                            )
+                        sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+                        try_binding(self.drag_selection_binding_func, sel_event)
+                        self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
                 if self.scroll_if_event_offscreen(event):
                     need_redraw = True
             if need_redraw:
@@ -775,10 +765,9 @@ class RowIndex(tk.Canvas):
                 c_to_sel,
                 item=self.MT.create_selection_box(*to_sel, set_current=False),
             )
-            if self.drag_selection_binding_func is not None:
-                self.drag_selection_binding_func(
-                    self.MT.get_select_event(being_drawn_item=self.being_drawn_item),
-                )
+            sel_event = self.MT.get_select_event(being_drawn_item=self.being_drawn_item)
+            try_binding(self.drag_selection_binding_func, sel_event)
+            self.PAR.emit_event("<<SheetSelect>>", data=sel_event)
         self.MT.bind("<MouseWheel>", self.MT.mousewheel)
         if self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
             self.currently_resizing_height = False
@@ -886,8 +875,7 @@ class RowIndex(tk.Canvas):
         self.rsz_w = None
         self.rsz_h = None
         self.mouse_motion(event)
-        if self.extra_b1_release_func is not None:
-            self.extra_b1_release_func(event)
+        try_binding(self.extra_b1_release_func, event)
 
     def event_over_tree_arrow(
         self,
@@ -1738,7 +1726,7 @@ class RowIndex(tk.Canvas):
             text = event.char
         else:
             return False
-        if self.extra_begin_edit_cell_func is not None:
+        if self.extra_begin_edit_cell_func:
             try:
                 text = self.extra_begin_edit_cell_func(
                     event_dict(

{tksheet-7.1.2 → tksheet-7.1.4}/tksheet/sheet.py

@@ -2967,14 +2967,24 @@ class Sheet(tk.Frame):
     def get_all_selection_boxes_with_types(self) -> list[tuple[tuple[int, int, int, int], str]]:
         return self.MT.get_all_selection_boxes_with_types()
 
-    def cell_selected(self, r: int, c: int) -> bool:
-        return self.MT.cell_selected(r, c)
+    @property
+    def boxes(self) -> list[tuple[tuple[int, int, int, int], str]]:
+        return self.MT.get_all_selection_boxes_with_types()
+
+    def cell_selected(
+        self,
+        r: int,
+        c: int,
+        rows: bool = False,
+        columns: bool = False,
+    ) -> bool:
+        return self.MT.cell_selected(r, c, inc_cols=columns, inc_rows=rows)
 
-    def row_selected(self, r: int) -> bool:
-        return self.MT.row_selected(r)
+    def row_selected(self, r: int, cells: bool = False) -> bool:
+        return self.MT.row_selected(r, cells=cells)
 
-    def column_selected(self, c: int) -> bool:
-        return self.MT.col_selected(c)
+    def column_selected(self, c: int, cells: bool = False) -> bool:
+        return self.MT.col_selected(c, cells=cells)
 
     def anything_selected(
         self,
@@ -3603,6 +3613,7 @@ class Sheet(tk.Frame):
         return c if self.MT.all_columns_displayed else self.MT.displayed_columns[c]
 
     data_c = displayed_column_to_data
+    dcol = displayed_column_to_data
 
     def display_columns(
         self,
@@ -3710,6 +3721,7 @@ class Sheet(tk.Frame):
         return r if self.MT.all_rows_displayed else self.MT.displayed_rows[r]
 
     data_r = displayed_row_to_data
+    drow = displayed_row_to_data
 
     def display_rows(
         self,
@@ -4104,6 +4116,25 @@ class Sheet(tk.Frame):
             )
         return self
 
+    def event_widget_is_sheet(
+        self,
+        event: object,
+        table: bool = True,
+        index: bool = True,
+        header: bool = True,
+        top_left: bool = True,
+    ) -> bool:
+        return (
+            table
+            and event.widget == self.MT
+            or index
+            and event.widget == self.RI
+            or header
+            and event.widget == self.CH
+            or top_left
+            and event.widget == self.TL
+        )
+
     def get_cell_options(
         self,
         key: None | str = None,
@@ -4420,7 +4451,8 @@ class Sheet(tk.Frame):
             redraw=False,
             deselect_all=True,
         )
-        self.tree_open(*open_ids)
+        if open_ids:
+            self.tree_open(*open_ids)
         return self
 
     def tree_open(self, *items) -> Sheet:
@@ -4428,7 +4460,7 @@ class Sheet(tk.Frame):
         If used without args all items are opened
         """
         if items:
-            for item in items:
+            for item in unpack(items):
                 self.item(item, open_=True)
         else:
             for item in self.get_children():
@@ -4440,7 +4472,7 @@ class Sheet(tk.Frame):
         If used without args all items are closed
         """
         if items:
-            for item in items:
+            for item in unpack(items):
                 self.item(item, open_=False)
         else:
             for item in self.get_children():
@@ -4525,8 +4557,6 @@ class Sheet(tk.Frame):
         if not (item := item.lower()) or item not in self.RI.tree:
             raise ValueError(f"Item '{item}' does not exist.")
         if isinstance(iid, str):
-            if not (iid := iid.lower()):
-                raise ValueError(f"iid '{iid}' does not exist.")
             if iid in self.RI.tree:
                 raise ValueError(f"Cannot rename '{iid}', it already exists.")
             iid = iid.lower()
@@ -4538,7 +4568,7 @@ class Sheet(tk.Frame):
         if isinstance(text, str):
             self.RI.tree[item].text = text
         if isinstance(values, list):
-            self.set_data(self.RI.tree_rns[item], values)
+            self.set_data(self.RI.tree_rns[item], data=values)
         if isinstance(open_, bool):
             if self.RI.tree[item].children:
                 if open_:
@@ -4569,10 +4599,15 @@ class Sheet(tk.Frame):
         return self
 
     def itemrow(self, item: str) -> int:
-        return self.RI.tree_rns[item.lower()]
+        try:
+            return self.RI.tree_rns[item.lower()]
+        except Exception:
+            raise ValueError(f"item '{item.lower()}' does not exist.")
 
-    def rowitem(self, row: int) -> str | None:
-        if len(self.MT._row_index) > row:
+    def rowitem(self, row: int, data_index: bool = False) -> str | None:
+        if not data_index:
+            row = self.data_r(row)
+        if isinstance(row, int) and len(self.MT._row_index) > row:
             return self.MT._row_index[row].iid
         return None
 
@@ -4782,12 +4817,14 @@ class Sheet(tk.Frame):
         self.display_item(item)
         self.see(row=bisect_left(self.MT.displayed_rows, self.RI.tree_rns[item]), keep_xscroll=True)
 
-    def selection(self) -> list[str]:
+    def selection(self, cells: bool = False) -> list[str]:
         """
         Get currently selected item ids
-        - Only includes selected rows
         """
-        return [self.MT._row_index[self.displayed_row_to_data(rn)].iid for rn in self.get_selected_rows()]
+        return [
+            self.MT._row_index[self.displayed_row_to_data(rn)].iid
+            for rn in self.get_selected_rows(get_cells_as_rows=cells)
+        ]
 
     def selection_set(self, *items) -> Sheet:
         self.deselect()
@@ -4797,7 +4834,7 @@ class Sheet(tk.Frame):
     def selection_add(self, *items) -> Sheet:
         for item in unpack(items):
             if (item := item.lower()) not in self.RI.tree:
-                raise ValueError(f"Item '{item}' does not exist.")
+                continue
             if not self.item_displayed(item):
                 self.display_item(item)
             self.add_row_selection(bisect_left(self.MT.displayed_rows, self.RI.tree_rns[item]))
@@ -4806,7 +4843,7 @@ class Sheet(tk.Frame):
     def selection_remove(self, *items) -> Sheet:
         for item in unpack(items):
             if (item := item.lower()) not in self.RI.tree:
-                raise ValueError(f"Item '{item}' does not exist.")
+                continue
             try:
                 self.deselect(bisect_left(self.MT.displayed_rows, self.RI.tree_rns[item]))
             except Exception:

{tksheet-7.1.2 → tksheet-7.1.4/tksheet.egg-info}/PKG-INFO

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