tksheet 7.4.7__py3-none-any.whl → 7.4.9__py3-none-any.whl

tksheet/row_index.py

@@ -923,6 +923,7 @@ class RowIndex(tk.Canvas):
                         value=val,
                         event_data=event_data,
                     )
+        event_data = self.MT.bulk_edit_validation(event_data)
         if event_data["cells"]["table"]:
             if undo and self.MT.undo_enabled:
                 self.MT.undo_stack.append(stored_event_dict(event_data))
@@ -1099,7 +1100,7 @@ class RowIndex(tk.Canvas):
             self.itemconfig(item, state="hidden")
 
     def get_cell_dimensions(self, datarn: int) -> tuple[int, int]:
-        txt = self.get_valid_cell_data_as_str(datarn, fix=False)
+        txt = self.cell_str(datarn, fix=False)
         if txt:
             self.MT.txt_measure_canvas.itemconfig(self.MT.txt_measure_canvas_text, text=txt, font=self.ops.index_font)
             b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
@@ -1126,7 +1127,7 @@ class RowIndex(tk.Canvas):
             sum(
                 1
                 for _ in wrap_text(
-                    text=self.get_valid_cell_data_as_str(datarn, fix=False),
+                    text=self.cell_str(datarn, fix=False),
                     max_width=self.current_width,
                     max_lines=float("inf"),
                     char_width_fn=self.wrap_get_char_w,
@@ -1163,16 +1164,14 @@ class RowIndex(tk.Canvas):
                 else:
                     start_col, end_col = 0, len(self.MT.displayed_columns)
                 iterable = self.MT.displayed_columns[start_col:end_col]
-            h = max(
-                h,
-                max(
-                    self.MT.get_wrapped_cell_height(
-                        datarn,
-                        datacn,
-                    )
-                    for datacn in iterable
-                ),
+            cell_heights = (
+                self.MT.get_wrapped_cell_height(
+                    datarn,
+                    datacn,
+                )
+                for datacn in iterable
             )
+            h = max(h, max(cell_heights, default=h))
             self.MT.cells_cache = None
         h = max(h, ih)
         if only_if_too_small and h < self.MT.row_positions[row + 1] - self.MT.row_positions[row]:
@@ -1777,7 +1776,7 @@ class RowIndex(tk.Canvas):
                 )
             if max_width <= 1:
                 continue
-            text = self.get_valid_cell_data_as_str(datarn, fix=False)
+            text = self.cell_str(datarn, fix=False)
             if not text:
                 continue
             start_line = max(0, int((scrollpos_top - rtopgridln) / self.MT.index_txt_height))
@@ -2458,7 +2457,7 @@ class RowIndex(tk.Canvas):
         redirect_int: bool = False,
     ) -> Any:
         if get_displayed:
-            return self.get_valid_cell_data_as_str(datarn, fix=False)
+            return self.cell_str(datarn, fix=False)
         if redirect_int and isinstance(self.MT._row_index, int):  # internal use
             return self.MT.get_cell_data(datarn, self.MT._row_index, none_to_empty_str=True)
         if (
@@ -2472,7 +2471,7 @@ class RowIndex(tk.Canvas):
             return self.MT._row_index[datarn].text
         return self.MT._row_index[datarn]
 
-    def get_valid_cell_data_as_str(self, datarn: int, fix: bool = True) -> str:
+    def cell_str(self, datarn: int, fix: bool = True) -> str:
         kwargs = self.get_cell_kwargs(datarn, key="dropdown")
         if kwargs:
             if kwargs["text"] is not None:
@@ -2482,7 +2481,7 @@ class RowIndex(tk.Canvas):
             if kwargs:
                 return f"{kwargs['text']}"
         if isinstance(self.MT._row_index, int):
-            return self.MT.get_valid_cell_data_as_str(datarn, self.MT._row_index, get_displayed=True)
+            return self.MT.cell_str(datarn, self.MT._row_index, get_displayed=True)
         if fix:
             self.fix_index(datarn)
         try:
@@ -2732,6 +2731,7 @@ class RowIndex(tk.Canvas):
                         min_to = min(event_data["moved"]["rows"]["data"].values())
                         max_to = max(event_data["moved"]["rows"]["data"].values())
                         insert_row = max_to if min_from <= min_to else min_to
+                        move_to_row = insert_row
                         move_to_iid = self.MT._row_index[insert_row].iid
 
                     move_to_index = self.PAR.index(move_to_iid)