tksheet 7.1.7__py3-none-any.whl → 7.1.9__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.1.7"
+__version__ = "7.1.9"
 
 from .colors import (
     color_map,
@@ -35,13 +35,13 @@ from .functions import (
     alpha2idx,
     alpha2num,
     consecutive_chunks,
+    consecutive_ranges,
     data_to_displayed_idxs,
     displayed_to_data_idxs,
     dropdown_search_function,
     event_dict,
     get_checkbox_dict,
     get_checkbox_kwargs,
-    rounded_box_coords,
     get_dropdown_dict,
     get_dropdown_kwargs,
     get_index_of_gap_in_sorted_integer_seq_forward,
@@ -53,12 +53,10 @@ from .functions import (
     move_elements_by_mapping,
     move_elements_to,
     num2alpha,
+    rounded_box_coords,
     span_dict,
     tksheet_type_error,
 )
-from .listbox import (
-    ListBox,
-)
 from .main_table import MainTable
 from .other_classes import (
     DotDict,

tksheet/column_headers.py

@@ -23,9 +23,9 @@ from .functions import (
     consecutive_ranges,
     ev_stack_dict,
     event_dict,
-    rounded_box_coords,
     get_n2a,
     is_contiguous,
+    rounded_box_coords,
     try_binding,
 )
 from .other_classes import (
@@ -41,6 +41,7 @@ from .vars import (
     USER_OS,
     rc_binding,
     symbols_set,
+    text_editor_to_unbind,
 )
 
 
@@ -942,7 +943,7 @@ class ColumnHeaders(tk.Canvas):
             y1,
             x2,
             y2,
-            radius=9 if self.PAR.ops.rounded_boxes else 0,
+            radius=8 if self.PAR.ops.rounded_boxes else 0,
         )
         if isinstance(iid, int):
             self.coords(iid, coords)
@@ -1663,6 +1664,7 @@ class ColumnHeaders(tk.Canvas):
                         key=extra_func_key,
                         value=text,
                         loc=c,
+                        column=c,
                         boxes=self.MT.get_boxes(),
                         selected=self.MT.selected,
                     )
@@ -1726,12 +1728,14 @@ class ColumnHeaders(tk.Canvas):
             self.text_editor.tktext.focus_set()
             self.text_editor.window.scroll_to_bottom()
         self.text_editor.tktext.bind("<Alt-Return>", lambda _x: self.text_editor_newline_binding(c=c))
+        self.text_editor.tktext.bind("<Alt-KP_Enter>", lambda _x: self.text_editor_newline_binding(c=c))
         if USER_OS == "darwin":
             self.text_editor.tktext.bind("<Option-Return>", lambda _x: self.text_editor_newline_binding(c=c))
         for key, func in self.MT.text_editor_user_bound_keys.items():
             self.text_editor.tktext.bind(key, func)
         self.text_editor.tktext.bind("<Tab>", lambda _x: self.close_text_editor((c, "Tab")))
         self.text_editor.tktext.bind("<Return>", lambda _x: self.close_text_editor((c, "Return")))
+        self.text_editor.tktext.bind("<KP_Enter>", lambda _x: self.close_text_editor((c, "Return")))
         if not dropdown:
             self.text_editor.tktext.bind("<FocusOut>", lambda _x: self.close_text_editor((c, "FocusOut")))
         self.text_editor.tktext.bind("<Escape>", lambda _x: self.close_text_editor((c, "Escape")))
@@ -1827,8 +1831,8 @@ class ColumnHeaders(tk.Canvas):
 
     def hide_text_editor(self, reason: None | str = None) -> None:
         if self.text_editor.open:
-            for b in ("<Alt-Return>", "<Option-Return>", "<Tab>", "<Return>", "<FocusOut>", "<Escape>"):
-                self.text_editor.tktext.unbind(b)
+            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":
@@ -1862,6 +1866,7 @@ class ColumnHeaders(tk.Canvas):
             key=editor_info[1] if len(editor_info) >= 2 else "FocusOut",
             value=text_editor_value,
             loc=c,
+            column=c,
             boxes=self.MT.get_boxes(),
             selected=self.MT.selected,
         )
@@ -1970,6 +1975,7 @@ class ColumnHeaders(tk.Canvas):
                         sheet=self.PAR.name,
                         value=self.text_editor.get(),
                         loc=c,
+                        column=c,
                         boxes=self.MT.get_boxes(),
                         selected=self.MT.selected,
                     ),
@@ -2005,6 +2011,7 @@ class ColumnHeaders(tk.Canvas):
                 key="??",
                 value=selection,
                 loc=c,
+                column=c,
                 boxes=self.MT.get_boxes(),
                 selected=self.MT.selected,
             )
@@ -2230,6 +2237,7 @@ class ColumnHeaders(tk.Canvas):
                 key="??",
                 value=value,
                 loc=c,
+                column=c,
                 boxes=self.MT.get_boxes(),
                 selected=self.MT.selected,
             )

tksheet/functions.py

@@ -102,6 +102,8 @@ def event_dict(
     key: None | str = None,
     value: object = None,
     loc: None | int | tuple[int] = None,
+    row: None | int = None,
+    column: None | int = None,
     resized_rows: None | dict = None,
     resized_columns: None | dict = None,
     # resized_index: None, dict] = None,
@@ -147,6 +149,8 @@ def event_dict(
         key="" if key is None else key,
         value=None if value is None else value,
         loc=tuple() if loc is None else loc,
+        row=row,
+        column=column,
         resized=DotDict(
             rows=DotDict() if resized_rows is None else resized_rows,
             columns=DotDict() if resized_columns is None else resized_columns,
@@ -403,8 +407,8 @@ def index_exists(seq: Sequence[object], index: int) -> bool:
 
 def move_elements_by_mapping(
     seq: list[object],
-    new_idxs: dict,
-    old_idxs: dict,
+    new_idxs: dict[int, int],
+    old_idxs: dict[int, int],
 ) -> list[object]:
     # move elements of a list around, displacing
     # other elements based on mapping
@@ -472,8 +476,7 @@ def get_new_indexes(
 
 
 def insert_items(seq: list | tuple, to_insert: dict, seq_len_func: Callable | None = None) -> list:
-    # faster method of inserting many items into a list
-    # using a dict of reverse sorted order of
+    # inserts many items into a list using a dict of reverse sorted order of
     # {index: value, index: value, ...}
     res = []
     extended = 0
@@ -611,7 +614,7 @@ def try_binding(
     event: dict,
     new_name: None | str = None,
 ) -> bool:
-    if binding is not None:
+    if binding:
         try:
             if new_name is None:
                 binding(event)