rotor-framework 0.8.1 → 0.8.2

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.8.1-blue?label=Documents%20TAG)
+![Version](https://img.shields.io/badge/version-v0.8.2-blue?label=Documents%20TAG)
 
 ### Framework Core
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rotor-framework",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"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.8.1
+' Version 0.8.2
 ' © 2025-2026 Balázs Molnár — Apache License 2.0
 ' =========================================================================
 
@@ -86,7 +86,7 @@ namespace Rotor
     class Framework
 
         name = "Rotor Framework"
-        version = "0.8.1"
+        version = "0.8.2"
 
         config = {
             tasks: invalid, ' @array    (optional)
@@ -295,12 +295,15 @@ namespace Rotor
         end function
 
         ' ---------------------------------------------------------------------
-        ' getDispatcher - Gets dispatcher facade by ID
+        ' connectDispatcher - Creates a new dispatcher facade connection by ID
+        '
+        ' Each call creates a unique facade with its own listenerId and scope binding.
+        ' Use facade.release() when done to clean up listeners.
         '
         ' @param {string} dispatcherId - Dispatcher identifier
         ' @returns {object} Dispatcher facade instance
         '
-        public function getDispatcher(dispatcherId as string) as object
+        public function connectDispatcher(dispatcherId as string) as object
             return m.dispatcherProvider.getFacade(dispatcherId, GetGlobalAA())
         end function
 
@@ -336,14 +339,15 @@ namespace Rotor
         ' ---------------------------------------------------------------------
         ' registerSourceObject - Not available on render thread
         '
-        public sub registerSourceObject(objectId as string, dispatcherId as string, sourceObject as object, eventFilter = invalid as dynamic)
-            throw "registerSourceObject() is only available on the task thread. Source objects require a task thread message port for event routing."
-        end sub
+        public function registerSourceObject(typeName as string, dispatcherId as string, eventFilter = invalid as dynamic) as object
+            throw "registerSourceObject() is only available on the task thread."
+            return invalid
+        end function
 
         ' ---------------------------------------------------------------------
         ' unregisterSourceObject - Not available on render thread
         '
-        public sub unregisterSourceObject(objectId as string)
+        public sub unregisterSourceObject(sourceObject as object, dispatcherId as string)
             throw "unregisterSourceObject() is only available on the task thread."
         end sub
 

package/src/source/RotorFrameworkTask.bs

@@ -4,7 +4,7 @@
 ' ▐▛▀▚▖▐▌ ▐▌ █ ▐▌ ▐▌▐▛▀▚▖    ▐▛▀▀▘▐▛▀▚▖▐▛▀▜▌▐▌  ▐▌▐▛▀▀▘▐▌ ▐▌▐▌ ▐▌▐▛▀▚▖▐▛▚▖
 ' ▐▌ ▐▌▝▚▄▞▘ █ ▝▚▄▞▘▐▌ ▐▌    ▐▌   ▐▌ ▐▌▐▌ ▐▌▐▌  ▐▌▐▙▄▄▖▐▙█▟▌▝▚▄▞▘▐▌ ▐▌▐▌ ▐▌
 ' Rotor Framework™
-' Version 0.8.1
+' Version 0.8.2
 ' © 2025-2026 Balázs Molnár — Apache License 2.0
 ' =========================================================================
 
@@ -70,7 +70,7 @@ namespace Rotor
     class FrameworkTask
 
         name = "Rotor Framework"
-        version = "0.8.1"
+        version = "0.8.2"
 
         config = {
             tasks: invalid, ' optional
@@ -88,7 +88,7 @@ namespace Rotor
         port as object
         sourceObjectRegistry = {} ' identity -> { dispatcherId, objectId, eventFilter }
         sourceObjectIdIndex = {} ' objectId -> identity (reverse index for unregistration)
-        sourceObjectTypeRegistry = [] ' [{ dispatcherId, objectId, eventFilter }] - broadcast routing
+        sharedSourceObjects = {} ' typeName -> { sourceObject, subscribers: [{ dispatcherId, eventFilter }] }
         private _eventFilterFn = invalid as dynamic
         onTick as function
 
@@ -124,34 +124,40 @@ namespace Rotor
         ' =====================================================================
 
         ' ---------------------------------------------------------------------
-        ' getDispatcher - Gets dispatcher facade by ID
+        ' connectDispatcher - Creates a new dispatcher facade connection by ID
+        '
+        ' Each call creates a unique facade with its own listenerId and scope binding.
+        ' Use facade.release() when done to clean up listeners.
         '
         ' @param {string} dispatcherId - Dispatcher identifier
         ' @returns {object} Dispatcher facade instance
         '
-        public function getDispatcher(dispatcherId as string) as object
+        public function connectDispatcher(dispatcherId as string) as object
             return m.dispatcherProvider.getFacade(dispatcherId, GetGlobalAA())
         end function
 
         ' ---------------------------------------------------------------------
-        ' registerSourceObject - Registers a source object for event routing
+        ' registerSourceObject - Creates and registers a source object for event routing
         '
-        ' Generic registry for any Roku source object. Auto-detects routing mode:
-        '   - Identity-based: If sourceObject implements ifSourceIdentity, routes via
-        '     GetSourceIdentity() on the event (roUrlTransfer, roChannelStore).
-        '   - Broadcast: If sourceObject does NOT implement ifSourceIdentity, broadcasts
-        '     to all registered dispatchers (roDeviceInfo, roInput, roAppManager).
+        ' Creates a Roku source object by type name and auto-detects routing mode:
+        '   - Identity-based: If sourceObject implements GetIdentity, each call creates
+        '     a new instance with unique routing (roUrlTransfer, roChannelStore).
+        '   - Broadcast (singleton): If sourceObject does NOT implement GetIdentity,
+        '     first call creates the instance, subsequent calls return the shared instance
+        '     and add the dispatcher as a subscriber (roDeviceInfo, roInput, roAppManager).
         '
-        ' @param {string} objectId - Unique identifier for this registration
+        ' @param {string} typeName - Roku object type name (e.g. "roUrlTransfer", "roDeviceInfo")
         ' @param {string} dispatcherId - Dispatcher ID that will handle events
-        ' @param {object} sourceObject - The source object (SetMessagePort will be called)
         ' @param {function} eventFilter - Optional filter function. Receives msg, returns boolean.
+        ' @returns {object} The created (or shared) source object
         '
-        public sub registerSourceObject(objectId as string, dispatcherId as string, sourceObject as object, eventFilter = invalid as dynamic)
-            sourceObject.SetMessagePort(m.port)
+        public function registerSourceObject(typeName as string, dispatcherId as string, eventFilter = invalid as dynamic) as object
+            sourceObject = CreateObject(typeName)
             if FindMemberFunction(sourceObject, "GetIdentity") <> invalid
-                ' Identity-based routing
+                ' Identity-based: unique per call
+                sourceObject.SetMessagePort(m.port)
                 identity = sourceObject.GetIdentity().ToStr()
+                objectId = `${dispatcherId}_${identity}`
                 m.sourceObjectRegistry[identity] = {
                     dispatcherId: dispatcherId,
                     objectId: objectId,
@@ -159,34 +165,64 @@ namespace Rotor
                 }
                 m.sourceObjectIdIndex[objectId] = identity
             else
-                ' Broadcast routing
-                m.sourceObjectTypeRegistry.push({
-                    dispatcherId: dispatcherId,
-                    objectId: objectId,
-                    eventFilter: eventFilter
-                })
+                ' Broadcast: singleton per type
+                if m.sharedSourceObjects.DoesExist(typeName)
+                    ' Existing — add subscriber, discard new object
+                    m.sharedSourceObjects[typeName].subscribers.push({
+                        dispatcherId: dispatcherId,
+                        eventFilter: eventFilter
+                    })
+                    return m.sharedSourceObjects[typeName].sourceObject
+                else
+                    ' First — store as shared
+                    sourceObject.SetMessagePort(m.port)
+                    m.sharedSourceObjects[typeName] = {
+                        sourceObject: sourceObject,
+                        subscribers: [{
+                            dispatcherId: dispatcherId,
+                            eventFilter: eventFilter
+                        }]
+                    }
+                end if
             end if
-        end sub
+            return sourceObject
+        end function
 
         ' ---------------------------------------------------------------------
-        ' unregisterSourceObject - Unregisters a port-based object by its objectId
+        ' unregisterSourceObject - Unregisters a source object
         '
-        ' @param {string} objectId - The unique identifier used during registration
+        ' Identity-based objects: removes by identity from registry.
+        ' Broadcast objects: removes dispatcher subscriber, cleans up if no subscribers remain.
         '
-        public sub unregisterSourceObject(objectId as string)
-            ' Try identity-based registry
-            if m.sourceObjectIdIndex.DoesExist(objectId)
-                identity = m.sourceObjectIdIndex[objectId]
-                m.sourceObjectRegistry.Delete(identity)
-                m.sourceObjectIdIndex.Delete(objectId)
-                return
-            end if
-            ' Try broadcast registry
-            for i = m.sourceObjectTypeRegistry.count() - 1 to 0 step -1
-                if m.sourceObjectTypeRegistry[i].objectId = objectId
-                    m.sourceObjectTypeRegistry.Delete(i)
+        ' @param {object} sourceObject - The source object to unregister
+        ' @param {string} dispatcherId - Dispatcher ID that owns this registration
+        '
+        public sub unregisterSourceObject(sourceObject as object, dispatcherId as string)
+            if FindMemberFunction(sourceObject, "GetIdentity") <> invalid
+                ' Identity-based: remove by identity
+                identity = sourceObject.GetIdentity().ToStr()
+                if m.sourceObjectRegistry.DoesExist(identity)
+                    m.sourceObjectRegistry.Delete(identity)
+                end if
+                objectId = `${dispatcherId}_${identity}`
+                if m.sourceObjectIdIndex.DoesExist(objectId)
+                    m.sourceObjectIdIndex.Delete(objectId)
+                end if
+            else
+                ' Broadcast: remove subscriber, cleanup if empty
+                typeName = type(sourceObject)
+                if m.sharedSourceObjects.DoesExist(typeName)
+                    shared = m.sharedSourceObjects[typeName]
+                    for i = shared.subscribers.count() - 1 to 0 step -1
+                        if shared.subscribers[i].dispatcherId = dispatcherId
+                            shared.subscribers.Delete(i)
+                        end if
+                    end for
+                    if shared.subscribers.count() = 0
+                        m.sharedSourceObjects.Delete(typeName)
+                    end if
                 end if
-            end for
+            end if
         end sub
 
         ' ---------------------------------------------------------------------
@@ -300,22 +336,24 @@ namespace Rotor
                             end try
                         end if
 
-                        ' Broadcast to all non-identity registered dispatchers
+                        ' Broadcast to shared source object subscribers
                         if not routed
-                            for each entry in m.sourceObjectTypeRegistry
-                                ' Apply event filter if provided
-                                allowed = true
-                                if entry.eventFilter <> invalid
-                                    m._eventFilterFn = entry.eventFilter
-                                    allowed = m._eventFilterFn(msg)
-                                end if
+                            for each typeName in m.sharedSourceObjects
+                                shared = m.sharedSourceObjects[typeName]
+                                for each subscriber in shared.subscribers
+                                    allowed = true
+                                    if subscriber.eventFilter <> invalid
+                                        m._eventFilterFn = subscriber.eventFilter
+                                        allowed = m._eventFilterFn(msg)
+                                    end if
 
-                                if allowed
-                                    dispatcherInstance = m.dispatcherProvider.get(entry.dispatcherId)
-                                    if dispatcherInstance <> invalid
-                                        dispatcherInstance.onSourceEvent(msg)
+                                    if allowed
+                                        dispatcherInstance = m.dispatcherProvider.get(subscriber.dispatcherId)
+                                        if dispatcherInstance <> invalid
+                                            dispatcherInstance.onSourceEvent(msg)
+                                        end if
                                     end if
-                                end if
+                                end for
                             end for
                         end if
                     end if
@@ -385,7 +423,7 @@ namespace Rotor
         public sub destroy()
             m.sourceObjectRegistry.clear()
             m.sourceObjectIdIndex.clear()
-            m.sourceObjectTypeRegistry.clear()
+            m.sharedSourceObjects.clear()
             m.dispatcherProvider.destroy()
 
             globalScope = GetGlobalAA()

package/src/source/base/BaseReducer.bs

@@ -27,7 +27,7 @@ namespace Rotor
         port as object                  ' Framework port for async operations
 
         ' Dispatcher integration
-        getDispatcher as function       ' Get dispatcher facade by ID
+        connectDispatcher as function   ' Connect to dispatcher facade by ID
         getState as function            ' Get dispatcher's model state
         dispatch as function            ' Dispatch intent to owner dispatcher
         dispatchTo as function          ' Dispatch intent to dispatcher by ID
@@ -49,8 +49,8 @@ namespace Rotor
             frameworkInstance = GetGlobalAA().rotor_framework_helper.frameworkInstance
             m.port = frameworkInstance.port
 
-            ' Inject getDispatcher method
-            m.getDispatcher = function(dispatcherId as string) as object
+            ' Inject connectDispatcher method
+            m.connectDispatcher = function(dispatcherId as string) as object
                 return GetGlobalAA().rotor_framework_helper.frameworkInstance.dispatcherProvider.getFacade(dispatcherId, m)
             end function
 
@@ -66,13 +66,13 @@ namespace Rotor
 
             ' Inject dispatchTo method for dispatching intents to other dispatchers
             m.dispatchTo = sub(dispatcherId as string, dispatchObject as object)
-                dispatcherFacade = m.getDispatcher(dispatcherId)
+                dispatcherFacade = m.connectDispatcher(dispatcherId)
                 dispatcherFacade.dispatch(dispatchObject)
             end sub
 
             ' Inject getStateFrom method for accessing state from other dispatchers
             m.getStateFrom = function(dispatcherId as string, mapStateToProps = invalid as dynamic)
-                dispatcherFacade = m.getDispatcher(dispatcherId)
+                dispatcherFacade = m.connectDispatcher(dispatcherId)
                 return dispatcherFacade.getState(mapStateToProps)
             end function
         end sub
@@ -191,23 +191,21 @@ namespace Rotor
         ' =============================================================
 
         ' ---------------------------------------------------------------------
-        ' registerSourceObject - Registers a source object with the framework
+        ' registerSourceObject - Creates and registers a source object with the framework
         '
-        ' Helper method for registering any Roku source object (roUrlTransfer,
-        ' roDeviceInfo, roChannelStore, etc.). The framework will call
-        ' SetMessagePort and route events to this reducer's onSourceEvent.
-        ' Routing mode is auto-detected: identity-based if sourceObject has GetIdentity(),
-        ' broadcast otherwise.
+        ' Creates a Roku source object by type name. The framework manages object
+        ' creation, message port assignment, and event routing.
+        ' - Identity-based types (roUrlTransfer, roChannelStore): new instance per call
+        ' - Broadcast types (roDeviceInfo, roInput): singleton, shared across dispatchers
         '
-        ' @param {object} sourceObject - The source object
+        ' @param {string} typeName - Roku object type (e.g. "roUrlTransfer", "roDeviceInfo")
         ' @param {function} eventFilter - Optional filter function. Receives msg, returns boolean.
+        ' @returns {object} The created (or shared) source object
         '
-        sub registerSourceObject(sourceObject as object, eventFilter = invalid as dynamic)
+        function registerSourceObject(typeName as string, eventFilter = invalid as dynamic) as object
             frameworkInstance = GetGlobalAA().rotor_framework_helper.frameworkInstance
-
-            objectId = m.getSourceObjectId(sourceObject)
-            frameworkInstance.registerSourceObject(objectId, m.dispatcherId, sourceObject, eventFilter)
-        end sub
+            return frameworkInstance.registerSourceObject(typeName, m.dispatcherId, eventFilter)
+        end function
 
         ' ---------------------------------------------------------------------
         ' unregisterSourceObject - Unregisters a source object from the framework
@@ -216,31 +214,9 @@ namespace Rotor
         '
         sub unregisterSourceObject(sourceObject as object)
             frameworkInstance = GetGlobalAA().rotor_framework_helper.frameworkInstance
-            objectId = m.getSourceObjectId(sourceObject)
-            frameworkInstance.unregisterSourceObject(objectId)
+            frameworkInstance.unregisterSourceObject(sourceObject, m.dispatcherId)
         end sub
 
-        ' =============================================================
-        ' ASYNC CALLBACK
-        ' =============================================================
-
-        ' ---------------------------------------------------------------------
-        ' getSourceObjectId - Generates unique objectId for a source object
-        '
-        ' Identity-based objects (roUrlTransfer, etc.): dispatcherId + GetIdentity()
-        ' Broadcast objects (roDeviceInfo, etc.): dispatcherId + type name
-        '
-        ' @param {object} sourceObject - The source object
-        ' @returns {string} Unique objectId
-        '
-        private function getSourceObjectId(sourceObject as object) as string
-            if FindMemberFunction(sourceObject, "GetIdentity") <> invalid
-                return `${m.dispatcherId}_${sourceObject.GetIdentity()}`
-            else
-                return `${m.dispatcherId}_${type(sourceObject)}`
-            end if
-        end function
-
         ' ---------------------------------------------------------------------
         ' onSourceEvent - Callback for source object events
         '

package/src/source/base/BaseWidget.bs

@@ -73,7 +73,7 @@ namespace Rotor
 
         ' Framework Integration
         getFrameworkInstance as function ' Get framework instance
-        getDispatcher as function        ' Get dispatcher facade by ID
+        connectDispatcher as function    ' Connect to dispatcher facade by ID
         dispatchTo as function           ' Dispatch intent to dispatcher by ID
         getStateFrom as function         ' Get state from dispatcher by ID
         animator as function             ' Get animator factory
@@ -90,6 +90,7 @@ namespace Rotor
         ' Focus Plugin Methods (from FocusPlugin.bs)
         optional enableFocusNavigation as function    ' Enable focus navigation
         optional isFocusNavigationEnabled as function ' Check if focus enabled
+        optional isFocused as function                ' Check if widget is focused
         optional setFocus as function                 ' Set focus on widget
         optional getFocusedWidget as function         ' Get currently focused widget
         optional proceedLongPress as function         ' Trigger long press

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

@@ -136,20 +136,20 @@ namespace Rotor.ViewBuilder
             m.getFrameworkInstance().builder.erase(payloads, shouldSkipNodePool, parentHID)
         end sub
 
-        ' getDispatcher - Gets dispatcher facade by ID *'
-        widget.getDispatcher = function(dispatcherId as string) as object
+        ' connectDispatcher - Creates a new dispatcher facade connection by ID *'
+        widget.connectDispatcher = function(dispatcherId as string) as object
             return m.getFrameworkInstance().dispatcherProvider.getFacade(dispatcherId, m)
         end function
 
         ' Dispatch shortcut - Dispatches an event via specific dispatcher'
         widget.dispatchTo = sub(dispatcherId as string, dispatchObject as object)
-            dispatcherFaced = m.getDispatcher(dispatcherId)
+            dispatcherFaced = m.connectDispatcher(dispatcherId)
             dispatcherFaced.dispatch(dispatchObject)
         end sub
 
         ' Listen shortcut - Listen to specific dispatcher'
         widget.getStateFrom = function(dispatcherId as string, mapStateToProps = invalid as dynamic)
-            dispatcherFaced = m.getDispatcher(dispatcherId)
+            dispatcherFaced = m.connectDispatcher(dispatcherId)
             return dispatcherFaced.getState(mapStateToProps)
         end function
 

package/src/source/engine/providers/Dispatcher.bs

@@ -60,9 +60,12 @@ namespace Rotor
         end sub
 
         ' ---------------------------------------------------------------------
-        ' destroy - Cleans up the dispatcher facade by removing all listeners and clearing references
+        ' release - Releases this dispatcher facade by removing all listeners and clearing references
         '
-        public sub destroy()
+        ' Note: This does not destroy the underlying dispatcher — only releases
+        ' the facade's connection (listenerId + scope binding). One-way operation.
+        '
+        public sub release()
             m.removeAllListenersByListenerId()
             m.listenerScope = invalid
             m.dispatcherInstance = invalid

package/src/source/plugins/DispatcherProviderPlugin.bs

@@ -71,7 +71,7 @@ namespace Rotor
                 if dispatcherFacades.Count() > 0
                     for each dispatcherFacadeKey in dispatcherFacades
                         dispatcherFacadeInstance = dispatcherFacades[dispatcherFacadeKey]
-                        dispatcherFacadeInstance.destroy()
+                        dispatcherFacadeInstance.release()
                         widget.viewModelState[scope.pluginKey][dispatcherFacadeKey] = invalid
                     end for
                 end if

package/src/source/plugins/FocusPlugin.bs

@@ -378,7 +378,29 @@ namespace Rotor
                         parentGroup.setLastFocusedHID(resolvedHID)
                     end if
                 end if
-            end sub
+            end sub,
+
+            ' ---------------------------------------------------------------------
+            ' isFocused - Checks if this widget currently has focus
+            '
+            ' For a FocusItem: returns whether this item is the focused element
+            ' For a Group: returns whether any descendant within this group has focus (is in focus chain)
+            ' For widgets without focus config: returns false
+            '
+            ' @returns {boolean} True if focused (or in focus chain for groups), false otherwise
+            '
+            isFocused: function() as boolean
+                plugin = m.getFrameworkInstance().plugins[PRIMARY_FOCUS_PLUGIN_KEY]
+                focusItem = plugin.focusItemStack.get(m.HID)
+                if focusItem <> invalid
+                    return focusItem.isFocused
+                end if
+                group = plugin.groupStack.get(m.HID)
+                if group <> invalid
+                    return group.isFocused
+                end if
+                return false
+            end function
 
         }
 
@@ -754,6 +776,21 @@ namespace Rotor
             end if
         end sub
 
+        function delegateKeyPress(key as string) as boolean
+            focused = m.getFocusedItem()
+            if focused = invalid then return false
+
+            ' Bubble through ancestor groups (focused item already checked by caller)
+            focusChainGroups = m.findAncestorGroups(focused.HID)
+            for each groupHID in focusChainGroups
+                group = m.groupStack.get(groupHID)
+                handled = group.callKeyPressHandler(key)
+                if handled then return true
+            end for
+
+            return false
+        end function
+
         sub delegateLongPressChanged(isLongPress as boolean, key as string)
             focused = m.getFocusedItem()
             handled = focused.callLongPressHandler(isLongPress, key)
@@ -862,7 +899,7 @@ namespace Rotor
                 currentAncestors = m.findAncestorGroups(m.globalFocusHID)
                 newAncestors = m.findAncestorGroups(newHID)
                 if currentAncestors.Count() > 0 and newAncestors.Count() > 0
-                    if currentAncestors[0] = newAncestors[0] then newHID = ""
+                    if currentAncestors[0] = newAncestors[0] and newHID <> m.globalFocusHID then newHID = ""
                 end if
             end if
 
@@ -1003,6 +1040,14 @@ namespace Rotor
 
             if true = press
 
+                ' keyPressHandler: local (no bubbling), fires for all keys before navigation
+                focusedItem = m.focusItemStack.get(m.globalFocusHID)
+                if focusedItem <> invalid and focusedItem.keyPressHandler <> invalid
+                    if true = Rotor.Utils.callbackScoped(focusedItem.keyPressHandler, focusedItem.widget, key)
+                        return m.parseOnKeyEventResult(key, true, false)
+                    end if
+                end if
+
                 if -1 < Rotor.Utils.findInArray([
                         Rotor.Const.Direction.UP,
                         Rotor.Const.Direction.RIGHT,
@@ -1080,6 +1125,9 @@ namespace Rotor
                     return m.parseOnKeyEventResult(key, true, true)
 
                 end if
+
+                ' Unhandled key (not direction, not OK) → bubble through ancestor groups
+                if m.delegateKeyPress(key) then return m.parseOnKeyEventResult(key, true, false)
             end if
 
             return m.parseOnKeyEventResult(key, false, false)
@@ -1256,7 +1304,6 @@ namespace Rotor
 
         class BaseFocusConfig
 
-            autoSetIsFocusedState as boolean
             staticDirection as object
 
             sub new (config as object)
@@ -1268,8 +1315,6 @@ namespace Rotor
                 m.node = m.widget.node
                 m.isFocused = config.isFocused ?? false
 
-                m.autoSetIsFocusedState = config.autoSetIsFocusedState ?? true
-
                 m.isEnabled = config.isEnabled ?? true
                 m.enableSpatialNavigation = config.enableSpatialNavigation ?? false
                 m.staticDirection = {}
@@ -1281,14 +1326,14 @@ namespace Rotor
 
                 m.onFocusChanged = config.onFocusChanged
                 m.longPressHandler = config.longPressHandler
+                m.keyPressHandler = config.keyPressHandler
                 m.onFocus = config.onFocus
                 m.onBlur = config.onBlur
 
                 Rotor.Utils.setCustomFields(m.node, { "isFocused": false }, true, true)
 
-                ' convenience (usually this is used on viewModelState)
-                if false = m.widget.viewModelState.DoesExist("isFocused") and true = m.autoSetIsFocusedState
-                    m.widget.viewModelState.isFocused = false ' as default
+                if m.widget.isViewModel = true and not m.widget.viewModelState.DoesExist("isFocused")
+                    m.widget.viewModelState.isFocused = false
                 end if
 
             end sub
@@ -1304,6 +1349,7 @@ namespace Rotor
             onFocus as dynamic
             onBlur as dynamic
             longPressHandler as dynamic
+            keyPressHandler as dynamic
             node as object
             widget as object
 
@@ -1374,6 +1420,14 @@ namespace Rotor
                 end if
             end function
 
+            function callKeyPressHandler(key as string) as boolean
+                if Rotor.Utils.isFunction(m.keyPressHandler)
+                    return Rotor.Utils.callbackScoped(m.keyPressHandler, m.widget, key)
+                else
+                    return false
+                end if
+            end function
+
             sub destroy()
                 m.widget = invalid
                 m.node = invalid
@@ -1381,6 +1435,7 @@ namespace Rotor
                 m.onFocus = invalid
                 m.onBlur = invalid
                 m.longPressHandler = invalid
+                m.keyPressHandler = invalid
             end sub
 
         end class
@@ -1534,8 +1589,9 @@ namespace Rotor
                     defaultFocusId = m.defaultFocusId
                 end if
 
+                focusItemsHIDlist = m.getGroupMembersHIDs()
+
                 if defaultFocusId <> ""
-                    focusItemsHIDlist = m.getGroupMembersHIDs()
                     if focusItemsHIDlist.Count() > 0
                         ' Try find valid HID in focusItems by node id
                         focusItemHID = m.findHIDinFocusItemsByNodeId(defaultFocusId, focusItemsHIDlist)
@@ -1548,6 +1604,11 @@ namespace Rotor
                     return defaultFocusId
                 end if
 
+                ' Last resort: pick the first available member of the group
+                if focusItemsHIDlist.Count() > 0
+                    return focusItemsHIDlist[0]
+                end if
+
                 return HID
             end function
 
@@ -1565,11 +1626,8 @@ namespace Rotor
                 if m.isFocused = isFocused then return
 
                 m.isFocused = isFocused
-
-                if m.autoSetIsFocusedState
-                    m.widget.viewModelState.isFocused = isFocused
-                end if
                 m.node.setField("isFocused", isFocused)
+                if m.widget.isViewModel = true then m.widget.viewModelState.isFocused = isFocused
                 m.callOnFocusedFnOnWidget(isFocused)
             end sub
 
@@ -1588,7 +1646,7 @@ namespace Rotor
             sub new (config as object)
                 super(config)
 
-                m.onSelect = config.onSelect ?? ""
+                m.onSelect = config.onSelect ?? config.ok ?? ""
                 m.enableNativeFocus = config.enableNativeFocus ?? false
             end sub
 
@@ -1686,12 +1744,8 @@ namespace Rotor
                 if m.isFocused = isFocused then return
 
                 m.isFocused = isFocused
-
-                if m.autoSetIsFocusedState
-                    m.widget.viewModelState.isFocused = isFocused
-                end if
-
                 m.node.setField("isFocused", isFocused)
+                if m.widget.isViewModel = true then m.widget.viewModelState.isFocused = isFocused
 
                 if enableNativeFocus or m.enableNativeFocus
                     m.node.setFocus(isFocused)