From 5430143735d027f066cab89f722d925f6bc3f653 Mon Sep 17 00:00:00 2001
From: Augusto Moura <augusto.moura@toptal.com>
Date: Wed, 28 Jun 2023 19:01:19 -0300
Subject: [PATCH] fix: tidy merge conflicts from rebasing the feature branch

---
 .../src/LexicalEditor/hooks/useTypographyClasses/test.ts    | 4 ++--
 .../picasso-rich-text-editor/src/RichTextEditor/index.ts    | 5 +----
 .../picasso-rich-text-editor/src/RichTextEditor/test.tsx    | 2 +-
 .../picasso-rich-text-editor/src/RichTextEditor/types.ts    | 6 +++++-
 packages/picasso-rich-text-editor/src/index.ts              | 5 ++++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/picasso-rich-text-editor/src/LexicalEditor/hooks/useTypographyClasses/test.ts b/packages/picasso-rich-text-editor/src/LexicalEditor/hooks/useTypographyClasses/test.ts
index f6fa533868..1af6e83a5b 100644
--- a/packages/picasso-rich-text-editor/src/LexicalEditor/hooks/useTypographyClasses/test.ts
+++ b/packages/picasso-rich-text-editor/src/LexicalEditor/hooks/useTypographyClasses/test.ts
@@ -1,8 +1,8 @@
 import { renderHook } from '@testing-library/react-hooks'
+import { getTypographyClassName } from '@toptal/picasso'
+import type { TypographyOptions } from '@toptal/picasso'
 
 import useTypographyClasses from './useTypographyClasses'
-import getTypographyClassName from '../../../Typography/utils/get-typography-class-name/get-typography-class-name'
-import type { TypographyOptions } from '../../../Typography/utils/get-typography-class-name/get-typography-class-name'
 
 jest.mock('../../../Typography/styles', () => ({
   __esModule: true,
diff --git a/packages/picasso-rich-text-editor/src/RichTextEditor/index.ts b/packages/picasso-rich-text-editor/src/RichTextEditor/index.ts
index 0e585663b0..f813768044 100644
--- a/packages/picasso-rich-text-editor/src/RichTextEditor/index.ts
+++ b/packages/picasso-rich-text-editor/src/RichTextEditor/index.ts
@@ -1,10 +1,7 @@
 import type { OmitInternalProps } from '@toptal/picasso-shared'
 
 import type { Props } from './RichTextEditor'
-export type {
-  CustomEmojiGroup,
-  ChangeHandler as RichTextEditorChangeHandler,
-} from './types'
+export type { CustomEmojiGroup, RichTextEditorChangeHandler } from './types'
 
 export { default } from './RichTextEditor'
 export type RichTextEditorProps = OmitInternalProps<Props>
diff --git a/packages/picasso-rich-text-editor/src/RichTextEditor/test.tsx b/packages/picasso-rich-text-editor/src/RichTextEditor/test.tsx
index 079120d0a2..da6ff7c9e4 100644
--- a/packages/picasso-rich-text-editor/src/RichTextEditor/test.tsx
+++ b/packages/picasso-rich-text-editor/src/RichTextEditor/test.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import type { OmitInternalProps } from '@toptal/picasso-shared'
 import { render } from '@toptal/picasso/test-utils'
+import { InputMultilineAdornment } from '@toptal/picasso'
 
 import RichTextEditor from './RichTextEditor'
 import type { Props } from './RichTextEditor'
 import LexicalEditor from '../LexicalEditor'
 import { useCounter } from './hooks'
-import InputMultilineAdornment from '../InputMultilineAdornment'
 
 jest.mock('../utils/use-deprecation-warnings', () => ({
   usePropDeprecationWarning: jest.fn(),
diff --git a/packages/picasso-rich-text-editor/src/RichTextEditor/types.ts b/packages/picasso-rich-text-editor/src/RichTextEditor/types.ts
index 3a18efc4ea..dd2333ff89 100644
--- a/packages/picasso-rich-text-editor/src/RichTextEditor/types.ts
+++ b/packages/picasso-rich-text-editor/src/RichTextEditor/types.ts
@@ -5,7 +5,11 @@ export type CounterMessageSetter = (
   isError: boolean
 ) => string
 
-export type { ChangeHandler, TextLengthChangeHandler } from '../LexicalEditor'
+export type {
+  ChangeHandler,
+  ChangeHandler as RichTextEditorChangeHandler,
+  TextLengthChangeHandler,
+} from '../LexicalEditor'
 
 // @todo: remove this when we remove the old editor
 export type { CustomEmojiGroup, CustomEmoji } from '../QuillEditor'
diff --git a/packages/picasso-rich-text-editor/src/index.ts b/packages/picasso-rich-text-editor/src/index.ts
index 176b1a2792..90946a1649 100644
--- a/packages/picasso-rich-text-editor/src/index.ts
+++ b/packages/picasso-rich-text-editor/src/index.ts
@@ -1,4 +1,7 @@
 export { default as RichTextEditor } from './RichTextEditor'
-export type { RichTextEditorProps } from './RichTextEditor'
+export type {
+  RichTextEditorProps,
+  RichTextEditorChangeHandler,
+} from './RichTextEditor'
 export { default as RichText } from './RichText'
 export type { RichTextProps, ASTType } from './RichText'