Fix an issue where each group would register its own listeners for sh…

…ortcuts

Signed-off-by: Axel Boberg <[email protected]>

plugins/rundown/app/components/RundownGroupItem/index.jsx

@@ -133,7 +133,7 @@ export function RundownGroupItem ({ index, item }) {
                  onDrop={e => handleDrop(e)}
                />
                )
-             : <RundownList className='RundownGroupItem-children' rundownId={item.id} indexPrefix={`${index}.`} />
+             : <RundownList className='RundownGroupItem-children' rundownId={item.id} indexPrefix={`${index}.`} disableShortcuts />
         }
       </div>
     </div>

plugins/rundown/app/components/RundownList/index.jsx

@@ -129,7 +129,8 @@ async function toggleDisableSelection () {
 export function RundownList ({
   rundownId = '',
   className = '',
-  indexPrefix = ''
+  indexPrefix = '',
+  disableShortcuts = false
 }) {
   const [shared] = React.useContext(SharedContext)
 
@@ -169,11 +170,13 @@ export function RundownList ({
    * from the current selection
    * @param { Number } deltaIndex
    */
-  function select (deltaIndex = 0) {
+  async function select (deltaIndex = 0) {
     if (itemIds.length === 0) {
       return
     }
 
+    const selection = await bridge.client.getSelection()
+
     /*
     Find the currently selected item id,
     use the first selected item if going upwards
@@ -245,11 +248,15 @@ export function RundownList ({
       }
     }
 
+    if (disableShortcuts) {
+      return
+    }
+
     bridge.events.on('shortcut', onShortcut)
     return () => {
       bridge.events.off('shortcut', onShortcut)
     }
-  }, [itemIds, selection])
+  }, [itemIds, rundownId, disableShortcuts])
 
   /*
   Try to scroll to the selection