hyperlist 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03eb9614c8726c4e597cadde5b213e195a352ccaeae0234cb93b4114dddd9729
-  data.tar.gz: 557a147e2874dcb0aa1e0acbe13d28f5de51954661a7fd7e6b3cc4408e73ff94
+  metadata.gz: bbd169877052f1ab57f546b6dbd8cdcc8c7f32bff29fdabb0722e529827e8139
+  data.tar.gz: f3e095c33a6cc73df1d0e04f8d77dd0e07f35510a50a98b2a372ca76b19a65a9
 SHA512:
-  metadata.gz: d3ee01faf4256502806d37700f64217fccd29fea0c4d131d86693adf6f83f18e2b7477597cae4cc8fff61b507a7012f0219b21b24a8795319765f2a455359f9f
-  data.tar.gz: 156252aaa0cdc6ba380049b04ae8812c48906cf4fa67ae2e0af060868fba9d8ddbc97af5a6a8fe000714bd5371149e929e2dda4afa3842daaf391383689d7f15
+  metadata.gz: 8299b5c733b268225f56ea4eb1e8bcd3af25aa970baa999b9213f2b0561314dcf07a9223610c36ba95fe31a5acc5a92a631a3878489bfa4281de8a5b7e52426c
+  data.tar.gz: e24fcb589303ce626689de3a946d9f1db02b8b01fdf0142a8f3bb7b3b962ef41f3af799030b4b2b7fe03fc83231638398a102881ce66a3b5015be61c2d13d065

data/hyperlist

@@ -783,13 +783,16 @@ class HyperListApp
         end
       end
       
-      # Apply current item highlighting
+      # Apply current item highlighting (but not in presentation mode for focused items)
       if idx == @current
