Skip to content

fix: add triggerClass binding to PopoverTrigger and update icon-picker styles #6095

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 1, 2025
Merged

fix: add triggerClass binding to PopoverTrigger and update icon-picker styles #6095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0599f4b
fix: add triggerClass binding to PopoverTrigger and update icon-picke…
mynetfan May 1, 2025
5ca9c03
fix: lint fixed
mynetfan May 1, 2025
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
4 changes: 3 additions & 1 deletion packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ interface Props extends PopoverRootProps {
class?: ClassType;
contentClass?: ClassType;
contentProps?: PopoverContentProps;
triggerClass?: ClassType;
}

const props = withDefaults(defineProps<Props>(), {});
Expand All @@ -32,6 +33,7 @@ const delegatedProps = computed(() => {
class: _cls,
contentClass: _,
contentProps: _cProps,
triggerClass: _tClass,
...delegated
} = props;

Expand All @@ -43,7 +45,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);

<template>
<PopoverRoot v-bind="forwarded">
<PopoverTrigger>
<PopoverTrigger :class="triggerClass">
<slot name="trigger"></slot>

<PopoverContent
Expand Down
8 changes: 7 additions & 1 deletion packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,18 @@ const searchInputProps = computed(() => {
};
});

function updateCurrentSelect(v: string) {
currentSelect.value = v;
}

defineExpose({ toggleOpenState, open, close });
</script>
<template>
<VbenPopover
v-model:open="visible"
:content-props="{ align: 'end', alignOffset: -11, sideOffset: 8 }"
content-class="p-0 pt-3"
content-class="p-0 pt-3 w-full"
trigger-class="w-full"
>
<template #trigger>
<template v-if="props.type === 'input'">
Expand All @@ -183,6 +188,7 @@ defineExpose({ toggleOpenState, open, close });
role="combobox"
:aria-label="$t('ui.iconPicker.placeholder')"
aria-expanded="visible"
:[`onUpdate:${modelValueProp}`]="updateCurrentSelect"
v-bind="$attrs"
>
<template #[iconSlot]>
Expand Down
Loading