tksheet 7.2.5__py3-none-any.whl → 7.2.7__py3-none-any.whl

tksheet/__init__.py

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

tksheet/column_headers.py

@@ -847,8 +847,10 @@ class ColumnHeaders(tk.Canvas):
                     and is_contiguous(self.dragged_col.to_move)
                 )
             ):
-                if c >= len(self.MT.col_positions) - 1:
-                    c -= 1
+                if c > self.dragged_col.to_move[-1]:
+                    c += 1
+                if c > len(self.MT.col_positions) - 1:
+                    c = len(self.MT.col_positions) - 1
                 event_data = event_dict(
                     name="move_columns",
                     sheet=self.PAR.name,
@@ -1010,7 +1012,9 @@ class ColumnHeaders(tk.Canvas):
         txt = self.get_valid_cell_data_as_str(datacn, fix=False)
         if txt:
             self.MT.txt_measure_canvas.itemconfig(
-                self.MT.txt_measure_canvas_text, text=txt, font=self.PAR.ops.header_font
+                self.MT.txt_measure_canvas_text,
+                text=txt,
+                font=self.PAR.ops.header_font,
             )
             b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
             w = b[2] - b[0] + 7

tksheet/main_table.py

@@ -999,25 +999,22 @@ class MainTable(tk.Canvas):
             disp_new_idxs = get_new_indexes(move_to=move_to, to_move=to_move)
         else:
             disp_new_idxs = {}
+        # at_least_cols should not be len in this case as move_to can be len
+        fix_len = (move_to - 1) if move_to else move_to
         if not self.all_columns_displayed and not data_indexes:
-            totalcols = self.equalize_data_row_lengths(at_least_cols=self.datacn(move_to) + 1)
-        else:
-            totalcols = self.equalize_data_row_lengths(at_least_cols=move_to + 1)
+            fix_len = self.datacn(fix_len)
+        totalcols = self.equalize_data_row_lengths(at_least_cols=fix_len)
         data_new_idxs = get_new_indexes(move_to=move_to, to_move=to_move)
         if not self.all_columns_displayed and not data_indexes:
-            moved = {self.displayed_columns[i] for i in to_move}
             data_new_idxs = dict(
-                filter(
-                    lambda tup: tup[0] in moved,
-                    zip(
-                        move_elements_by_mapping(
-                            self.displayed_columns,
-                            data_new_idxs,
-                            dict(zip(data_new_idxs.values(), data_new_idxs)),
-                        ),
+                zip(
+                    move_elements_by_mapping(
                         self.displayed_columns,
+                        data_new_idxs,
+                        dict(zip(data_new_idxs.values(), data_new_idxs)),
                     ),
-                )
+                    self.displayed_columns,
+                ),
             )
         return data_new_idxs, dict(zip(data_new_idxs.values(), data_new_idxs)), totalcols, disp_new_idxs
 
@@ -1107,6 +1104,7 @@ class MainTable(tk.Canvas):
                 tags: {full_new_idxs[k] for k in tagged} for tags, tagged in self.tagged_columns.items()
             }
             self.CH.cell_options = {full_new_idxs[k]: v for k, v in self.CH.cell_options.items()}
+            self.displayed_columns = sorted(full_new_idxs[k] for k in self.displayed_columns)
             if self.named_spans:
                 totalrows = self.total_data_rows()
                 new_ops = self.PAR.create_options_from_span
@@ -1205,8 +1203,6 @@ class MainTable(tk.Canvas):
                                         del self.cell_options[(r, full_new_idxs[k])][span["type_"]]
                     # finally, change the span coords
                     span["from_c"], span["upto_c"] = newfrom, newupto
-            if data_indexes:
-                self.displayed_columns = sorted(full_new_idxs[k] for k in self.displayed_columns)
         return data_new_idxs, disp_new_idxs, event_data
 
     def get_max_column_idx(self, maxidx: int | None = None) -> int:
@@ -1221,6 +1217,7 @@ class MainTable(tk.Canvas):
             max(map(max, self.tagged_columns.values()), default=maxidx),
             max((d.from_c for d in self.named_spans.values() if isinstance(d.from_c, int)), default=maxidx),
             max((d.upto_c for d in self.named_spans.values() if isinstance(d.upto_c, int)), default=maxidx),
+            self.displayed_columns[-1] if self.displayed_columns else maxidx,
         )
 
     def get_args_for_move_rows(
@@ -1233,23 +1230,23 @@ class MainTable(tk.Canvas):
             disp_new_idxs = get_new_indexes(move_to=move_to, to_move=to_move)
         else:
             disp_new_idxs = {}
-        self.fix_data_len(self.datarn(move_to) if not self.all_rows_displayed and not data_indexes else move_to)
+        # move_to can be len and fix_data_len() takes index so - 1
+        fix_len = (move_to - 1) if move_to else move_to
+        if not self.all_rows_displayed and not data_indexes:
+            fix_len = self.datarn(fix_len)
+        self.fix_data_len(fix_len)
         totalrows = max(self.total_data_rows(), len(self.row_positions) - 1)
         data_new_idxs = get_new_indexes(move_to=move_to, to_move=to_move)
         if not self.all_rows_displayed and not data_indexes:
-            moved = {self.displayed_rows[i] for i in to_move}
             data_new_idxs = dict(
-                filter(
-                    lambda tup: tup[0] in moved,
-                    zip(
-                        move_elements_by_mapping(
-                            self.displayed_rows,
-                            data_new_idxs,
-                            dict(zip(data_new_idxs.values(), data_new_idxs)),
-                        ),
+                zip(
+                    move_elements_by_mapping(
                         self.displayed_rows,
+                        data_new_idxs,
+                        dict(zip(data_new_idxs.values(), data_new_idxs)),
                     ),
-                )
+                    self.displayed_rows,
+                ),
             )
         return data_new_idxs, dict(zip(data_new_idxs.values(), data_new_idxs)), totalrows, disp_new_idxs
 
@@ -1337,6 +1334,7 @@ class MainTable(tk.Canvas):
             self.row_options = {full_new_idxs[k]: v for k, v in self.row_options.items()}
             self.RI.cell_options = {full_new_idxs[k]: v for k, v in self.RI.cell_options.items()}
             self.RI.tree_rns = {v: full_new_idxs[k] for v, k in self.RI.tree_rns.items()}
+            self.displayed_rows = sorted(full_new_idxs[k] for k in self.displayed_rows)
             if self.named_spans:
                 totalcols = self.total_data_cols()
                 new_ops = self.PAR.create_options_from_span
@@ -1435,8 +1433,6 @@ class MainTable(tk.Canvas):
                                         del self.cell_options[(full_new_idxs[k], c)][span["type_"]]
                     # finally, change the span coords
                     span["from_r"], span["upto_r"] = newfrom, newupto
-            if data_indexes:
-                self.displayed_rows = sorted(full_new_idxs[k] for k in self.displayed_rows)
         return data_new_idxs, disp_new_idxs, event_data
 
     def get_max_row_idx(self, maxidx: int | None = None) -> int:
@@ -1451,6 +1447,7 @@ class MainTable(tk.Canvas):
             max(map(max, self.tagged_rows.values()), default=maxidx),
             max((d.from_r for d in self.named_spans.values() if isinstance(d.from_r, int)), default=maxidx),
             max((d.upto_r for d in self.named_spans.values() if isinstance(d.upto_r, int)), default=maxidx),
+            self.displayed_rows[-1] if self.displayed_rows else maxidx,
         )
 
     def get_full_new_idxs(
@@ -3691,10 +3688,13 @@ class MainTable(tk.Canvas):
             else:
                 return False
 
-    def set_all_cell_sizes_to_text(self, w: int | None = None, slim: bool = False) -> tuple[list[float], list[float]]:
+    def set_all_cell_sizes_to_text(
+        self,
+        width: int | None = None,
+        slim: bool = False,
+    ) -> tuple[list[float], list[float]]:
         min_column_width = int(self.min_column_width)
         min_rh = int(self.min_row_height)
-        w = min_column_width if w is None else w
         h = min_rh
         rhs = defaultdict(lambda: int(min_rh))
         cws = []
@@ -3724,6 +3724,7 @@ class MainTable(tk.Canvas):
                     rhs[datarn] = h
         added_w_space = 1 if slim else 7
         for datacn in itercols:
+            w = min_column_width if width is None else width
             if (hw := self.CH.get_cell_dimensions(datacn)[0]) > w:
                 w = hw
             else:

tksheet/row_index.py

@@ -846,8 +846,10 @@ class RowIndex(tk.Canvas):
                     and is_contiguous(self.dragged_row.to_move)
                 )
             ):
