rotor-framework 0.7.3 → 0.7.5

package/README.md

@@ -96,7 +96,7 @@ You can find [🌱](./docs/ai/readme.opt.yaml) symbols in all documentation page
 
 ## 📚 Learn More
 
-![Version](https://img.shields.io/badge/version-v0.7.3-blue?label=Documents%20TAG)
+![Version](https://img.shields.io/badge/version-v0.7.5-blue?label=Documents%20TAG)
 
 ### Framework Core
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rotor-framework",
-	"version": "0.7.3",
+	"version": "0.7.5",
 	"description": "Roku toolkit library providing a ViewBuilder, full UI lifecycle with focus handling and many core features, plus MVI-based state management.",
 	"author": "Balázs Molnár",
 	"license": "Apache-2.0",

package/src/source/RotorFramework.bs

@@ -4,7 +4,7 @@
 ' ▐▛▀▚▖▐▌ ▐▌ █ ▐▌ ▐▌▐▛▀▚▖    ▐▛▀▀▘▐▛▀▚▖▐▛▀▜▌▐▌  ▐▌▐▛▀▀▘▐▌ ▐▌▐▌ ▐▌▐▛▀▚▖▐▛▚▖
 ' ▐▌ ▐▌▝▚▄▞▘ █ ▝▚▄▞▘▐▌ ▐▌    ▐▌   ▐▌ ▐▌▐▌ ▐▌▐▌  ▐▌▐▙▄▄▖▐▙█▟▌▝▚▄▞▘▐▌ ▐▌▐▌ ▐▌
 ' Rotor Framework™
-' Version 0.7.3
+' Version 0.7.5
 ' © 2025 Balázs Molnár — Apache License 2.0
 ' =========================================================================
 
@@ -86,7 +86,7 @@ namespace Rotor
     class Framework
 
         name = "Rotor Framework"
-        version = "0.7.3"
+        version = "0.7.5"
 
         config = {
             tasks: invalid, ' @array    (optional)

package/src/source/RotorFrameworkTask.bs

@@ -4,7 +4,7 @@
 ' ▐▛▀▚▖▐▌ ▐▌ █ ▐▌ ▐▌▐▛▀▚▖    ▐▛▀▀▘▐▛▀▚▖▐▛▀▜▌▐▌  ▐▌▐▛▀▀▘▐▌ ▐▌▐▌ ▐▌▐▛▀▚▖▐▛▚▖
 ' ▐▌ ▐▌▝▚▄▞▘ █ ▝▚▄▞▘▐▌ ▐▌    ▐▌   ▐▌ ▐▌▐▌ ▐▌▐▌  ▐▌▐▙▄▄▖▐▙█▟▌▝▚▄▞▘▐▌ ▐▌▐▌ ▐▌
 ' Rotor Framework™
-' Version 0.7.3
+' Version 0.7.5
 ' © 2025 Balázs Molnár — Apache License 2.0
 ' =========================================================================
 
@@ -70,7 +70,7 @@ namespace Rotor
     class FrameworkTask
 
         name = "Rotor Framework"
-        version = "0.7.3"
+        version = "0.7.5"
 
         config = {
             tasks: invalid, ' optional

package/src/source/base/BaseWidget.bs

@@ -24,6 +24,7 @@ namespace Rotor
         ' =============================================================
 
         id as string                    ' Widget identifier
+        HID as string                   ' Hierarchical unique ID
         children as object              ' Child widgets collection
 
         ' =============================================================
@@ -100,7 +101,6 @@ namespace Rotor
         ' PRIVATE PROPERTIES (Engine Use Only)
         ' =============================================================
 
-        private HID as string             ' Hierarchical ID (e.g., "0.header.logo")
         private vmHID as string           ' Owning ViewModel's HID
         private isRootChild as boolean    ' True if direct child of root
         private childrenHIDhash as object ' Hash of child HIDs for fast lookup

package/src/source/engine/builder/PostProcessor.bs

@@ -290,10 +290,18 @@ namespace Rotor.ViewBuilder
                 index = rootChildCount - 1
 
                 while index >= 0 and inserted = false
-                    siblingNodeHID = siblingNodes[index].HID
-                    siblingWidget = siblingNodeHID <> invalid ? m.frameworkInstance.builder.widgetTree.get(siblingNodeHID) : invalid
-                    if Rotor.Utils.isInteger(siblingWidget?.zIndex) and siblingWidget?.zIndex <= zIndex
-                        inserted = true ' loop
+                    siblingNode = siblingNodes[index]
+                    ' Find matching widget by node reference
+                    matchingWidget = invalid
+                    for each childId in widget.parent.children
+                        child = widget.parent.children[childId]
+                        if child.node <> invalid and child.node.isSameNode(siblingNode)
+                            matchingWidget = child
+                            exit for
+                        end if
+                    end for
+                    if Rotor.Utils.isInteger(matchingWidget?.zIndex) and matchingWidget?.zIndex <= zIndex
+                        inserted = true
                     else
                         index--
                     end if
@@ -325,7 +333,4 @@ namespace Rotor.ViewBuilder
 
     end class
 
-
-
-
 end namespace

package/src/source/plugins/FocusPlugin.bs

@@ -121,6 +121,13 @@ namespace Rotor
     '   2. group.defaultFocusId [CONFIGURED]
     '   3. Deep search (if defaultFocusId not found immediately)
     '
+    ' RULE #11b: Deep Focus Tracking (trackDescendantFocus: true)
+    '   When a FocusGroup has trackDescendantFocus: true, it stores lastFocusedHID
+    '   for ANY descendant FocusItem (not just direct children).
+    '   - Immediate parent ALWAYS stores lastFocusedHID (default behavior)
+    '   - Ancestor groups with trackDescendantFocus: true ALSO store it
+    '   - Enables "deep focus memory" - returning to deeply nested items
+    '
     ' RULE #12: DefaultFocusId Targets
     '   - FocusItem node ID → Focus goes directly to it
     '   - Group node ID → Capturing continues on that group
@@ -636,6 +643,7 @@ namespace Rotor
                     ' Record the last focused item within its parent group for potential future use (e.g., returning focus)
                     lastFocusChainingGroups = m.findAncestorGroups(m.globalFocusHID)
                     if lastFocusChainingGroups.Count() > 0
+                        ' Always set on immediate parent (index 0)
                         parentGroupHID = lastFocusChainingGroups[0]
                         if parentGroupHID <> invalid and parentGroupHID <> ""
                             group = m.groupStack.get(parentGroupHID)
@@ -652,9 +660,20 @@ namespace Rotor
             for each groupHID in focusChainGroups
                 allAffectedGroups.unshift(groupHID) ' Add in reverse order (highest ancestor first)
             end for
-            for each groupHID in lastFocusChainingGroups
+            for i = 0 to lastFocusChainingGroups.Count() - 1
+                groupHID = lastFocusChainingGroups[i]
+
+                ' Add to allAffectedGroups if not present
                 if -1 = Rotor.Utils.findInArray(allAffectedGroups, groupHID)
-                    allAffectedGroups.unshift(groupHID) ' Add in reverse order if not already present
+                    allAffectedGroups.unshift(groupHID)
+                end if
+
+                ' Deep remember (skip index 0 - immediate parent is handled separately)
+                if i > 0 and lastFocused <> invalid
+                    ancestorGroup = m.groupStack.get(groupHID)
+                    if ancestorGroup <> invalid and ancestorGroup.trackDescendantFocus = true
+                        ancestorGroup.setLastFocusedHID(m.globalFocusHID)
+                    end if
                 end if
             end for
 
@@ -1279,11 +1298,13 @@ namespace Rotor
                 m.defaultFocusId = config.defaultFocusId ?? ""
                 m.lastFocusedHID = config.lastFocusedHID ?? ""
                 m.enableSpatialEnter = config.enableSpatialEnter ?? false
+                m.trackDescendantFocus = config.trackDescendantFocus ?? false
             end sub
 
             defaultFocusId as string
             lastFocusedHID as string
             enableSpatialEnter as boolean
+            trackDescendantFocus as boolean
             focusItemsRef as object
             groupsRef as object