tksheet 7.1.20__py3-none-any.whl → 7.1.22__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.1.20"
+__version__ = "7.1.22"
 
 from .colors import (
     color_map,
@@ -32,6 +32,7 @@ from .formatters import (
     try_to_bool,
 )
 from .functions import (
+    add_highlight,
     alpha2idx,
     alpha2num,
     consecutive_chunks,
@@ -42,6 +43,7 @@ from .functions import (
     event_dict,
     get_checkbox_dict,
     get_checkbox_kwargs,
+    get_csv_str_dialect,
     get_data_from_clipboard,
     get_dropdown_dict,
     get_dropdown_kwargs,
@@ -54,6 +56,7 @@ from .functions import (
     is_iterable,
     move_elements_by_mapping,
     move_elements_to,
+    new_tk_event,
     num2alpha,
     rounded_box_coords,
     span_dict,
@@ -66,6 +69,7 @@ from .other_classes import (
     DrawnItem,
     EventDataDict,
     GeneratedMouseEvent,
+    Highlight,
     Selected,
     Span,
     SpanRange,

tksheet/column_headers.py

@@ -25,6 +25,7 @@ from .functions import (
     event_dict,
     get_n2a,
     is_contiguous,
+    new_tk_event,
     pickled_event_dict,
     rounded_box_coords,
     try_binding,
@@ -42,6 +43,8 @@ from .vars import (
     USER_OS,
     rc_binding,
     symbols_set,
+    text_editor_close_bindings,
+    text_editor_newline_bindings,
     text_editor_to_unbind,
 )
 
@@ -124,6 +127,13 @@ class ColumnHeaders(tk.Canvas):
         self.align = kwargs["header_align"]
         self.basic_bindings()
 
+    def event_generate(self, *args, **kwargs) -> None:
+        for arg in args:
+            if self.MT and arg in self.MT.event_linker:
+                self.MT.event_linker[arg]()
+            else:
+                super().event_generate(*args, **kwargs)
+
     def basic_bindings(self, enable: bool = True):
         if enable:
             self.bind("<Motion>", self.mouse_motion)
@@ -833,6 +843,7 @@ class ColumnHeaders(tk.Canvas):
                 event_data = event_dict(
                     name="move_columns",
                     sheet=self.PAR.name,
+                    widget=self,
                     boxes=self.MT.get_boxes(),
                     selected=self.MT.selected,
                     value=c,
@@ -844,6 +855,7 @@ class ColumnHeaders(tk.Canvas):
                             to_move=self.dragged_col.to_move,
                         ),
                         move_data=self.PAR.ops.column_drag_and_drop_perform,
+                        move_widths=self.PAR.ops.column_drag_and_drop_perform,
                         event_data=event_data,
                     )
                     event_data["moved"]["columns"] = {
@@ -1284,12 +1296,9 @@ class ColumnHeaders(tk.Canvas):
                     self.itemconfig(t, fill=fill, tag=tag, state="normal")
                 self.lift(t)
             else:
-                t = self.create_line(
+                t = self.create_polygon(
                     points,
                     fill=fill,
-                    width=2,
-                    capstyle=tk.ROUND,
-                    joinstyle=tk.ROUND,
                     tag=tag,
                 )
             self.disp_dropdown[t] = True
@@ -1733,21 +1742,16 @@ class ColumnHeaders(tk.Canvas):
             self.itemconfig(self.text_editor.canvas_id, state="normal")
             self.text_editor.open = True
         self.coords(self.text_editor.canvas_id, x, y)
+        for b in text_editor_newline_bindings:
+            self.text_editor.tktext.bind(b, self.text_editor_newline_binding)
+        for b in text_editor_close_bindings:
+            self.text_editor.tktext.bind(b, self.close_text_editor)
         if not dropdown:
             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))
+            self.text_editor.tktext.bind("<FocusOut>", self.close_text_editor)
         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")))
         return True
 
     # displayed indexes                         #just here to receive text editor arg
@@ -1766,7 +1770,7 @@ class ColumnHeaders(tk.Canvas):
                 self.coords(self.text_editor.canvas_id, self.MT.col_positions[c] + 1, 0)
 
     # displayed indexes
-    def text_editor_newline_binding(self, r=0, c=0, event: object = None, check_lines=True):
+    def text_editor_newline_binding(self, event: object = None, check_lines=True):
         if not self.height_resizing_enabled:
             return
         curr_height = self.text_editor.window.winfo_height()
@@ -1780,6 +1784,7 @@ class ColumnHeaders(tk.Canvas):
             )
             > curr_height
         ):
+            c = self.text_editor.column
             new_height = curr_height + self.MT.header_xtra_lines_increment
             space_bot = self.MT.get_space_bot(0)
             if new_height > space_bot:
@@ -1848,31 +1853,33 @@ class ColumnHeaders(tk.Canvas):
             self.focus_set()
 
     # c is displayed col
-    def close_text_editor(
-        self,
-        editor_info: tuple,
-    ):
+    def close_text_editor(self, event: tk.Event) -> Literal["break"] | None:
         # checking if text editor should be closed or not
-        focused = self.focus_get()
+        # errors if __tk_filedialog is open
+        try:
+            focused = self.focus_get()
+        except Exception:
+            focused = None
         try:
             if focused == self.text_editor.tktext.rc_popup_menu:
                 return "break"
         except Exception:
             pass
-        if focused is None and editor_info:
+        if focused is None:
             return "break"
-        if editor_info[1] == "Escape":
+        if event.keysym == "Escape":
             self.hide_text_editor_and_dropdown()
             return
         # setting cell data with text editor value
         text_editor_value = self.text_editor.get()
-        c = editor_info[0]
+        c = self.text_editor.column
         datacn = c if self.MT.all_columns_displayed else self.MT.displayed_columns[c]
         event_data = event_dict(
             name="end_edit_header",
             sheet=self.PAR.name,
+            widget=self,
             cells_header={datacn: self.get_cell_data(datacn)},
-            key=editor_info[1] if len(editor_info) >= 2 else "FocusOut",
+            key=event.keysym,
             value=text_editor_value,
             loc=c,
             column=c,
@@ -1896,7 +1903,7 @@ class ColumnHeaders(tk.Canvas):
             try_binding(self.extra_end_edit_cell_func, event_data)
         self.MT.recreate_all_selection_boxes()
         self.hide_text_editor_and_dropdown()
-        if editor_info[1] != "FocusOut":
+        if event.keysym != "FocusOut":
             self.focus_set()
         return "break"
 
@@ -2017,6 +2024,7 @@ class ColumnHeaders(tk.Canvas):
             event_data = event_dict(
                 name="end_edit_header",
                 sheet=self.PAR.name,
+                widget=self,
                 cells_header={datacn: pre_edit_value},
                 key="??",
                 value=selection,
@@ -2048,7 +2056,7 @@ class ColumnHeaders(tk.Canvas):
     def mouseclick_outside_editor_or_dropdown(self, inside: bool = False):
         closed_dd_coords = self.dropdown.get_coords()
         if self.text_editor.open:
-            self.close_text_editor((self.text_editor.column, "ButtonPress-1"))
+            self.close_text_editor(new_tk_event("ButtonPress-1"))
         if closed_dd_coords is not None:
             self.hide_dropdown_window()
             if inside:
@@ -2086,6 +2094,7 @@ class ColumnHeaders(tk.Canvas):
         event_data = event_dict(
             name="edit_header",
             sheet=self.PAR.name,
+            widget=self,
             cells_header={datacn: self.get_cell_data(datacn)},
             boxes=self.MT.get_boxes(),
             selected=self.MT.selected,
@@ -2243,6 +2252,7 @@ class ColumnHeaders(tk.Canvas):
             event_data = event_dict(
                 name="end_edit_header",
                 sheet=self.PAR.name,
+                widget=self,
                 cells_header={datacn: pre_edit_value},
                 key="??",
                 value=value,

tksheet/functions.py

@@ -17,6 +17,9 @@ from collections.abc import (
 from functools import partial
 from itertools import islice, repeat
 
+from .formatters import (
+    to_bool,
+)
 from .other_classes import (
     Box_nt,
     DotDict,
@@ -31,16 +34,20 @@ pickle_obj = partial(pickle.dumps, protocol=pickle.HIGHEST_PROTOCOL)
 unpickle_obj = pickle.loads
 
 
+def get_csv_str_dialect(s: str, delimiters: str) -> csv.Dialect:
+    try:
+        return csv.Sniffer().sniff(s[:5000] if len(s) > 5000 else s, delimiters=delimiters)
+    except Exception:
+        return csv.excel_tab
+
+
 def get_data_from_clipboard(
     widget: tk.Misc,
     delimiters: str,
     lineterminator: str = "\n",
 ) -> list[list[str]]:
     data = widget.clipboard_get()
-    try:
-        dialect = csv.Sniffer().sniff(data, delimiters=delimiters)
-    except Exception:
-        dialect = csv.excel_tab
+    dialect = get_csv_str_dialect(data, delimiters=delimiters)
     if dialect.delimiter in data or lineterminator in data:
         return list(csv.reader(io.StringIO(data), dialect=dialect, skipinitialspace=True))
     return [[data]]
@@ -59,6 +66,12 @@ def tksheet_type_error(kwarg: str, valid_types: list[str], not_type: object) ->
     return f"Argument '{kwarg}' must be one of the following types: {valid_types}, " f"not {type(not_type)}."
 
 
+def new_tk_event(keysym: str) -> tk.Event:
+    event = tk.Event()
+    event.keysym = keysym
+    return event
+
+
 def dropdown_search_function(
     search_for: object,
     data: Sequence[object],
@@ -112,6 +125,7 @@ def selection_box_tup_to_dict(box: tuple) -> dict:
 def event_dict(
     name: str = None,
     sheet: object = None,
+    widget: tk.Canvas | None = None,
     boxes: None | dict | tuple = None,
     cells_table: None | dict = None,
     cells_header: None | dict = None,
@@ -176,6 +190,7 @@ def event_dict(
             # "header": DotDict() if resized_header is None else resized_header,
             # "index": DotDict() if resized_index is None else resized_index,
         ),
+        widget=widget,
     )
 
 
@@ -184,7 +199,7 @@ def change_eventname(event_dict: EventDataDict, newname: str) -> EventDataDict:
 
 
 def pickled_event_dict(d: DotDict) -> DotDict:
-    return DotDict(name=d["eventname"], data=pickle_compress(d))
+    return DotDict(name=d["eventname"], data=pickle_compress(DotDict({k: v for k, v in d.items() if k != "widget"})))
 
 
 def len_to_idx(n: int) -> int:
@@ -281,6 +296,13 @@ def is_type_int(o: object) -> bool:
     return isinstance(o, int) and not isinstance(o, bool)
 
 
+def force_bool(o: object) -> bool:
+    try:
+        return to_bool(o)
+    except Exception:
+        return False
+
+
 def str_to_coords(s: str) -> None | tuple[int]:
     s = s.split(":")