refactor: move tryAliasFastTrack into root-view-host (#1703)

Author: aurelleb

src/server/src/qml/qml/SearchBar.qml

@@ -285,8 +285,6 @@ Item {
                     } else if (event.key === Qt.Key_Backspace && searchInput.text === "" && !event.isAutoRepeat && launcher.showBackButton && launcher.popOnBackspace) {
                         launcher.goBack();
                         event.accepted = true;
-                    } else if (event.key === Qt.Key_Space && event.modifiers === Qt.NoModifier && searchInput.text.length > 0 && launcher.commandViewHost?.tryAliasFastTrack()) {
-                        event.accepted = true;
                     } else if (launcher.forwardKey(event.key, event.modifiers)) {
                         if (launcher.compacted)
                             launcher.expand();

src/server/src/qml/root-search-model.cpp

@@ -210,28 +210,6 @@ const RootItem *RootSearchModel::selectedRootItem() const {
   return section ? section->rootItem(itemIdx) : nullptr;
 }
 
-bool RootSearchModel::tryAliasFastTrack() {
-  int sourceIdx = -1;
-  int itemIdx = -1;
-  if (!dataItemAt(selectedIndex(), sourceIdx, itemIdx)) return false;
-
-  auto *src = sources()[sourceIdx];
-  const RootItem *item = nullptr;
-
-  if (src == m_resultsSource) {
-    item = m_resultsSource->rootItem(itemIdx);
-  } else if (src == m_favoritesSource) {
-    item = m_favoritesSource->rootItem(itemIdx);
-  }
-
-  if (!item || !item->supportsAliasSpaceShortcut()) return false;
-  auto meta = m_manager->itemMetadata(item->uniqueId());
-  if (!meta.alias || !meta.alias->starts_with(m_query)) return false;
-
-  activateSelected();
-  return true;
-}
-
 void RootSearchModel::startCalculator() {
   if (m_calcWatcher.isRunning()) {
     m_calculator->backend()->abort();

src/server/src/qml/root-search-model.hpp

@@ -27,7 +27,6 @@ class RootSearchModel : public SectionListModel {
 
   Q_INVOKABLE void setFilter(const QString &text);
   void setSelectedIndex(int index) override;
-  Q_INVOKABLE bool tryAliasFastTrack();
 
   const RootItem *selectedRootItem() const;
 

src/server/src/qml/root-view-host.cpp

@@ -44,11 +44,28 @@ void RootViewHost::beforeActionExecuted(const AbstractAction *action) {
   if (auto item = m_model->selectedRootItem()) { manager->registerVisit(item->uniqueId()); }
 }
 
+bool RootViewHost::tryAliasFastTrack() {
+  const auto manager = context()->services->rootItemManager();
+  const auto item = m_model->selectedRootItem();
+
+  if (!item || !item->supportsAliasSpaceShortcut()) return false;
+
+  const auto query = context()->navigation->searchText(this).toStdString();
+  const auto meta = manager->itemMetadata(item->uniqueId());
+
+  if (!meta.alias || !meta.alias->starts_with(query)) return false;
+
+  m_model->activateSelected();
+  return true;
+}
+
 bool RootViewHost::inputFilter(QKeyEvent *event) {
   auto manager = context()->services->rootItemManager();
   auto &nav = context()->navigation;
   auto &cfg = context()->services->config()->value();
 
+  if (!event->modifiers() && event->key() == Qt::Key_Space) { return tryAliasFastTrack(); }
+
   // wrapped navigation is incompatible with overriding key up, so we disable history in that case
   const bool activatableHistory =
       !cfg.wrapNavigation && m_model->selectedIndex() == m_model->nextSelectableIndex(-1, 1);
@@ -100,8 +117,3 @@ void RootViewHost::beforePop() {
 }
 
 QObject *RootViewHost::listModel() const { return m_model; }
-
-bool RootViewHost::tryAliasFastTrack() {
-  if (!m_model) return false;
-  return m_model->tryAliasFastTrack();
-}

src/server/src/qml/root-view-host.hpp

@@ -21,12 +21,12 @@ class RootViewHost : public ViewHostBase {
   void beforePop() override;
 
   QObject *listModel() const;
-  Q_INVOKABLE bool tryAliasFastTrack();
 
 protected:
   bool inputFilter(QKeyEvent *) override;
   void refreshClock();
   void beforeActionExecuted(const AbstractAction *action) override;
+  bool tryAliasFastTrack();
 
 private:
   bool m_textChangedByHistory = false;