tksheet 7.3.0__tar.gz → 7.3.1__tar.gz

{tksheet-7.3.0/tksheet.egg-info → tksheet-7.3.1}/PKG-INFO

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

{tksheet-7.3.0 → tksheet-7.3.1}/pyproject.toml

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

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/__init__.py

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

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/column_headers.py

@@ -28,10 +28,11 @@ from .functions import (
     consecutive_ranges,
     event_dict,
     get_n2a,
+    int_x_tuple,
     is_contiguous,
     new_tk_event,
-    stored_event_dict,
     rounded_box_coords,
+    stored_event_dict,
     try_binding,
 )
 from .other_classes import (
@@ -43,6 +44,9 @@ from .other_classes import (
 from .text_editor import (
     TextEditor,
 )
+from .types import (
+    AnyIter,
+)
 from .vars import (
     USER_OS,
     rc_binding,
@@ -928,20 +932,31 @@ class ColumnHeaders(tk.Canvas):
 
     def select_col(
         self,
-        c: int,
+        c: int | AnyIter[int],
         redraw: bool = False,
         run_binding_func: bool = True,
         ext: bool = False,
-    ) -> int:
+    ) -> int | list[int]:
         boxes_to_hide = tuple(self.MT.selection_boxes)
-        fill_iid = self.MT.create_selection_box(0, c, len(self.MT.row_positions) - 1, c + 1, "columns", ext=ext)
+        fill_iids = [
+            self.MT.create_selection_box(
+                0,
+                start,
+                len(self.MT.row_positions) - 1,
+                end,
+                "columns",
+                set_current=True,
+                ext=ext,
+            )
+            for start, end in consecutive_ranges(int_x_tuple(c))
+        ]
         for iid in boxes_to_hide:
             self.MT.hide_selection_box(iid)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
             self.MT.run_selection_binding("columns")
-        return fill_iid
+        return fill_iids[0] if len(fill_iids) == 1 else fill_iids
 
     def add_selection(
         self,

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/functions.py

@@ -12,6 +12,8 @@ from collections import deque
 from collections.abc import (
     Callable,
     Generator,
+    Hashable,
+    Iterable,
     Iterator,
     Sequence,
 )
@@ -30,6 +32,9 @@ from .other_classes import (
     Loc,
     Span,
 )
+from .types import (
+    AnyIter,
+)
 
 unpickle_obj = pickle.loads
 
@@ -295,13 +300,19 @@ def is_iterable(o: object) -> bool:
         return False
 
 
-def int_x_iter(i: Iterator[int] | int) -> Iterator[int]:
+def int_x_iter(i: AnyIter[int] | int) -> AnyIter[int]:
     if isinstance(i, int):
         return (i,)
     return i
 
 
-def unpack(t: tuple[object] | tuple[Iterator[object]]) -> tuple[object]:
+def int_x_tuple(i: AnyIter[int] | int) -> tuple[int]:
+    if isinstance(i, int):
+        return (i,)
+    return tuple(i)
+
+
+def unpack(t: tuple[object] | tuple[AnyIter[object]]) -> tuple[object]:
     if not len(t):
         return t
     if is_iterable(t[0]) and len(t) == 1:
@@ -427,7 +438,7 @@ def consecutive_ranges(seq: Sequence[int]) -> Generator[tuple[int, int]]:
             yield seq[start], seq[-1] + 1
 
 
-def is_contiguous(iterable: Iterator[int]) -> bool:
+def is_contiguous(iterable: Iterable[int]) -> bool:
     itr = iter(iterable)
     prev = next(itr)
     return all(i == (prev := prev + 1) for i in itr)
@@ -500,7 +511,7 @@ def cell_right_within_box(
 
 
 def get_last(
-    it: Iterator,
+    it: AnyIter[object],
 ) -> object:
     if hasattr(it, "__reversed__"):
         try:
@@ -522,7 +533,7 @@ def index_exists(seq: Sequence[object], index: int) -> bool:
         return False
 
 
-def add_to_displayed(displayed: list[int], to_add: Iterator[int]) -> list[int]:
+def add_to_displayed(displayed: list[int], to_add: Iterable[int]) -> list[int]:
     # assumes to_add is sorted in reverse
     for i in reversed(to_add):
         ins = bisect_left(displayed, i)
@@ -704,7 +715,7 @@ def diff_gen(seq: list[float]) -> Generator[int]:
     )
 
 
-def zip_fill_2nd_value(x: Iterator, o: object) -> Generator[object, object]:
+def zip_fill_2nd_value(x: AnyIter[object], o: object) -> Generator[object, object]:
     return zip(x, repeat(o))
 
 
@@ -1233,13 +1244,13 @@ def span_froms(
     return from_r, from_c
 
 
-def del_named_span_options(options: dict, itr: Iterator, type_: str) -> None:
+def del_named_span_options(options: dict, itr: AnyIter[Hashable], type_: str) -> None:
     for k in itr:
         if k in options and type_ in options[k]:
             del options[k][type_]
 
 
-def del_named_span_options_nested(options: dict, itr1: Iterator, itr2: Iterator, type_: str) -> None:
+def del_named_span_options_nested(options: dict, itr1: AnyIter[Hashable], itr2: AnyIter[Hashable], type_: str) -> None:
     for k1 in itr1:
         for k2 in itr2:
             k = (k1, k2)
@@ -1320,7 +1331,7 @@ def set_align(
 def del_from_options(
     options: dict,
     key: str,
-    coords: int | Iterator | None = None,
+    coords: int | AnyIter[int | tuple[int, int]] | None = None,
 ) -> dict:
     if isinstance(coords, int):
         if coords in options and key in options[coords]:

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/main_table.py

@@ -15,7 +15,6 @@ from collections.abc import (
     Callable,
     Generator,
     Hashable,
-    Iterator,
     Sequence,
 )
 from functools import (
@@ -99,6 +98,9 @@ from .other_classes import (
 from .text_editor import (
     TextEditor,
 )
+from .types import (
+    AnyIter,
+)
 from .vars import (
     USER_OS,
     bind_add_columns,
@@ -405,7 +407,9 @@ class MainTable(tk.Canvas):
             ("<Control-MouseWheel>", self.ctrl_mousewheel),
             ("<Control-plus>", self.zoom_in),
             ("<Control-equal>", self.zoom_in),
+            ("<Meta-Command-equal>", self.zoom_in),
             ("<Control-minus>", self.zoom_out),
+            ("<Meta-Command-minus>", self.zoom_out),
         )
         mt_ri_canvas_linux_bindings = {
             ("<Button-4>", self.mousewheel),
@@ -1844,14 +1848,43 @@ class MainTable(tk.Canvas):
             if redraw:
                 self.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
             if run_binding_func:
-                if self.select_all_binding_func:
-                    self.select_all_binding_func(
-                        self.get_select_event(being_drawn_item=self.being_drawn_item),
-                    )
                 event_data = self.get_select_event(self.being_drawn_item)
+                try_binding(self.select_all_binding_func, event_data)
                 self.PAR.emit_event("<<SheetSelect>>", data=event_data)
                 self.PAR.emit_event("<<SelectAll>>", data=event_data)
 
+    def select_columns(self, event: object) -> None:
+        if not self.selected:
+            return
+        r1, c1, r2, c2 = self.selection_boxes[self.selected.fill_iid].coords
+        r, c = self.selected.row, self.selected.column
+        self.set_currently_selected(
+            r=r,
+            c=c,
+            item=self.CH.select_col(range(c1, c2), redraw=True),
+        )
+
+    def select_rows(self, event: object) -> None:
+        if not self.selected:
+            return
+        r1, c1, r2, c2 = self.selection_boxes[self.selected.fill_iid].coords
+        r, c = self.selected.row, self.selected.column
+        self.set_currently_selected(
+            r=r,
+            c=c,
+            item=self.RI.select_row(range(r1, r2), redraw=True),
+        )
+
+    def select_row_start(self, event: object) -> None:
+        if self.selected:
+            self.select_cell(self.selected.row, 0)
+            self.see(self.selected.row, 0)
+
+    def select_a1(self, event: object) -> None:
+        if len(self.row_positions) > 1 and len(self.col_positions) > 1:
+            self.select_cell(0, 0)
+            self.see(0, 0)
+
     def select_cell(
         self,
         r: int,
@@ -1934,7 +1967,9 @@ class MainTable(tk.Canvas):
     ) -> None:
         if not self.selected:
             return
+        curr_box = self.selected.fill_iid
         if r == "all" or (r is None and c is None and cell is None):
+            self.hide_dropdown_editor_all_canvases()
             for item, box in self.get_selection_items():
                 self.hide_selection_box(item)
         elif r in ("allrows", "allcols"):
@@ -1944,6 +1979,8 @@ class MainTable(tk.Canvas):
                 cells=False,
             ):
                 self.hide_selection_box(item)
+                if item == curr_box:
+                    self.hide_dropdown_editor_all_canvases()
         elif isinstance(r, int) and c is None and cell is None:
             for item, box in self.get_selection_items(columns=False, cells=False):
                 r1, c1, r2, c2 = box.coords
@@ -1951,6 +1988,8 @@ class MainTable(tk.Canvas):
                     resel = self.selected.fill_iid == item
                     to_sel = self.selected.row
                     self.hide_selection_box(item)
+                    if item == curr_box:
+                        self.hide_dropdown_editor_all_canvases()
                     if r2 - r1 != 1:
                         if r == r1:
                             self.create_selection_box(
@@ -1994,6 +2033,8 @@ class MainTable(tk.Canvas):
                     resel = self.selected.fill_iid == item
                     to_sel = self.selected.column
                     self.hide_selection_box(item)
+                    if item == curr_box:
+                        self.hide_dropdown_editor_all_canvases()
                     if c2 - c1 != 1:
                         if c == c1:
                             self.create_selection_box(
@@ -2037,6 +2078,8 @@ class MainTable(tk.Canvas):
                 r1, c1, r2, c2 = box.coords
                 if r >= r1 and c >= c1 and r < r2 and c < c2:
                     self.hide_selection_box(item)
+                    if item == curr_box:
+                        self.hide_text_editor_and_dropdown(redraw=False)
         if redraw:
             self.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         sel_event = self.get_select_event(being_drawn_item=self.being_drawn_item)
@@ -2046,12 +2089,15 @@ class MainTable(tk.Canvas):
 
     def deselect_any(
         self,
-        rows: Iterator[int] | int | None = None,
-        columns: Iterator[int] | int | None = None,
+        rows: AnyIter[int] | int | None = None,
+        columns: AnyIter[int] | int | None = None,
         redraw: bool = True,
     ) -> None:
+        if not self.selected:
+            return
         rows = int_x_iter(rows)
         columns = int_x_iter(columns)
+        curr_box = self.selected.fill_iid
         if is_iterable(rows) and is_iterable(columns):
             rows = tuple(consecutive_ranges(sorted(rows)))
             columns = tuple(consecutive_ranges(sorted(columns)))
@@ -2066,6 +2112,8 @@ class MainTable(tk.Canvas):
                             (cols_end >= c1 and cols_end <= c2) or (cols_st >= c1 and cols_st < c2)
                         ):
                             hidden = self.hide_selection_box(item)
+                            if item == curr_box:
+                                self.hide_dropdown_editor_all_canvases()
                             break
         elif is_iterable(rows):
             rows = tuple(consecutive_ranges(sorted(rows)))
@@ -2074,6 +2122,8 @@ class MainTable(tk.Canvas):
                 for rows_st, rows_end in rows:
                     if (rows_end >= r1 and rows_end <= r2) or (rows_st >= r1 and rows_st < r2):
                         self.hide_selection_box(item)
+                        if item == curr_box:
+                            self.hide_dropdown_editor_all_canvases()
                         break
         elif is_iterable(columns):
             columns = tuple(consecutive_ranges(sorted(columns)))
@@ -2082,6 +2132,8 @@ class MainTable(tk.Canvas):
                 for cols_st, cols_end in columns:
                     if (cols_end >= c1 and cols_end <= c2) or (cols_st >= c1 and cols_st < c2):
                         self.hide_selection_box(item)
+                        if item == curr_box:
+                            self.hide_dropdown_editor_all_canvases()
                         break
         else:
             self.deselect()
@@ -2672,7 +2724,7 @@ class MainTable(tk.Canvas):
             self._enable_binding(bindings.lower())
         self.create_rc_menus()
 
-    def disable_bindings(self, bindings):
+    def disable_bindings(self, bindings: object) -> None:
         if not bindings:
             self._disable_binding("all")
         elif isinstance(bindings, (list, tuple)):
@@ -2686,21 +2738,33 @@ class MainTable(tk.Canvas):
             self._disable_binding(bindings)
         self.create_rc_menus()
 
-    def _enable_binding(self, binding):
+    def _enable_binding(self, binding: str) -> None:
         if binding == "enable_all":
             binding = "all"
-        if binding in ("all", "single", "single_selection_mode", "single_select"):
-            self.single_selection_enabled = True
-            self.toggle_selection_enabled = False
-        elif binding in ("toggle", "toggle_selection_mode", "toggle_select"):
-            self.toggle_selection_enabled = True
-            self.single_selection_enabled = False
+        if binding in (
+            "all",
+            "single",
+            "single_selection_mode",
+            "single_select",
+            "toggle",
+            "toggle_selection_mode",
+            "toggle_select",
+        ):
+            self._tksheet_bind("row_start_bindings", self.select_row_start)
+            self._tksheet_bind("table_start_bindings", self.select_a1)
+            if binding in ("all", "single", "single_selection_mode", "single_select"):
+                self.single_selection_enabled = True
+                self.toggle_selection_enabled = False
+            elif binding in ("toggle", "toggle_selection_mode", "toggle_select"):
+                self.toggle_selection_enabled = True
+                self.single_selection_enabled = False
         if binding in ("all", "drag_select"):
             self.drag_selection_enabled = True
         if binding in ("all", "column_width_resize"):
             self.CH.width_resizing_enabled = True
         if binding in ("all", "column_select"):
             self.CH.col_selection_enabled = True
+            self._tksheet_bind("select_columns_bindings", self.select_columns)
         if binding in ("all", "column_height_resize"):
             self.CH.height_resizing_enabled = True
             self.TL.rh_state()
@@ -2717,6 +2781,7 @@ class MainTable(tk.Canvas):
             self.TL.rw_state()
         if binding in ("all", "row_select"):
             self.RI.row_selection_enabled = True
+            self._tksheet_bind("select_rows_bindings", self.select_rows)
         if binding in ("all", "row_drag_and_drop", "move_rows"):
             self.RI.drag_and_drop_enabled = True
         if binding in ("all", "select_all"):
@@ -2802,21 +2867,29 @@ class MainTable(tk.Canvas):
             for binding in self.PAR.ops[bindings_key]:
                 widget.bind(binding, func)
 
-    def _disable_binding(self, binding):
+    def _disable_binding(self, binding: str) -> None:
         if binding == "disable_all":
             binding = "all"
-        if binding in ("all", "single", "single_selection_mode", "single_select"):
+        if binding in (
+            "all",
+            "single",
+            "single_selection_mode",
+            "single_select",
+            "toggle",
+            "toggle_selection_mode",
+            "toggle_select",
+        ):
+            self._tksheet_unbind("row_start_bindings")
+            self._tksheet_unbind("table_start_bindings")
             self.single_selection_enabled = False
             self.toggle_selection_enabled = False
-        elif binding in ("toggle", "toggle_selection_mode", "toggle_select"):
-            self.toggle_selection_enabled = False
-            self.single_selection_enabled = False
         if binding in ("all", "drag_select"):
             self.drag_selection_enabled = False
         if binding in ("all", "column_width_resize"):
             self.CH.width_resizing_enabled = False
         if binding in ("all", "column_select"):
             self.CH.col_selection_enabled = False
+            self._tksheet_unbind("select_columns_bindings")
         if binding in ("all", "column_height_resize"):
             self.CH.height_resizing_enabled = False
             self.TL.rh_state("hidden")
@@ -2833,6 +2906,7 @@ class MainTable(tk.Canvas):
             self.TL.rw_state("hidden")
         if binding in ("all", "row_select"):
             self.RI.row_selection_enabled = False
+            self._tksheet_unbind("select_rows_bindings")
         if binding in ("all", "row_drag_and_drop", "move_rows"):
             self.RI.drag_and_drop_enabled = False
         if binding in bind_del_columns:
@@ -3880,7 +3954,7 @@ class MainTable(tk.Canvas):
         self.recreate_all_selection_boxes()
         return self.row_positions, self.col_positions
 
-    def set_col_positions(self, itr: Iterator[float]) -> None:
+    def set_col_positions(self, itr: AnyIter[float]) -> None:
         self.col_positions = list(accumulate(chain([0], itr)))
 
     def reset_col_positions(self, ncols: int | None = None):
@@ -3892,7 +3966,7 @@ class MainTable(tk.Canvas):
         else:
             self.set_col_positions(itr=repeat(colpos, len(self.displayed_columns)))
 
-    def set_row_positions(self, itr: Iterator[float]) -> None:
+    def set_row_positions(self, itr: AnyIter[float]) -> None:
         self.row_positions = list(accumulate(chain([0], itr)))
 
     def reset_row_positions(self, nrows: int | None = None):
@@ -3926,7 +4000,7 @@ class MainTable(tk.Canvas):
             del self.row_positions[idx]
             self.row_positions[idx:] = [e - w for e in islice(self.row_positions, idx, len(self.row_positions))]
 
-    def del_col_positions(self, idxs: Iterator[int] | None = None):
+    def del_col_positions(self, idxs: AnyIter[int] | None = None):
         if idxs is None:
             del self.col_positions[-1]
         else:
@@ -3934,7 +4008,7 @@ class MainTable(tk.Canvas):
                 idxs = set(idxs)
             self.set_col_positions(itr=(w for i, w in enumerate(self.gen_column_widths()) if i not in idxs))
 
-    def del_row_positions(self, idxs: Iterator[int] | None = None):
+    def del_row_positions(self, idxs: AnyIter[int] | None = None):
         if idxs is None:
             del self.row_positions[-1]
         else:
@@ -4934,7 +5008,7 @@ class MainTable(tk.Canvas):
 
     def display_rows(
         self,
-        rows: int | Iterator | None = None,
+        rows: int | AnyIter | None = None,
         all_rows_displayed: bool | None = None,
         reset_row_positions: bool = True,
         deselect_all: bool = True,
@@ -4963,7 +5037,7 @@ class MainTable(tk.Canvas):
 
     def display_columns(
         self,
-        columns: int | Iterator | None = None,
+        columns: int | AnyIter | None = None,
         all_columns_displayed: bool | None = None,
         reset_col_positions: bool = True,
         deselect_all: bool = True,

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/row_index.py

@@ -5,7 +5,6 @@ from collections import defaultdict
 from collections.abc import (
     Generator,
     Hashable,
-    Iterator,
     Sequence,
 )
 from functools import (
@@ -35,13 +34,15 @@ from .formatters import (
 )
 from .functions import (
     consecutive_chunks,
+    consecutive_ranges,
     event_dict,
     get_n2a,
+    int_x_tuple,
     is_contiguous,
     new_tk_event,
     num2alpha,
-    stored_event_dict,
     rounded_box_coords,
+    stored_event_dict,
     try_binding,
 )
 from .other_classes import (
@@ -54,6 +55,9 @@ from .other_classes import (
 from .text_editor import (
     TextEditor,
 )
+from .types import (
+    AnyIter,
+)
 from .vars import (
     rc_binding,
     symbols_set,
@@ -944,20 +948,31 @@ class RowIndex(tk.Canvas):
 
     def select_row(
         self,
-        r: int,
+        r: int | AnyIter[int],
         redraw: bool = False,
         run_binding_func: bool = True,
         ext: bool = False,
     ) -> int:
         boxes_to_hide = tuple(self.MT.selection_boxes)
-        fill_iid = self.MT.create_selection_box(r, 0, r + 1, len(self.MT.col_positions) - 1, "rows", ext=ext)
+        fill_iids = [
+            self.MT.create_selection_box(
+                start,
+                0,
+                end,
+                len(self.MT.col_positions) - 1,
+                "rows",
+                set_current=True,
+                ext=ext,
+            )
+            for start, end in consecutive_ranges(int_x_tuple(r))
+        ]
         for iid in boxes_to_hide:
             self.MT.hide_selection_box(iid)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
             self.MT.run_selection_binding("rows")
-        return fill_iid
+        return fill_iids[0] if len(fill_iids) == 1 else fill_iids
 
     def add_selection(
         self,
@@ -1113,7 +1128,7 @@ class RowIndex(tk.Canvas):
 
     def get_index_text_width(
         self,
-        only_rows: Iterator[int] | None = None,
+        only_rows: AnyIter[int] | None = None,
     ) -> int:
         self.fix_index()
         w = self.PAR.ops.default_row_index_width

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/sheet.py

@@ -83,6 +83,7 @@ from .themes import (
 )
 from .top_left_rectangle import TopLeftRectangle
 from .types import (
+    AnyIter,
     CreateSpanTypes,
 )
 from .vars import (
@@ -544,7 +545,7 @@ class Sheet(tk.Frame):
     def set_header_data(
         self,
         value: object,
-        c: int | None | Iterator[int] = None,
+        c: int | None | AnyIter[int] = None,
         redraw: bool = True,
     ) -> Sheet:
         if c is None:
@@ -580,7 +581,7 @@ class Sheet(tk.Frame):
     def set_index_data(
         self,
         value: object,
-        r: int | None | Iterator[int] = None,
+        r: int | None | AnyIter[int] = None,
         redraw: bool = True,
     ) -> Sheet:
         if r is None:
@@ -2305,7 +2306,7 @@ class Sheet(tk.Frame):
 
     def del_rows(
         self,
-        rows: int | Iterator[int],
+        rows: int | AnyIter[int],
         data_indexes: bool = True,
         undo: bool = False,
         emit_event: bool = False,
@@ -2347,7 +2348,7 @@ class Sheet(tk.Frame):
 
     def del_columns(
         self,
-        columns: int | Iterator[int],
+        columns: int | AnyIter[int],
         data_indexes: bool = True,
         undo: bool = False,
         emit_event: bool = False,
@@ -3463,8 +3464,8 @@ class Sheet(tk.Frame):
 
     def deselect_any(
         self,
-        rows: Iterator[int] | int | None,
-        columns: Iterator[int] | int | None,
+        rows: AnyIter[int] | int | None,
+        columns: AnyIter[int] | int | None,
         redraw: bool = True,
     ) -> Sheet:
         self.MT.deselect_any(rows=rows, columns=columns, redraw=False)
@@ -3622,7 +3623,7 @@ class Sheet(tk.Frame):
 
     def set_column_widths(
         self,
-        column_widths: Iterator[float] | None = None,
+        column_widths: AnyIter[float] | None = None,
         canvas_positions: bool = False,
         reset: bool = False,
     ) -> Sheet:
@@ -3637,7 +3638,7 @@ class Sheet(tk.Frame):
 
     def set_row_heights(
         self,
-        row_heights: Iterator[float] | None = None,
+        row_heights: AnyIter[float] | None = None,
         canvas_positions: bool = False,
         reset: bool = False,
     ) -> Sheet:
@@ -3684,7 +3685,7 @@ class Sheet(tk.Frame):
 
     delete_row_position = del_row_position
 
-    def del_row_positions(self, idxs: Iterator[int] | None = None) -> Sheet:
+    def del_row_positions(self, idxs: AnyIter[int] | None = None) -> Sheet:
         self.MT.del_row_positions(idxs=idxs)
         self.set_refresh_timer()
         return self
@@ -3695,7 +3696,7 @@ class Sheet(tk.Frame):
 
     delete_column_position = del_column_position
 
-    def del_column_positions(self, idxs: Iterator[int] | None = None) -> Sheet:
+    def del_column_positions(self, idxs: AnyIter[int] | None = None) -> Sheet:
         self.MT.del_col_positions(idxs=idxs)
         self.set_refresh_timer()
         return self
@@ -3968,7 +3969,7 @@ class Sheet(tk.Frame):
 
     def display_columns(
         self,
-        columns: None | Literal["all"] | Iterator[int] = None,
+        columns: None | Literal["all"] | AnyIter[int] = None,
         all_columns_displayed: None | bool = None,
         reset_col_positions: bool = True,
         redraw: bool = False,
@@ -3992,7 +3993,7 @@ class Sheet(tk.Frame):
 
     def hide_columns(
         self,
-        columns: int | set[int] | Iterator[int],
+        columns: int | set[int] | AnyIter[int],
         redraw: bool = True,
         deselect_all: bool = True,
         data_indexes: bool = False,
@@ -4036,7 +4037,7 @@ class Sheet(tk.Frame):
 
     def show_columns(
         self,
-        columns: int | Iterator[int],
+        columns: int | AnyIter[int],
         redraw: bool = True,
         deselect_all: bool = True,
     ) -> Sheet:
@@ -4102,7 +4103,7 @@ class Sheet(tk.Frame):
 
     def display_rows(
         self,
-        rows: None | Literal["all"] | Iterator[int] = None,
+        rows: None | Literal["all"] | AnyIter[int] = None,
         all_rows_displayed: None | bool = None,
         reset_row_positions: bool = True,
         redraw: bool = False,
@@ -4124,7 +4125,7 @@ class Sheet(tk.Frame):
 
     def hide_rows(
         self,
-        rows: int | set[int] | Iterator[int],
+        rows: int | set[int] | AnyIter[int],
         redraw: bool = True,
         deselect_all: bool = True,
         data_indexes: bool = False,
@@ -4170,7 +4171,7 @@ class Sheet(tk.Frame):
 
     def show_rows(
         self,
-        rows: int | Iterator[int],
+        rows: int | AnyIter[int],
         redraw: bool = True,
         deselect_all: bool = True,
     ) -> Sheet:
@@ -4790,7 +4791,7 @@ class Sheet(tk.Frame):
     def tag(
         self,
         *key: CreateSpanTypes,
-        tags: Iterator[str] | str = "",
+        tags: AnyIter[str] | str = "",
     ) -> Sheet:
         span = self.span_from_key(*key)
         rows, cols = self.ranges_from_span(span)
@@ -4835,7 +4836,7 @@ class Sheet(tk.Frame):
 
     def tag_rows(
         self,
-        rows: int | Iterator[int],
+        rows: int | AnyIter[int],
         *tags,
     ) -> Sheet:
         if isinstance(rows, int):
@@ -4848,7 +4849,7 @@ class Sheet(tk.Frame):
 
     def tag_columns(
         self,
-        columns: int | Iterator[int],
+        columns: int | AnyIter[int],
         *tags,
     ) -> Sheet:
         if isinstance(columns, int):
@@ -4862,8 +4863,8 @@ class Sheet(tk.Frame):
     def untag(
         self,
         cell: tuple[int, int] | None = None,
-        rows: int | Iterator[int] | None = None,
-        columns: int | Iterator[int] | None = None,
+        rows: int | AnyIter[int] | None = None,
+        columns: int | AnyIter[int] | None = None,
     ) -> Sheet:
         if isinstance(cell, tuple):
             for tagged in self.MT.tagged_cells.values():
@@ -4923,7 +4924,7 @@ class Sheet(tk.Frame):
         text_column: None | int | list[str] = None,
         push_ops: bool = False,
         row_heights: Sequence[int] | None | False = None,
-        open_ids: Iterator[str] | None = None,
+        open_ids: AnyIter[str] | None = None,
         safety: bool = True,
         ncols: int | None = None,
         lower: bool = False,
@@ -4950,7 +4951,7 @@ class Sheet(tk.Frame):
                 if not iid:
                     continue
                 tally_of_ids[iid] += 1
-                if tally_of_ids[iid] > 0:
+                if tally_of_ids[iid]:
                     x = 1
                     while iid in tally_of_ids:
                         new = f"{row[iid_column]}_DUPLICATED_{x}"
@@ -5032,7 +5033,7 @@ class Sheet(tk.Frame):
         """
         return self.RI.tree_open_ids
 
-    def tree_set_open(self, open_ids: Iterator[str]) -> Sheet:
+    def tree_set_open(self, open_ids: AnyIter[str]) -> Sheet:
         """
         Accepts set[str] of iids that are open in the treeview
         Closes everything else
@@ -5087,7 +5088,7 @@ class Sheet(tk.Frame):
             deselect_all=False,
         )
 
-    def _tree_close(self, items: Iterator[str]) -> list[int]:
+    def _tree_close(self, items: AnyIter[str]) -> list[int]:
         """
         Only meant for internal use
         """
@@ -5129,6 +5130,9 @@ class Sheet(tk.Frame):
     ) -> str:
         """
         Insert an item into the treeview
+
+        Returns:
+            str: new item iid
         """
         if not iid:
             i = 0
@@ -5187,7 +5191,12 @@ class Sheet(tk.Frame):
         include_text_column: bool = True,
     ) -> dict[str, int]:
         """
-        Insert multiple items into the treeview at once, under the same parent
+        Insert multiple items into the treeview at once, under the same parent.
+
+        Returns:
+            dict:
+            - Keys (str): iid
+            - Values (int): row numbers
         """
         to_insert = []
         pid = parent
@@ -5778,7 +5787,7 @@ class Sheet(tk.Frame):
         get_displayed: bool = False,
         get_index: bool = False,
         get_index_displayed: bool = True,
-        only_columns: int | Iterator[int] | None = None,
+        only_columns: int | AnyIter[int] | None = None,
     ) -> list[object]:
         if only_columns is not None:
             if isinstance(only_columns, int):
@@ -5804,7 +5813,7 @@ class Sheet(tk.Frame):
         get_displayed: bool = False,
         get_header: bool = False,
         get_header_displayed: bool = True,
-        only_rows: int | Iterator[int] | None = None,
+        only_rows: int | AnyIter[int] | None = None,
     ) -> list[object]:
         if only_rows is not None:
             if isinstance(only_rows, int):
@@ -5823,8 +5832,8 @@ class Sheet(tk.Frame):
         get_index: bool = False,
         get_header_displayed: bool = True,
         get_index_displayed: bool = True,
-        only_rows: Iterator[int] | int | None = None,
-        only_columns: Iterator[int] | int | None = None,
+        only_rows: AnyIter[int] | int | None = None,
+        only_columns: AnyIter[int] | int | None = None,
     ) -> list[object]:
         if only_rows is not None:
             if isinstance(only_rows, int):
@@ -5872,8 +5881,8 @@ class Sheet(tk.Frame):
         get_index: bool = False,
         get_index_displayed: bool = True,
         get_header_displayed: bool = True,
-        only_rows: int | Iterator[int] | None = None,
-        only_columns: int | Iterator[int] | None = None,
+        only_rows: int | AnyIter[int] | None = None,
+        only_columns: int | AnyIter[int] | None = None,
     ) -> Iterator[list[object]]:
         if only_rows is not None:
             if isinstance(only_rows, int):
@@ -6142,7 +6151,7 @@ class Sheet(tk.Frame):
 
     def highlight_rows(
         self,
-        rows: Iterator[int] | int,
+        rows: AnyIter[int] | int,
         bg: None | str = None,
         fg: None | str = None,
         highlight_index: bool = True,
@@ -6160,7 +6169,7 @@ class Sheet(tk.Frame):
 
     def highlight_columns(
         self,
-        columns: Iterator[int] | int,
+        columns: AnyIter[int] | int,
         bg: bool | None | str = False,
         fg: bool | None | str = False,
         highlight_header: bool = True,
@@ -6460,7 +6469,12 @@ class Sheet(tk.Frame):
     ) -> None:
         self.create_checkbox(r=r, c=c, **get_checkbox_kwargs(*args, **kwargs))
 
-    def checkbox_row(self, r: Iterator[int] | int | Literal["all"] = 0, *args, **kwargs) -> None:
+    def checkbox_row(
+        self,
+        r: AnyIter[int] | int | Literal["all"] = 0,
+        *args,
+        **kwargs,
+    ) -> None:
         kwargs = get_checkbox_kwargs(*args, **kwargs)
         d = get_checkbox_dict(**kwargs)
         if isinstance(r, str) and r.lower() == "all":
@@ -6482,7 +6496,7 @@ class Sheet(tk.Frame):
 
     def checkbox_column(
         self,
-        c: Iterator[int] | int | Literal["all"] = 0,
+        c: AnyIter[int] | int | Literal["all"] = 0,
         *args,
         **kwargs,
     ) -> None:
@@ -6505,7 +6519,12 @@ class Sheet(tk.Frame):
         for r in range(self.MT.total_data_rows()):
             self.MT.set_cell_data(r, c, v)
 
-    def create_header_checkbox(self, c: Iterator[int] | int | Literal["all"] = 0, *args, **kwargs) -> None:
+    def create_header_checkbox(
+        self,
+        c: AnyIter[int] | int | Literal["all"] = 0,
+        *args,
+        **kwargs,
+    ) -> None:
         kwargs = get_checkbox_kwargs(*args, **kwargs)
         d = get_checkbox_dict(**kwargs)
         if isinstance(c, str) and c.lower() == "all":
@@ -6523,7 +6542,12 @@ class Sheet(tk.Frame):
         add_to_options(self.CH.cell_options, c, "checkbox", d)
         self.CH.set_cell_data(c, v)
 
-    def create_index_checkbox(self, r: Iterator[int] | int | Literal["all"] = 0, *args, **kwargs) -> None:
+    def create_index_checkbox(
+        self,
+        r: AnyIter[int] | int | Literal["all"] = 0,
+        *args,
+        **kwargs,
+    ) -> None:
         kwargs = get_checkbox_kwargs(*args, **kwargs)
         d = get_checkbox_dict(**kwargs)
         if isinstance(r, str) and r.lower() == "all":
@@ -6568,7 +6592,10 @@ class Sheet(tk.Frame):
     ) -> None:
         self.delete_checkbox(r, c)
 
-    def delete_row_checkbox(self, r: Iterator[int] | int | Literal["all"] = 0) -> None:
+    def delete_row_checkbox(
+        self,
+        r: AnyIter[int] | int | Literal["all"] = 0,
+    ) -> None:
         if isinstance(r, str) and r.lower() == "all":
             for r_ in self.MT.row_options:
                 self.del_table_row_options_checkbox(r_)
@@ -6578,7 +6605,10 @@ class Sheet(tk.Frame):
             for r_ in r:
                 self.del_table_row_options_checkbox(r_)
 
-    def delete_column_checkbox(self, c: Iterator[int] | int | Literal["all"] = 0) -> None:
+    def delete_column_checkbox(
+        self,
+        c: AnyIter[int] | int | Literal["all"] = 0,
+    ) -> None:
         if isinstance(c, str) and c.lower() == "all":
             for c_ in self.MT.col_options:
                 self.del_table_column_options_checkbox(c_)
@@ -6588,7 +6618,10 @@ class Sheet(tk.Frame):
             for c_ in c:
                 self.del_table_column_options_checkbox(c_)
 
-    def delete_header_checkbox(self, c: Iterator[int] | int | Literal["all"] = 0) -> None:
+    def delete_header_checkbox(
+        self,
+        c: AnyIter[int] | int | Literal["all"] = 0,
+    ) -> None:
         if isinstance(c, str) and c.lower() == "all":
             for c_ in self.CH.cell_options:
                 if "checkbox" in self.CH.cell_options[c_]:
@@ -6599,7 +6632,10 @@ class Sheet(tk.Frame):
             for c_ in c:
                 self.del_header_cell_options_checkbox(c_)
 
-    def delete_index_checkbox(self, r: Iterator[int] | int | Literal["all"] = 0) -> None:
+    def delete_index_checkbox(
+        self,
+        r: AnyIter[int] | int | Literal["all"] = 0,
+    ) -> None:
         if isinstance(r, str) and r.lower() == "all":
             for r_ in self.RI.cell_options:
                 if "checkbox" in self.RI.cell_options[r_]:
@@ -6688,7 +6724,7 @@ class Sheet(tk.Frame):
 
     def dropdown_row(
         self,
-        r: Iterator[int] | int | Literal["all"] = 0,
+        r: AnyIter[int] | int | Literal["all"] = 0,
         *args,
         **kwargs,
     ) -> Sheet:
@@ -6713,7 +6749,7 @@ class Sheet(tk.Frame):
 
     def dropdown_column(
         self,
-        c: Iterator[int] | int | Literal["all"] = 0,
+        c: AnyIter[int] | int | Literal["all"] = 0,
         *args,
         **kwargs,
     ) -> Sheet:
@@ -6738,7 +6774,7 @@ class Sheet(tk.Frame):
 
     def create_header_dropdown(
         self,
-        c: Iterator[int] | int | Literal["all"] = 0,
+        c: AnyIter[int] | int | Literal["all"] = 0,
         *args,
         **kwargs,
     ) -> Sheet:
@@ -6762,7 +6798,7 @@ class Sheet(tk.Frame):
 
     def create_index_dropdown(
         self,
-        r: Iterator[int] | int | Literal["all"] = 0,
+        r: AnyIter[int] | int | Literal["all"] = 0,
         *args,
         **kwargs,
     ) -> Sheet:
@@ -6813,7 +6849,7 @@ class Sheet(tk.Frame):
 
     def delete_row_dropdown(
         self,
-        r: Iterator[int] | int | Literal["all"] = "all",
+        r: AnyIter[int] | int | Literal["all"] = "all",
     ) -> None:
         if isinstance(r, str) and r.lower() == "all":
             for r_ in self.MT.row_options:
@@ -6827,7 +6863,7 @@ class Sheet(tk.Frame):
 
     def delete_column_dropdown(
         self,
-        c: Iterator[int] | int | Literal["all"] = "all",
+        c: AnyIter[int] | int | Literal["all"] = "all",
     ) -> None:
         if isinstance(c, str) and c.lower() == "all":
             for c_ in self.MT.col_options:
@@ -6839,7 +6875,7 @@ class Sheet(tk.Frame):
             for c_ in c:
                 self.del_column_options_dropdown(datacn=c_)
 
-    def delete_header_dropdown(self, c: Iterator[int] | int | Literal["all"]) -> None:
+    def delete_header_dropdown(self, c: AnyIter[int] | int | Literal["all"]) -> None:
         if isinstance(c, str) and c.lower() == "all":
             for c_ in self.CH.cell_options:
                 if "dropdown" in self.CH.cell_options[c_]:
@@ -6850,7 +6886,7 @@ class Sheet(tk.Frame):
             for c_ in c:
                 self.del_header_cell_options_dropdown(c_)
 
-    def delete_index_dropdown(self, r: Iterator[int] | int | Literal["all"]) -> None:
+    def delete_index_dropdown(self, r: AnyIter[int] | int | Literal["all"]) -> None:
         if isinstance(r, str) and r.lower() == "all":
             for r_ in self.RI.cell_options:
                 if "dropdown" in self.RI.cell_options[r_]:
@@ -7079,7 +7115,7 @@ class Sheet(tk.Frame):
 
     def format_row(
         self,
-        r: Iterator[int] | int | Literal["all"],
+        r: AnyIter[int] | int | Literal["all"],
         formatter_options: dict = {},
         formatter_class: object = None,
         redraw: bool = True,
@@ -7109,7 +7145,7 @@ class Sheet(tk.Frame):
 
     def delete_row_format(
         self,
-        r: Iterator[int] | int | Literal["all"] = "all",
+        r: AnyIter[int] | int | Literal["all"] = "all",
         clear_values: bool = False,
     ) -> Sheet:
         if is_iterable(r):
@@ -7121,7 +7157,7 @@ class Sheet(tk.Frame):
 
     def format_column(
         self,
-        c: Iterator[int] | int | Literal["all"],
+        c: AnyIter[int] | int | Literal["all"],
         formatter_options: dict = {},
         formatter_class: object = None,
         redraw: bool = True,
@@ -7151,7 +7187,7 @@ class Sheet(tk.Frame):
 
     def delete_column_format(
         self,
-        c: Iterator[int] | int | Literal["all"] = "all",
+        c: AnyIter[int] | int | Literal["all"] = "all",
         clear_values: bool = False,
     ) -> Sheet:
         if is_iterable(c):

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/sheet_options.py

@@ -103,6 +103,20 @@ def new_sheet_options() -> DotDict:
             "select_all_bindings": [
                 f"<{ctrl_key}-a>",
                 f"<{ctrl_key}-A>",
+                f"<{ctrl_key}-Shift-space>",
+            ],
+            "select_columns_bindings": [
+                "<Control-space>",
+            ],
+            "select_rows_bindings": [
+                "<Shift-space>",
+            ],
+            "row_start_bindings": [
+                "<Command-Left>",
+                "<Home>",
+            ],
+            "table_start_bindings": [
+                f"<{ctrl_key}-Home>",
             ],
             "tab_bindings": [
                 "<Tab>",

{tksheet-7.3.0 → tksheet-7.3.1}/tksheet/types.py

@@ -1,3 +1,9 @@
+from __future__ import annotations
+
+from collections.abc import (
+    Iterable,
+    Iterator,
+)
 from typing import Tuple, Union
 
 from .other_classes import (
@@ -15,3 +21,5 @@ CreateSpanTypes = Union[
     Tuple[int, None, int, None, int, None, int, None],
     Span,
 ]
+
+AnyIter = Iterable | Iterator

{tksheet-7.3.0 → tksheet-7.3.1/tksheet.egg-info}/PKG-INFO

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