tksheet 7.5.4__tar.gz → 7.5.5__tar.gz

{tksheet-7.5.4/tksheet.egg-info → tksheet-7.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tksheet
-Version: 7.5.4
+Version: 7.5.5
 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.5.4 → tksheet-7.5.5}/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.5.4"
+version = "7.5.5"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.5.4 → tksheet-7.5.5}/tksheet/__init__.py

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

{tksheet-7.5.4 → tksheet-7.5.5}/tksheet/functions.py

@@ -765,6 +765,14 @@ def add_to_displayed(displayed: list[int], to_add: Iterable[int]) -> list[int]:
     return displayed
 
 
+def push_displayed(displayed: list[int], to_add: Iterable[int]) -> list[int]:
+    # assumes to_add is sorted
+    for i in to_add:
+        ins = bisect_left(displayed, i)
+        displayed[ins:] = [e + 1 for e in islice(displayed, ins, None)]
+    return displayed
+
+
 def move_elements_by_mapping(
     seq: list[Any],
     new_idxs: dict[int, int],
@@ -1195,14 +1203,14 @@ PATTERN_ALL = re.compile(r"^:$")  # ":"
 
 def span_a2i(a: str) -> int | None:
     n = 0
-    for c in a:
+    for c in a.upper():
         n = n * 26 + ord(c) - ORD_A + 1
     return n - 1
 
 
 def span_a2n(a: str) -> int | None:
     n = 0
-    for c in a:
+    for c in a.upper():
         n = n * 26 + ord(c) - ORD_A + 1
     return n
 
@@ -1239,7 +1247,7 @@ def key_to_span(
         return coords_to_span(widget=widget, from_r=None, from_c=None, upto_r=None, upto_c=None)
 
     # Validate input type
-    elif not isinstance(key, (str, int, slice, list, tuple)):
+    elif not isinstance(key, (str, int, slice, tuple, list)):
         return f"Key type must be either str, int, list, tuple or slice, not '{type(key).__name__}'."
 
     try:
@@ -1265,22 +1273,34 @@ def key_to_span(
             )
 
         # Sequence key: various span formats
-        elif isinstance(key, (list, tuple)):
-            if (
-                len(key) == 2
-                and (isinstance(key[0], int) or key[0] is None)
-                and (isinstance(key[1], int) or key[1] is None)
-            ):
-                # Single cell or partial span: (row, col)
-                r_int = isinstance(key[0], int)
-                c_int = isinstance(key[1], int)
-                return span_dict(
-                    from_r=key[0] if r_int else 0,
-                    from_c=key[1] if c_int else 0,
-                    upto_r=key[0] + 1 if r_int else None,
-                    upto_c=key[1] + 1 if c_int else None,
-                    widget=widget,
-                )
+        elif isinstance(key, (tuple, list)):
+            if len(key) == 2:
+                if (isinstance(key[0], int) or key[0] is None) and (isinstance(key[1], int) or key[1] is None):
+                    # Single cell or partial span: (row, col)
+                    r_int = isinstance(key[0], int)
+                    c_int = isinstance(key[1], int)
+                    return span_dict(
+                        from_r=key[0] if r_int else 0,
+                        from_c=key[1] if c_int else 0,
+                        upto_r=key[0] + 1 if r_int else None,
+                        upto_c=key[1] + 1 if c_int else None,
+                        widget=widget,
+                    )
+
+                elif isinstance(key[0], int) and isinstance(key[1], str):
+                    # Single cell with column letter: (row 0, col A)
+                    c_int = span_a2i(key[1])
+                    return span_dict(
+                        from_r=key[0],
+                        from_c=c_int,
+                        upto_r=key[0] + 1,
+                        upto_c=c_int + 1,
+                        widget=widget,
+                    )
+
+                else:
+                    return f"'{key}' could not be converted to span."
+
             elif len(key) == 4:
                 # Full span coordinates: (from_r, from_c, upto_r, upto_c)
                 return coords_to_span(
@@ -1290,7 +1310,7 @@ def key_to_span(
                     upto_r=key[2],
                     upto_c=key[3],
                 )
-            elif len(key) == 2 and all(isinstance(k, (list, tuple)) for k in key):
+            elif len(key) == 2 and all(isinstance(k, (tuple, list)) for k in key):
                 # Start and end points: ((from_r, from_c), (upto_r, upto_c))
                 return coords_to_span(
                     widget=widget,
@@ -1327,11 +1347,12 @@ def key_to_span(
                     widget=widget,
                 )
             elif m := PATTERN_COL.match(key):
+                c_int = span_a2i(m[1])
                 return span_dict(
                     from_r=None,
-                    from_c=span_a2i(m[1]),
+                    from_c=c_int,
                     upto_r=None,
-                    upto_c=span_a2n(m[1]),
+                    upto_c=c_int + 1,
                     widget=widget,
                 )
             elif m := PATTERN_CELL.match(key):

{tksheet-7.5.4 → tksheet-7.5.5}/tksheet/row_index.py

@@ -32,6 +32,7 @@ from .functions import (
     mod_event_val,
     new_tk_event,
     num2alpha,
+    push_displayed,
     rounded_box_coords,
     stored_event_dict,
     try_b_index,
@@ -2632,13 +2633,17 @@ class RowIndex(tk.Canvas):
 
             # handle displaying the new rows
             event_data["added"]["rows"]["row_heights"] = {}
+            # parent exists and it's displayed and it's open
             if parent and self.PAR.item_displayed(parent) and parent in self.tree_open_ids:
                 self.MT.displayed_rows = add_to_displayed(self.MT.displayed_rows, event_data["added"]["rows"]["index"])
                 disp_idx = self.MT.disprn(self.rns[a_node.iid])  # first node, they're contiguous because not undo
                 h = self.MT.get_default_row_height()
                 for i in range(len(event_data["added"]["rows"]["index"])):
                     event_data["added"]["rows"]["row_heights"][disp_idx + i] = h
-
+            # parent exists and either it's not displayed or not open
+            elif parent:
+                self.MT.displayed_rows = push_displayed(self.MT.displayed_rows, event_data["added"]["rows"]["index"])
+            # no parent, top level
             elif not parent:
                 self.MT.displayed_rows = add_to_displayed(self.MT.displayed_rows, event_data["added"]["rows"]["index"])
                 h = self.MT.get_default_row_height()

{tksheet-7.5.4 → tksheet-7.5.5}/tksheet/sheet.py

@@ -4746,24 +4746,29 @@ class Sheet(tk.Frame):
 
     def _get_id_insert_row(self, index: int | None, parent: str) -> int:
         if parent:
+            chn = self.RI.iid_children(parent)
             if isinstance(index, int):
-                index = min(index, len(self.RI.iid_children(parent)))
-                datarn = (
-                    self.RI.rns[parent]
-                    + index
-                    + 1
-                    + sum(self.RI.num_descendants(cid) for cid in islice(self.get_children(parent), index))
-                )
+                index = min(index, len(chn))
+                if index == 0:
+                    return self.RI.rns[parent] + 1
+                else:
+                    prev_chld = chn[index - 1]
+                    return self.RI.rns[prev_chld] + self.RI.num_descendants(prev_chld) + 1
             else:
-                datarn = self.RI.rns[parent] + self.RI.num_descendants(parent) + 1
+                if chn:
+                    last_chld = chn[-1]
+                    last_chld_rn = self.RI.rns[last_chld]
+                    return last_chld_rn + self.RI.num_descendants(last_chld) + 1
+                else:
+                    return self.RI.rns[parent] + 1
         else:
             if isinstance(index, int):
-                datarn = index
-                if index and (datarn := self.top_index_row(index)) is None:
-                    datarn = len(self.MT._row_index)
+                if index == 0:
+                    return 0
+                datarn = self.top_index_row(index)
+                return len(self.MT._row_index) if datarn is None else datarn
             else:
-                datarn = len(self.MT._row_index)
-        return datarn
+                return len(self.MT._row_index)
 
     def bulk_insert(
         self,

{tksheet-7.5.4 → tksheet-7.5.5/tksheet.egg-info}/PKG-INFO

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