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
27 changes: 0 additions & 27 deletions src/components/MessageInput/__tests__/MessageInput.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,33 +31,6 @@ import {

expect.extend(toHaveNoViolations);

jest.mock('react', () => {
const React = jest.requireActual('react');
const Suspense = ({ children }) => children;

const lazy = jest.fn().mockImplementation((fn) => {
const Component = (props) => {
const [C, setC] = React.useState();

React.useEffect(() => {
fn().then((v) => {
setC(v);
});
}, []);

return C ? <C.default {...props} /> : null;
};

return Component;
});

return {
...React,
lazy,
Suspense,
};
});

jest.mock('../../Channel/utils', () => ({ makeAddNotifications: jest.fn }));

let chatClient;
Expand Down
4 changes: 4 additions & 0 deletions src/context/DefaultEmoji.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @ts-expect-error
import NimbleEmoji from 'emoji-mart/dist/components/emoji/nimble-emoji';

export { NimbleEmoji as default };
4 changes: 4 additions & 0 deletions src/context/DefaultEmojiPicker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @ts-expect-error
import NimblePicker from 'emoji-mart/dist/components/picker/nimble-picker';

export { NimblePicker as default };
14 changes: 3 additions & 11 deletions src/context/EmojiContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,9 @@ export type EmojiContextValue = {
EmojiPicker?: React.ComponentType<NimblePickerProps>;
};

const DefaultEmoji = React.lazy(async () => {
//@ts-expect-error
const emoji = await import('emoji-mart/dist/components/emoji/nimble-emoji.js');
return { default: emoji.default };
});

const DefaultEmojiPicker = React.lazy(async () => {
// @ts-expect-error
const emojiPicker = await import('emoji-mart/dist/components/picker/nimble-picker.js');
return { default: emojiPicker.default };
});
const DefaultEmoji = React.lazy(() => import('./DefaultEmoji'));

const DefaultEmojiPicker = React.lazy(() => import('./DefaultEmojiPicker'));

export const EmojiContext = React.createContext<EmojiContextValue | undefined>(undefined);

Expand Down