tksheet 7.1.10__tar.gz → 7.1.11__tar.gz

{tksheet-7.1.10/tksheet.egg-info → tksheet-7.1.11}/PKG-INFO

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

{tksheet-7.1.10 → tksheet-7.1.11}/pyproject.toml

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

{tksheet-7.1.10 → tksheet-7.1.11}/tksheet/__init__.py

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

{tksheet-7.1.10 → tksheet-7.1.11}/tksheet/column_headers.py

@@ -4,6 +4,7 @@ import tkinter as tk
 from collections import defaultdict
 from collections.abc import (
     Callable,
+    Sequence,
 )
 from functools import (
     partial,
@@ -673,11 +674,11 @@ class ColumnHeaders(tk.Canvas):
 
     def show_drag_and_drop_indicators(
         self,
-        xpos,
-        y1,
-        y2,
-        cols,
-    ):
+        xpos: float,
+        y1: float,
+        y2: float,
+        cols: Sequence[int],
+    ) -> None:
         self.hide_resize_and_ctrl_lines()
         self.create_resize_line(
             xpos,
@@ -698,13 +699,13 @@ class ColumnHeaders(tk.Canvas):
                 delete_on_timer=False,
             )
 
-    def hide_resize_and_ctrl_lines(self, ctrl_lines=True):
+    def hide_resize_and_ctrl_lines(self, ctrl_lines: bool = True) -> None:
         self.delete_resize_lines()
         self.MT.delete_resize_lines()
         if ctrl_lines:
             self.MT.delete_ctrl_outlines()
 
-    def scroll_if_event_offscreen(self, event: object):
+    def scroll_if_event_offscreen(self, event: object) -> bool:
         xcheck = self.xview()
         need_redraw = False
         if event.x > self.winfo_width() and len(xcheck) > 1 and xcheck[1] < 1:
@@ -727,14 +728,14 @@ class ColumnHeaders(tk.Canvas):
             need_redraw = True
         return need_redraw
 
-    def fix_xview(self):
+    def fix_xview(self) -> None:
         xcheck = self.xview()
         if xcheck and xcheck[0] < 0:
             self.MT.set_xviews("moveto", 0)
         elif len(xcheck) > 1 and xcheck[1] > 1:
             self.MT.set_xviews("moveto", 1)
 
