From 5ffc2ccb80f19f25bf98e4ed5699f0974017e4ee Mon Sep 17 00:00:00 2001 From: amcdnl Date: Wed, 8 May 2024 07:43:00 -0700 Subject: [PATCH] try out aliases --- .eslintrc.cjs | 9 +++++-- package-lock.json | 26 +++++++++++++++++++ package.json | 2 ++ src/data/DateFormat/DateFormat.tsx | 2 +- src/data/Ellipsis/Ellipsis.tsx | 2 +- src/data/Pager/Pager.tsx | 10 +++---- src/data/Redact/Redact.tsx | 2 +- src/data/Sort/Sort.tsx | 2 +- src/elements/Arrow/Arrow.tsx | 2 +- src/elements/Avatar/Avatar.tsx | 2 +- src/elements/AvatarGroup/AvatarGroup.tsx | 4 +-- src/elements/Badge/Badge.tsx | 2 +- src/elements/Button/Button.tsx | 2 +- src/elements/Chip/Chip.tsx | 2 +- src/elements/Chip/DeletableChip.tsx | 6 ++--- .../CommandPalette/CommandPalette.tsx | 8 +++--- .../CommandPaletteInput.tsx | 6 ++--- .../CommandPaletteItem/CommandPaletteItem.tsx | 10 +++---- .../CommandPaletteSection.tsx | 8 +++--- src/elements/IconButton/IconButton.tsx | 2 +- src/elements/Kbd/Kbd.tsx | 4 +-- src/elements/Loader/DotsLoader.tsx | 2 +- src/form/Calendar/Calendar.tsx | 8 +++--- .../Calendar/CalendarDays/CalendarDays.tsx | 8 +++--- .../CalendarMonths/CalendarMonths.tsx | 8 +++--- src/form/Calendar/CalendarRange.tsx | 8 +++--- .../Calendar/CalendarYears/CalendarYears.tsx | 6 ++--- src/form/Checkbox/Checkbox.tsx | 2 +- src/form/Checkbox/CheckboxTheme.ts | 2 +- .../Input/DebouncedInput/DebouncedInput.tsx | 2 +- src/form/Input/InlineInput/InlineInput.tsx | 4 +-- src/form/Input/Input.tsx | 2 +- src/form/Radio/Radio.tsx | 2 +- src/form/Range/RangeDouble.tsx | 2 +- src/form/Range/RangeSingle.tsx | 2 +- src/form/Range/RangeTooltip.tsx | 2 +- src/form/Select/Select.tsx | 4 +-- src/form/Select/SelectInput/SelectInput.tsx | 18 ++++++------- .../Select/SelectInput/SelectInputChip.tsx | 8 +++--- src/form/Select/SelectMenu/SelectMenu.tsx | 10 +++---- src/form/Select/utils/grouping.ts | 2 +- src/form/Select/utils/options.ts | 2 +- src/form/Select/utils/useWidth.ts | 2 +- src/form/Textarea/Textarea.tsx | 2 +- src/form/Textarea/TextareaTheme.ts | 2 +- src/form/Toggle/Toggle.tsx | 2 +- src/layers/ContextMenu/ContextMenu.tsx | 6 ++--- src/layers/Dialog/Dialog.tsx | 6 ++--- src/layers/Dialog/DialogHeader.tsx | 2 +- src/layers/Drawer/Drawer.tsx | 6 ++--- src/layers/Drawer/DrawerHeader.tsx | 2 +- src/layers/Menu/Menu.tsx | 8 +++--- src/layers/Menu/NestedMenu.tsx | 4 +-- src/layers/Notification/Notification.tsx | 2 +- src/layers/Notification/Notifications.tsx | 10 +++---- src/layers/Popover/Popover.tsx | 6 ++--- src/layers/Tooltip/Tooltip.tsx | 6 ++--- src/layout/Block/Block.tsx | 2 +- src/layout/Card/Card.tsx | 2 +- src/layout/Collapse/Collapse.tsx | 2 +- src/layout/Divider/Divider.tsx | 2 +- src/layout/List/List.tsx | 2 +- src/layout/List/ListHeader/ListHeader.tsx | 6 ++--- src/layout/List/ListItem/ListItem.tsx | 4 +-- src/layout/Stack/Stack.tsx | 2 +- src/layout/Tabs/Tab.tsx | 4 +-- src/layout/Tabs/TabList.tsx | 2 +- src/layout/Tabs/TabPanel.tsx | 2 +- src/layout/Tabs/Tabs.tsx | 4 +-- src/layout/Tree/JsonTree/JsonTree.tsx | 2 +- src/layout/Tree/JsonTree/JsonTreeNode.tsx | 8 +++--- src/layout/Tree/Tree.tsx | 4 +-- src/layout/Tree/TreeNode.tsx | 6 ++--- src/layout/VerticalSpacer/VerticalSpacer.tsx | 2 +- src/typography/PageTitle/PageTitle.tsx | 4 +-- .../PrimaryHeading/PrimaryHeading.tsx | 4 +-- .../SecondaryHeading/SecondaryHeading.tsx | 4 +-- src/typography/SmallHeading/SmallHeading.tsx | 4 +-- src/typography/Sub/Sub.tsx | 4 +-- src/typography/Text/Text.tsx | 4 +-- .../ConnectedOverlay/ConnectedOverlay.tsx | 6 ++--- .../ConnectedOverlayContent.tsx | 8 +++--- .../Overlay/GlobalOverlay/GlobalOverlay.tsx | 8 +++--- .../Overlay/OverlayPortal/OverlayPortal.tsx | 4 +-- src/utils/Portal/Portal.ts | 2 +- src/utils/Theme/blocks/ComponentBlocks.tsx | 2 +- src/utils/Theme/hooks/useComponentTheme.ts | 2 +- src/utils/Theme/hooks/useTheme.ts | 2 +- src/utils/Theme/themes/extendCoponentTheme.ts | 2 +- src/utils/Theme/themes/extendTheme.ts | 2 +- src/utils/Theme/themes/theme.ts | 12 ++++----- tsconfig.json | 5 +++- vite.config.ts | 9 +++++++ 93 files changed, 236 insertions(+), 191 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 68158fe7..64c321b6 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -21,7 +21,8 @@ module.exports = { }, plugins: [ 'react', - '@typescript-eslint' + '@typescript-eslint', + 'no-relative-import-paths' ], overrides: [{ files: ['*.test.*'], @@ -36,6 +37,10 @@ module.exports = { 'react/prop-types': [0], 'linebreak-style': ['error', 'unix'], 'quotes': ['error', 'single'], - 'semi': ['error', 'always'] + 'semi': ['error', 'always'], + 'no-relative-import-paths/no-relative-import-paths': [ + 'warn', + { 'allowSameFolder': true, 'prefix': '@', 'rootDir': 'src' } + ] } }; diff --git a/package-lock.json b/package-lock.json index 8934340f..3baa8d4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,6 +55,7 @@ "autoprefixer": "^10.4.19", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", + "eslint-plugin-no-relative-import-paths": "^1.5.4", "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.3.0", "eslint-plugin-storybook": "^0.8.0", @@ -76,6 +77,7 @@ "vite-plugin-checker": "^0.6.4", "vite-plugin-css-injected-by-js": "^3.5.0", "vite-plugin-dts": "^3.7.3", + "vite-plugin-static-copy": "^1.0.4", "vite-plugin-svgr": "^4.2.0", "vite-tsconfig-paths": "^4.3.2", "vitest": "^1.4.0" @@ -9838,6 +9840,12 @@ "eslint": ">=7.0.0" } }, + "node_modules/eslint-plugin-no-relative-import-paths": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-no-relative-import-paths/-/eslint-plugin-no-relative-import-paths-1.5.4.tgz", + "integrity": "sha512-2smViH7R3682NR6dwgYr8Vm7emqNP1gEjBku6DbvUy3Ef/2Fz+mhwsFjZGSixzWzazMCj4MAgIWTsHELCCDJKA==", + "dev": true + }, "node_modules/eslint-plugin-react": { "version": "7.34.1", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz", @@ -19683,6 +19691,24 @@ } } }, + "node_modules/vite-plugin-static-copy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-1.0.4.tgz", + "integrity": "sha512-UtyOttgoeotSCwmBugsEZCZJZcIpjE9NGO7jlZ9OeedYpBueBdspD8waRZrjE+yQLH6qGNU2CvYB2FILviCQjg==", + "dev": true, + "dependencies": { + "chokidar": "^3.5.3", + "fast-glob": "^3.2.11", + "fs-extra": "^11.1.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "vite": "^5.0.0" + } + }, "node_modules/vite-plugin-svgr": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.2.0.tgz", diff --git a/package.json b/package.json index e576356e..3027db6e 100644 --- a/package.json +++ b/package.json @@ -104,6 +104,7 @@ "autoprefixer": "^10.4.19", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", + "eslint-plugin-no-relative-import-paths": "^1.5.4", "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.3.0", "eslint-plugin-storybook": "^0.8.0", @@ -125,6 +126,7 @@ "vite-plugin-checker": "^0.6.4", "vite-plugin-css-injected-by-js": "^3.5.0", "vite-plugin-dts": "^3.7.3", + "vite-plugin-static-copy": "^1.0.4", "vite-plugin-svgr": "^4.2.0", "vite-tsconfig-paths": "^4.3.2", "vitest": "^1.4.0" diff --git a/src/data/DateFormat/DateFormat.tsx b/src/data/DateFormat/DateFormat.tsx index e6124d03..16a7e48c 100644 --- a/src/data/DateFormat/DateFormat.tsx +++ b/src/data/DateFormat/DateFormat.tsx @@ -10,7 +10,7 @@ import { formatRelative, getInterval } from './relative'; import { safeFormat } from './formatting'; import { twMerge } from 'tailwind-merge'; import { DateFormatTheme } from './DateFormatTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface DateFormatProps { /** diff --git a/src/data/Ellipsis/Ellipsis.tsx b/src/data/Ellipsis/Ellipsis.tsx index 9e95ca46..02c8d472 100644 --- a/src/data/Ellipsis/Ellipsis.tsx +++ b/src/data/Ellipsis/Ellipsis.tsx @@ -1,7 +1,7 @@ import React, { FC, useState, useMemo } from 'react'; import ellipsize from 'ellipsize'; import { EllipsisTheme } from './EllipsisTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface EllipsisProps { /** diff --git a/src/data/Pager/Pager.tsx b/src/data/Pager/Pager.tsx index f42c6d2a..57a31ab1 100644 --- a/src/data/Pager/Pager.tsx +++ b/src/data/Pager/Pager.tsx @@ -1,14 +1,14 @@ import React, { FC, Fragment, ReactNode, useCallback } from 'react'; -import { Button } from '../../elements'; -import { Stack } from '../../layout'; -import { Text } from '../../typography'; -import { Pluralize } from '../Pluralize'; +import { Button } from '@/elements'; +import { Stack } from '@/layout'; +import { Text } from '@/typography'; +import { Pluralize } from '@/data/Pluralize'; import EndArrow from './assets/arrow-end.svg?react'; import NextArrow from './assets/arrow-next.svg?react'; import PreviousArrow from './assets/arrow-previous.svg?react'; import StartArrow from './assets/arrow-start.svg?react'; import { FUZZY_RANGE, getItemsRange, getPageRange } from './utils'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; import { PagerTheme } from './PagerTheme'; diff --git a/src/data/Redact/Redact.tsx b/src/data/Redact/Redact.tsx index b05b330c..fc15181c 100644 --- a/src/data/Redact/Redact.tsx +++ b/src/data/Redact/Redact.tsx @@ -2,7 +2,7 @@ import React, { FC, useMemo, useState } from 'react'; import coverup from 'coverup'; import { twMerge } from 'tailwind-merge'; import { RedactTheme } from './RedactTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface RedactProps { /** diff --git a/src/data/Sort/Sort.tsx b/src/data/Sort/Sort.tsx index 40fec98c..5eb37774 100644 --- a/src/data/Sort/Sort.tsx +++ b/src/data/Sort/Sort.tsx @@ -4,7 +4,7 @@ import { DownArrowIcon } from './DownArrowIcon'; import { getNextDirection, SortDirection } from './utils'; import { twMerge } from 'tailwind-merge'; import { SortTheme } from './SortTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface SortProps extends PropsWithChildren { /** diff --git a/src/elements/Arrow/Arrow.tsx b/src/elements/Arrow/Arrow.tsx index d62aa598..f1e022f6 100644 --- a/src/elements/Arrow/Arrow.tsx +++ b/src/elements/Arrow/Arrow.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { ArrowTheme } from './ArrowTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; export interface ArrowProps { diff --git a/src/elements/Avatar/Avatar.tsx b/src/elements/Avatar/Avatar.tsx index 7d209370..2b216895 100644 --- a/src/elements/Avatar/Avatar.tsx +++ b/src/elements/Avatar/Avatar.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import getInitials from 'name-initials'; import { generateColor } from '@marko19907/string-to-color'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { AvatarTheme } from './AvatarTheme'; export interface AvatarProps extends React.HTMLAttributes { diff --git a/src/elements/AvatarGroup/AvatarGroup.tsx b/src/elements/AvatarGroup/AvatarGroup.tsx index cff6aa4b..701dd727 100644 --- a/src/elements/AvatarGroup/AvatarGroup.tsx +++ b/src/elements/AvatarGroup/AvatarGroup.tsx @@ -1,7 +1,7 @@ import React, { Children, forwardRef, Ref } from 'react'; -import { useInfinityList } from '../../data'; +import { useInfinityList } from '@/data'; import { AvatarGroupTheme } from './AvatarGroupTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; export interface AvatarGroupProps extends React.HTMLAttributes { diff --git a/src/elements/Badge/Badge.tsx b/src/elements/Badge/Badge.tsx index f879f619..45a7192e 100644 --- a/src/elements/Badge/Badge.tsx +++ b/src/elements/Badge/Badge.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; import { motion } from 'framer-motion'; import { BadgeTheme } from './BadgeTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; export type BadgeColor = 'default' | 'primary' | 'secondary' | 'error'; diff --git a/src/elements/Button/Button.tsx b/src/elements/Button/Button.tsx index c0c13f61..a1499101 100644 --- a/src/elements/Button/Button.tsx +++ b/src/elements/Button/Button.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef, useContext } from 'react'; import { motion } from 'framer-motion'; import { ButtonGroupContext } from './ButtonGroupContext'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; import { ButtonTheme } from './ButtonTheme'; diff --git a/src/elements/Chip/Chip.tsx b/src/elements/Chip/Chip.tsx index 1ef0a9e7..cd69f52f 100644 --- a/src/elements/Chip/Chip.tsx +++ b/src/elements/Chip/Chip.tsx @@ -1,6 +1,6 @@ import React, { FC, forwardRef, LegacyRef, ReactElement } from 'react'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { ChipTheme } from './ChipTheme'; export interface ChipProps extends React.HTMLAttributes { diff --git a/src/elements/Chip/DeletableChip.tsx b/src/elements/Chip/DeletableChip.tsx index a50efb56..162e0307 100644 --- a/src/elements/Chip/DeletableChip.tsx +++ b/src/elements/Chip/DeletableChip.tsx @@ -1,10 +1,10 @@ import React, { FC, forwardRef, ReactElement } from 'react'; import { twMerge } from 'tailwind-merge'; -import { Button } from '../Button'; +import { Button } from '@/elements/Button'; import { Chip, ChipProps, ChipRef } from './Chip'; -import { CloseIcon } from '../../form'; +import { CloseIcon } from '@/form'; import { ChipTheme } from './ChipTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface DeletableChipProps extends Omit { /** diff --git a/src/elements/CommandPalette/CommandPalette.tsx b/src/elements/CommandPalette/CommandPalette.tsx index b4a7b728..055f6e0e 100644 --- a/src/elements/CommandPalette/CommandPalette.tsx +++ b/src/elements/CommandPalette/CommandPalette.tsx @@ -14,10 +14,10 @@ import { HotkeyIem, useFlattenedTree } from './useFlattenedTree'; -import { List, ListItem } from '../../layout/List'; -import { Card } from '../../layout/Card'; -import { MotionGroup } from '../../layout/Motion'; -import { useComponentTheme } from '../../utils'; +import { List, ListItem } from '@/layout/List'; +import { Card } from '@/layout/Card'; +import { MotionGroup } from '@/layout/Motion'; +import { useComponentTheme } from '@/utils'; import { CommandPaletteTheme } from './CommandPaletteTheme'; export interface CommandPaletteProps extends PropsWithChildren { diff --git a/src/elements/CommandPalette/CommandPaletteInput/CommandPaletteInput.tsx b/src/elements/CommandPalette/CommandPaletteInput/CommandPaletteInput.tsx index ea50d6fb..49a24736 100644 --- a/src/elements/CommandPalette/CommandPaletteInput/CommandPaletteInput.tsx +++ b/src/elements/CommandPalette/CommandPaletteInput/CommandPaletteInput.tsx @@ -8,9 +8,9 @@ import React, { useRef } from 'react'; import { SearchIcon } from './SearchIcon'; -import { HotkeyIem } from '../useFlattenedTree'; -import { CommandPaletteTheme } from '../CommandPaletteTheme'; -import { useComponentTheme } from '../../../utils'; +import { HotkeyIem } from '@/elements/CommandPalette/useFlattenedTree'; +import { CommandPaletteTheme } from '@/elements/CommandPalette/CommandPaletteTheme'; +import { useComponentTheme } from '@/utils'; import keys, { Handler } from '@reaviz/ctrl-keys'; export interface CommandPaletteInputProps { diff --git a/src/elements/CommandPalette/CommandPaletteItem/CommandPaletteItem.tsx b/src/elements/CommandPalette/CommandPaletteItem/CommandPaletteItem.tsx index cd5342c3..7be5e4e0 100644 --- a/src/elements/CommandPalette/CommandPaletteItem/CommandPaletteItem.tsx +++ b/src/elements/CommandPalette/CommandPaletteItem/CommandPaletteItem.tsx @@ -1,10 +1,10 @@ import React, { forwardRef } from 'react'; -import { ListItem, ListItemProps } from '../../../layout'; -import { MotionItem } from '../../../layout'; -import { Kbd } from '../../Kbd'; +import { ListItem, ListItemProps } from '@/layout'; +import { MotionItem } from '@/layout'; +import { Kbd } from '@/elements/Kbd'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../../utils'; -import { CommandPaletteTheme } from '../CommandPaletteTheme'; +import { useComponentTheme } from '@/utils'; +import { CommandPaletteTheme } from '@/elements/CommandPalette/CommandPaletteTheme'; export interface CommandPaletteItemProps extends Omit { hotkey?: string; diff --git a/src/elements/CommandPalette/CommandPaletteSection/CommandPaletteSection.tsx b/src/elements/CommandPalette/CommandPaletteSection/CommandPaletteSection.tsx index 8f667e75..c3972c0c 100644 --- a/src/elements/CommandPalette/CommandPaletteSection/CommandPaletteSection.tsx +++ b/src/elements/CommandPalette/CommandPaletteSection/CommandPaletteSection.tsx @@ -1,9 +1,9 @@ import React, { PropsWithChildren, forwardRef } from 'react'; -import { List, ListHeader } from '../../../layout'; -import { MotionGroup, MotionItem } from '../../../layout'; +import { List, ListHeader } from '@/layout'; +import { MotionGroup, MotionItem } from '@/layout'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../../utils'; -import { CommandPaletteTheme } from '../CommandPaletteTheme'; +import { useComponentTheme } from '@/utils'; +import { CommandPaletteTheme } from '@/elements/CommandPalette/CommandPaletteTheme'; export interface CommandPaletteSectionProps extends PropsWithChildren { /** diff --git a/src/elements/IconButton/IconButton.tsx b/src/elements/IconButton/IconButton.tsx index 0f441dec..23274e35 100644 --- a/src/elements/IconButton/IconButton.tsx +++ b/src/elements/IconButton/IconButton.tsx @@ -1,5 +1,5 @@ import React, { FC, forwardRef, Ref } from 'react'; -import { Button, ButtonProps, ButtonRef } from '../Button'; +import { Button, ButtonProps, ButtonRef } from '@/elements/Button'; export interface IconButtonProps extends Omit {} diff --git a/src/elements/Kbd/Kbd.tsx b/src/elements/Kbd/Kbd.tsx index 62f4851a..75b63256 100644 --- a/src/elements/Kbd/Kbd.tsx +++ b/src/elements/Kbd/Kbd.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { Chip, ChipProps } from '../Chip'; +import { Chip, ChipProps } from '@/elements/Chip'; import { getHotkeyText } from './utils'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { KbdTheme } from './KbdTheme'; import { twMerge } from 'tailwind-merge'; diff --git a/src/elements/Loader/DotsLoader.tsx b/src/elements/Loader/DotsLoader.tsx index 857c7621..db050e17 100644 --- a/src/elements/Loader/DotsLoader.tsx +++ b/src/elements/Loader/DotsLoader.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { motion } from 'framer-motion'; import { DotsLoaderTheme } from './DotsLoaderTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; export interface DotsLoaderProps { diff --git a/src/form/Calendar/Calendar.tsx b/src/form/Calendar/Calendar.tsx index 72b2b9d8..54313f54 100644 --- a/src/form/Calendar/Calendar.tsx +++ b/src/form/Calendar/Calendar.tsx @@ -1,6 +1,6 @@ import { AnimatePresence, motion } from 'framer-motion'; import React, { FC, useCallback, useMemo, useState } from 'react'; -import { Button } from '../../elements/Button'; +import { Button } from '@/elements/Button'; import { add, addYears, @@ -19,11 +19,11 @@ import { import { CalendarDays } from './CalendarDays'; import { CalendarMonths } from './CalendarMonths'; import { CalendarYears } from './CalendarYears'; -import { SmallHeading } from '../../typography'; +import { SmallHeading } from '@/typography'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { CalendarTheme } from './CalendarTheme'; -import { Divider } from '../../layout/Divider'; +import { Divider } from '@/layout/Divider'; export type CalendarViewType = 'days' | 'months' | 'years'; diff --git a/src/form/Calendar/CalendarDays/CalendarDays.tsx b/src/form/Calendar/CalendarDays/CalendarDays.tsx index d82e74dc..0208c8cc 100644 --- a/src/form/Calendar/CalendarDays/CalendarDays.tsx +++ b/src/form/Calendar/CalendarDays/CalendarDays.tsx @@ -1,16 +1,16 @@ import React, { FC, useCallback, useMemo, useState } from 'react'; import { isAfter, isBefore } from 'date-fns'; -import { Button } from '../../../elements'; +import { Button } from '@/elements'; import { daysOfWeek, getDayAttributes, getWeeks, isNextWeekEmpty, isPreviousWeekEmpty -} from '../utils'; +} from '@/form/Calendar/utils'; import { AnimatePresence, motion } from 'framer-motion'; -import { useComponentTheme } from '../../../utils'; -import { CalendarTheme } from '../CalendarTheme'; +import { useComponentTheme } from '@/utils'; +import { CalendarTheme } from '@/form/Calendar/CalendarTheme'; import { twMerge } from 'tailwind-merge'; export interface CalendarDaysProps { diff --git a/src/form/Calendar/CalendarMonths/CalendarMonths.tsx b/src/form/Calendar/CalendarMonths/CalendarMonths.tsx index 495aea96..7e6cdbb1 100644 --- a/src/form/Calendar/CalendarMonths/CalendarMonths.tsx +++ b/src/form/Calendar/CalendarMonths/CalendarMonths.tsx @@ -1,8 +1,8 @@ import React, { FC } from 'react'; -import { Button } from '../../../elements'; -import { monthNames } from '../utils'; -import { useComponentTheme } from '../../../utils'; -import { CalendarTheme } from '../CalendarTheme'; +import { Button } from '@/elements'; +import { monthNames } from '@/form/Calendar/utils'; +import { useComponentTheme } from '@/utils'; +import { CalendarTheme } from '@/form/Calendar/CalendarTheme'; import { twMerge } from 'tailwind-merge'; export interface CalendarMonthsProps { diff --git a/src/form/Calendar/CalendarRange.tsx b/src/form/Calendar/CalendarRange.tsx index 835ca61d..f7d0c392 100644 --- a/src/form/Calendar/CalendarRange.tsx +++ b/src/form/Calendar/CalendarRange.tsx @@ -8,13 +8,13 @@ import { format } from 'date-fns'; import { AnimatePresence, motion } from 'framer-motion'; -import { Button } from '../../elements'; +import { Button } from '@/elements'; import { CalendarProps } from './Calendar'; import { CalendarDays } from './CalendarDays'; -import { SmallHeading } from '../../typography'; -import { Divider, Stack } from '../../layout'; +import { SmallHeading } from '@/typography'; +import { Divider, Stack } from '@/layout'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { CalendarRangeTheme } from './CalendarRangeTheme'; export interface CalendarRangeProps diff --git a/src/form/Calendar/CalendarYears/CalendarYears.tsx b/src/form/Calendar/CalendarYears/CalendarYears.tsx index e901357e..509e564d 100644 --- a/src/form/Calendar/CalendarYears/CalendarYears.tsx +++ b/src/form/Calendar/CalendarYears/CalendarYears.tsx @@ -1,8 +1,8 @@ import React, { FC, useMemo } from 'react'; import { AnimatePresence, motion } from 'framer-motion'; -import { Button } from '../../../elements'; -import { useComponentTheme } from '../../../utils'; -import { CalendarTheme } from '../CalendarTheme'; +import { Button } from '@/elements'; +import { useComponentTheme } from '@/utils'; +import { CalendarTheme } from '@/form/Calendar/CalendarTheme'; import { twMerge } from 'tailwind-merge'; export interface CalendarYearsProps { diff --git a/src/form/Checkbox/Checkbox.tsx b/src/form/Checkbox/Checkbox.tsx index e0057dce..02f55ede 100644 --- a/src/form/Checkbox/Checkbox.tsx +++ b/src/form/Checkbox/Checkbox.tsx @@ -2,7 +2,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; import { motion, useMotionValue, useTransform } from 'framer-motion'; import { twMerge } from 'tailwind-merge'; import { CheckboxTheme } from './CheckboxTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface CheckboxProps { /** diff --git a/src/form/Checkbox/CheckboxTheme.ts b/src/form/Checkbox/CheckboxTheme.ts index fcd11d6a..c949b016 100644 --- a/src/form/Checkbox/CheckboxTheme.ts +++ b/src/form/Checkbox/CheckboxTheme.ts @@ -1,4 +1,4 @@ -import TWConfig from '../../utils/Theme/config'; +import TWConfig from '@/utils/Theme/config'; export interface CheckboxTheme { base: string; diff --git a/src/form/Input/DebouncedInput/DebouncedInput.tsx b/src/form/Input/DebouncedInput/DebouncedInput.tsx index bfced19b..0ed42ff7 100644 --- a/src/form/Input/DebouncedInput/DebouncedInput.tsx +++ b/src/form/Input/DebouncedInput/DebouncedInput.tsx @@ -1,5 +1,5 @@ import React, { forwardRef, Ref, useEffect, useRef, useState } from 'react'; -import { Input, InputProps, InputRef } from '../Input'; +import { Input, InputProps, InputRef } from '@/form/Input/Input'; export interface DebouncedInputProps extends InputProps { /** diff --git a/src/form/Input/InlineInput/InlineInput.tsx b/src/form/Input/InlineInput/InlineInput.tsx index efc22f1e..d5f05aa8 100644 --- a/src/form/Input/InlineInput/InlineInput.tsx +++ b/src/form/Input/InlineInput/InlineInput.tsx @@ -1,8 +1,8 @@ import { FC, forwardRef, Ref, InputHTMLAttributes } from 'react'; import AutosizeInput from 'react-18-input-autosize'; import { twMerge } from 'tailwind-merge'; -import { InputTheme } from '../InputTheme'; -import { useComponentTheme } from '../../../utils'; +import { InputTheme } from '@/form/Input/InputTheme'; +import { useComponentTheme } from '@/utils'; export interface InlineInputProps extends InputHTMLAttributes { diff --git a/src/form/Input/Input.tsx b/src/form/Input/Input.tsx index 744e2973..f27fce15 100644 --- a/src/form/Input/Input.tsx +++ b/src/form/Input/Input.tsx @@ -8,7 +8,7 @@ import React, { } from 'react'; import { twMerge } from 'tailwind-merge'; import { InputTheme } from './InputTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface InputProps extends Omit, 'size'> { diff --git a/src/form/Radio/Radio.tsx b/src/form/Radio/Radio.tsx index 3876f314..71e4efeb 100644 --- a/src/form/Radio/Radio.tsx +++ b/src/form/Radio/Radio.tsx @@ -9,7 +9,7 @@ import React, { import { motion } from 'framer-motion'; import { RadioGroupContext } from './RadioGroupContext'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { RadioTheme } from './RadioTheme'; export interface RadioProps { diff --git a/src/form/Range/RangeDouble.tsx b/src/form/Range/RangeDouble.tsx index 22f79be1..048295b7 100644 --- a/src/form/Range/RangeDouble.tsx +++ b/src/form/Range/RangeDouble.tsx @@ -10,7 +10,7 @@ import React, { import { motion, useMotionValue } from 'framer-motion'; import { RangeProps, RangeTooltip } from './RangeTooltip'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { RangeTheme } from './RangeTheme'; export const RangeDouble: FC> = ({ diff --git a/src/form/Range/RangeSingle.tsx b/src/form/Range/RangeSingle.tsx index 2fc0fdad..71253b0b 100644 --- a/src/form/Range/RangeSingle.tsx +++ b/src/form/Range/RangeSingle.tsx @@ -9,7 +9,7 @@ import React, { import { motion, useMotionValue } from 'framer-motion'; import { RangeProps, RangeTooltip } from './RangeTooltip'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { RangeTheme } from './RangeTheme'; export const RangeSingle: FC> = ({ diff --git a/src/form/Range/RangeTooltip.tsx b/src/form/Range/RangeTooltip.tsx index 2d75b2c9..7a6baca3 100644 --- a/src/form/Range/RangeTooltip.tsx +++ b/src/form/Range/RangeTooltip.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { AnimatePresence, motion } from 'framer-motion'; import { RangeTheme } from './RangeTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface RangeProps { /** diff --git a/src/form/Select/Select.tsx b/src/form/Select/Select.tsx index 405594a6..7e1c43e9 100644 --- a/src/form/Select/Select.tsx +++ b/src/form/Select/Select.tsx @@ -13,8 +13,8 @@ import { ConnectedOverlay, ConnectedOverlayContentRef, Placement -} from '../../utils'; -import { CloneElement, useId } from '../../utils'; +} from '@/utils'; +import { CloneElement, useId } from '@/utils'; import { SelectInput, SelectInputProps, SelectInputRef } from './SelectInput'; import { SelectMenu, SelectMenuProps } from './SelectMenu'; import { SelectOptionProps, SelectValue } from './SelectOption'; diff --git a/src/form/Select/SelectInput/SelectInput.tsx b/src/form/Select/SelectInput/SelectInput.tsx index c29f35dd..fea18997 100644 --- a/src/form/Select/SelectInput/SelectInput.tsx +++ b/src/form/Select/SelectInput/SelectInput.tsx @@ -8,17 +8,17 @@ import React, { useMemo, useRef } from 'react'; -import { SelectOptionProps, SelectValue } from '../SelectOption'; -import { InlineInput } from '../../Input'; -import { DownArrowIcon } from '../icons/DownArrowIcon'; -import { CloseIcon } from '../icons/CloseIcon'; -import { DotsLoader } from '../../../elements/Loader/DotsLoader'; -import { RefreshIcon } from '../icons/RefreshIcon'; +import { SelectOptionProps, SelectValue } from '@/form/Select/SelectOption'; +import { InlineInput } from '@/form/Input'; +import { DownArrowIcon } from '@/form/Select/icons/DownArrowIcon'; +import { CloseIcon } from '@/form/Select/icons/CloseIcon'; +import { DotsLoader } from '@/elements/Loader/DotsLoader'; +import { RefreshIcon } from '@/form/Select/icons/RefreshIcon'; import { SelectInputChip, SelectInputChipProps } from './SelectInputChip'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../../utils'; -import { SelectTheme } from '../SelectTheme'; -import { CloneElement } from '../../../utils'; +import { useComponentTheme } from '@/utils'; +import { SelectTheme } from '@/form/Select/SelectTheme'; +import { CloneElement } from '@/utils'; export interface SelectInputProps { /** diff --git a/src/form/Select/SelectInput/SelectInputChip.tsx b/src/form/Select/SelectInput/SelectInputChip.tsx index c618cc09..33217ae8 100644 --- a/src/form/Select/SelectInput/SelectInputChip.tsx +++ b/src/form/Select/SelectInput/SelectInputChip.tsx @@ -1,10 +1,10 @@ import React, { FC } from 'react'; -import { SelectOptionProps } from '../SelectOption'; +import { SelectOptionProps } from '@/form/Select/SelectOption'; import ellipsize from 'ellipsize'; -import { CloseIcon } from '../icons'; +import { CloseIcon } from '@/form/Select/icons'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../../utils'; -import { SelectTheme } from '../SelectTheme'; +import { useComponentTheme } from '@/utils'; +import { SelectTheme } from '@/form/Select/SelectTheme'; export interface SelectInputChipProps { option: SelectOptionProps; diff --git a/src/form/Select/SelectMenu/SelectMenu.tsx b/src/form/Select/SelectMenu/SelectMenu.tsx index 5e737522..6daeef17 100644 --- a/src/form/Select/SelectMenu/SelectMenu.tsx +++ b/src/form/Select/SelectMenu/SelectMenu.tsx @@ -1,11 +1,11 @@ import React, { FC, Fragment, useCallback } from 'react'; import { motion } from 'framer-motion'; -import { SelectOptionProps, SelectValue } from '../SelectOption'; +import { SelectOptionProps, SelectValue } from '@/form/Select/SelectOption'; import Highlighter from 'react-highlight-words'; -import { GroupOptions, GroupOption } from '../utils'; -import { List, ListItem } from '../../../layout'; -import { useComponentTheme } from '../../../utils'; -import { SelectTheme } from '../SelectTheme'; +import { GroupOptions, GroupOption } from '@/form/Select/utils'; +import { List, ListItem } from '@/layout'; +import { useComponentTheme } from '@/utils'; +import { SelectTheme } from '@/form/Select/SelectTheme'; import { twMerge } from 'tailwind-merge'; export interface SelectMenuProps { diff --git a/src/form/Select/utils/grouping.ts b/src/form/Select/utils/grouping.ts index b83e5b0a..d1a44df8 100644 --- a/src/form/Select/utils/grouping.ts +++ b/src/form/Select/utils/grouping.ts @@ -1,4 +1,4 @@ -import { SelectOptionProps } from '../SelectOption'; +import { SelectOptionProps } from '@/form/Select/SelectOption'; export interface GroupOptions { groups: GroupOption[]; diff --git a/src/form/Select/utils/options.ts b/src/form/Select/utils/options.ts index 7067b3c5..5c8ed10e 100644 --- a/src/form/Select/utils/options.ts +++ b/src/form/Select/utils/options.ts @@ -1,5 +1,5 @@ import { Children } from 'react'; -import { SelectOption } from '../SelectOption'; +import { SelectOption } from '@/form/Select/SelectOption'; export function createOptions(children) { const arr = Children.toArray(children); diff --git a/src/form/Select/utils/useWidth.ts b/src/form/Select/utils/useWidth.ts index d783706a..571f9bcb 100644 --- a/src/form/Select/utils/useWidth.ts +++ b/src/form/Select/utils/useWidth.ts @@ -1,5 +1,5 @@ import { RefObject, useCallback, useEffect, useState } from 'react'; -import { ConnectedOverlayContentRef } from '../../../utils/Overlay'; +import { ConnectedOverlayContentRef } from '@/utils/Overlay'; export const useWidth = ( ref: RefObject, diff --git a/src/form/Textarea/Textarea.tsx b/src/form/Textarea/Textarea.tsx index 43b4ccb8..ec7b9014 100644 --- a/src/form/Textarea/Textarea.tsx +++ b/src/form/Textarea/Textarea.tsx @@ -9,7 +9,7 @@ import TextareaAutosize, { } from 'react-textarea-autosize'; import { twMerge } from 'tailwind-merge'; import { TextareaTheme } from './TextareaTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface TextareaProps extends TextareaAutosizeProps { /** diff --git a/src/form/Textarea/TextareaTheme.ts b/src/form/Textarea/TextareaTheme.ts index efd88d77..5db93fba 100644 --- a/src/form/Textarea/TextareaTheme.ts +++ b/src/form/Textarea/TextareaTheme.ts @@ -1,4 +1,4 @@ -import { legacyInputTheme, inputTheme } from '../Input/InputTheme'; +import { legacyInputTheme, inputTheme } from '@/form/Input/InputTheme'; export interface TextareaTheme { base: string; diff --git a/src/form/Toggle/Toggle.tsx b/src/form/Toggle/Toggle.tsx index ca405941..86a5ee4b 100644 --- a/src/form/Toggle/Toggle.tsx +++ b/src/form/Toggle/Toggle.tsx @@ -2,7 +2,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; import { motion } from 'framer-motion'; import { twMerge } from 'tailwind-merge'; import { ToggleTheme } from './ToggleTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface ToggleProps { /** diff --git a/src/layers/ContextMenu/ContextMenu.tsx b/src/layers/ContextMenu/ContextMenu.tsx index 25c77364..9e0871d6 100644 --- a/src/layers/ContextMenu/ContextMenu.tsx +++ b/src/layers/ContextMenu/ContextMenu.tsx @@ -1,12 +1,12 @@ import React, { FC, ReactNode, useState, useCallback, useEffect } from 'react'; import { motion } from 'framer-motion'; -import { ConnectedOverlay, ConnectedOverlayProps } from '../../utils'; -import { useId } from '../../utils'; +import { ConnectedOverlay, ConnectedOverlayProps } from '@/utils'; +import { useId } from '@/utils'; import FocusTrap from 'focus-trap-react'; import creteGlobalStateHook from 'create-global-state-hook'; import { twMerge } from 'tailwind-merge'; import { ContextMenuTheme } from './ContextMenuTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; const useGlobalMenuState = creteGlobalStateHook([]); diff --git a/src/layers/Dialog/Dialog.tsx b/src/layers/Dialog/Dialog.tsx index 24f4d373..ce346b00 100644 --- a/src/layers/Dialog/Dialog.tsx +++ b/src/layers/Dialog/Dialog.tsx @@ -1,12 +1,12 @@ import React, { FC, ReactElement } from 'react'; import classNames from 'classnames'; -import { GlobalOverlay, GlobalOverlayProps } from '../../utils/Overlay'; -import { useId, CloneElement } from '../../utils'; +import { GlobalOverlay, GlobalOverlayProps } from '@/utils/Overlay'; +import { useId, CloneElement } from '@/utils'; import FocusTrap from 'focus-trap-react'; import { motion } from 'framer-motion'; import { twMerge } from 'tailwind-merge'; import { DialogHeader, DialogHeaderProps } from './DialogHeader'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { DialogTheme } from './DialogTheme'; export interface DialogProps extends Omit { diff --git a/src/layers/Dialog/DialogHeader.tsx b/src/layers/Dialog/DialogHeader.tsx index 76f39f20..2bdb143e 100644 --- a/src/layers/Dialog/DialogHeader.tsx +++ b/src/layers/Dialog/DialogHeader.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { DialogTheme } from './DialogTheme'; export interface DialogHeaderProps { diff --git a/src/layers/Drawer/Drawer.tsx b/src/layers/Drawer/Drawer.tsx index 33a5f73c..29951877 100644 --- a/src/layers/Drawer/Drawer.tsx +++ b/src/layers/Drawer/Drawer.tsx @@ -1,13 +1,13 @@ import React, { FC, ReactElement } from 'react'; import FocusTrap from 'focus-trap-react'; -import { useId, CloneElement } from '../../utils'; -import { GlobalOverlay, GlobalOverlayProps } from '../../utils/Overlay'; +import { useId, CloneElement } from '@/utils'; +import { GlobalOverlay, GlobalOverlayProps } from '@/utils/Overlay'; import { motion } from 'framer-motion'; import { variants } from './variants'; import { DrawerHeader, DrawerHeaderProps } from './DrawerHeader'; import { twMerge } from 'tailwind-merge'; import { DrawerTheme } from './DrawerTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface DrawerProps extends Omit { position?: 'start' | 'end' | 'top' | 'bottom'; diff --git a/src/layers/Drawer/DrawerHeader.tsx b/src/layers/Drawer/DrawerHeader.tsx index 82d4b8c9..617d7649 100644 --- a/src/layers/Drawer/DrawerHeader.tsx +++ b/src/layers/Drawer/DrawerHeader.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { DrawerTheme } from './DrawerTheme'; export interface DrawerHeaderProps { diff --git a/src/layers/Menu/Menu.tsx b/src/layers/Menu/Menu.tsx index fc29d6c0..64bcf57f 100644 --- a/src/layers/Menu/Menu.tsx +++ b/src/layers/Menu/Menu.tsx @@ -1,13 +1,13 @@ import React, { FC, forwardRef, LegacyRef, useMemo } from 'react'; import FocusTrap from 'focus-trap-react'; -import { ConnectedOverlay, OverlayEvent } from '../../utils/Overlay'; -import { Placement } from '../../utils/Position'; -import { useId } from '../../utils'; +import { ConnectedOverlay, OverlayEvent } from '@/utils/Overlay'; +import { Placement } from '@/utils/Position'; +import { useId } from '@/utils'; import { Modifiers } from 'popper.js'; import { motion } from 'framer-motion'; import { twMerge } from 'tailwind-merge'; import { MenuTheme } from './MenuTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface MenuProps { /** diff --git a/src/layers/Menu/NestedMenu.tsx b/src/layers/Menu/NestedMenu.tsx index 8acda3b0..ba91a421 100644 --- a/src/layers/Menu/NestedMenu.tsx +++ b/src/layers/Menu/NestedMenu.tsx @@ -1,6 +1,6 @@ import React, { FC, Fragment, useCallback, useRef, useState } from 'react'; -import { OverlayEvent } from '../../utils/Overlay'; -import { Placement } from '../../utils/Position'; +import { OverlayEvent } from '@/utils/Overlay'; +import { Placement } from '@/utils/Position'; import { Menu } from './Menu'; import classNames from 'classnames'; diff --git a/src/layers/Notification/Notification.tsx b/src/layers/Notification/Notification.tsx index dbaf264e..6504d073 100644 --- a/src/layers/Notification/Notification.tsx +++ b/src/layers/Notification/Notification.tsx @@ -3,7 +3,7 @@ import { NotificationOptions } from './NotificationsContext'; import { motion } from 'framer-motion'; import { twMerge } from 'tailwind-merge'; import { NotificationTheme } from './NotificationTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface NotificationProps extends NotificationOptions { id: number; diff --git a/src/layers/Notification/Notifications.tsx b/src/layers/Notification/Notifications.tsx index d52c1c27..d4eb1f65 100644 --- a/src/layers/Notification/Notifications.tsx +++ b/src/layers/Notification/Notifications.tsx @@ -17,11 +17,11 @@ import { NotificationVariants } from './NotificationsContext'; import { NotificationTheme } from './NotificationTheme'; -import { useComponentTheme } from '../../utils'; -import InfoIcon from '../../assets/icons/info.svg?react'; -import CheckCircleIcon from '../../assets/icons/check_circle.svg?react'; -import WarningIcon from '../../assets/icons/warning.svg?react'; -import ErrorCircleIcon from '../../assets/icons/error_circle.svg?react'; +import { useComponentTheme } from '@/utils'; +import InfoIcon from '@/assets/icons/info.svg?react'; +import CheckCircleIcon from '@/assets/icons/check_circle.svg?react'; +import WarningIcon from '@/assets/icons/warning.svg?react'; +import ErrorCircleIcon from '@/assets/icons/error_circle.svg?react'; export interface NotificationComponentProps { message: string; diff --git a/src/layers/Popover/Popover.tsx b/src/layers/Popover/Popover.tsx index 454f8be9..96254685 100644 --- a/src/layers/Popover/Popover.tsx +++ b/src/layers/Popover/Popover.tsx @@ -1,10 +1,10 @@ import React, { FC } from 'react'; -import { TooltipProps, Tooltip } from '../Tooltip'; +import { TooltipProps, Tooltip } from '@/layers/Tooltip'; import FocusTrap from 'focus-trap-react'; -import { useId } from '../../utils'; +import { useId } from '@/utils'; import { twMerge } from 'tailwind-merge'; import { PopoverTheme } from './PopoverTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; type FocusTargetValueOrFalse = HTMLElement | SVGElement | string | false; diff --git a/src/layers/Tooltip/Tooltip.tsx b/src/layers/Tooltip/Tooltip.tsx index d4881fe7..ed555236 100644 --- a/src/layers/Tooltip/Tooltip.tsx +++ b/src/layers/Tooltip/Tooltip.tsx @@ -1,11 +1,11 @@ import React, { FC, useState, useRef, useEffect, ReactNode } from 'react'; -import { ConnectedOverlay, TriggerTypes } from '../../utils/Overlay'; -import { Placement, ReferenceObject } from '../../utils/Position'; +import { ConnectedOverlay, TriggerTypes } from '@/utils/Overlay'; +import { Placement, ReferenceObject } from '@/utils/Position'; import { motion } from 'framer-motion'; import { twMerge } from 'tailwind-merge'; import { useTooltipState } from './useTooltipState'; import { TooltipTheme } from './TooltipTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface TooltipProps { /** diff --git a/src/layout/Block/Block.tsx b/src/layout/Block/Block.tsx index 1c92fbcb..eaa2be01 100644 --- a/src/layout/Block/Block.tsx +++ b/src/layout/Block/Block.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { twMerge } from 'tailwind-merge'; import { BlockTheme } from './BlockTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface BlockProps extends React.HTMLAttributes { /** diff --git a/src/layout/Card/Card.tsx b/src/layout/Card/Card.tsx index 462a1686..cfcae553 100644 --- a/src/layout/Card/Card.tsx +++ b/src/layout/Card/Card.tsx @@ -1,7 +1,7 @@ import React, { forwardRef, LegacyRef, FC, PropsWithChildren } from 'react'; import { twMerge } from 'tailwind-merge'; import { CardTheme } from './CardTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface CardProps extends React.DOMAttributes { /** diff --git a/src/layout/Collapse/Collapse.tsx b/src/layout/Collapse/Collapse.tsx index f38edea2..3bf50ec0 100644 --- a/src/layout/Collapse/Collapse.tsx +++ b/src/layout/Collapse/Collapse.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { motion, AnimatePresence } from 'framer-motion'; import { CollapseTheme } from './CollapseTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; const VARIANTS = { diff --git a/src/layout/Divider/Divider.tsx b/src/layout/Divider/Divider.tsx index e411e265..12190ab1 100644 --- a/src/layout/Divider/Divider.tsx +++ b/src/layout/Divider/Divider.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; import { DividerTheme } from './DividerTheme'; diff --git a/src/layout/List/List.tsx b/src/layout/List/List.tsx index 940553db..7383ceb6 100644 --- a/src/layout/List/List.tsx +++ b/src/layout/List/List.tsx @@ -1,6 +1,6 @@ import React, { forwardRef, InputHTMLAttributes } from 'react'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { ListTheme } from './ListTheme'; export type ListProps = InputHTMLAttributes & { diff --git a/src/layout/List/ListHeader/ListHeader.tsx b/src/layout/List/ListHeader/ListHeader.tsx index a02a0760..d687012a 100644 --- a/src/layout/List/ListHeader/ListHeader.tsx +++ b/src/layout/List/ListHeader/ListHeader.tsx @@ -1,7 +1,7 @@ import React, { FC, InputHTMLAttributes } from 'react'; -import { Sub } from '../../../typography'; -import { ListTheme } from '../ListTheme'; -import { useComponentTheme } from '../../../utils'; +import { Sub } from '@/typography'; +import { ListTheme } from '@/layout/List/ListTheme'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; export type ListHeaderProps = InputHTMLAttributes & { diff --git a/src/layout/List/ListItem/ListItem.tsx b/src/layout/List/ListItem/ListItem.tsx index 5db3d7a4..f0ccaab0 100644 --- a/src/layout/List/ListItem/ListItem.tsx +++ b/src/layout/List/ListItem/ListItem.tsx @@ -1,7 +1,7 @@ import React, { InputHTMLAttributes, forwardRef } from 'react'; import { twMerge } from 'tailwind-merge'; -import { ListTheme } from '../ListTheme'; -import { useComponentTheme } from '../../../utils'; +import { ListTheme } from '@/layout/List/ListTheme'; +import { useComponentTheme } from '@/utils'; export interface ListItemProps extends InputHTMLAttributes { /** diff --git a/src/layout/Stack/Stack.tsx b/src/layout/Stack/Stack.tsx index b2c0ca2f..b1bb34b0 100644 --- a/src/layout/Stack/Stack.tsx +++ b/src/layout/Stack/Stack.tsx @@ -1,5 +1,5 @@ import React, { forwardRef, HTMLAttributes } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; import { StackTheme } from './StackTheme'; diff --git a/src/layout/Tabs/Tab.tsx b/src/layout/Tabs/Tab.tsx index 864d6b71..26d43b0f 100644 --- a/src/layout/Tabs/Tab.tsx +++ b/src/layout/Tabs/Tab.tsx @@ -1,7 +1,7 @@ import React, { FC, PropsWithChildren } from 'react'; -import { Button } from '../../elements/Button'; +import { Button } from '@/elements/Button'; import { TabsTheme } from './TabsTheme'; -import { useComponentTheme, cn } from '../../utils'; +import { useComponentTheme, cn } from '@/utils'; import { motion } from 'framer-motion'; export interface TabProps extends PropsWithChildren { diff --git a/src/layout/Tabs/TabList.tsx b/src/layout/Tabs/TabList.tsx index 7434dda0..d131c608 100644 --- a/src/layout/Tabs/TabList.tsx +++ b/src/layout/Tabs/TabList.tsx @@ -1,6 +1,6 @@ import React, { FC, PropsWithChildren, Children } from 'react'; import { Tab } from './Tab'; -import { cn, useComponentTheme } from '../../utils'; +import { cn, useComponentTheme } from '@/utils'; import { TabsTheme } from './TabsTheme'; import { twMerge } from 'tailwind-merge'; import classNames from 'classnames'; diff --git a/src/layout/Tabs/TabPanel.tsx b/src/layout/Tabs/TabPanel.tsx index 8edbc600..4fe87a81 100644 --- a/src/layout/Tabs/TabPanel.tsx +++ b/src/layout/Tabs/TabPanel.tsx @@ -1,7 +1,7 @@ import React, { FC, PropsWithChildren } from 'react'; import { twMerge } from 'tailwind-merge'; import { TabsTheme } from './TabsTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface TabPanelProps extends PropsWithChildren { /** diff --git a/src/layout/Tabs/Tabs.tsx b/src/layout/Tabs/Tabs.tsx index 1a0d9b15..b59e3916 100644 --- a/src/layout/Tabs/Tabs.tsx +++ b/src/layout/Tabs/Tabs.tsx @@ -7,10 +7,10 @@ import React, { useMemo, useState } from 'react'; -import { useId } from '../../utils'; +import { useId } from '@/utils'; import { twMerge } from 'tailwind-merge'; import { AnimatePresence } from 'framer-motion'; -import { useComponentTheme } from '../../utils/Theme/hooks'; +import { useComponentTheme } from '@/utils/Theme/hooks'; import { TabsTheme } from './TabsTheme'; import { TabPanel } from './TabPanel'; import { TabList } from './TabList'; diff --git a/src/layout/Tree/JsonTree/JsonTree.tsx b/src/layout/Tree/JsonTree/JsonTree.tsx index 1c47dba6..23316be8 100644 --- a/src/layout/Tree/JsonTree/JsonTree.tsx +++ b/src/layout/Tree/JsonTree/JsonTree.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { Tree } from '../Tree'; +import { Tree } from '@/layout/Tree/Tree'; import { JsonTreeNode } from './JsonTreeNode'; import { parseJsonTree } from './utils'; diff --git a/src/layout/Tree/JsonTree/JsonTreeNode.tsx b/src/layout/Tree/JsonTree/JsonTreeNode.tsx index 1a16c049..3fb8a3d1 100644 --- a/src/layout/Tree/JsonTree/JsonTreeNode.tsx +++ b/src/layout/Tree/JsonTree/JsonTreeNode.tsx @@ -1,11 +1,11 @@ import React, { FC, useCallback, useMemo } from 'react'; -import { TreeNode } from '../TreeNode'; +import { TreeNode } from '@/layout/Tree/TreeNode'; import { JsonTreeData } from './utils'; -import { useComponentTheme } from '../../../utils/Theme/hooks'; +import { useComponentTheme } from '@/utils/Theme/hooks'; import { JsonTreeTheme } from './JsonTreeTheme'; import { twMerge } from 'tailwind-merge'; -import { Ellipsis } from '../../../data/Ellipsis'; -import { useInfinityList } from '../../../data/InfinityList'; +import { Ellipsis } from '@/data/Ellipsis'; +import { useInfinityList } from '@/data/InfinityList'; export interface JsonTreeNodeProps { /** diff --git a/src/layout/Tree/Tree.tsx b/src/layout/Tree/Tree.tsx index 571af3e7..b6f26f96 100644 --- a/src/layout/Tree/Tree.tsx +++ b/src/layout/Tree/Tree.tsx @@ -1,8 +1,8 @@ import React, { FC, PropsWithChildren, useMemo } from 'react'; -import { Arrow } from '../../elements/Arrow'; +import { Arrow } from '@/elements/Arrow'; import { TreeContext, TreeContextProps } from './TreeContext'; import { TreeTheme } from './TreeTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; export type TreeProps = { diff --git a/src/layout/Tree/TreeNode.tsx b/src/layout/Tree/TreeNode.tsx index 8ff23aff..19818cd4 100644 --- a/src/layout/Tree/TreeNode.tsx +++ b/src/layout/Tree/TreeNode.tsx @@ -8,12 +8,12 @@ import React, { useContext, PropsWithChildren } from 'react'; -import { Button } from '../../elements/Button'; -import { Collapse } from '../Collapse'; +import { Button } from '@/elements/Button'; +import { Collapse } from '@/layout/Collapse'; import { TreeContext } from './TreeContext'; import { twMerge } from 'tailwind-merge'; import { TreeTheme } from './TreeTheme'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; export interface TreeNodeProps extends PropsWithChildren { /** diff --git a/src/layout/VerticalSpacer/VerticalSpacer.tsx b/src/layout/VerticalSpacer/VerticalSpacer.tsx index d158ba85..8db71ec5 100644 --- a/src/layout/VerticalSpacer/VerticalSpacer.tsx +++ b/src/layout/VerticalSpacer/VerticalSpacer.tsx @@ -1,6 +1,6 @@ import React, { forwardRef, HTMLAttributes } from 'react'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { VerticalSpacerTheme } from './VerticalSpacerTheme'; export interface VerticalSpacerProps extends HTMLAttributes { diff --git a/src/typography/PageTitle/PageTitle.tsx b/src/typography/PageTitle/PageTitle.tsx index a3a7c611..811227e6 100644 --- a/src/typography/PageTitle/PageTitle.tsx +++ b/src/typography/PageTitle/PageTitle.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; -import { TypographyTheme } from '../TypographyTheme'; +import { TypographyTheme } from '@/typography/TypographyTheme'; export interface PageTitleProps extends React.HTMLAttributes { diff --git a/src/typography/PrimaryHeading/PrimaryHeading.tsx b/src/typography/PrimaryHeading/PrimaryHeading.tsx index ba19630b..8dd196ff 100644 --- a/src/typography/PrimaryHeading/PrimaryHeading.tsx +++ b/src/typography/PrimaryHeading/PrimaryHeading.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; import { twMerge } from 'tailwind-merge'; -import { useComponentTheme } from '../../utils'; -import { TypographyTheme } from '../TypographyTheme'; +import { useComponentTheme } from '@/utils'; +import { TypographyTheme } from '@/typography/TypographyTheme'; export interface PrimaryHeadingProps extends React.HTMLAttributes { diff --git a/src/typography/SecondaryHeading/SecondaryHeading.tsx b/src/typography/SecondaryHeading/SecondaryHeading.tsx index a50b3453..988383d3 100644 --- a/src/typography/SecondaryHeading/SecondaryHeading.tsx +++ b/src/typography/SecondaryHeading/SecondaryHeading.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; -import { TypographyTheme } from '../TypographyTheme'; +import { TypographyTheme } from '@/typography/TypographyTheme'; export interface SecondaryHeadingProps extends React.HTMLAttributes { diff --git a/src/typography/SmallHeading/SmallHeading.tsx b/src/typography/SmallHeading/SmallHeading.tsx index 25cfa543..617b4367 100644 --- a/src/typography/SmallHeading/SmallHeading.tsx +++ b/src/typography/SmallHeading/SmallHeading.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; -import { TypographyTheme } from '../TypographyTheme'; +import { TypographyTheme } from '@/typography/TypographyTheme'; export type SmallHeadingColors = | 'default' diff --git a/src/typography/Sub/Sub.tsx b/src/typography/Sub/Sub.tsx index 8a0584d6..3c5057f0 100644 --- a/src/typography/Sub/Sub.tsx +++ b/src/typography/Sub/Sub.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; -import { TypographyTheme } from '../TypographyTheme'; +import { TypographyTheme } from '@/typography/TypographyTheme'; export interface SubProps extends React.HTMLAttributes { /** diff --git a/src/typography/Text/Text.tsx b/src/typography/Text/Text.tsx index dc6a4059..09a4f708 100644 --- a/src/typography/Text/Text.tsx +++ b/src/typography/Text/Text.tsx @@ -1,7 +1,7 @@ import React, { FC, forwardRef, LegacyRef } from 'react'; -import { useComponentTheme } from '../../utils'; +import { useComponentTheme } from '@/utils'; import { twMerge } from 'tailwind-merge'; -import { TypographyTheme } from '../TypographyTheme'; +import { TypographyTheme } from '@/typography/TypographyTheme'; export interface TextProps extends React.HTMLAttributes { /** diff --git a/src/utils/Overlay/ConnectedOverlay/ConnectedOverlay.tsx b/src/utils/Overlay/ConnectedOverlay/ConnectedOverlay.tsx index 07df710f..85bc209d 100644 --- a/src/utils/Overlay/ConnectedOverlay/ConnectedOverlay.tsx +++ b/src/utils/Overlay/ConnectedOverlay/ConnectedOverlay.tsx @@ -8,10 +8,10 @@ import React, { useImperativeHandle, useMemo } from 'react'; -import { TriggerTypes, OverlayTrigger } from '../OverlayTrigger'; -import { Placement, ReferenceProp } from '../../Position'; +import { TriggerTypes, OverlayTrigger } from '@/utils/Overlay/OverlayTrigger'; +import { Placement, ReferenceProp } from '@/utils/Position'; import { AnimatePresence } from 'framer-motion'; -import { OverlayContext } from '../../Overlay/OverlayContext'; +import { OverlayContext } from '@/utils/Overlay/OverlayContext'; import { ConnectedOverlayContent, ConnectedOverlayContentRef diff --git a/src/utils/Overlay/ConnectedOverlay/ConnectedOverlayContent.tsx b/src/utils/Overlay/ConnectedOverlay/ConnectedOverlayContent.tsx index 29795c7c..b5403e01 100644 --- a/src/utils/Overlay/ConnectedOverlay/ConnectedOverlayContent.tsx +++ b/src/utils/Overlay/ConnectedOverlay/ConnectedOverlayContent.tsx @@ -8,10 +8,10 @@ import React, { useCallback, LegacyRef } from 'react'; -import { useExitListener } from '../../ExitListener'; -import { Placement, usePosition } from '../../Position'; -import { OverlayPortal, portals } from '../OverlayPortal'; -import { useId } from '../../../utils/useId'; +import { useExitListener } from '@/utils/ExitListener'; +import { Placement, usePosition } from '@/utils/Position'; +import { OverlayPortal, portals } from '@/utils/Overlay/OverlayPortal'; +import { useId } from '@/utils/useId'; export interface ConnectedOverlayContentRef { updatePosition: () => void; diff --git a/src/utils/Overlay/GlobalOverlay/GlobalOverlay.tsx b/src/utils/Overlay/GlobalOverlay/GlobalOverlay.tsx index 09b034a1..b83d5419 100644 --- a/src/utils/Overlay/GlobalOverlay/GlobalOverlay.tsx +++ b/src/utils/Overlay/GlobalOverlay/GlobalOverlay.tsx @@ -3,11 +3,11 @@ import { disableBodyScroll, clearAllBodyScrollLocks } from 'body-scroll-lock-upgrade'; -import { OverlayContext } from '../OverlayContext'; +import { OverlayContext } from '@/utils/Overlay/OverlayContext'; import { AnimatePresence } from 'framer-motion'; -import { OverlayPortal } from '../OverlayPortal'; -import { useExitListener } from '../../ExitListener'; -import { Backdrop } from '../../../layers/Backdrop'; +import { OverlayPortal } from '@/utils/Overlay/OverlayPortal'; +import { useExitListener } from '@/utils/ExitListener'; +import { Backdrop } from '@/layers/Backdrop'; export interface GlobalOverlayProps { /** diff --git a/src/utils/Overlay/OverlayPortal/OverlayPortal.tsx b/src/utils/Overlay/OverlayPortal/OverlayPortal.tsx index 82de72d6..3c496766 100644 --- a/src/utils/Overlay/OverlayPortal/OverlayPortal.tsx +++ b/src/utils/Overlay/OverlayPortal/OverlayPortal.tsx @@ -6,8 +6,8 @@ import React, { useRef, useState } from 'react'; -import { useId } from '../../../utils/useId'; -import { Portal } from '../../Portal'; +import { useId } from '@/utils/useId'; +import { Portal } from '@/utils/Portal'; // NOTE: This should not be used by external consumers. export const portals: string[] = []; diff --git a/src/utils/Portal/Portal.ts b/src/utils/Portal/Portal.ts index 618d9603..5c62feea 100644 --- a/src/utils/Portal/Portal.ts +++ b/src/utils/Portal/Portal.ts @@ -9,7 +9,7 @@ import { LegacyRef } from 'react'; import { createPortal } from 'react-dom'; -import { useUnmount } from '../../utils/useUnmount'; +import { useUnmount } from '@/utils/useUnmount'; export interface PortalProps extends PropsWithChildren { element?: string; diff --git a/src/utils/Theme/blocks/ComponentBlocks.tsx b/src/utils/Theme/blocks/ComponentBlocks.tsx index 49e33a74..f3e10abd 100644 --- a/src/utils/Theme/blocks/ComponentBlocks.tsx +++ b/src/utils/Theme/blocks/ComponentBlocks.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import dracula from 'react-syntax-highlighter/dist/cjs/styles/prism/dracula.js'; -import { ReablocksTheme } from '../themes'; +import { ReablocksTheme } from '@/utils/Theme/themes'; export const ComponentBlocks = ({ components diff --git a/src/utils/Theme/hooks/useComponentTheme.ts b/src/utils/Theme/hooks/useComponentTheme.ts index 35fb3cda..856d2fd1 100644 --- a/src/utils/Theme/hooks/useComponentTheme.ts +++ b/src/utils/Theme/hooks/useComponentTheme.ts @@ -1,5 +1,5 @@ import { useTheme } from './useTheme'; -import { ReablocksTheme } from '../themes/theme'; +import { ReablocksTheme } from '@/utils/Theme/themes/theme'; export const useComponentTheme = ( component: T, diff --git a/src/utils/Theme/hooks/useTheme.ts b/src/utils/Theme/hooks/useTheme.ts index f84456f1..2011c18b 100644 --- a/src/utils/Theme/hooks/useTheme.ts +++ b/src/utils/Theme/hooks/useTheme.ts @@ -1,5 +1,5 @@ import { useContext } from 'react'; -import { ThemeContext, ThemeContextProps } from '../ThemeProvider'; +import { ThemeContext, ThemeContextProps } from '@/utils/Theme/ThemeProvider'; export const useTheme = (): ThemeContextProps | null => { const context = useContext(ThemeContext); diff --git a/src/utils/Theme/themes/extendCoponentTheme.ts b/src/utils/Theme/themes/extendCoponentTheme.ts index 0d908d9c..0db67e2b 100644 --- a/src/utils/Theme/themes/extendCoponentTheme.ts +++ b/src/utils/Theme/themes/extendCoponentTheme.ts @@ -1,4 +1,4 @@ -import { mergeDeep } from '../helpers'; +import { mergeDeep } from '@/utils/Theme/helpers'; type DeepPartial = { [P in keyof T]?: DeepPartial; diff --git a/src/utils/Theme/themes/extendTheme.ts b/src/utils/Theme/themes/extendTheme.ts index bd809b8c..65c3b4b0 100644 --- a/src/utils/Theme/themes/extendTheme.ts +++ b/src/utils/Theme/themes/extendTheme.ts @@ -1,5 +1,5 @@ import { ReablocksTheme } from './theme'; -import { mergeDeep } from '../helpers'; +import { mergeDeep } from '@/utils/Theme/helpers'; type DeepPartial = { [P in keyof T]?: DeepPartial; diff --git a/src/utils/Theme/themes/theme.ts b/src/utils/Theme/themes/theme.ts index a83286c6..039978c2 100644 --- a/src/utils/Theme/themes/theme.ts +++ b/src/utils/Theme/themes/theme.ts @@ -26,7 +26,7 @@ import { legacyLoaderTheme, legacyKbdTheme, legacyCommandPaletteTheme -} from '../../../elements'; +} from '@/elements'; import { CheckboxTheme, @@ -56,7 +56,7 @@ import { legacyRadioTheme, legacyRangeTheme, legacyToggleTheme -} from '../../../form'; +} from '@/form'; import { ContextMenuTheme, @@ -80,7 +80,7 @@ import { NotificationTheme, PopoverTheme, TooltipTheme -} from '../../../layers'; +} from '@/layers'; import { BlockTheme, @@ -113,13 +113,13 @@ import { JsonTreeTheme, jsonTreeTheme, legacyJsonTreeTheme -} from '../../../layout'; +} from '@/layout'; import { legacyTypographyTheme, typographyTheme, TypographyTheme -} from '../../../typography'; +} from '@/typography'; import { ellipsisTheme, @@ -137,7 +137,7 @@ import { legacySortTheme, legacyRedactTheme, legacyPagerTheme -} from '../../../data'; +} from '@/data'; export interface ReablocksTheme { components: { diff --git a/tsconfig.json b/tsconfig.json index 03cb5a35..66cb938d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -30,7 +30,10 @@ "suppressExcessPropertyErrors": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, - "ignoreDeprecations": "5.0" + "ignoreDeprecations": "5.0", + "paths": { + "@/*": ["./src/*"] + } }, "types": ["node"], "include": ["src/**/*", "demo/**/*"], diff --git a/vite.config.ts b/vite.config.ts index c085fa6b..a9520fe5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -9,6 +9,7 @@ import { resolve } from 'path'; import external from 'rollup-plugin-peer-deps-external'; import dts from 'vite-plugin-dts'; import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; export default defineConfig(({ mode }) => mode === 'library' @@ -24,6 +25,14 @@ export default defineConfig(({ mode }) => }), checker({ typescript: true + }), + viteStaticCopy({ + targets: [ + { + src: 'src/**/*.story.tsx', + dest: 'stories/' + } + ] }) ], test: {