-                if r >= len(self.MT.row_positions) - 1:
-                    r -= 1
+                if r > self.dragged_row.to_move[-1]:
+                    r += 1
+                if r > len(self.MT.row_positions) - 1:
+                    r = len(self.MT.row_positions) - 1
                 event_data = event_dict(
                     name="move_rows",
                     sheet=self.PAR.name,

tksheet/sheet.py

@@ -3362,7 +3362,7 @@ class Sheet(tk.Frame):
         width: int | None = None,
         slim: bool = False,
     ) -> tuple[list[float], list[float]]:
-        self.MT.set_all_cell_sizes_to_text(w=width, slim=slim)
+        self.MT.set_all_cell_sizes_to_text(width=width, slim=slim)
         self.set_refresh_timer(redraw)
         return self.MT.row_positions, self.MT.col_positions
 

{tksheet-7.2.5.dist-info → tksheet-7.2.7.dist-info}/METADATA

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

{tksheet-7.2.5.dist-info → tksheet-7.2.7.dist-info}/RECORD

@@ -1,20 +1,20 @@
-tksheet/__init__.py,sha256=jxysTI4P2sqhdCWqckgkzFoja_LNIxd-Xbd57GWir6A,2144
+tksheet/__init__.py,sha256=x_4i9xHuhs0udU1k7z8-4bY0maNfh98XfaGxCktPPKY,2144
 tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=PTkKI8OHWn4GzBhPJYU7c8Lz0X52DldV-0J4mPQbjkE,102045
