tksheet 7.4.21__tar.gz → 7.4.22__tar.gz

{tksheet-7.4.21/tksheet.egg-info → tksheet-7.4.22}/PKG-INFO

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

{tksheet-7.4.21 → tksheet-7.4.22}/pyproject.toml

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

{tksheet-7.4.21 → tksheet-7.4.22}/tksheet/__init__.py

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

{tksheet-7.4.21 → tksheet-7.4.22}/tksheet/main_table.py

@@ -1324,7 +1324,7 @@ class MainTable(tk.Canvas):
                             and self.input_valid_for_cell(r, datacn, val, ignore_empty=True)
                         )
                     ):
-                        rows[r][datacn] = val
+                        rows[r][datacn] = self.format_value(datarn, datacn, val)
                         ctr += 1
             if ctr:
                 event_data = self.add_rows(
@@ -1374,7 +1374,7 @@ class MainTable(tk.Canvas):
                             and self.input_valid_for_cell(datarn, c, val, ignore_empty=True)
                         )
                     ):
-                        columns[c][datarn] = val
+                        columns[c][datarn] = self.format_value(datarn, datacn, val)
                         ctr += 1
             if ctr:
                 event_data = self.add_columns(
@@ -4788,7 +4788,7 @@ class MainTable(tk.Canvas):
         # if there are named spans where columns were added
         # add options to gap which was created by adding columns
         totalrows = None
-        new_ops = self.PAR.create_options_from_span
+        new_ops = partial(self.PAR.create_options_from_span, set_data=False)
         qkspan = self.span()
         for span in self.named_spans.values():
             if isinstance(span["from_c"], int):
@@ -4851,7 +4851,7 @@ class MainTable(tk.Canvas):
         # if there are named spans where rows were added
         # add options to gap which was created by adding rows
         totalcols = None
-        new_ops = self.PAR.create_options_from_span
+        new_ops = partial(self.PAR.create_options_from_span, set_data=False)
         qkspan = self.span()
         for span in self.named_spans.values():
             if isinstance(span["from_r"], int):
@@ -5119,7 +5119,7 @@ class MainTable(tk.Canvas):
                 )
         if isinstance(self._headers, list) and header:
             self._headers = insert_items(self._headers, header, self.CH.fix_header)
-        if push_ops:
+        if push_ops and columns:
             self.adjust_options_post_add_columns(
                 cols=tuple(columns),
                 create_ops=create_ops,
@@ -5241,7 +5241,7 @@ class MainTable(tk.Canvas):
                         repeat(default_width, maxcn + 1 - (len(self.col_positions) - 1)),
                     )
                 )
