fix: rebase issues

gravity-ui · Dec 6, 2023 · 30f485a · 30f485a
1 parent 7a5ae9e
commit 30f485a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/components/List/List.tsx b/src/components/List/List.tsx
@@ -437,6 +437,7 @@ export class List<T = unknown> extends React.Component<ListProps<T>, ListState<T
                                         itemCount={items.length}
                                         overscanCount={10}
                                         onItemsRendered={this.onItemsRendered}
+                                        direction={this.context.direction}
                                         // this property used to rerender items in viewport
                                         // must be last, typescript skips checks for all props behind ts-ignore/ts-expect-error
                                         // @ts-expect-error

diff --git a/src/hooks/private/usePopper/usePopper.ts b/src/hooks/private/usePopper/usePopper.ts
@@ -4,7 +4,7 @@ import type popper from '@popperjs/core';
 import {usePopper as useReactPopper} from 'react-popper';
 import type {Modifier} from 'react-popper';
 
-import {useDirection} from '../theme';
+import {useDirection} from '../../../components/theme';
 
 export type PopperPlacement = popper.Placement | popper.Placement[];
 export type PopperOffset = [number, number];