hyperlist 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bfa281e52d034a301cc645167ff71600f11bbb718b6220ff97ba1df74feed97
-  data.tar.gz: 67ef0888bfad609aea9260b07c538cba47ac219e70aec504f568b7fbea00d6cb
+  metadata.gz: bbd169877052f1ab57f546b6dbd8cdcc8c7f32bff29fdabb0722e529827e8139
+  data.tar.gz: f3e095c33a6cc73df1d0e04f8d77dd0e07f35510a50a98b2a372ca76b19a65a9
 SHA512:
-  metadata.gz: 0f932ad62217a97698953ff73930ce28a54d7abe67510eeadbfb1e84ea2a64421a66d3239e2badde5bd7fd19e920d3c916b378a792e1f87c97549298867c0d17
-  data.tar.gz: 8fe1a8f377ec7775e024030e3119121727935225da24517dd77e72079ca17969cef632ff320259fdb80a6c93d4b044c51493571a42f2b0bd7ff45c6a7cb7c3c4
+  metadata.gz: 8299b5c733b268225f56ea4eb1e8bcd3af25aa970baa999b9213f2b0561314dcf07a9223610c36ba95fe31a5acc5a92a631a3878489bfa4281de8a5b7e52426c
+  data.tar.gz: e24fcb589303ce626689de3a946d9f1db02b8b01fdf0142a8f3bb7b3b962ef41f3af799030b4b2b7fe03fc83231638398a102881ce66a3b5015be61c2d13d065

data/hyperlist

@@ -1283,38 +1283,116 @@ class HyperListApp
   end
   
   def move_up
-    max_items = get_visible_items.length - 1
-    
-    if @current == 0
-      # Wrap around to last item
-      @current = max_items
+    if @presentation_mode
+      # In presentation mode, we need to handle navigation differently
+      visible_before = get_visible_items
+      
+      if @current == 0
+        # Wrap around to last item
+        target_index = visible_before.length - 1
+      else
+        target_index = @current - 1
+      end
+      
+      # Get the actual item we want to move to
+      target_item = visible_before[target_index]
+      target_real_idx = get_real_index(target_item)
+      
+      # Update presentation focus for the target item
+      @current = target_index
+      update_presentation_focus
+      
+      # Now find where the target item ended up after reorganization
+      visible_after = get_visible_items
+      visible_after.each_with_index do |item, idx|
+        if get_real_index(item) == target_real_idx
+          @current = idx
+          break
+        end
+      end
     else
-      @current = [@current - 1, 0].max
+      # Normal mode navigation
+      max_items = get_visible_items.length - 1
+      
+      if @current == 0
+        # Wrap around to last item
+        @current = max_items
+      else
+        @current = [@current - 1, 0].max
+      end
     end
-    
-    update_presentation_focus if @presentation_mode
   end
   
   def move_down
-    max = get_visible_items.length - 1
-    
-    if @current == max
-      # Wrap around to first item
-      @current = 0
+    if @presentation_mode
+      # In presentation mode, we need to handle navigation differently
+      visible_before = get_visible_items
+      max = visible_before.length - 1
+      
+      if @current == max
+        # Wrap around to first item
+        target_index = 0
+      else
+        target_index = @current + 1
+      end
+      
+      # Get the actual item we want to move to
+      target_item = visible_before[target_index]
+      target_real_idx = get_real_index(target_item)
+      
+      # Update presentation focus for the target item
+      @current = target_index
+      update_presentation_focus
+      
+      # Now find where the target item ended up after reorganization
+      visible_after = get_visible_items
+      visible_after.each_with_index do |item, idx|
+        if get_real_index(item) == target_real_idx
+          @current = idx
+          break
+        end
+      end
     else
-      @current = [@current + 1, max].min
+      # Normal mode navigation
+      max = get_visible_items.length - 1
+      
+      if @current == max
+        # Wrap around to first item
+        @current = 0
+      else
+        @current = [@current + 1, max].min
+      end
     end
