diff --git a/client/components/GenericModal.tsx b/client/components/GenericModal.tsx index 528a94283d476..9393ce4fbfdca 100644 --- a/client/components/GenericModal.tsx +++ b/client/components/GenericModal.tsx @@ -1,5 +1,5 @@ -import { Box, Button, ButtonGroup, Icon, Modal, ButtonProps } from '@rocket.chat/fuselage'; -import React, { FC } from 'react'; +import { Box, Button, ButtonGroup, Icon, Modal } from '@rocket.chat/fuselage'; +import React, { FC, ComponentProps } from 'react'; import { useTranslation } from '../contexts/TranslationContext'; import { withDoNotAskAgain, RequiredModalProps } from './withDoNotAskAgain'; @@ -24,7 +24,7 @@ const iconMap = { success: 'check', }; -const getButtonProps = (variant: VariantType): ButtonProps => { +const getButtonProps = (variant: VariantType): ComponentProps => { switch (variant) { case 'danger': return { primary: true, danger: true }; diff --git a/client/components/Page/PageScrollableContent.tsx b/client/components/Page/PageScrollableContent.tsx index 2d809c51ec127..15aff587cf9dd 100644 --- a/client/components/Page/PageScrollableContent.tsx +++ b/client/components/Page/PageScrollableContent.tsx @@ -1,10 +1,10 @@ -import { Box, ScrollableProps } from '@rocket.chat/fuselage'; -import React, { forwardRef } from 'react'; +import { Box, Scrollable } from '@rocket.chat/fuselage'; +import React, { forwardRef, ComponentProps } from 'react'; import ScrollableContentWrapper, { CustomScrollbarsProps } from '../ScrollableContentWrapper'; type PageScrollableContentProps = { - onScrollContent?: ScrollableProps['onScrollContent']; + onScrollContent?: ComponentProps['onScrollContent']; }; const PageScrollableContent = forwardRef( diff --git a/package-lock.json b/package-lock.json index 255ed9c9f1cd4..e32e39e3e3266 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6323,9 +6323,9 @@ } }, "@rocket.chat/fuselage": { - "version": "0.6.3-dev.248", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.248.tgz", - "integrity": "sha512-moFwib95YoZkCrnfBnLpVr7/PJ0qgJhVCxseyRMQ3TF4utOdoawiiEKhgpWE7WMK0lzXkOhEDgjc/1iykPImNw==", + "version": "0.6.3-dev.253", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.253.tgz", + "integrity": "sha512-CJT/lYL5ezbIUHczRJg8oJxmwd2GWbFXh06c/mycxZ1fLZY8wgzluDHqvfe7UplIhDF83/t6DSI+Nwaj5kUb6g==", "requires": { "@rocket.chat/css-in-js": "^0.24.0", "@rocket.chat/fuselage-tokens": "^0.24.0", diff --git a/package.json b/package.json index 3ba714ce2c4ef..977165d4e6bea 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "@rocket.chat/apps-engine": "1.25.0", "@rocket.chat/css-in-js": "^0.24.0", "@rocket.chat/emitter": "^0.24.0", - "@rocket.chat/fuselage": "^0.6.3-dev.248", + "@rocket.chat/fuselage": "^0.6.3-dev.253", "@rocket.chat/fuselage-hooks": "^0.24.0", "@rocket.chat/fuselage-polyfills": "^0.24.0", "@rocket.chat/fuselage-tokens": "^0.24.0",