Merge branch 'dev' into next

IntelliTect · Jul 25, 2024 · 5308614 · 5308614
2 parents 9a9f5b4 + 5a5448f
commit 5308614
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/coalesce-vue-vuetify3/src/components/input/c-select.spec.tsx b/src/coalesce-vue-vuetify3/src/components/input/c-select.spec.tsx
@@ -227,6 +227,14 @@ describe("CSelect", () => {
     });
   });
 
+  test("autofocus applies to correct element", () => {
+    const wrapper = mountApp(() => <CSelect for="Course" autofocus></CSelect>);
+
+    const elements = wrapper.findAll("[autofocus]");
+    expect(elements).toHaveLength(1);
+    expect(elements[0].element).toBeInstanceOf(HTMLInputElement);
+  });
+
   describe("hint", () => {
     test("shows persistent hint", () => {
       const wrapper = mountApp(() => (

diff --git a/src/coalesce-vue-vuetify3/src/components/input/c-select.vue b/src/coalesce-vue-vuetify3/src/components/input/c-select.vue
@@ -45,6 +45,7 @@
           v-model="mainValue"
           @focus="focused = true"
           @blur="focused = false"
+          :autofocus="autofocus"
           :disabled="isDisabled.value"
           :readonly="isReadonly.value"
           :placeholder="internalModelValue ? undefined : placeholder"
@@ -259,6 +260,7 @@ const props = withDefaults(
       ForeignKeyProperty | ModelReferenceNavigationProperty | ModelValue
     >;
 
+    autofocus?: boolean;
     clearable?: boolean;
     placeholder?: string;
     preselectFirst?: boolean;