Merge branch 'main' into livekit-experiment
This commit is contained in:
commit
7f5ec069a5
2 changed files with 36 additions and 34 deletions
|
@ -136,5 +136,11 @@
|
||||||
"Submitting…": "Надсилання…",
|
"Submitting…": "Надсилання…",
|
||||||
"Submit": "Надіслати",
|
"Submit": "Надіслати",
|
||||||
"If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Якщо у вас виникли проблеми або ви просто хочете залишити відгук, надішліть нам короткий опис нижче.",
|
"If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Якщо у вас виникли проблеми або ви просто хочете залишити відгук, надішліть нам короткий опис нижче.",
|
||||||
"Feedback": "Відгук"
|
"Feedback": "Відгук",
|
||||||
|
"<0>Thanks for your feedback!</0>": "<0>Дякуємо за ваш відгук!</0>",
|
||||||
|
"{{count}} stars|one": "{{count}} зірка",
|
||||||
|
"{{count}} stars|other": "{{count}} зірок",
|
||||||
|
"{{displayName}}, your call has ended.": "{{displayName}}, ваш виклик завершено.",
|
||||||
|
"<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Ми будемо раді почути ваші відгуки, щоб поліпшити роботу застосунку.</0>",
|
||||||
|
"How did it go?": "Вам усе сподобалось?"
|
||||||
}
|
}
|
||||||
|
|
|
@ -260,7 +260,7 @@ export function NewVideoGrid<T>({
|
||||||
enter: { opacity: 1, scale: 1, immediate: disableAnimations },
|
enter: { opacity: 1, scale: 1, immediate: disableAnimations },
|
||||||
update: ({ item, x, y, width, height }: Tile) =>
|
update: ({ item, x, y, width, height }: Tile) =>
|
||||||
item.id === dragState.current?.tileId
|
item.id === dragState.current?.tileId
|
||||||
? {}
|
? null
|
||||||
: {
|
: {
|
||||||
x,
|
x,
|
||||||
y,
|
y,
|
||||||
|
@ -284,38 +284,34 @@ export function NewVideoGrid<T>({
|
||||||
const { tileId, tileX, tileY, cursorX, cursorY } = dragState.current!;
|
const { tileId, tileX, tileY, cursorX, cursorY } = dragState.current!;
|
||||||
const tile = tiles.find((t) => t.item.id === tileId)!;
|
const tile = tiles.find((t) => t.item.id === tileId)!;
|
||||||
|
|
||||||
springRef.start((_i, controller) => {
|
springRef.current
|
||||||
if ((controller.item as Tile).item.id === tileId) {
|
.find((c) => (c.item as Tile).item.id === tileId)
|
||||||
if (endOfGesture) {
|
?.start(
|
||||||
return {
|
endOfGesture
|
||||||
scale: 1,
|
? {
|
||||||
zIndex: 1,
|
scale: 1,
|
||||||
shadow: 1,
|
zIndex: 1,
|
||||||
x: tile.x,
|
shadow: 1,
|
||||||
y: tile.y,
|
x: tile.x,
|
||||||
width: tile.width,
|
y: tile.y,
|
||||||
height: tile.height,
|
width: tile.width,
|
||||||
immediate: disableAnimations || ((key) => key === "zIndex"),
|
height: tile.height,
|
||||||
// Allow the tile's position to settle before pushing its
|
immediate: disableAnimations || ((key) => key === "zIndex"),
|
||||||
// z-index back down
|
// Allow the tile's position to settle before pushing its
|
||||||
delay: (key) => (key === "zIndex" ? 500 : 0),
|
// z-index back down
|
||||||
};
|
delay: (key) => (key === "zIndex" ? 500 : 0),
|
||||||
} else {
|
}
|
||||||
return {
|
: {
|
||||||
scale: 1.1,
|
scale: 1.1,
|
||||||
zIndex: 2,
|
zIndex: 2,
|
||||||
shadow: 15,
|
shadow: 15,
|
||||||
x: tileX,
|
x: tileX,
|
||||||
y: tileY,
|
y: tileY,
|
||||||
immediate:
|
immediate:
|
||||||
disableAnimations ||
|
disableAnimations ||
|
||||||
((key) => key === "zIndex" || key === "x" || key === "y"),
|
((key) => key === "zIndex" || key === "x" || key === "y"),
|
||||||
};
|
}
|
||||||
}
|
);
|
||||||
} else {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const overTile = tiles.find(
|
const overTile = tiles.find(
|
||||||
(t) =>
|
(t) =>
|
||||||
|
|
Loading…
Add table
Reference in a new issue