-    
-    update_presentation_focus if @presentation_mode
   end
   
   def page_up
     if @split_view && @active_pane == :split
       @split_current = [@split_current - (@split_pane.h - 1), 0].max
+    elsif @presentation_mode
+      # In presentation mode, handle page navigation differently
+      visible_before = get_visible_items
+      target_index = [@current - (@main.h - 1), 0].max
+      
+      if target_index < visible_before.length
+        target_item = visible_before[target_index]
+        target_real_idx = get_real_index(target_item)
+        
+        @current = target_index
+        update_presentation_focus
+        
+        # Find where the target item ended up
+        visible_after = get_visible_items
+        visible_after.each_with_index do |item, idx|
+          if get_real_index(item) == target_real_idx
+            @current = idx
+            break
+          end
+        end
+      end
+      @offset = [@offset - (@main.h - 1), 0].max
     else
       @current = [@current - (@main.h - 1), 0].max
       @offset = [@offset - (@main.h - 1), 0].max
-      update_presentation_focus if @presentation_mode
     end
   end
   
@@ -1322,10 +1400,29 @@ class HyperListApp
     if @split_view && @active_pane == :split
       max = get_visible_split_items.length - 1
       @split_current = [@split_current + (@split_pane.h - 1), max].min
+    elsif @presentation_mode
+      # In presentation mode, handle page navigation differently  
+      visible_before = get_visible_items
+      max = visible_before.length - 1
+      target_index = [@current + (@main.h - 1), max].min
+      
+      target_item = visible_before[target_index]
+      target_real_idx = get_real_index(target_item)
+      
+      @current = target_index
+      update_presentation_focus
+      
+      # Find where the target item ended up
+      visible_after = get_visible_items
+      visible_after.each_with_index do |item, idx|
+        if get_real_index(item) == target_real_idx
+          @current = idx
+          break
+        end
+      end
     else
       max = get_visible_items.length - 1
       @current = [@current + (@main.h - 1), max].min
-      update_presentation_focus if @presentation_mode
     end
   end
   
@@ -1336,12 +1433,39 @@ class HyperListApp
     current_level = visible[@current]["level"]
     return if current_level == 0
     
-    # Search upward for parent
-    (@current - 1).downto(0) do |i|
-      if visible[i]["level"] < current_level
-        @current = i
-        update_presentation_focus if @presentation_mode
-        break
+    if @presentation_mode
+      # Find parent and navigate to it properly
+      target_idx = nil
+      (@current - 1).downto(0) do |i|
+        if visible[i]["level"] < current_level
+          target_idx = i
+          break
+        end
+      end
+      
+      if target_idx
+        target_item = visible[target_idx]
+        target_real_idx = get_real_index(target_item)
+        
+        @current = target_idx
+        update_presentation_focus
+        
+        # Find where the target item ended up
+        visible_after = get_visible_items
+        visible_after.each_with_index do |item, idx|
+          if get_real_index(item) == target_real_idx
+            @current = idx
+            break
+          end
+        end
+      end
+    else
+      # Search upward for parent
+      (@current - 1).downto(0) do |i|
+        if visible[i]["level"] < current_level
+          @current = i
+          break
+        end
       end
     end
   end
@@ -1352,8 +1476,24 @@ class HyperListApp
     
     current_level = visible[@current]["level"]
     if visible[@current + 1]["level"] > current_level
-      @current += 1
-      update_presentation_focus if @presentation_mode
+      if @presentation_mode
+        target_item = visible[@current + 1]
+        target_real_idx = get_real_index(target_item)
+        
+        @current += 1
+        update_presentation_focus
+        
+        # Find where the target item ended up
+        visible_after = get_visible_items
+        visible_after.each_with_index do |item, idx|
+          if get_real_index(item) == target_real_idx
+            @current = idx
+            break
+          end
+        end
+      else
+        @current += 1
+      end
     end
   end
   

data/hyperlist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "hyperlist"
-  spec.version       = "1.2.5"
+  spec.version       = "1.2.6"
   spec.authors       = ["Geir Isene"]
   spec.email         = ["g@isene.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperlist
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Geir Isene