Skip to content
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
4 changes: 2 additions & 2 deletions docs/.vitepress/components/preview-group.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
TabsList,
TabsRoot,
TabsTrigger,
} from 'radix-vue';
} from 'reka-ui';

defineOptions({
inheritAttrs: false,
Expand Down Expand Up @@ -56,7 +56,7 @@ const toggleOpen = () => {
<TabsList class="relative flex">
<template v-if="open">
<TabsIndicator
class="absolute bottom-0 left-0 h-[2px] w-[--radix-tabs-indicator-size] translate-x-[--radix-tabs-indicator-position] rounded-full transition-[width,transform] duration-300"
class="absolute bottom-0 left-0 h-[2px] w-[--reka-tabs-indicator-size] translate-x-[--reka-tabs-indicator-position] rounded-full transition-[width,transform] duration-300"
>
<div class="size-full bg-[var(--vp-c-indigo-1)]"></div>
</TabsIndicator>
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"ant-design-vue": "catalog:",
"lucide-vue-next": "catalog:",
"medium-zoom": "catalog:",
"radix-vue": "catalog:",
"reka-ui": "catalog:",
"vitepress-plugin-group-icons": "catalog:"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/demos/vben-vxe-table/custom-cell/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const [Grid] = useVbenVxeGrid({ gridOptions });
<Image :src="row.imageUrl" height="30" width="30" />
</template>
<template #open="{ row }">
<Switch v-model:checked="row.open" />
<Switch v-model="row.open" />
</template>
<template #status="{ row }">
<Tag :color="row.color">{{ row.status }}</Tag>
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/composables/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"dependencies": {
"@vben-core/shared": "workspace:*",
"@vueuse/core": "catalog:",
"radix-vue": "catalog:",
"reka-ui": "catalog:",
"sortablejs": "catalog:",
"vue": "catalog:"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/composables/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export {
useForwardExpose,
useForwardProps,
useForwardPropsEmits,
} from 'radix-vue';
} from 'reka-ui';
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ onBeforeUnmount(() => {
is(rootMenu.theme, true),
opened ? '' : 'hidden',
'overflow-auto',
'max-h-[calc(var(--radix-hover-card-content-available-height)-20px)]',
'max-h-[calc(var(--reka-hover-card-content-available-height)-20px)]',
]"
:content-props="contentProps"
:open="true"
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/shadcn-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@vueuse/core": "catalog:",
"class-variance-authority": "catalog:",
"lucide-vue-next": "catalog:",
"radix-vue": "catalog:",
"reka-ui": "catalog:",
"vee-validate": "catalog:",
"vue": "catalog:"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {
AvatarFallbackProps,
AvatarImageProps,
AvatarRootProps,
} from 'radix-vue';
} from 'reka-ui';
import type { CSSProperties } from 'vue';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { BreadcrumbProps } from './types';
import { useForwardPropsEmits } from 'radix-vue';
import { useForwardPropsEmits } from 'reka-ui';
import BreadcrumbBackground from './breadcrumb-background.vue';
import Breadcrumb from './breadcrumb.vue';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AsTag } from 'radix-vue';
import type { AsTag } from 'reka-ui';

import type { Component } from 'vue';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { computed } from 'vue';
import { LoaderCircle } from '@vben-core/icons';
import { cn } from '@vben-core/shared/utils';
import { Primitive } from 'radix-vue';
import { Primitive } from 'reka-ui';
import { buttonVariants } from '../../ui';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<script setup lang="ts">
import type { CheckboxRootEmits, CheckboxRootProps } from 'radix-vue';
import type { CheckboxRootEmits, CheckboxRootProps } from 'reka-ui';

import { useId } from 'vue';

import { useForwardPropsEmits } from 'radix-vue';
import { useForwardPropsEmits } from 'reka-ui';

import { Checkbox } from '../../ui/checkbox';

const props = defineProps<CheckboxRootProps & { indeterminate?: boolean }>();

const emits = defineEmits<CheckboxRootEmits>();

const checked = defineModel<boolean>('checked');
const checked = defineModel<boolean>();

const forwarded = useForwardPropsEmits(props, emits);

Expand All @@ -20,7 +20,7 @@ const id = useId();

<template>
<div class="flex items-center">
<Checkbox v-bind="forwarded" :id="id" v-model:checked="checked" />
<Checkbox v-bind="forwarded" :id="id" v-model="checked" />
<label :for="id" class="ml-2 cursor-pointer text-sm"> <slot></slot> </label>
</div>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import type {
ContextMenuContentProps,
ContextMenuRootEmits,
ContextMenuRootProps,
} from 'radix-vue';
} from 'reka-ui';

import type { ClassType } from '@vben-core/typings';

import type { IContextMenuItem } from './interface';

import { computed } from 'vue';

import { useForwardPropsEmits } from 'radix-vue';
import { useForwardPropsEmits } from 'reka-ui';

import {
ContextMenu,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import type {
HoverCardContentProps,
HoverCardRootEmits,
HoverCardRootProps,
} from 'radix-vue';
} from 'reka-ui';

import type { ClassType } from '@vben-core/typings';

import { computed } from 'vue';

import { useForwardPropsEmits } from 'radix-vue';
import { useForwardPropsEmits } from 'reka-ui';

import { HoverCard, HoverCardContent, HoverCardTrigger } from '../../ui';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default as VbenHoverCard } from './hover-card.vue';
export type { HoverCardContentProps } from 'radix-vue';
export type { HoverCardContentProps } from 'reka-ui';
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ onBeforeUnmount(() => {
});
const id = useId();
const pinType = 'text' as const;
</script>

