Skip to content

Commit

Permalink
fix: remove alias import
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Lüders committed Oct 11, 2023
1 parent aa6f7e2 commit f800d2b
Show file tree
Hide file tree
Showing 102 changed files with 274 additions and 274 deletions.
6 changes: 3 additions & 3 deletions src/components/Accordion/Accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import type { ComponentProps, FC, PropsWithChildren, ReactElement } from 'react'
import { Children, cloneElement, useMemo, useState } from 'react';
import { HiChevronDown } from 'react-icons/hi';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean } from '../Flowbite';
import type { FlowbiteAccordionComponentTheme } from './AccordionContent';
import { AccordionContent } from './AccordionContent';
Expand Down
6 changes: 3 additions & 3 deletions src/components/Accordion/AccordionContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import { useAccordionContext } from './AccordionPanelContext';

export interface FlowbiteAccordionComponentTheme {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Accordion/AccordionTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import type { ComponentProps, FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean, FlowbiteHeadingLevel } from '../Flowbite';
import { useAccordionContext } from './AccordionPanelContext';

Expand Down
2 changes: 1 addition & 1 deletion src/components/Alert/Alert.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryFn } from '@storybook/react';
import { HiEye, HiInformationCircle } from 'react-icons/hi';
import { theme } from '~/src/theme';
import { theme } from '../../theme';
import type { AlertProps } from './Alert';
import { Alert } from './Alert';

Expand Down
6 changes: 3 additions & 3 deletions src/components/Alert/Alert.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ComponentProps, FC, PropsWithChildren, ReactNode } from 'react';
import { HiX } from 'react-icons/hi';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteColors } from '../Flowbite';

export interface FlowbiteAlertTheme {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Avatar/Avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ComponentProps, FC, PropsWithChildren, ReactElement } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean, FlowbiteColors, FlowbitePositions, FlowbiteSizes } from '../Flowbite';
import type { FlowbiteAvatarGroupTheme } from './AvatarGroup';
import { AvatarGroup } from './AvatarGroup';
Expand Down
6 changes: 3 additions & 3 deletions src/components/Avatar/AvatarGroup.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ComponentProps, PropsWithChildren } from 'react';
import React from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';

export interface FlowbiteAvatarGroupTheme {
base: string;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Avatar/AvatarGroupCounter.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';

export interface FlowbiteAvatarGroupCounterTheme {
base: string;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Badge/Badge.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryFn } from '@storybook/react';
import { HiCheck } from 'react-icons/hi';
import { theme } from '~/src/theme';
import { theme } from '../../theme';
import type { BadgeProps } from './Badge';
import { Badge } from './Badge';

Expand Down
6 changes: 3 additions & 3 deletions src/components/Badge/Badge.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean, FlowbiteColors, FlowbiteSizes } from '../Flowbite';

export interface FlowbiteBadgeTheme {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Blockquote/Blockquote.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';

export interface FlowbiteBlockquoteTheme {
root: FlowbiteBlockquoteRootTheme;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Breadcrumb/Breadcrumb.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ComponentProps, FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBreadcrumbItemTheme } from './BreadcrumbItem';
import { BreadcrumbItem } from './BreadcrumbItem';

Expand Down
6 changes: 3 additions & 3 deletions src/components/Breadcrumb/BreadcrumbItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { forwardRef } from 'react';
import { HiOutlineChevronRight } from 'react-icons/hi';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean } from '../Flowbite';

export interface FlowbiteBreadcrumbItemTheme {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/Button.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Meta, StoryFn } from '@storybook/react';
import { theme } from '~/src/theme';
import { theme } from '../../theme';
import type { ButtonProps } from './Button';
import { Button } from './Button';

Expand Down
8 changes: 4 additions & 4 deletions src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { ComponentPropsWithoutRef, ElementType, ForwardedRef } from 'react';
import { type ReactNode } from 'react';
import { twMerge } from 'tailwind-merge';
import genericForwardRef from '~/src/helpers/generic-forward-ref';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import genericForwardRef from '../../helpers/generic-forward-ref';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type {
FlowbiteBoolean,
FlowbiteColors,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/ButtonBase.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createElement, type ComponentPropsWithoutRef, type ElementType, type ForwardedRef } from 'react';
import genericForwardRef from '~/src/helpers/generic-forward-ref';
import genericForwardRef from '../../helpers/generic-forward-ref';

export type ButtonBaseProps<T extends ElementType = 'button'> = {
as?: T;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/ButtonGroup.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it, vi } from 'vitest';
import { theme } from '~/src/theme';
import { theme } from '../../theme';
import { Flowbite } from '../Flowbite';
import { Button } from './Button';

Expand Down
6 changes: 3 additions & 3 deletions src/components/Button/ButtonGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import type { ComponentProps, FC, PropsWithChildren, ReactElement } from 'react';
import { Children, cloneElement, useMemo } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { ButtonProps } from '../Button';

export interface FlowbiteButtonGroupTheme {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Card/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { omit } from '~/src/helpers/omit';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { omit } from '../../helpers/omit';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean } from '../Flowbite';

export interface FlowbiteCardTheme {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Carousel/Carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { Children, cloneElement, useCallback, useEffect, useMemo, useRef, useSta
import { HiOutlineChevronLeft, HiOutlineChevronRight } from 'react-icons/hi';
import ScrollContainer from 'react-indiana-drag-scroll';
import { twMerge } from 'tailwind-merge';
import { isClient } from '~/src/helpers/is-client';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { isClient } from '../../helpers/is-client';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteBoolean } from '../Flowbite';

export interface FlowbiteCarouselTheme {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ComponentProps } from 'react';
import { forwardRef } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteColors } from '../Flowbite';