-        bg_color = (!@split_view || @active_pane == :main) ? "237" : "234"
-        if bg_color
-          bg_code = "\e[48;5;#{bg_color}m"
-          reset_bg = "\e[49m"
-          line = bg_code + line.gsub(/\e\[49m/, '') + reset_bg
+        # Skip background highlighting in presentation mode for items in focus
+        if !(@presentation_mode && is_item_in_presentation_focus?(item))
+          bg_color = (!@split_view || @active_pane == :main) ? "237" : "234"
+          if bg_color
+            bg_code = "\e[48;5;#{bg_color}m"
+            reset_bg = "\e[49m"
+            line = bg_code + line.gsub(/\e\[49m/, '') + reset_bg
+          end
         end
       end
       
@@ -1280,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
   
@@ -1319,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
   
@@ -1333,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
@@ -1349,8 +1476,62 @@ 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
+  
+  def jump_to_next_sibling
+    visible = get_visible_items
+    return if @current >= visible.length - 1
+    
+    current_level = visible[@current]["level"]
+    
+    # Search forward for the next item at the same level
+    (@current + 1...visible.length).each do |i|
+      if visible[i]["level"] == current_level
+        @current = i
+        update_presentation_focus if @presentation_mode
+        return
+      elsif visible[i]["level"] < current_level
+        # We've gone up a level, no more siblings
+        return
+      end
+    end
+  end
+  
+  def jump_to_prev_sibling
+    visible = get_visible_items
+    return if @current <= 0
+    
+    current_level = visible[@current]["level"]
+    
+    # Search backward for the previous item at the same level
+    (@current - 1).downto(0) do |i|
+      if visible[i]["level"] == current_level
+        @current = i
+        update_presentation_focus if @presentation_mode
+        return
+      elsif visible[i]["level"] < current_level
+        # We've gone up a level, no more siblings before this
+        return
+      end
     end
   end
   
@@ -1444,9 +1625,11 @@ class HyperListApp
       item["presentation_focus"] = false
     end
     
-    # Mark current item as in focus and unfold it
-    current_item["presentation_focus"] = true
-    current_item["fold"] = false
+    # Mark current item as in focus and unfold it in the main items array
+    if current_real_idx && current_real_idx < @items.length
+      @items[current_real_idx]["presentation_focus"] = true
+      @items[current_real_idx]["fold"] = false
+    end
     
     # Unfold all ancestors of current item
     ancestor_indices = []
@@ -2314,11 +2497,13 @@ class HyperListApp
     help_lines << help_line("#{"h".fg("10")}", "Go to parent", "#{"l".fg("10")}", "Go to first child")
     help_lines << help_line("#{"PgUp".fg("10")}", "Page up", "#{"PgDn".fg("10")}", "Page down")
     help_lines << help_line("#{"g/Home".fg("10")}", "Go to top", "#{"G/End".fg("10")}", "Go to bottom")
-    help_lines << help_line("#{"/".fg("10")}", "Search", "#{"n".fg("10")}", "Next match")
-    help_lines << help_line("#{"?".fg("10")}", "This help", "#{"??".fg("10")}", "Full documentation")
+    help_lines << help_line("#{"R".fg("10")}", "Jump to reference", "#{"F".fg("10")}", "Open file/URL")
     help_lines << help_line("#{"ma".fg("10")}", "Set mark 'a'", "#{"'a".fg("10")}", "Jump to mark 'a'")
     help_lines << help_line("#{"''".fg("10")}", "Jump to prev position", "#{"N".fg("10")}", "Next = template marker")
     help_lines << ""
+    help_lines << "#{"SEARCH".fg("14")}"
+    help_lines << help_line("#{"/".fg("10")}", "Search forward", "#{"n".fg("10")}", "Next match")
+    help_lines << ""
     help_lines << "#{"FOLDING".fg("14")}"
     help_lines << help_line("#{"Space".fg("10")}", "Toggle fold", "#{"za".fg("10")}", "Toggle all folds")
     help_lines << help_line("#{"zo".fg("10")}", "Open fold", "#{"zc".fg("10")}", "Close fold")
@@ -2341,14 +2526,12 @@ class HyperListApp
     help_lines << help_line("#{"Tab".fg("10")}", "Indent item+kids", "#{"S-Tab".fg("10")}", "Unindent item+kids")
     help_lines << help_line("#{"→".fg("10")}", "Indent item only", "#{"←".fg("10")}", "Unindent item only")
     help_lines << ""
-    help_lines << "#{"FEATURES".fg("14")}"
+    help_lines << "#{"SPECIAL FEATURES".fg("14")}"
     help_lines << help_line("#{"v".fg("10")}", "Toggle checkbox", "#{"V".fg("10")}", "Checkbox with date")
     help_lines << help_line("#{"C-E".fg("10")}", "Encrypt/decrypt line", "#{"C-U".fg("10")}", "Toggle State/Trans underline")
-    help_lines << help_line("#{"R".fg("10")}", "Go to reference", "#{"F".fg("10")}", "Open file")
-    help_lines << help_line("#{"N".fg("10")}", "Next = marker", "#{"P".fg("10")}", "Presentation mode")
-    help_lines << help_line("#{"t".fg("10")}", "Insert template", "#{":st".fg("10")}", "Save as template")
+    help_lines << help_line("#{"P".fg("10")}", "Presentation mode", "#{"Tab/S-Tab".fg("10")}", "Next/prev sibling (in P)")
     help_lines << help_line("#{"Ma".fg("10")}", "Record macro 'a'", "#{"@a".fg("10")}", "Play macro 'a'")
-    help_lines << help_line("#{":vsplit".fg("10")}", "Split view vertically", "#{"w".fg("10")}", "Switch panes")
+    help_lines << help_line("#{"w".fg("10")}", "Switch panes (split view)", "", "")
     help_lines << ""
     help_lines << "#{"FILE OPERATIONS".fg("14")}"
     help_lines << help_line("#{":w".fg("10")}", "Save", "#{":q".fg("10")}", "Quit")
@@ -2359,9 +2542,11 @@ class HyperListApp
     help_lines << help_line("#{":as N".fg("10")}", "Set interval (secs)", "#{":as".fg("10")}", "Show autosave status")
     help_lines << ""
     help_lines << "#{"TEMPLATES".fg("14")}"
-    help_lines << help_line("#{":st".fg("10")}", "Save as template", "#{":dt".fg("10")}", "Delete template")
-    help_lines << help_line("#{":lt".fg("10")}", "List user templates", "#{"t".fg("10")}", "Insert template")
+    help_lines << help_line("#{"t".fg("10")}", "Insert template", "#{":st".fg("10")}", "Save as template")
+    help_lines << help_line("#{":dt".fg("10")}", "Delete template", "#{":lt".fg("10")}", "List user templates")
     help_lines << ""
+    help_lines << "#{"HELP & QUIT".fg("14")}"
+    help_lines << help_line("#{"?".fg("10")}", "This help", "#{"??".fg("10")}", "Full documentation")
     help_lines << help_line("#{"q".fg("10")}", "Quit (asks to save)", "#{"Q".fg("10")}", "Force quit")
     help_lines << ""
     help_lines << "#{"COLOR SCHEME".fg("14")}"
@@ -4986,18 +5171,28 @@ class HyperListApp
         when "C-K"  # Alternative: Move item and descendants up (for terminals that intercept C-UP)
           move_item_up(true)
         when "TAB"
-          # Indent with all children
-          if @split_view && @active_pane == :split
-            indent_split_right(true)
+          if @presentation_mode
+            # In presentation mode, Tab goes to next sibling
+            jump_to_next_sibling
           else
-            indent_right(true)
+            # Normal mode: Indent with all children
+            if @split_view && @active_pane == :split
+              indent_split_right(true)
+            else
+              indent_right(true)
+            end
           end
         when "S-TAB"  # Shift-Tab
-          # Unindent with all children
-          if @split_view && @active_pane == :split
-            indent_split_left(true)
+          if @presentation_mode
+            # In presentation mode, Shift-Tab goes to previous sibling
+            jump_to_prev_sibling
           else
-            indent_left(true)
+            # Normal mode: Unindent with all children
+            if @split_view && @active_pane == :split
+              indent_split_left(true)
+            else
+              indent_left(true)
+            end
           end
         when "u"
           undo

data/hyperlist.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperlist
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-08-23 00:00:00.000000000 Z
+date: 2025-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses