From 3ce714ecbbd8f2f68bf39aa14c1620b91ebb67e5 Mon Sep 17 00:00:00 2001
From: Alexander Ackermann <abackermann91@gmail.com>
Date: Wed, 1 Apr 2026 00:45:20 +0200
Subject: [PATCH 1/3] feat: focus global search bar via keyboard shortcut

---
 1                                             | 33 +++++++++++++++++++
 .../components/OcSearchBar/OcSearchBar.vue    |  3 +-
 .../src/helpers/isEditableElement.ts          | 15 +++++++++
 .../web-app-search/src/portals/SearchBar.vue  | 29 +++++++++++++++-
 .../tests/unit/portals/SearchBar.spec.ts      | 30 +++++++++++++++++
 .../keyboardActions/useKeyboardActions.ts     |  1 +
 6 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 1
 create mode 100644 packages/web-app-search/src/helpers/isEditableElement.ts

diff --git a/1 b/1
new file mode 100644
index 0000000000..7e7a0f979c
--- /dev/null
+++ b/1
@@ -0,0 +1,33 @@
+pick a4a7321ff0 # feat: focus global search bar via keyboard shortcut
+f 0faac156c1 # feat: focus global search bar via keyboard shortcut
+
+# Rebase ace9e3bbac..0faac156c1 onto ace9e3bbac (2 commands)
+#
+# Commands:
+# p, pick <commit> = use commit
+# r, reword <commit> = use commit, but edit the commit message
+# e, edit <commit> = use commit, but stop for amending
+# s, squash <commit> = use commit, but meld into previous commit
+# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
+#                    commit's log message, unless -C is used, in which case
+#                    keep only this commit's message; -c is same as -C but
+#                    opens the editor
+# x, exec <command> = run command (the rest of the line) using shell
+# b, break = stop here (continue rebase later with 'git rebase --continue')
+# d, drop <commit> = remove commit
+# l, label <label> = label current HEAD with a name
+# t, reset <label> = reset HEAD to a label
+# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
+#         create a merge commit using the original merge commit's
+#         message (or the oneline, if no original merge commit was
+#         specified); use -c <commit> to reword the commit message
+# u, update-ref <ref> = track a placeholder for the <ref> to be updated
+#                       to this position in the new commits. The <ref> is
+#                       updated at the end of the rebase
+#
+# These lines can be re-ordered; they are executed from top to bottom.
+#
+# If you remove a line here THAT COMMIT WILL BE LOST.
+#
+# However, if you remove everything, the rebase will be aborted.
+#
diff --git a/packages/design-system/src/components/OcSearchBar/OcSearchBar.vue b/packages/design-system/src/components/OcSearchBar/OcSearchBar.vue
index 5afe5d371a..db07cb0f1b 100644
--- a/packages/design-system/src/components/OcSearchBar/OcSearchBar.vue
+++ b/packages/design-system/src/components/OcSearchBar/OcSearchBar.vue
@@ -190,7 +190,8 @@ const inputClass = computed(() => {
     'p-4',
     'rounded-4xl',
     'disabled:cursor-not-allowed',
-    'focus:bg-none'
+    'focus:bg-none',
+    'focus:outline focus:outline-offset-2 focus:outline-white'
   ]
   if (!buttonHidden) {
     classes.push(...['oc-search-input-button', 'rounded-r-none'])
diff --git a/packages/web-app-search/src/helpers/isEditableElement.ts b/packages/web-app-search/src/helpers/isEditableElement.ts
new file mode 100644
index 0000000000..aa0bef208f
--- /dev/null
+++ b/packages/web-app-search/src/helpers/isEditableElement.ts
@@ -0,0 +1,15 @@
+export function isEditableElement(element: Element): boolean {
+  if (
+    element instanceof HTMLInputElement ||
+    element instanceof HTMLTextAreaElement ||
+    element instanceof HTMLSelectElement
+  ) {
+    return true
+  }
+
+  if (element instanceof HTMLElement) {
+    return element.isContentEditable
+  }
+
+  return false
+}
diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
index 8c30310725..a483de04ff 100644
--- a/packages/web-app-search/src/portals/SearchBar.vue
+++ b/packages/web-app-search/src/portals/SearchBar.vue
@@ -8,6 +8,7 @@
   >
     <oc-search-bar
       id="files-global-search-bar"
+      ref="searchInputRef"
       :model-value="term"
       :label="searchLabel"
       :type-ahead="true"
@@ -122,6 +123,8 @@
 
 <script lang="ts">
 import {
+  Key,
+  Modifier,
   SearchProvider,
   createLocationCommon,
   isLocationCommonActive,
@@ -130,6 +133,7 @@ import {
   useAuthStore,
   useCapabilityStore,
   useIsAppActive,
+  useKeyboardActions,
   useResourcesStore
 } from '@opencloud-eu/web-pkg'
 import Mark from 'mark.js'
@@ -152,6 +156,7 @@ import {
 import { SearchLocationFilterConstants } from '@opencloud-eu/web-pkg'
 import { SearchBarFilter } from '@opencloud-eu/web-pkg'
 import { useAvailableProviders } from '../composables'
+import { isEditableElement } from '../helpers/isEditableElement'
 import { RouteLocationNormalizedLoaded } from 'vue-router'
 import { OcDrop } from '@opencloud-eu/design-system/components'
 
@@ -175,6 +180,8 @@ export default defineComponent({
 
     const locationFilterId = ref(SearchLocationFilterConstants.allFiles)
     const optionsDropRef = useTemplateRef<ComponentPublicInstance<typeof OcDrop>>('optionsDropRef')
+    const searchInputRef = useTemplateRef<ComponentPublicInstance>('searchInputRef')
+    const searchBarRef = useTemplateRef<HTMLElement>('searchBar')
     const activePreviewIndex = ref<number | null>(null)
     const term = ref('')
     const restoreSearchFromRoute = ref(false)
@@ -362,6 +369,25 @@ export default defineComponent({
       term.value = ''
     })
 
+    const { bindKeyAction } = useKeyboardActions({ skipDisabledKeyBindingsCheck: true })
+
+    const onSearchShortcut = (event: KeyboardEvent) => {
+      const activeElement = document.activeElement
+      if (activeElement && isEditableElement(activeElement)) {
+        return
+      }
+
+      const inputElement = unref(searchBarRef)?.querySelector('input') as HTMLElement
+      inputElement?.focus()
+
+      event.preventDefault()
+    }
+
+    bindKeyAction({ primary: Key.S }, onSearchShortcut, { preventDefault: false })
+    bindKeyAction({ primary: Key.Slash, modifier: Modifier.Shift }, onSearchShortcut, {
+      preventDefault: false
+    })
+
     onBeforeUnmount(() => {
       eventBus.unsubscribe('app.search.term.clear', clearTermEvent)
     })
@@ -398,7 +424,8 @@ export default defineComponent({
       getSearchResultLocation,
       showDrop,
       isAppActive,
-      getFocusableElements
+      getFocusableElements,
+      onSearchShortcut
     }
   },
 
diff --git a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
index 207ea44156..425073a509 100644
--- a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
+++ b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
@@ -215,6 +215,36 @@ describe('Search Bar portal component', () => {
     const spyRouterPushStub = wrapper.vm.$router.push
     expect(spyRouterPushStub).not.toHaveBeenCalled()
   })
+  test('focuses search input when pressing "s"', () => {
+    const { wrapper } = getMountedWrapper()
+    const nonEditableTarget = document.createElement('div')
+    document.body.appendChild(nonEditableTarget)
+    nonEditableTarget.focus()
+    const keyEvent = new KeyboardEvent('keydown', { key: 's', cancelable: true })
+
+    wrapper.vm.onSearchShortcut(keyEvent)
+    nonEditableTarget.remove()
+  })
+  test('focuses search input when pressing "/"', () => {
+    const { wrapper } = getMountedWrapper()
+    const nonEditableTarget = document.createElement('button')
+    document.body.appendChild(nonEditableTarget)
+    nonEditableTarget.focus()
+    const keyEvent = new KeyboardEvent('keydown', { key: '/', cancelable: true })
+
+    wrapper.vm.onSearchShortcut(keyEvent)
+    nonEditableTarget.remove()
+  })
+  test('does not focus search input when editable element is already focused', () => {
+    const { wrapper } = getMountedWrapper()
+    const textInput = document.createElement('input')
+    document.body.appendChild(textInput)
+    textInput.focus()
+
+    const keyEvent = new KeyboardEvent('keydown', { key: 's', cancelable: true })
+    wrapper.vm.onSearchShortcut(keyEvent)
+    textInput.remove()
+  })
 })
 
 function getMountedWrapper({
diff --git a/packages/web-pkg/src/composables/keyboardActions/useKeyboardActions.ts b/packages/web-pkg/src/composables/keyboardActions/useKeyboardActions.ts
index f5f8194d59..157858e085 100644
--- a/packages/web-pkg/src/composables/keyboardActions/useKeyboardActions.ts
+++ b/packages/web-pkg/src/composables/keyboardActions/useKeyboardActions.ts
@@ -16,6 +16,7 @@ export enum Key {
   Plus = '+',
   Minus = '-',
   Space = ' ',
+  Slash = '/',
   ArrowUp = 'ArrowUp',
   ArrowDown = 'ArrowDown',
   ArrowLeft = 'ArrowLeft',

From 44d39d74bc604ade10becc500cfe5605c4a1c0dd Mon Sep 17 00:00:00 2001
From: Alex <abackermann91@gmail.com>
Date: Wed, 1 Apr 2026 00:59:38 +0200
Subject: [PATCH 2/3] Delete 1

---
 1 | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 1

diff --git a/1 b/1
deleted file mode 100644
index 7e7a0f979c..0000000000
--- a/1
+++ /dev/null
@@ -1,33 +0,0 @@
-pick a4a7321ff0 # feat: focus global search bar via keyboard shortcut
-f 0faac156c1 # feat: focus global search bar via keyboard shortcut
-
-# Rebase ace9e3bbac..0faac156c1 onto ace9e3bbac (2 commands)
-#
-# Commands:
-# p, pick <commit> = use commit
-# r, reword <commit> = use commit, but edit the commit message
-# e, edit <commit> = use commit, but stop for amending
-# s, squash <commit> = use commit, but meld into previous commit
-# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
-#                    commit's log message, unless -C is used, in which case
-#                    keep only this commit's message; -c is same as -C but
-#                    opens the editor
-# x, exec <command> = run command (the rest of the line) using shell
-# b, break = stop here (continue rebase later with 'git rebase --continue')
-# d, drop <commit> = remove commit
-# l, label <label> = label current HEAD with a name
-# t, reset <label> = reset HEAD to a label
-# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
-#         create a merge commit using the original merge commit's
-#         message (or the oneline, if no original merge commit was
-#         specified); use -c <commit> to reword the commit message
-# u, update-ref <ref> = track a placeholder for the <ref> to be updated
-#                       to this position in the new commits. The <ref> is
-#                       updated at the end of the rebase
-#
-# These lines can be re-ordered; they are executed from top to bottom.
-#
-# If you remove a line here THAT COMMIT WILL BE LOST.
-#
-# However, if you remove everything, the rebase will be aborted.
-#

From 492fabaebccd0121966a493f0e1c051577e0bef9 Mon Sep 17 00:00:00 2001
From: Alexander Ackermann <abackermann91@gmail.com>
Date: Thu, 2 Apr 2026 00:44:58 +0200
Subject: [PATCH 3/3] simplify

---
 .../src/helpers/isEditableElement.ts            | 15 ---------------
 .../web-app-search/src/portals/SearchBar.vue    | 17 ++++-------------
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 packages/web-app-search/src/helpers/isEditableElement.ts

diff --git a/packages/web-app-search/src/helpers/isEditableElement.ts b/packages/web-app-search/src/helpers/isEditableElement.ts
deleted file mode 100644
index aa0bef208f..0000000000
--- a/packages/web-app-search/src/helpers/isEditableElement.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export function isEditableElement(element: Element): boolean {
-  if (
-    element instanceof HTMLInputElement ||
-    element instanceof HTMLTextAreaElement ||
-    element instanceof HTMLSelectElement
-  ) {
-    return true
-  }
-
-  if (element instanceof HTMLElement) {
-    return element.isContentEditable
-  }
-
-  return false
-}
diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
index a483de04ff..e062f4d708 100644
--- a/packages/web-app-search/src/portals/SearchBar.vue
+++ b/packages/web-app-search/src/portals/SearchBar.vue
@@ -156,7 +156,6 @@ import {
 import { SearchLocationFilterConstants } from '@opencloud-eu/web-pkg'
 import { SearchBarFilter } from '@opencloud-eu/web-pkg'
 import { useAvailableProviders } from '../composables'
-import { isEditableElement } from '../helpers/isEditableElement'
 import { RouteLocationNormalizedLoaded } from 'vue-router'
 import { OcDrop } from '@opencloud-eu/design-system/components'
 
@@ -369,24 +368,16 @@ export default defineComponent({
       term.value = ''
     })
 
-    const { bindKeyAction } = useKeyboardActions({ skipDisabledKeyBindingsCheck: true })
+    const { bindKeyAction } = useKeyboardActions()
 
     const onSearchShortcut = (event: KeyboardEvent) => {
-      const activeElement = document.activeElement
-      if (activeElement && isEditableElement(activeElement)) {
-        return
-      }
-
       const inputElement = unref(searchBarRef)?.querySelector('input') as HTMLElement
       inputElement?.focus()
-
-      event.preventDefault()
     }
 
-    bindKeyAction({ primary: Key.S }, onSearchShortcut, { preventDefault: false })
-    bindKeyAction({ primary: Key.Slash, modifier: Modifier.Shift }, onSearchShortcut, {
-      preventDefault: false
-    })
+    bindKeyAction({ primary: Key.S }, onSearchShortcut)
+    bindKeyAction({ primary: Key.Slash }, onSearchShortcut)
+    bindKeyAction({ primary: Key.Slash, modifier: Modifier.Shift }, onSearchShortcut)
 
     onBeforeUnmount(() => {
       eventBus.unsubscribe('app.search.term.clear', clearTermEvent)