<template>
Expand All @@ -94,7 +96,7 @@ const id = useId();
class="flex w-full justify-between"
otp
placeholder=""
type="number"
:type="pinType"
@complete="handleComplete"
>
<div class="relative flex w-full">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import type {
PopoverContentProps,
PopoverRootEmits,
PopoverRootProps,
} from 'radix-vue';
} from 'reka-ui';

import type { ClassType } from '@vben-core/typings';

import { computed } from 'vue';

import { useForwardPropsEmits } from 'radix-vue';
import { useForwardPropsEmits } from 'reka-ui';

import {
PopoverContent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { SegmentedItem } from './types';

import { computed } from 'vue';

import { TabsTrigger } from 'radix-vue';
import { TabsTrigger } from 'reka-ui';

import { Tabs, TabsContent, TabsList } from '../../ui';
import TabsIndicator from './tabs-indicator.vue';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup lang="ts">
import type { TabsIndicatorProps } from 'radix-vue';
import type { TabsIndicatorProps } from 'reka-ui';

import { computed } from 'vue';

import { cn } from '@vben-core/shared/utils';

import { TabsIndicator, useForwardProps } from 'radix-vue';
import { TabsIndicator, useForwardProps } from 'reka-ui';

const props = defineProps<TabsIndicatorProps & { class?: any }>();

Expand All @@ -23,7 +23,7 @@ const forwardedProps = useForwardProps(delegatedProps);
v-bind="forwardedProps"
:class="
cn(
'absolute bottom-0 left-0 z-10 h-full w-1/2 translate-x-[--radix-tabs-indicator-position] rounded-full px-0 py-1 pr-0.5 transition-[width,transform] duration-300',
'absolute bottom-0 left-0 z-10 h-full w-1/2 translate-x-[--reka-tabs-indicator-position] rounded-full px-0 py-1 pr-0.5 transition-[width,transform] duration-300',
props.class,
)
"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import type { TooltipContentProps } from 'radix-vue';
import type { TooltipContentProps } from 'reka-ui';
import type { StyleValue } from 'vue';
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/shadcn-ui/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from './components';
export * from './ui';
export { createContext, Slot, VisuallyHidden } from 'radix-vue';
export { createContext, Slot, VisuallyHidden } from 'reka-ui';
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { AccordionRootEmits, AccordionRootProps } from 'radix-vue';
import type { AccordionRootEmits, AccordionRootProps } from 'reka-ui';

import { AccordionRoot, useForwardPropsEmits } from 'radix-vue';
import { AccordionRoot, useForwardPropsEmits } from 'reka-ui';

const props = defineProps<AccordionRootProps>();
const emits = defineEmits<AccordionRootEmits>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup lang="ts">
import type { AccordionContentProps } from 'radix-vue';
import type { AccordionContentProps } from 'reka-ui';

import { computed } from 'vue';

import { cn } from '@vben-core/shared/utils';

import { AccordionContent } from 'radix-vue';
import { AccordionContent } from 'reka-ui';

const props = defineProps<AccordionContentProps & { class?: any }>();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup lang="ts">
import type { AccordionItemProps } from 'radix-vue';
import type { AccordionItemProps } from 'reka-ui';

import { computed } from 'vue';

import { cn } from '@vben-core/shared/utils';

import { AccordionItem, useForwardProps } from 'radix-vue';
import { AccordionItem, useForwardProps } from 'reka-ui';

const props = defineProps<AccordionItemProps & { class?: any }>();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<script setup lang="ts">
import type { AccordionTriggerProps } from 'radix-vue';
import type { AccordionTriggerProps } from 'reka-ui';

import { computed } from 'vue';

import { cn } from '@vben-core/shared/utils';

import { ChevronDown } from 'lucide-vue-next';
import { AccordionHeader, AccordionTrigger } from 'radix-vue';
import { AccordionHeader, AccordionTrigger } from 'reka-ui';

const props = defineProps<AccordionTriggerProps & { class?: any }>();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { AlertDialogEmits, AlertDialogProps } from 'radix-vue';
import type { AlertDialogEmits, AlertDialogProps } from 'reka-ui';

import { AlertDialogRoot, useForwardPropsEmits } from 'radix-vue';
import { AlertDialogRoot, useForwardPropsEmits } from 'reka-ui';

const props = defineProps<AlertDialogProps>();
const emits = defineEmits<AlertDialogEmits>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { AlertDialogActionProps } from 'radix-vue';
import type { AlertDialogActionProps } from 'reka-ui';

import { AlertDialogAction } from 'radix-vue';
import { AlertDialogAction } from 'reka-ui';

const props = defineProps<AlertDialogActionProps>();
</script>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { AlertDialogCancelProps } from 'radix-vue';
import type { AlertDialogCancelProps } from 'reka-ui';
import { AlertDialogCancel } from 'radix-vue';
import { AlertDialogCancel } from 'reka-ui';
const props = defineProps<AlertDialogCancelProps>();
</script>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<script setup lang="ts">
import type {
AlertDialogContentEmits,
AlertDialogContentProps,
} from 'radix-vue';
import type { AlertDialogContentEmits, AlertDialogContentProps } from 'reka-ui';

import type { ClassType } from '@vben-core/typings';

Expand All @@ -14,7 +11,7 @@ import {
AlertDialogContent,
AlertDialogPortal,
useForwardPropsEmits,
} from 'radix-vue';
} from 'reka-ui';

