Fix bad merge
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
import React, {useImperativeHandle} from 'react'
|
import React, {useImperativeHandle} from 'react'
|
||||||
import {View, Dimensions, Keyboard, Pressable} from 'react-native'
|
import {View, Dimensions, Keyboard, Pressable} from 'react-native'
|
||||||
import BottomSheet, {
|
import BottomSheet, {
|
||||||
BottomSheetFlatList,
|
|
||||||
BottomSheetBackdropProps,
|
BottomSheetBackdropProps,
|
||||||
BottomSheetScrollView,
|
BottomSheetScrollView,
|
||||||
BottomSheetTextInput,
|
BottomSheetTextInput,
|
||||||
@@ -29,7 +28,6 @@ export {useDialogControl, useDialogContext} from '#/components/Dialog/context'
|
|||||||
export * from '#/components/Dialog/types'
|
export * from '#/components/Dialog/types'
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
export const Input = createInput(BottomSheetTextInput)
|
export const Input = createInput(BottomSheetTextInput)
|
||||||
export const FlatList = BottomSheetFlatList
|
|
||||||
|
|
||||||
function Backdrop(props: BottomSheetBackdropProps) {
|
function Backdrop(props: BottomSheetBackdropProps) {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import {useDialogStateControlContext} from '#/state/dialogs'
|
|||||||
export {useDialogControl, useDialogContext} from '#/components/Dialog/context'
|
export {useDialogControl, useDialogContext} from '#/components/Dialog/context'
|
||||||
export * from '#/components/Dialog/types'
|
export * from '#/components/Dialog/types'
|
||||||
export {Input} from '#/components/forms/TextField'
|
export {Input} from '#/components/forms/TextField'
|
||||||
export {FlatList} from 'react-native'
|
|
||||||
|
|
||||||
const stopPropagation = (e: any) => e.stopPropagation()
|
const stopPropagation = (e: any) => e.stopPropagation()
|
||||||
|
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ function ShellInner() {
|
|||||||
<Composer winHeight={winDim.height} />
|
<Composer winHeight={winDim.height} />
|
||||||
<ModalsContainer />
|
<ModalsContainer />
|
||||||
<MutedWordsDialog />
|
<MutedWordsDialog />
|
||||||
<PortalOutlet />
|
|
||||||
<Lightbox />
|
<Lightbox />
|
||||||
<PortalOutlet />
|
<PortalOutlet />
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ function ShellInner() {
|
|||||||
<Composer winHeight={0} />
|
<Composer winHeight={0} />
|
||||||
<ModalsContainer />
|
<ModalsContainer />
|
||||||
<MutedWordsDialog />
|
<MutedWordsDialog />
|
||||||
<PortalOutlet />
|
|
||||||
<Lightbox />
|
<Lightbox />
|
||||||
<PortalOutlet />
|
<PortalOutlet />
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user