txl_notebook_editor 0.2.6__tar.gz → 0.2.8__tar.gz

{txl_notebook_editor-0.2.6 → txl_notebook_editor-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: txl_notebook_editor
-Version: 0.2.6
+Version: 0.2.8
 Summary: TXL plugin for a notebook editor
 Project-URL: Source, https://github.com/davidbrochart/jpterm/plugins/notebook_editor
 Author-email: David Brochart <david.brochart@gmail.com>

txl_notebook_editor-0.2.8/txl_notebook_editor/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.8"

{txl_notebook_editor-0.2.6 → txl_notebook_editor-0.2.8}/txl_notebook_editor/components.py

@@ -152,7 +152,15 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
                         kernel_name = kernelspec.get("name")
                         if kernel_name:
                             self.kernel = self.kernels(kernel_name)
+            elif target == "state":
+                if "dirty" in events.keys:
+                    dirty = events.keys["dirty"]["newValue"]
+                    if dirty:
+                        self.main_area.set_dirty(self)
+                    else:
+                        self.main_area.clear_dirty(self)
             elif target == "cells":
+                self.main_area.set_dirty(self)
                 for event in events:
                     if event.path:
                         continue
@@ -165,6 +173,13 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
                         if delete is not None:
                             self.cells[idx].remove()
                             del self.cells[idx]
+                            if self.cell_i == len(self.cells):
+                                self.cell_i -= 1
+                                self.current_cell.select()
+                                self.current_cell.focus()
+                            elif self.cell_i == 0:
+                                self.current_cell.select()
+                                self.current_cell.focus()
                         insert = d.get("insert")
                         if insert is not None:
                             for c in insert:
@@ -198,12 +213,7 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
         elif event.key == Keys.Down:
             if not self.edit_mode:
                 event.stop()
-                if self.cell_i < len(self.cells) - 1:
-                    self.current_cell.unselect()
-                    self.cell_i += 1
-                    self.current_cell.select()
-                    self.current_cell.focus()
-                    self.scroll_to_widget(self.current_cell)
+                self.go_down()
         elif event.key == Keys.ControlUp:
             event.stop()
             if self.cell_i > 0:
@@ -229,6 +239,7 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
                 asyncio.create_task(do_later())
         elif event.key == Keys.ControlS:
             await self.contents.save(self.path, self.ynb)
+            self.main_area.clear_dirty(self)
             event.stop()
         elif event.key == Keys.Return or event.key == Keys.Enter:
             event.stop()
@@ -263,7 +274,8 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
         elif event.character == "x":
             event.stop()
             self.cell_copy = str(self.current_cell.ycell)
-            del self.ynb.ycells[self.cell_i]
+            if len(self.cells) > 1:
+                del self.ynb.ycells[self.cell_i]
         elif event.key == Keys.ControlV:
             event.stop()
             if self.cell_copy is not None:
@@ -305,13 +317,32 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
                         )
                 else:
                     await self.kernel.execute(self.current_cell.ycell)
-            if self.cell_i < len(self.cells) - 1:
-                self.current_cell.unselect()
-                self.cell_i += 1
-                self.current_cell.select()
-                self.current_cell.source.focus()
+            if self.cell_i == len(self.cells) - 1:
+                ycell = self.ynb.create_ycell(
+                    {
+                        "cell_type": "code",
+                        "execution_count": None,
+                        "source": "",
+                    }
+                )
+                self.ynb.ycells.append(ycell)
+            async def will_go_down():
+                while self.cell_i == len(self.cells) - 1:
+                    await asyncio.sleep(0)
+                self.go_down(edit_mode=True)
+            asyncio.create_task(will_go_down())
+
+    def go_down(self, edit_mode: bool = False) -> None:
+        if self.cell_i < len(self.cells) - 1:
+            self.current_cell.unselect()
+            self.cell_i += 1
+            self.current_cell.select()
+            if edit_mode:
                 self.edit_mode = True
-                self.scroll_to_widget(self.current_cell)
+                self.current_cell.source.focus()
+            else:
+                self.current_cell.focus()
+            self.scroll_to_widget(self.current_cell)
 
     def on_click(self) -> None:
         for cell_i, cell in enumerate(self.cells):

txl_notebook_editor-0.2.6/txl_notebook_editor/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.6"