fix incorrectly resolved conflicts
This commit is contained in:
parent
202d1b423c
commit
a8ec304f74
apps/web
|
@ -29,7 +29,7 @@ const updateProperty = (property: string, value: number) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const [loading, setLoading] = useState(false)
|
const [loading /*, setLoading*/] = useState(false)
|
||||||
const [showMembers, setShowMembers] = useState(false)
|
const [showMembers, setShowMembers] = useState(false)
|
||||||
|
|
||||||
// TODO: Use it to simulate loading
|
// TODO: Use it to simulate loading
|
||||||
|
@ -61,14 +61,14 @@ function App() {
|
||||||
useResizeObserver<HTMLDivElement>({
|
useResizeObserver<HTMLDivElement>({
|
||||||
ref: topbarRef,
|
ref: topbarRef,
|
||||||
onResize({ height }) {
|
onResize({ height }) {
|
||||||
updateProperty('--topbar-height', height)
|
updateProperty('--topbar-height', height!)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
useResizeObserver<HTMLDivElement>({
|
useResizeObserver<HTMLDivElement>({
|
||||||
ref: composerRef,
|
ref: composerRef,
|
||||||
onResize({ height }) {
|
onResize({ height }) {
|
||||||
updateProperty('--composer-height', height)
|
updateProperty('--composer-height', height!)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ function App() {
|
||||||
})
|
})
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
contentRef.current.scrollTop = contentRef.current.scrollHeight
|
contentRef.current!.scrollTop = contentRef.current!.scrollHeight
|
||||||
}, [selectedChannel])
|
}, [selectedChannel])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -97,7 +97,7 @@ function App() {
|
||||||
<div id="topbar" ref={topbarRef}>
|
<div id="topbar" ref={topbarRef}>
|
||||||
<Topbar
|
<Topbar
|
||||||
blur={scrollPosition !== 'top'}
|
blur={scrollPosition !== 'top'}
|
||||||
channel={selectedChannel}
|
channel={selectedChannel!}
|
||||||
showMembers={showMembers}
|
showMembers={showMembers}
|
||||||
onMembersPress={() => setShowMembers(show => !show)}
|
onMembersPress={() => setShowMembers(show => !show)}
|
||||||
pinnedMessages={[
|
pinnedMessages={[
|
||||||
|
|
|
@ -16,7 +16,7 @@ export function useScrollPosition(options: Options) {
|
||||||
positionRef.current = position
|
positionRef.current = position
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const node = ref.current
|
const node = ref.current!
|
||||||
|
|
||||||
const handleScroll = () => {
|
const handleScroll = () => {
|
||||||
if (!node) return
|
if (!node) return
|
||||||
|
|
|
@ -3,17 +3,7 @@
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ESNext",
|
"target": "ESNext",
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
"allowJs": true,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"strict": false,
|
|
||||||
"forceConsistentCasingInFileNames": true,
|
|
||||||
"noEmit": true,
|
|
||||||
"incremental": true,
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"module": "esnext",
|
"module": "esnext",
|
||||||
"moduleResolution": "node",
|
|
||||||
"resolveJsonModule": true,
|
|
||||||
"isolatedModules": true,
|
|
||||||
"jsx": "react-jsx"
|
"jsx": "react-jsx"
|
||||||
},
|
},
|
||||||
"include": ["src"]
|
"include": ["src"]
|
||||||
|
|
Loading…
Reference in New Issue