-        if push_ops:
+        if push_ops and rows:
             self.adjust_options_post_add_rows(
                 rows=tuple(rows),
                 create_ops=create_ops,
@@ -5370,11 +5370,16 @@ class MainTable(tk.Canvas):
                 for datacn, column in enumerate(columns, data_ins_col):
                     if column:
                         header_dict[datacn] = column[0]
-                        columns_dict[datacn] = dict(enumerate(islice(column, 1, None)))
+                        columns_dict[datacn] = {
+                            datarn: self.format_value(datarn, datacn, v)
+                            for datarn, v in enumerate(islice(column, 1, None))
+                        }
             else:
                 for datacn, column in enumerate(columns, data_ins_col):
                     if column:
-                        columns_dict[datacn] = dict(enumerate(column))
+                        columns_dict[datacn] = {
+                            datarn: self.format_value(datarn, datacn, v) for datarn, v in enumerate(column)
+                        }
 
         rng = range(displayed_ins_col, displayed_ins_col + len(columns_dict))
         if widths is None:
@@ -5414,12 +5419,12 @@ class MainTable(tk.Canvas):
                     if row:
                         index_dict[datarn] = row[0]
                     if len(row) > 1:
-                        rows_dict[datarn] = row[1:]
+                        rows_dict[datarn] = [self.format_value(datarn, datacn, v) for datacn, v in enumerate(row[1:])]
                     else:
                         rows_dict[datarn] = []
             else:
                 for datarn, row in enumerate(rows, data_ins_row):
-                    rows_dict[datarn] = row
+                    rows_dict[datarn] = [self.format_value(datarn, datacn, v) for datacn, v in enumerate(row)]
 
         rng = range(displayed_ins_row, displayed_ins_row + len(rows_dict))
         if heights is None:
@@ -5561,7 +5566,6 @@ class MainTable(tk.Canvas):
         if self.PAR.ops.treeview:
             event_data["deleted"]["index"] = {datarn: self._row_index[datarn] for datarn in rows}
             event_data = self.RI.tree_del_rows(event_data=event_data)
-
         elif isinstance(self._row_index, list):
             for i, datarn in enumerate(rows):
                 r = datarn - i
@@ -7996,6 +8000,17 @@ class MainTable(tk.Canvas):
                 else:
                     self.data[datarn][datacn] = value
 
+    def format_value(self, datarn: int, datacn: int, value: Any) -> Any:
+        if (datarn, datacn) in self.cell_options and "checkbox" in self.cell_options[(datarn, datacn)]:
+            return try_to_bool(value)
+        elif kwargs := self.get_cell_kwargs(datarn, datacn, key="format"):
+            if kwargs["formatter"] is None:
+                return format_data(value=value, **kwargs)
+            else:
+                return kwargs["formatter"](value, **kwargs)
+        else:
+            return value
+
     def get_value_for_empty_cell(self, datarn: int, datacn: int, r_ops: bool = True, c_ops: bool = True) -> Any:
         kwargs = self.get_cell_kwargs(
             datarn,
@@ -8010,7 +8025,7 @@ class MainTable(tk.Canvas):
         elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
             return kwargs["dropdown"]["values"][0]
         else:
-            return ""
+            return self.format_value(datarn, datacn, "")
 
     def get_empty_row_seq(
         self, datarn: int, end: int, start: int = 0, r_ops: bool = True, c_ops: bool = True

{tksheet-7.4.21 → tksheet-7.4.22}/tksheet/other_classes.py

@@ -440,7 +440,7 @@ class Span(dict):
                         try:
                             # Deep copy non-callable items in kwargs
                             span[key][k] = copy.deepcopy(v)
-                        except (TypeError, AttributeError):
+                        except Exception:
                             # Handle non-copyable objects (e.g., complex closures or objects)
                             span[key][k] = v  # Fallback to shallow copy
             elif key == "convert" and callable(value):
@@ -450,7 +450,7 @@ class Span(dict):
                 # Deep copy other values to handle nested objects like DotDict
                 try:
                     span[key] = copy.deepcopy(value)
-                except (TypeError, AttributeError):
+                except Exception:
                     # Fallback for non-copyable objects
                     span[key] = value  # Shallow copy as fallback
 

{tksheet-7.4.21 → tksheet-7.4.22}/tksheet/sheet.py

@@ -954,8 +954,11 @@ class Sheet(tk.Frame):
         self.create_options_from_span(span)
         return span
 
-    def create_options_from_span(self, span: Span) -> Sheet:
-        getattr(self, span.type_)(span, **span.kwargs)
+    def create_options_from_span(self, span: Span, set_data: bool = True) -> Sheet:
+        if span.type_ == "format":
+            self.format(span, set_data=set_data, **span.kwargs)
+        else:
+            getattr(self, span.type_)(span, **span.kwargs)
         return self
 
     def del_named_span(self, name: str) -> Sheet:
@@ -1534,32 +1537,22 @@ class Sheet(tk.Frame):
                 event_data = set_h(startc, data, event_data)
         # add row/column lines (positions) if required
         if self.MT.all_columns_displayed and maxc >= (ncols := len(self.MT.col_positions) - 1):
-            _, _, widths = self.MT.get_args_for_add_columns(
-                data_ins_col=len(self.MT.col_positions) - 1,
-                displayed_ins_col=len(self.MT.col_positions) - 1,
-                columns=maxc + 1 - ncols,
-                widths=None,
-                headers=False,
-            )
+            disp_ins_col, widths_n_cols = len(self.MT.col_positions) - 1, maxc + 1 - ncols
+            w = self.ops.default_column_width
             event_data = self.MT.add_columns(
                 columns={},
                 header={},
-                column_widths=widths,
+                column_widths=dict(zip(range(disp_ins_col, disp_ins_col + widths_n_cols), repeat(w))),
                 event_data=event_data,
                 create_selections=False,
             )
         if self.MT.all_rows_displayed and maxr >= (nrows := len(self.MT.row_positions) - 1):
-            _, _, heights = self.MT.get_args_for_add_rows(
-                data_ins_row=len(self.MT.row_positions) - 1,
-                displayed_ins_row=len(self.MT.row_positions) - 1,
-                rows=maxr + 1 - nrows,
-                heights=None,
-                row_index=False,
-            )
+            disp_ins_row, heights_n_rows = len(self.MT.row_positions) - 1, maxr + 1 - nrows
+            h = self.MT.get_default_row_height()
             event_data = self.MT.add_rows(
                 rows={},
                 index={},
-                row_heights=heights,
+                row_heights=dict(zip(range(disp_ins_row, disp_ins_row + heights_n_rows), repeat(h))),
                 event_data=event_data,
                 create_selections=False,
             )
@@ -2580,6 +2573,7 @@ class Sheet(tk.Frame):
         formatter_options: dict | None = None,
         formatter_class: Any = None,
         redraw: bool = True,
+        set_data: bool = True,
         **kwargs,
     ) -> Span:
         if formatter_options is None:
@@ -2592,36 +2586,39 @@ class Sheet(tk.Frame):
                 for c in cols:
                     self.del_cell_options_checkbox(r, c)
                     add_to_options(self.MT.cell_options, (r, c), "format", kwargs)
-                    self.MT.set_cell_data(
-                        r,
-                        c,
-                        value=kwargs["value"] if "value" in kwargs else self.MT.get_cell_data(r, c),
-                        kwargs=kwargs,
-                    )
+                    if set_data:
+                        self.MT.set_cell_data(
+                            r,
+                            c,
+                            value=kwargs["value"] if "value" in kwargs else self.MT.get_cell_data(r, c),
+                            kwargs=kwargs,
+                        )
         elif span.kind == "row":
             for r in rows:
                 self.del_row_options_checkbox(r)
                 kwargs = fix_format_kwargs(kwargs)
                 add_to_options(self.MT.row_options, r, "format", kwargs)
-                for c in cols:
-                    self.MT.set_cell_data(
-                        r,
-                        c,
-                        value=kwargs["value"] if "value" in kwargs else self.MT.get_cell_data(r, c),
-                        kwargs=kwargs,
-                    )
+                if set_data:
+                    for c in cols:
+                        self.MT.set_cell_data(
+                            r,
+                            c,
+                            value=kwargs["value"] if "value" in kwargs else self.MT.get_cell_data(r, c),
+                            kwargs=kwargs,
+                        )
         elif span.kind == "column":
             for c in cols:
                 self.del_column_options_checkbox(c)
                 kwargs = fix_format_kwargs(kwargs)
                 add_to_options(self.MT.col_options, c, "format", kwargs)
-                for r in rows:
-                    self.MT.set_cell_data(
-                        r,
-                        c,
-                        value=kwargs["value"] if "value" in kwargs else self.MT.get_cell_data(r, c),
-                        kwargs=kwargs,
-                    )
+                if set_data:
+                    for r in rows:
+                        self.MT.set_cell_data(
+                            r,
+                            c,
+                            value=kwargs["value"] if "value" in kwargs else self.MT.get_cell_data(r, c),
+                            kwargs=kwargs,
+                        )
         self.set_refresh_timer(redraw)
         return span
 

{tksheet-7.4.21 → tksheet-7.4.22/tksheet.egg-info}/PKG-INFO

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