import AlertDialogOverlay from './AlertDialogOverlay.vue';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script lang="ts" setup>
import type { AlertDialogDescriptionProps } from 'radix-vue';
import type { AlertDialogDescriptionProps } from 'reka-ui';

import { computed } from 'vue';

import { cn } from '@vben-core/shared/utils';

import { AlertDialogDescription, useForwardProps } from 'radix-vue';
import { AlertDialogDescription, useForwardProps } from 'reka-ui';

const props = defineProps<AlertDialogDescriptionProps & { class?: any }>();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup lang="ts">
import type { AlertDialogTitleProps } from 'radix-vue';
import type { AlertDialogTitleProps } from 'reka-ui';

import { computed } from 'vue';

import { cn } from '@vben-core/shared/utils';

import { AlertDialogTitle, useForwardProps } from 'radix-vue';
import { AlertDialogTitle, useForwardProps } from 'reka-ui';

const props = defineProps<AlertDialogTitleProps & { class?: any }>();

Expand Down
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/shadcn-ui/src/ui/avatar/Avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { AvatarVariants } from './avatar';
import { cn } from '@vben-core/shared/utils';
import { AvatarRoot } from 'radix-vue';
import { AvatarRoot } from 'reka-ui';
import { avatarVariant } from './avatar';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { AvatarFallbackProps } from 'radix-vue';
import type { AvatarFallbackProps } from 'reka-ui';

import { AvatarFallback } from 'radix-vue';
import { AvatarFallback } from 'reka-ui';

const props = defineProps<AvatarFallbackProps>();
</script>
Expand Down
Loading