-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: tidy merge conflicts from rebasing the feature branch
- Loading branch information
1 parent
20df1f7
commit d6cc8d0
Showing
5 changed files
with
13 additions
and
9 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
packages/picasso-rich-text-editor/src/LexicalEditor/hooks/useTypographyClasses/test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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' |