+tksheet/column_headers.py,sha256=OTK9av3WkPF3ToXAALsa12TqltEFw_-c3kBUv_MTcok,102189
 tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
 tksheet/functions.py,sha256=Ie53z5GWbGoUXUiTf0DtoyOadWFbMFXMFwUjM67vetI,40706
-tksheet/main_table.py,sha256=tC3spF57o_yEc-o5b0USonf25d3dCZT9LS1UFKWfjaU,327559
+tksheet/main_table.py,sha256=12LMFBbZr_eWJih45tG_RQ2LCZCEPnkWsil4RG0tCJc,327526
 tksheet/other_classes.py,sha256=CDN38ZjKxZro9YOS_g0DjMC82-Mi9udedny4wdd90W0,14347
-tksheet/row_index.py,sha256=IdmELtqq5siD2dLtCMdP2IkW6XljCVJyBwZo3GFWoOE,108497
-tksheet/sheet.py,sha256=hWNp4E0UtbUbbbBNfTOecfadGWoWrRbxbfcLQEVW7pw,272364
+tksheet/row_index.py,sha256=Owsa7YKVZc9TY7W5nfs-M0I1RdFvuoyXhpuyCi5kleo,108606
+tksheet/sheet.py,sha256=xMctRdAC9npUPPEMXFfH4qCE_vyrUV7BJFrCumaOmU0,272368
 tksheet/sheet_options.py,sha256=Azo7_-H0e0ssYEoU7Mq_OWy3S-U05rp4_6Q2E2Ffuu8,12262
 tksheet/text_editor.py,sha256=aRm1Y5GfORiEAJthtN1uQ30CT3VoF8mRWvR-SIXPrJU,6548
 tksheet/themes.py,sha256=N9nAj6vcWk4UdcrAakvz2LPbJEJWXdv3j7Om6AnvX5k,14474
 tksheet/top_left_rectangle.py,sha256=o-M6i5NjaJwo60tV-BDP9SbaT1CzQNoPjuoC7p-nb5Q,8436
 tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
 tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
-tksheet-7.2.5.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.2.5.dist-info/METADATA,sha256=svT0ORmBRA9KUD05sBQFVDLkvLBjFWicOi-pJvnw3HQ,6284
-tksheet-7.2.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.2.5.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.2.5.dist-info/RECORD,,
+tksheet-7.2.7.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.2.7.dist-info/METADATA,sha256=S4tF46fSc18hhRz-8v2P9vJD8M3JtXlRTJRpuH7vQpY,6284
+tksheet-7.2.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.2.7.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.2.7.dist-info/RECORD,,