Fix lints

This commit is contained in:
Robin
2024-06-04 11:20:25 -04:00
parent 07ce272e9f
commit 70fdc68b13
23 changed files with 60 additions and 38 deletions

View File

@@ -33,6 +33,7 @@ import {
VideoGridProps as Props,
TileSpring,
ChildrenProperties,
TileSpringUpdate,
} from "./VideoGrid";
import { useReactiveState } from "../useReactiveState";
import { useMergedRefs } from "../useMergedRefs";
@@ -110,7 +111,7 @@ export function NewVideoGrid<T>({
});
observer.observe(slotsRoot, { attributes: true });
return () => observer.disconnect();
return (): void => observer.disconnect();
}
}, [slotsRoot, setRenderedGeneration]);
@@ -174,8 +175,8 @@ export function NewVideoGrid<T>({
const [tileTransitions, springRef] = useTransition(
tiles,
() => ({
key: ({ item }: Tile<T>) => item.id,
from: ({ x, y, width, height }: Tile<T>) => ({
key: ({ item }: Tile<T>): string => item.id,
from: ({ x, y, width, height }: Tile<T>): TileSpringUpdate => ({
opacity: 0,
scale: 0,
shadow: 0,
@@ -188,7 +189,13 @@ export function NewVideoGrid<T>({
immediate: disableAnimations,
}),
enter: { opacity: 1, scale: 1, immediate: disableAnimations },
update: ({ item, x, y, width, height }: Tile<T>) =>
update: ({
item,
x,
y,
width,
height,
}: Tile<T>): TileSpringUpdate | null =>
item.id === dragState.current?.tileId
? null
: {
@@ -230,7 +237,7 @@ export function NewVideoGrid<T>({
disableAnimations || ((key): boolean => key === "zIndex"),
// Allow the tile's position to settle before pushing its
// z-index back down
delay: (key) => (key === "zIndex" ? 500 : 0),
delay: (key): number => (key === "zIndex" ? 500 : 0),
}
: {
scale: 1.1,

View File

@@ -77,6 +77,13 @@ export interface TileSpring {
height: number;
}
export interface TileSpringUpdate extends Partial<TileSpring> {
from?: Partial<TileSpring>;
reset?: boolean;
immediate?: boolean | ((key: string) => boolean);
delay?: (key: string) => number;
}
type LayoutDirection = "vertical" | "horizontal";
export function useVideoGridLayout(hasScreenshareFeeds: boolean): {
@@ -120,7 +127,7 @@ function useIsMounted(): MutableRefObject<boolean> {
useEffect(() => {
isMountedRef.current = true;
return () => {
return (): void => {
isMountedRef.current = false;
};
}, []);
@@ -1026,7 +1033,7 @@ export function VideoGrid<T>({
const oneOnOneLayout =
tiles.length === 2 && !tiles.some((t) => t.focused);
return (tileIndex: number) => {
return (tileIndex: number): TileSpringUpdate => {
const tile = tiles[tileIndex];
const tilePosition = tilePositions[tile.order];
const draggingTile = draggingTileRef.current;
@@ -1045,7 +1052,7 @@ export function VideoGrid<T>({
zIndex: 2,
shadow: 15,
shadowSpread: 0,
immediate: (key: string) =>
immediate: (key: string): boolean =>
disableAnimations ||
key === "zIndex" ||
key === "x" ||
@@ -1112,14 +1119,14 @@ export function VideoGrid<T>({
shadowSpread: oneOnOneLayout && tile.item.local ? 1 : 0,
from,
reset,
immediate: (key: string) =>
immediate: (key: string): boolean =>
disableAnimations ||
key === "zIndex" ||
key === "shadow" ||
key === "shadowSpread",
// If we just stopped dragging a tile, give it time for the
// animation to settle before pushing its z-index back down
delay: (key: string) => (key === "zIndex" ? 500 : 0),
delay: (key: string): number => (key === "zIndex" ? 500 : 0),
};
}
};