Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useEffectEvent, useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import { useCallback, useRef, useState } from 'react';

const events = ['error', 'stalled', 'play'];
Expand Down Expand Up @@ -135,11 +134,7 @@ export const useReloadOnError = (url: string, type: 'video' | 'audio') => {

const mediaRefCallback = useSafeRefCallback(
useCallback(
(node: HTMLAudioElement | null) => {
if (!node) {
return;
}

(node: HTMLAudioElement) => {
events.forEach((event) => {
node.addEventListener(event, handleMediaURLRecovery);
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { IMessage } from '@rocket.chat/core-typings';
import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useMergedRefs, useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import { useRouter } from '@rocket.chat/ui-contexts';
import { useCallback, useRef } from 'react';

Expand Down Expand Up @@ -49,12 +48,8 @@ export const useJumpToMessage = (messageId: IMessage['_id']) => {

const ref = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node || !scroll) {
return;
}

if (!listRef) {
(node: HTMLElement) => {
if (!listRef || !scroll) {
return;
}

Expand Down
7 changes: 2 additions & 5 deletions apps/meteor/client/views/room/body/hooks/useGetMore.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import { useSearchParameter } from '@rocket.chat/ui-contexts';
import type { MutableRefObject } from 'react';
import { useCallback, useEffect, useRef } from 'react';
Expand All @@ -19,10 +19,7 @@ export const useGetMore = (rid: string, atBottomRef: MutableRefObject<boolean>)

const ref = useSafeRefCallback(
useCallback(
(element: HTMLElement | null) => {
if (!element) {
return;
}
(element: HTMLElement) => {
const checkPositionAndGetMore = withThrottling({ wait: 100 })(async () => {
if (!element.isConnected) {
return;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useMergedRefs, useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import type { MutableRefObject } from 'react';
import { useCallback, useRef } from 'react';

Expand Down Expand Up @@ -35,11 +34,7 @@ export const useListIsAtBottom = () => {

const ref = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node) {
return;
}

(node: HTMLElement) => {
const messageList = node.querySelector('ul');

if (!messageList) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import { useCallback, useRef } from 'react';

import { isAtBottom } from '../../../../../app/ui/client/views/app/lib/scrolling';
Expand All @@ -9,10 +9,7 @@ export function useRestoreScrollPosition(rid: string, wait = 100) {
const jumpToRef = useRef<HTMLElement>(undefined);
const ref = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node) {
return;
}
(node: HTMLElement) => {
const store = RoomManager.getStore(rid);
if (store?.atBottom) {
node.scrollTop = node.scrollHeight;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import type { CSSProperties, MutableRefObject, RefCallback } from 'react';
import { useCallback } from 'react';

Expand All @@ -19,10 +19,6 @@ export const useAutoGrow = (
const autoGrowRef = useSafeRefCallback(
useCallback(
(node: HTMLTextAreaElement) => {
if (!node) {
return;
}

ref.current = node;

const resize = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable complexity */
import { isRoomFederated, isRoomNativeFederated, type IMessage, type ISubscription } from '@rocket.chat/core-typings';
import { useContentBoxSize, useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useContentBoxSize, useEffectEvent, useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import {
MessageComposerAction,
MessageComposerToolbarActions,
Expand Down Expand Up @@ -358,9 +357,6 @@ const MessageBox = ({
const keyDownHandlerCallbackRef = useSafeRefCallback(
useCallback(
(node: HTMLTextAreaElement) => {
if (node === null) {
return;
}
const eventHandler = (e: KeyboardEvent) => keyboardEventHandler(e);
node.addEventListener('keydown', eventHandler);

Expand Down
9 changes: 2 additions & 7 deletions apps/meteor/client/views/room/hooks/useIsVisible.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { useDebouncedState, useSafely } from '@rocket.chat/fuselage-hooks';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useDebouncedState, useSafely, useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import { useCallback } from 'react';

export const useIsVisible = () => {
const [menuVisibility, setMenuVisibility] = useSafely(useDebouncedState(!!window.DISABLE_ANIMATION, 100));

const callbackRef = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node) {
return;
}

(node: HTMLElement) => {
const observer = new IntersectionObserver((entries) => {
entries.forEach((entry) => {
setMenuVisibility(entry.isIntersecting);
Expand Down
1 change: 0 additions & 1 deletion packages/ui-client/src/hooks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ export * from './useFeaturePreview';
export * from './useFeaturePreviewList';
export * from './useLicense';
export * from './usePreferenceFeaturePreviewList';
export * from './useSafeRefCallback';
export * from './useUserDisplayName';
export * from './useValidatePassword';
1 change: 0 additions & 1 deletion packages/ui-client/src/hooks/useSafeRefCallback/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 2 additions & 7 deletions packages/ui-voip/src/context/useMediaStream.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import type { MediaSignalingSession } from '@rocket.chat/media-signaling';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useCallback, useRef } from 'react';

const getRemoteStream = (instance?: MediaSignalingSession) => {
Expand Down Expand Up @@ -29,12 +29,7 @@ const useMediaStream = (
return [
useSafeRefCallback(
useCallback(
(node) => {
// TODO remove node check when useSafeRefCallback is updated from fuselage.
if (!node) {
return;
}

(node: HTMLAudioElement) => {
actualRef.current = node;

if (!remoteStream) {
Expand Down
20 changes: 4 additions & 16 deletions packages/ui-voip/src/hooks/VoipPopupDraggable/DraggableCore.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Emitter } from '@rocket.chat/emitter';
import type { OffCallbackHandler } from '@rocket.chat/emitter';
import { useSafeRefCallback } from '@rocket.chat/ui-client';
import { useSafeRefCallback } from '@rocket.chat/fuselage-hooks';
import { useCallback, useRef, useState } from 'react';

const GRAB_DOM_EVENTS = ['pointerdown'] as const;
Expand Down Expand Up @@ -531,11 +531,7 @@ export const useDraggable = () => {

const handleElementCallbackRef = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node) {
return;
}

(node: HTMLElement) => {
return handleElement.element.setElement(node);
},
[handleElement],
Expand All @@ -544,11 +540,7 @@ export const useDraggable = () => {

const draggableCallbackRef = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node) {
return;
}

(node: HTMLElement) => {
const offMove = draggableElement.onMove(() => {
restorePositionRef.current = node.getBoundingClientRect();
});
Expand All @@ -570,11 +562,7 @@ export const useDraggable = () => {

const boundingCallbackRef = useSafeRefCallback(
useCallback(
(node: HTMLElement | null) => {
if (!node) {
return;
}

(node: HTMLElement) => {
return boundingElement.element.setElement(node);
},
[boundingElement],
Expand Down
Loading