mirror/App
1
0
Fork 0
mirror of https://github.com/Jellify-Music/App.git synced 2026-03-17 10:40:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove usecallback (#965)

Browse Source
This commit is contained in:
Violet Caulfield
2026-01-31 13:59:21 -06:00
committed by GitHub
parent e8cf80d9f9
commit 7271dc0b54
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/components/Queue/index.tsx
View File

@@ -3,7 +3,7 @@ import Track from '../Global/components/Track'
import { RootStackParamList } from '../../screens/types'
import { NativeStackNavigationProp } from '@react-navigation/native-stack'
import { Text, XStack } from 'tamagui'
import { useCallback, useLayoutEffect, useRef, useState } from 'react'
import { useLayoutEffect, useRef, useState } from 'react'
import { LayoutChangeEvent, useWindowDimensions } from 'react-native'
import JellifyTrack from '../../types/JellifyTrack'
import {
@@ -52,32 +52,26 @@ export default function Queue({
const hasScrolledToCurrentRef = useRef(false)
const rowHeightRef = useRef<number | null>(null)
const scrollToCurrentSong = useCallback(
(measuredRowHeight: number) => {
if (hasScrolledToCurrentRef.current) return
const index = currentIndexFromStore ?? 0
const scrollY = getInitialScrollY(index, windowHeight, measuredRowHeight)
scrollableRef.current?.scrollTo({ y: scrollY, animated: false })
hasScrolledToCurrentRef.current = true
},
[currentIndexFromStore, windowHeight],
)
const scrollToCurrentSong = (measuredRowHeight: number) => {
if (hasScrolledToCurrentRef.current) return
const index = currentIndexFromStore ?? 0
const scrollY = getInitialScrollY(index, windowHeight, measuredRowHeight)
scrollableRef.current?.scrollTo({ y: scrollY, animated: false })
hasScrolledToCurrentRef.current = true
}
const handleFirstRowLayout = useCallback(
(e: LayoutChangeEvent) => {
const height = e.nativeEvent.layout.height
if (rowHeightRef.current === null) {
const hadCachedHeight = lastMeasuredRowHeight !== null
rowHeightRef.current = height
lastMeasuredRowHeight = height
// Only correct with scroll when we used TRACK_ITEM_HEIGHT for contentOffset (first open)
if (!hadCachedHeight) {
scrollToCurrentSong(height)
}
const handleFirstRowLayout = (e: LayoutChangeEvent) => {
const height = e.nativeEvent.layout.height
if (rowHeightRef.current === null) {
const hadCachedHeight = lastMeasuredRowHeight !== null
rowHeightRef.current = height
lastMeasuredRowHeight = height
// Only correct with scroll when we used TRACK_ITEM_HEIGHT for contentOffset (first open)
if (!hadCachedHeight) {
scrollToCurrentSong(height)
}
},
[scrollToCurrentSong],
)
}
}
useLayoutEffect(() => {
navigation.setOptions({