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,10 +1,8 @@
import { Margins } from '@rocket.chat/fuselage';
import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn, PageScrollableContent } from '@rocket.chat/ui-client';
import type { ComponentProps } from 'react';
import { forwardRef, memo } from 'react';

import { PageScrollableContent } from '../Page';

const ContextualbarScrollableContent = forwardRef<HTMLElement, ComponentProps<typeof PageScrollableContent>>(
function ContextualbarScrollableContent({ children, ...props }, ref) {
return (
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/client/components/Page/Page.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
import { PageScrollableContent } from '@rocket.chat/ui-client';
import type { Meta, StoryFn } from '@storybook/react';
import type { ComponentType } from 'react';

import { Page, PageContent, PageHeader, PageScrollableContent, PageScrollableContentWithShadow } from '.';
import { Page, PageContent, PageHeader, PageScrollableContentWithShadow } from '.';

export default {
component: Page,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { PageScrollableContent } from '@rocket.chat/ui-client';
import type { ComponentPropsWithoutRef } from 'react';
import { useContext } from 'react';

import PageContext from './PageContext';
import PageScrollableContent from './PageScrollableContent';

type PageScrollableContentWithShadowProps = ComponentPropsWithoutRef<typeof PageScrollableContent>;

Expand Down
1 change: 0 additions & 1 deletion apps/meteor/client/components/Page/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ export { default as Page } from './Page';
export { default as PageContent } from './PageContent';
export { default as PageFooter } from './PageFooter';
export { default as PageHeader } from './PageHeader';
export { default as PageScrollableContent } from './PageScrollableContent';
export { default as PageScrollableContentWithShadow } from './PageScrollableContentWithShadow';
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { Box, Select, Tabs } from '@rocket.chat/fuselage';
import { PageScrollableContent } from '@rocket.chat/ui-client';
import type { ReactElement } from 'react';
import { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';

import ChannelsTab from './channels/ChannelsTab';
import MessagesTab from './messages/MessagesTab';
import UsersTab from './users/UsersTab';
import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
import { Page, PageHeader } from '../../../components/Page';

type EngagementDashboardPageProps = {
tab: 'users' | 'messages' | 'channels';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/home/DefaultHomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box, CardGroup } from '@rocket.chat/fuselage';
import { PageScrollableContent } from '@rocket.chat/ui-client';
import { useAtLeastOnePermission, useSetting, useTranslation, useRole, usePermission } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';

Expand All @@ -11,7 +12,6 @@ import DocumentationCard from './cards/DocumentationCard';
import JoinRoomsCard from './cards/JoinRoomsCard';
import MobileAppsCard from './cards/MobileAppsCard';
import Page from '../../components/Page/Page';
import PageScrollableContent from '../../components/Page/PageScrollableContent';

const CREATE_CHANNEL_PERMISSIONS = ['create-c', 'create-p'];

Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/client/views/marketplace/AppInstallPage.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Button, ButtonGroup, Field, FieldGroup, FieldLabel, FieldRow, TextInput } from '@rocket.chat/fuselage';
import { PageScrollableContent } from '@rocket.chat/ui-client';
import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
import { useCallback, useId } from 'react';
import { useForm, Controller } from 'react-hook-form';

import { useInstallApp } from './hooks/useInstallApp';
import { Page, PageHeader, PageScrollableContent } from '../../components/Page';
import { Page, PageHeader } from '../../components/Page';
import { useSingleFileInput } from '../../hooks/useSingleFileInput';

const AppInstallPage = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Box } from '@rocket.chat/fuselage';
import type { OverlayScrollbars } from '@rocket.chat/ui-client';
import { CustomScrollbars } from '@rocket.chat/ui-client';
import type { ComponentProps } from 'react';
import { forwardRef } from 'react';

import type { OverlayScrollbars } from '../CustomScrollbars';
import { CustomScrollbars } from '../CustomScrollbars';

type PageScrollableContentProps = {
onScroll?: (args: OverlayScrollbars) => void;
} & Omit<ComponentProps<typeof Box>, 'onScroll'>;
Expand Down
1 change: 1 addition & 0 deletions packages/ui-client/src/components/Page/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as PageScrollableContent } from './PageScrollableContent';
1 change: 1 addition & 0 deletions packages/ui-client/src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ export * from './GenericMenu';
export * from './Modal';
export * from './Wizard';
export * from './CustomScrollbars';
export * from './Page';
Loading