-    def event_over_dropdown(self, c, datacn, event: object, canvasx):
+    def event_over_dropdown(self, c: int, datacn: int, event: object, canvasx: float) -> bool:
         if (
             event.y < self.MT.header_txt_height + 5
             and self.get_cell_kwargs(datacn, key="dropdown")
@@ -744,7 +745,7 @@ class ColumnHeaders(tk.Canvas):
             return True
         return False
 
-    def event_over_checkbox(self, c, datacn, event: object, canvasx):
+    def event_over_checkbox(self, c: int, datacn: int, event: object, canvasx: float) -> bool:
         if (
             event.y < self.MT.header_txt_height + 5
             and self.get_cell_kwargs(datacn, key="checkbox")
@@ -753,7 +754,7 @@ class ColumnHeaders(tk.Canvas):
             return True
         return False
 
-    def b1_release(self, event: object):
+    def b1_release(self, event: object) -> None:
         if self.being_drawn_item is not None:
             to_sel = self.MT.coords_and_type(self.being_drawn_item)
             r_to_sel, c_to_sel = self.MT.selected.row, self.MT.selected.column
@@ -909,8 +910,7 @@ class ColumnHeaders(tk.Canvas):
 
     def select_col(self, c, redraw=False, run_binding_func=True):
         self.MT.deselect("all", redraw=False)
-        box = (0, c, len(self.MT.row_positions) - 1, c + 1, "columns")
-        fill_iid = self.MT.create_selection_box(*box)
+        fill_iid = self.MT.create_selection_box(0, c, len(self.MT.row_positions) - 1, c + 1, "columns")
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:

{tksheet-7.1.10 → tksheet-7.1.11}/tksheet/main_table.py

@@ -551,7 +551,10 @@ class MainTable(tk.Canvas):
         for r1, c1, r2, c2 in boxes:
             self.show_ctrl_outline(canvas="table", start_cell=(c1, r1), end_cell=(c2, r2))
         self.clipboard_clear()
-        self.clipboard_append(s.getvalue())
+        if len(event_data["cells"]["table"]) == 1:
+            self.clipboard_append(next(iter(event_data["cells"]["table"].values())))
+        else:
+            self.clipboard_append(s.getvalue())
         self.update_idletasks()
         try_binding(self.extra_end_ctrl_c_func, event_data, "end_ctrl_c")
 
@@ -615,7 +618,10 @@ class MainTable(tk.Canvas):
         if event_data["cells"]["table"]:
             self.undo_stack.append(ev_stack_dict(event_data))
         self.clipboard_clear()
-        self.clipboard_append(s.getvalue())
+        if len(event_data["cells"]["table"]) == 1:
+            self.clipboard_append(next(iter(event_data["cells"]["table"].values())))
+        else:
+            self.clipboard_append(s.getvalue())
         self.update_idletasks()
         self.refresh()
         for r1, c1, r2, c2 in boxes:
@@ -657,9 +663,11 @@ class MainTable(tk.Canvas):
             dialect = csv.Sniffer().sniff(data, delimiters=self.PAR.ops.from_clipboard_delimiters)
         except Exception:
             dialect = csv.excel_tab
-        data = list(csv.reader(io.StringIO(data), dialect=dialect, skipinitialspace=True))
-        if not data:
-            return
+        if dialect.delimiter in data:
+            if not (data := list(csv.reader(io.StringIO(data), dialect=dialect, skipinitialspace=True))):
+                return
+        else:
+            data = [[data]]
         new_data_numcols = max(map(len, data))
         new_data_numrows = len(data)
         for rn, r in enumerate(data):
@@ -5657,7 +5665,7 @@ class MainTable(tk.Canvas):
                 r = r1
             if c is None:
                 c = c1
-            if r1 <= r and c1 <= c and r2 > r and c2 > c:
+            if r1 <= r and c1 <= c and r2 >= r and c2 >= c:
                 self.create_currently_selected_box(
                     r,
                     c,
@@ -5673,7 +5681,7 @@ class MainTable(tk.Canvas):
                 c = box[1]
             for item, selection_box in self.get_selection_items(reverse=True):
                 r1, c1, r2, c2 = selection_box.coords
-                if box == (r1, c1, r2, c2) and r1 <= r and c1 <= c and r2 > r and c2 > c:
+                if box == (r1, c1, r2, c2) and r1 <= r and c1 <= c and r2 >= r and c2 >= c:
                     self.create_currently_selected_box(
                         r,
                         c,
@@ -5686,7 +5694,7 @@ class MainTable(tk.Canvas):
         if r is not None and c is not None:
             for item, selection_box in self.get_selection_items(reverse=True):
                 r1, c1, r2, c2 = selection_box.coords
-                if r1 <= r and c1 <= c and r2 > r and c2 > c:
+                if r1 <= r and c1 <= c and r2 >= r and c2 >= c:
                     self.create_currently_selected_box(
                         r,
                         c,
@@ -6057,9 +6065,16 @@ class MainTable(tk.Canvas):
             return
         for item, box in self.get_selection_items():
             r1, c1, r2, c2 = box.coords
-            if r1 >= len(self.row_positions) - 1 or c1 >= len(self.col_positions) - 1:
-                self.hide_selection_box(item)
-                continue
+            if r1 >= len(self.row_positions) - 1:
+                if len(self.row_positions) > 1:
+                    r1 = len(self.row_positions) - 2
+                else:
+                    r1 = len(self.row_positions) - 1
+            if c1 >= len(self.col_positions) - 1:
+                if len(self.col_positions) > 1:
+                    c1 = len(self.col_positions) - 2
+                else:
+                    c1 = len(self.col_positions) - 1
             if r2 > len(self.row_positions) - 1:
                 r2 = len(self.row_positions) - 1
             if c2 > len(self.col_positions) - 1:

{tksheet-7.1.10 → tksheet-7.1.11/tksheet.egg-info}/PKG-INFO

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