Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(inputs): expose setFocus function for all input components #793

Merged
merged 2 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
}

// use form input functionalities
const { checkHtml5Validity, onInvalid, onFocus, onBlur, isFocused } =
const { checkHtml5Validity, onInvalid, onFocus, onBlur, isFocused, setFocus } =
useInputHandler(inputRef, emits, props);

const vmodel = useVModelBinding<string | number>(props, emits, {
Expand Down Expand Up @@ -720,7 +720,7 @@
if (props.clearable) {
vmodel.value = "";
setSelected(null, false);
if (props.openOnFocus) inputRef.value.$el.focus();
if (props.openOnFocus) setFocus();

Check warning on line 723 in packages/oruga-next/src/components/autocomplete/Autocomplete.vue

View check run for this annotation

Codecov / codecov/patch

packages/oruga-next/src/components/autocomplete/Autocomplete.vue#L723

Added line #L723 was not covered by tests
} else emits("icon-right-click", event);
}

Expand Down Expand Up @@ -797,6 +797,11 @@

return [...itemClasses.value, ...optionClasses.value];
}

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/checkbox/Checkbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,11 @@ const inputClasses = defineClasses(
);

const labelClasses = defineClasses(["labelClass", "o-chk__label"]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
9 changes: 8 additions & 1 deletion packages/oruga-next/src/components/datepicker/Datepicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ const { defaultDateFormatter, defaultDateParser } = useDatepickerMixins(props);

const { isMobile } = useMatchMedia(props.mobileBreakpoint);

const pickerRef = ref<InstanceType<typeof OPickerWrapper>>();

/** modelvalue of selected date */
const vmodel = defineModel<Date | Date[]>();

Expand Down Expand Up @@ -924,11 +926,16 @@ const dropdownClass = defineClasses([

const boxClasses = defineClasses(["boxClass", "o-dpck__box"]);
const boxClassBind = computed(() => getActiveClasses(boxClasses.value));

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: pickerRef.value.focus });
</script>

<template>
<OPickerWrapper
ref="wrapperRef"
ref="pickerRef"
v-model:active="isActive"
data-oruga="datepicker"
:value="vmodel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ const elementRef = computed(() =>
);

// use form input functionality for native input
const { onBlur, onFocus, onInvalid } = useInputHandler(
const { setFocus, onBlur, onFocus, onInvalid } = useInputHandler(
elementRef,
emits,
props,
Expand Down Expand Up @@ -555,6 +555,11 @@ const timepickerWrapperClasses = defineClasses([
"timepickerWrapperClass",
"o-dtpck__time",
]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga-next/src/components/dropdown/Dropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ const menuClasses = defineClasses(
],
);

// --- Expose Public Functionality ---
// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ $trigger: triggerRef, $content: contentRef });
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/input/Input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,11 @@ const iconRightClasses = defineClasses([
]);

const counterClasses = defineClasses(["counterClass", "o-input__counter"]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga-next/src/components/loading/Loading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const iconClasses = defineClasses(["iconClass", "o-load__icon"]);

const labelClasses = defineClasses(["labelClass", "o-load__label"]);

// --- Expose Public Functionality ---
// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ close, promise: props.promise });
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga-next/src/components/modal/Modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ const scrollClass = computed(() =>
// computed ref must be computed at least once for programmatic usage
scrollClass.value;

// --- Expose Public Functionality ---
// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ close, promise: props.promise });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ const noticeCustomContainerClasses = defineClasses([
"o-notices__custom-container",
]);

// --- Expose Public Functionality ---
// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ close: handleClose, promise: props.promise });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ const linkCurrentClasses = defineClasses([

const listItemClasses = defineClasses(["listItemClass", "o-pag__item"]);

// --- Expose Public Functionality ---
// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ last, first, prev, next });
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/radio/Radio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ const inputClasses = defineClasses(
);

const labelClasses = defineClasses(["labelClass", "o-radio__label"]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/select/Select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,11 @@ const selectClasses = defineClasses(
const iconLeftClasses = defineClasses(["iconLeftClass", "o-sel__icon-left"]);

const iconRightClasses = defineClasses(["iconRightClass", "o-sel__icon-right"]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga-next/src/components/sidebar/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ const scrollClass = computed(() =>
// computed ref must be computed at least once for programmatic usage
scrollClass.value;

// --- Expose Public Functionality ---
// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ close, promise: props.promise });
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/switch/Switch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ const switchCheckClasses = defineClasses(
);

const labelClasses = defineClasses(["labelClass", "o-switch__label"]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/taginput/Taginput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,11 @@ const itemClasses = defineClasses(
const closeClasses = defineClasses(["closeClass", "o-taginput__item__close"]);

const counterClasses = defineClasses(["counterClass", "o-taginput__counter"]);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
9 changes: 8 additions & 1 deletion packages/oruga-next/src/components/timepicker/Timepicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ const {
secondLiteral,
} = useTimepickerMixins(props);

const pickerRef = ref<InstanceType<typeof OPickerWrapper>>();

const vmodel = useVModelBinding<Date>(props, emits);

/** Dropdown active state */
Expand Down Expand Up @@ -734,11 +736,16 @@ const dropdownClass = defineClasses([

const boxClasses = defineClasses(["boxClass", "o-tpck__box"]);
const boxClassBind = computed(() => getActiveClasses(boxClasses.value));

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: pickerRef.value.focus });
</script>

<template>
<OPickerWrapper
ref="wrapperRef"
ref="pickerRef"
v-model:active="isActive"
data-oruga="timepicker"
:value="vmodel"
Expand Down
12 changes: 7 additions & 5 deletions packages/oruga-next/src/components/upload/Upload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,8 @@ const vmodel = useVModelBinding<Object | Object[] | File | File[]>(
);

// use form input functionality
const { checkHtml5Validity, onFocus, onBlur, isValid } = useInputHandler(
inputRef,
emits,
props,
);
const { checkHtml5Validity, onFocus, onBlur, isValid, setFocus } =
useInputHandler(inputRef, emits, props);

const dragDropFocus = ref(false);

Expand Down Expand Up @@ -266,6 +263,11 @@ const draggableClasses = defineClasses(
computed(() => props.variant && dragDropFocus.value),
],
);

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
5 changes: 5 additions & 0 deletions packages/oruga-next/src/components/utils/PickerWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ const dropdownBind = computed(() => ({
"root-class": getActiveClasses(props.dropdownClasses),
...picker.value.dropdownClasses,
}));

// --- Expose Public Functionalities ---

/** expose functionalities for programmatic usage */
defineExpose({ focus: setFocus });
</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga-next/src/composables/useInputHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function useInputHandler(
const { parentField } = injectField();

const element = computed<ValidatableFormElement>(() => {
const el = unrefElement(inputRef as Component);
const el = unrefElement<Component | HTMLElement>(inputRef);
if (!el) {
console.warn("useInputHandler: inputRef contains no element");
return undefined;
Expand Down
Loading