diff --git a/web/package.json b/web/package.json index 0fbbeb5..215e5b6 100644 --- a/web/package.json +++ b/web/package.json @@ -62,7 +62,6 @@ "@vue-flow/minimap": "^1.5.4", "dompurify": "^3.3.1", "marked": "^17.0.1", - "sortablejs": "catalog:", "tippy.js": "catalog:", "turndown": "^7.2.2" }, diff --git a/web/packages/@core/composables/package.json b/web/packages/@core/composables/package.json index a904700..50fe92f 100644 --- a/web/packages/@core/composables/package.json +++ b/web/packages/@core/composables/package.json @@ -37,10 +37,6 @@ "dependencies": { "@vben-core/shared": "workspace:*", "@vueuse/core": "catalog:", - "sortablejs": "catalog:", "vue": "catalog:" - }, - "devDependencies": { - "@types/sortablejs": "catalog:" } } diff --git a/web/packages/@core/composables/src/__tests__/use-sortable.test.ts b/web/packages/@core/composables/src/__tests__/use-sortable.test.ts deleted file mode 100644 index b244067..0000000 --- a/web/packages/@core/composables/src/__tests__/use-sortable.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import type { SortableOptions } from 'sortablejs'; - -import { beforeEach, describe, expect, it, vi } from 'vitest'; - -import { useSortable } from '../use-sortable'; - -describe('useSortable', () => { - beforeEach(() => { - vi.mock('sortablejs/modular/sortable.complete.esm.js', () => ({ - default: { - create: vi.fn(), - }, - })); - }); - it('should call Sortable.create with the correct options', async () => { - // Create a mock element - const mockElement = document.createElement('div') as HTMLDivElement; - - // Define custom options - const customOptions: SortableOptions = { - group: 'test-group', - sort: false, - }; - - // Use the useSortable function - const { initializeSortable } = useSortable(mockElement, customOptions); - - // Initialize sortable - await initializeSortable(); - - // Import sortablejs to access the mocked create function - const Sortable = - await import('sortablejs/modular/sortable.complete.esm.js'); - - // Verify that Sortable.create was called with the correct parameters - expect(Sortable.default.create).toHaveBeenCalledTimes(1); - expect(Sortable.default.create).toHaveBeenCalledWith( - mockElement, - expect.objectContaining({ - animation: 300, - delay: 400, - delayOnTouchOnly: true, - ...customOptions, - }), - ); - }); -}); diff --git a/web/packages/@core/composables/src/index.ts b/web/packages/@core/composables/src/index.ts index 182e105..aa17729 100644 --- a/web/packages/@core/composables/src/index.ts +++ b/web/packages/@core/composables/src/index.ts @@ -5,4 +5,3 @@ export * from './use-namespace'; export * from './use-priority-value'; export * from './use-scroll-lock'; export * from './use-simple-locale'; -export * from './use-sortable'; diff --git a/web/packages/@core/composables/src/use-sortable.ts b/web/packages/@core/composables/src/use-sortable.ts deleted file mode 100644 index 57f87a6..0000000 --- a/web/packages/@core/composables/src/use-sortable.ts +++ /dev/null @@ -1,29 +0,0 @@ -import type { SortableOptions } from 'sortablejs'; -import type Sortable from 'sortablejs'; - -function useSortable( - sortableContainer: T, - options: SortableOptions = {}, -) { - const initializeSortable = async () => { - const Sortable = await import( - // @ts-expect-error - This is a dynamic import - 'sortablejs/modular/sortable.complete.esm.js' - ); - const sortable = Sortable?.default?.create?.(sortableContainer, { - animation: 300, - delay: 400, - delayOnTouchOnly: true, - ...options, - }); - return sortable as Sortable; - }; - - return { - initializeSortable, - }; -} - -export { useSortable }; - -export type { Sortable }; diff --git a/web/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue b/web/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue index daf9f77..29d99a5 100644 --- a/web/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue +++ b/web/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue @@ -6,7 +6,6 @@ import { ChevronLeft, ChevronRight } from '@vben-core/icons'; import { VbenScrollbar } from '@vben-core/shadcn-ui'; import { Tabs, TabsChrome } from './components'; -import { useTabsDrag } from './use-tabs-drag'; import { useTabsViewScroll } from './use-tabs-view-scroll'; interface Props extends TabsProps {} @@ -43,8 +42,6 @@ function onWheel(e: WheelEvent) { e.preventDefault(); } } - -useTabsDrag(props, emit);