svedit 0.1.0 → 0.1.1

package/dist/Svedit.svelte

@@ -261,7 +261,10 @@
     const is_collapsed = selection?.anchor_offset === selection?.focus_offset;
 
     // console.log('onkeydown', e.key);
-    if (e.key === 'ArrowRight' && e.altKey && e.ctrlKey && doc.selected_node) {
+    if (
+      (e.key === 'ArrowRight' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowRight' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node)
+    ) {
       const node = doc.selected_node;
       const layout_count = doc.config.node_layouts[node.type];
 
@@ -272,7 +275,10 @@
         tr.set([doc.selected_node?.id, 'layout'], next_layout);
         doc.apply(tr);
       }
-    } else if (e.key === 'ArrowLeft' && e.altKey && e.ctrlKey && doc.selected_node) {
+    } else if (
+      (e.key === 'ArrowLeft' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowLeft' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node)
+    ) {
       const node = doc.selected_node;
       const layout_count = doc.config.node_layouts[node.type];
       if (layout_count > 1 && node?.layout) {
@@ -282,7 +288,10 @@
         doc.apply(tr);
         console.log('layout / count / prev_layout', node.layout, layout_count, prev_layout);
       }
-    } else if (e.key === 'ArrowDown' && e.altKey && e.ctrlKey && doc.selected_node) {
+    } else if (
+      (e.key === 'ArrowDown' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowDown' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node  )
+    ) {
       const node = doc.selected_node;
 
       if (doc.selection.type !== 'node') {
@@ -301,9 +310,10 @@
       doc.config.inserters[next_type](tr);
       tr.set_selection(old_selection);
       doc.apply(tr);
-
-
-    } else if (e.key === 'ArrowUp' && e.altKey && e.ctrlKey && doc.selected_node) {
+    } else if (
+      (e.key === 'ArrowUp' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowUp' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node)
+    ) {
       const node = doc.selected_node;
 
       if (doc.selection.type !== 'node') {
@@ -483,6 +493,8 @@
 
     let focus_root_path = focus_root.dataset.path.split('.');
     let anchor_root_path = anchor_root.dataset.path.split('.');
+    let focus_node_depth = focus_root_path.length;
+    let anchor_node_depth = anchor_root_path.length;
 
     // HACK: this works only for one level nesting - should be done recursively to work generally
     if (focus_root_path.length > anchor_root_path.length) {
@@ -512,6 +524,27 @@
       focus_offset += 1;
     }
 
+    // Exclude first node when anchor_node[data-type="after-node-cursor-trap"]
+    // in a non-collapsed forward selection
+    if (
+      anchor_node.dataset.type === 'after-node-cursor-trap' &&
+      !is_backwards &&
+      anchor_offset !== focus_offset
+    ) {
+      anchor_offset += 1;
+    }
+    // Exclude first node when focus_node[data-type="after-node-cursor-trap"]
+    // in a non-collapsed backward selection
+    else if (
+      focus_node.dataset.type === 'after-node-cursor-trap' &&
+      is_backwards &&
+      anchor_offset !== focus_offset &&
+      // EDGE CASE: only apply this rule if focus node and anchor node are in the same container
+      focus_node_depth === anchor_node_depth
+    ) {
+      focus_offset += 1;
+    }
+
     return {
       type: 'node',
       path: anchor_root_path.slice(0, -1),

package/dist/Svedit.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Svedit.svelte.d.ts","sourceRoot":"","sources":["../src/lib/Svedit.svelte.js"],"names":[],"mappings":";;;;;;;AA64BA;;OAAqD;iCAj4BgE,cAAc"}
+{"version":3,"file":"Svedit.svelte.d.ts","sourceRoot":"","sources":["../src/lib/Svedit.svelte.js"],"names":[],"mappings":";;;;;;;AA86BA;;OAAqD;iCAl6BgE,cAAc"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "svedit",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite dev",

package/src/lib/Svedit.svelte

@@ -261,7 +261,10 @@
     const is_collapsed = selection?.anchor_offset === selection?.focus_offset;
 
     // console.log('onkeydown', e.key);
-    if (e.key === 'ArrowRight' && e.altKey && e.ctrlKey && doc.selected_node) {
+    if (
+      (e.key === 'ArrowRight' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowRight' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node)
+    ) {
       const node = doc.selected_node;
       const layout_count = doc.config.node_layouts[node.type];
 
@@ -272,7 +275,10 @@
         tr.set([doc.selected_node?.id, 'layout'], next_layout);
         doc.apply(tr);
       }
-    } else if (e.key === 'ArrowLeft' && e.altKey && e.ctrlKey && doc.selected_node) {
+    } else if (
+      (e.key === 'ArrowLeft' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowLeft' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node)
+    ) {
       const node = doc.selected_node;
       const layout_count = doc.config.node_layouts[node.type];
       if (layout_count > 1 && node?.layout) {
@@ -282,7 +288,10 @@
         doc.apply(tr);
         console.log('layout / count / prev_layout', node.layout, layout_count, prev_layout);
       }
-    } else if (e.key === 'ArrowDown' && e.altKey && e.ctrlKey && doc.selected_node) {
+    } else if (
+      (e.key === 'ArrowDown' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowDown' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node  )
+    ) {
       const node = doc.selected_node;
 
       if (doc.selection.type !== 'node') {
@@ -301,9 +310,10 @@
       doc.config.inserters[next_type](tr);
       tr.set_selection(old_selection);
       doc.apply(tr);
-
-
-    } else if (e.key === 'ArrowUp' && e.altKey && e.ctrlKey && doc.selected_node) {
+    } else if (
+      (e.key === 'ArrowUp' && e.altKey && e.ctrlKey && doc.selected_node) ||
+      (e.key === 'ArrowUp' && e.altKey && e.ctrlKey && e.shiftKey && doc.selected_node)
+    ) {
       const node = doc.selected_node;
 
       if (doc.selection.type !== 'node') {
@@ -483,6 +493,8 @@
 
     let focus_root_path = focus_root.dataset.path.split('.');
     let anchor_root_path = anchor_root.dataset.path.split('.');
+    let focus_node_depth = focus_root_path.length;
+    let anchor_node_depth = anchor_root_path.length;
 
     // HACK: this works only for one level nesting - should be done recursively to work generally
     if (focus_root_path.length > anchor_root_path.length) {
@@ -512,6 +524,27 @@
       focus_offset += 1;
     }
 
+    // Exclude first node when anchor_node[data-type="after-node-cursor-trap"]
+    // in a non-collapsed forward selection
+    if (
+      anchor_node.dataset.type === 'after-node-cursor-trap' &&
+      !is_backwards &&
+      anchor_offset !== focus_offset
+    ) {
+      anchor_offset += 1;
+    }
+    // Exclude first node when focus_node[data-type="after-node-cursor-trap"]
+    // in a non-collapsed backward selection
+    else if (
+      focus_node.dataset.type === 'after-node-cursor-trap' &&
+      is_backwards &&
+      anchor_offset !== focus_offset &&
+      // EDGE CASE: only apply this rule if focus node and anchor node are in the same container
+      focus_node_depth === anchor_node_depth
+    ) {
+      focus_offset += 1;
+    }
+
     return {
       type: 'node',
       path: anchor_root_path.slice(0, -1),