tksheet 7.5.7__py3-none-any.whl → 7.5.8__py3-none-any.whl

tksheet/__init__.py

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

tksheet/main_table.py

@@ -5389,21 +5389,23 @@ class MainTable(tk.Canvas):
         else:
             if data_indexes:
                 data_rows = rows
-                disp_rows = data_to_displayed_idxs(data_rows, self.displayed_rows)
+                # dont create disp_rows twice when using treeview mode
+                disp_rows = [] if self.PAR.ops.treeview else data_to_displayed_idxs(data_rows, self.displayed_rows)
             else:
                 data_rows = [self.displayed_rows[r] for r in rows]
                 disp_rows = rows
         if self.PAR.ops.treeview:
-            data_rows = sorted(
-                chain(
-                    data_rows,
-                    (
-                        self.RI.rns[did]
-                        for r in data_rows
-                        for did in self.RI.get_iid_descendants(self._row_index[r].iid)
-                    ),
-                )
-            )
+            # remove any included descendants &
+            # add all item descendants back in for safety,
+            # update disp rows to del afterwards
+            iids = {self._row_index[r].iid for r in data_rows}
+            all_iids = set()
+            for iid in iids:
+                if not any(ancestor in iids for ancestor in self.RI.get_iid_ancestors(iid)):
+                    all_iids.add(iid)
+                    all_iids.update(self.RI.get_iid_descendants(iid))
+            data_rows = sorted(map(self.RI.rns.__getitem__, all_iids))
+            disp_rows = data_to_displayed_idxs(data_rows, self.displayed_rows)
         event_data = self.delete_rows_displayed(
             disp_rows,
             event_data,
@@ -6825,7 +6827,7 @@ class MainTable(tk.Canvas):
             y2,
             fill=outline if self.PAR.ops.show_selected_cells_border else "",
             state="normal",
-            tags="selected",
+            tags=("selected", "lift"),
             width=2,
         )
         self.selected = Selected(

tksheet/row_index.py

@@ -2849,14 +2849,14 @@ class RowIndex(tk.Canvas):
                         # determine insert row
                         insert_row = self.PAR._get_id_insert_row(move_to_index, new_parent)
                 else:
+                    # remove any descendants
                     iids = {self.MT._row_index[r].iid for r in event_data["moved"]["rows"]["data"]}
-                    iids_descendants = {iid: set(self.get_iid_descendants(iid)) for iid in iids}
-
-                    # remove descendants in iids to move
-                    iids -= set.union(*iids_descendants.values()) & iids
-                    moved_rows = sorted(map(self.rns.__getitem__, iids))
+                    moved_rows = sorted(
+                        self.rns[iid]
+                        for iid in iids
+                        if not any(ancestor in iids for ancestor in self.get_iid_ancestors(iid))
+                    )
                     item = self.MT._row_index[moved_rows[0]].iid
-
                     if isinstance(event_data.value, int):
                         if event_data.value >= len(self.MT.displayed_rows):
                             insert_row = len(self.MT._row_index)

{tksheet-7.5.7.dist-info → tksheet-7.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tksheet
-Version: 7.5.7
+Version: 7.5.8
 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.7.dist-info → tksheet-7.5.8.dist-info}/RECORD

@@ -1,14 +1,14 @@
-tksheet/__init__.py,sha256=vNYNahxYlUHr2qV4kIpNVoZMDpCTWetLSBK0t4le_5o,2532
+tksheet/__init__.py,sha256=guUQx6M_vpYrJvYXpJHxr9eq8br5iOMXF1ZqYPEG73M,2532
 tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
 tksheet/column_headers.py,sha256=5hwloDxaBO2wf_3qJbDDJWX8I8rKx-WPwv0UPWQ9xnk,110618
 tksheet/constants.py,sha256=4cpU_PmOgN0isBVPWwCwBwqD8Fxnu4HJgDSSjfxjiPo,25467
 tksheet/find_window.py,sha256=aV2U-IDFL6xNRhF4VomdrXEML4qw6QBqlfrVskuiTNY,20954
 tksheet/formatters.py,sha256=r2vjgmKs_xWBYlfqVhPPNKQc67zCawOIl4dp4XAEzYg,10182
 tksheet/functions.py,sha256=8S5u8GXl-uHxsRfGqG5Vt5ec7nOql7QczvTWSNuoRPg,56109
-tksheet/main_table.py,sha256=5pdbQo245ahAXuJpsSNQEkPJHjJ7ETX1yNXdXrL-b7Q,367497
+tksheet/main_table.py,sha256=RuITcYD9kmn8JVYBW8WH6TQzOs03DV57EZbPHTw18iA,367907
 tksheet/menus.py,sha256=sRHZRgnYWddBtlzvbyWFSN2cVhlmUWyA9zf4vpqun7I,19431
 tksheet/other_classes.py,sha256=6LpexHAxj23ZweuL3a4yCcdMSj_iXP38S7WRNQAehe0,18354
-tksheet/row_index.py,sha256=-B-Fqz-HueJSsygKFFtcwrLUMe-O9MSeemaiCtVvfCo,146992
+tksheet/row_index.py,sha256=UgySVE0i3MvAoVz7HVcYZnu_1DpAHby4_pTAkrAKthI,146973
 tksheet/sheet.py,sha256=i3h1FBko5dAdlWcv57WoP8e2NorRXk2eC_kACYaLK1Q,271847
 tksheet/sheet_options.py,sha256=dhHY4jUULGXH2b_VOjoAfKXm3PAz7QL5CrVnHA0byho,14697
 tksheet/sorting.py,sha256=zcZPpRtP1h_xJGtGkG3E43H7deKQFnh9cMwZ1B2-aGc,17502
@@ -17,8 +17,8 @@ tksheet/themes.py,sha256=kUUCUmvgu8vUlzfVNk9a3BEbeBcU3asNwPB_u-OejCY,18471
 tksheet/tksheet_types.py,sha256=qthH565jq60QCAeczvIWttIa4X5rFfLWPSwWBMDPilw,4611
 tksheet/tooltip.py,sha256=TTWk3HW5Sltamish9GCnAECwZLa9Rm6QC8-RCDDtQnE,12374
 tksheet/top_left_rectangle.py,sha256=A4wWL8PFl57Pn2Ek71rASCE1-bW844cTl7bgt4tLWzI,8499
-tksheet-7.5.7.dist-info/licenses/LICENSE.txt,sha256=n1UvJHBr-AYNOf6ExICDsEggh9R7U4V4m_gH7FD-y-o,2305
-tksheet-7.5.7.dist-info/METADATA,sha256=2n-VXhCSwYtl-7EZHyVGXXKyc4Jyh6R-tdlemz3QiuY,9474
-tksheet-7.5.7.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-tksheet-7.5.7.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.5.7.dist-info/RECORD,,
+tksheet-7.5.8.dist-info/licenses/LICENSE.txt,sha256=n1UvJHBr-AYNOf6ExICDsEggh9R7U4V4m_gH7FD-y-o,2305
+tksheet-7.5.8.dist-info/METADATA,sha256=zLKKkpmO0H9rS0wtQIokuLh9WOscff7AxfFFVFkfV6Q,9474
+tksheet-7.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tksheet-7.5.8.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.5.8.dist-info/RECORD,,

{tksheet-7.5.7.dist-info → tksheet-7.5.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any