export interface FlowbiteCheckboxTheme {
Expand Down
8 changes: 4 additions & 4 deletions src/components/DarkThemeToggle/DarkThemeToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import type { ComponentProps, FC } from 'react';
import { HiMoon, HiSun } from 'react-icons/hi';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { useThemeMode } from '~/src/helpers/use-theme-mode';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { useThemeMode } from '../../helpers/use-theme-mode';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';

export interface FlowbiteDarkThemeToggleTheme {
root: FlowbiteDarkThemeToggleRootTheme;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Datepicker/Datepicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import type { FC, ReactNode } from 'react';
import { useEffect, useRef, useState } from 'react';
import { HiArrowLeft, HiArrowRight, HiCalendar } from 'react-icons/hi';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import { TextInput, type FlowbiteTextInputTheme, type TextInputProps } from '../TextInput';
import { DatepickerContext } from './DatepickerContext';
import type { FlowbiteDatepickerViewsDaysTheme } from './Views/Days';
Expand Down
6 changes: 3 additions & 3 deletions src/components/Datepicker/Views/Days.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../../helpers/merge-deep';
import { getTheme } from '../../../theme-store';
import type { DeepPartial } from '../../../types';
import { useDatePickerContext } from '../DatepickerContext';
import { addDays, getFirstDayOfTheMonth, getFormattedDate, getWeekDays, isDateEqual, isDateInRange } from '../helpers';

Expand Down
4 changes: 2 additions & 2 deletions src/components/Datepicker/Views/Decades.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import { mergeDeep } from '../../../helpers/merge-deep';
import { getTheme } from '../../../theme-store';
import { useDatePickerContext } from '../DatepickerContext';
import { Views, addYears, isDateInDecade, isDateInRange, startOfYearPeriod } from '../helpers';

Expand Down
4 changes: 2 additions & 2 deletions src/components/Datepicker/Views/Months.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import { mergeDeep } from '../../../helpers/merge-deep';
import { getTheme } from '../../../theme-store';
import { useDatePickerContext } from '../DatepickerContext';
import { Views, getFormattedDate, isDateEqual, isDateInRange } from '../helpers';

Expand Down
4 changes: 2 additions & 2 deletions src/components/Datepicker/Views/Years.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import type { FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import { mergeDeep } from '../../../helpers/merge-deep';
import { getTheme } from '../../../theme-store';
import { useDatePickerContext } from '../DatepickerContext';
import { Views, isDateEqual, isDateInRange, startOfYearPeriod } from '../helpers';

Expand Down
8 changes: 4 additions & 4 deletions src/components/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import type {
import { cloneElement, createContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { HiOutlineChevronDown, HiOutlineChevronLeft, HiOutlineChevronRight, HiOutlineChevronUp } from 'react-icons/hi';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { useBaseFLoating, useFloatingInteractions } from '~/src/helpers/use-floating';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { useBaseFLoating, useFloatingInteractions } from '../../helpers/use-floating';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { ButtonProps } from '../Button';
import { Button } from '../Button';
import type { FloatingProps, FlowbiteFloatingTheme } from '../Floating';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdown/DropdownDivider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ComponentProps, FC } from 'react';
import { twMerge } from 'tailwind-merge';
import { getTheme } from '~/src/theme-store';
import { getTheme } from '../../theme-store';

export interface FlowbiteDropdownDividerTheme {
divider: string;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdown/DropdownHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ComponentProps, FC, PropsWithChildren } from 'react';
import { twMerge } from 'tailwind-merge';
import { getTheme } from '~/src/theme-store';
import { getTheme } from '../../theme-store';
import { DropdownDivider } from './DropdownDivider';

export interface FlowbiteDropdownHeaderTheme {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Dropdown/DropdownItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { useListItem } from '@floating-ui/react';
import type { ComponentProps, ComponentPropsWithoutRef, ElementType, FC, RefCallback } from 'react';
import { useContext } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { ButtonBaseProps } from '../Button/ButtonBase';
import { ButtonBase } from '../Button/ButtonBase';
import { DropdownContext } from './Dropdown';
Expand Down
6 changes: 3 additions & 3 deletions src/components/FileInput/FileInput.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ComponentProps, ReactNode } from 'react';
import { forwardRef } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import { HelperText } from '../HelperText';
import type { FlowbiteTextInputColors, FlowbiteTextInputSizes } from '../TextInput';

Expand Down
2 changes: 1 addition & 1 deletion src/components/Floating/Floating.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { autoUpdate, useFocus } from '@floating-ui/react';
import type { ComponentProps, FC, PropsWithChildren, ReactNode } from 'react';
import { useEffect, useRef, useState } from 'react';
import { twMerge } from 'tailwind-merge';
import { useBaseFLoating, useFloatingInteractions } from '~/src/helpers/use-floating';
import { useBaseFLoating, useFloatingInteractions } from '../../helpers/use-floating';
import { getArrowPlacement } from './helpers';

export interface FlowbiteFloatingTheme {
Expand Down
6 changes: 3 additions & 3 deletions src/components/FloatingLabel/FloatingLabel.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ComponentProps } from 'react';
import { forwardRef, useId } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '~/src/helpers/merge-deep';
import { getTheme } from '~/src/theme-store';
import type { DeepPartial } from '~/src/types';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteSizes } from '../Flowbite';

export interface FlowbiteFloatingLabelTheme {
Expand Down
Loading

0 comments on commit f800d2b

Please sign in to comment.