editor-refactored

src/components/Article/AudioPlayer/PlayerPlaylist.tsx

@@ -9,7 +9,7 @@ import { SharePopup, getShareUrl } from '../SharePopup'
 
 import styles from './AudioPlayer.module.scss'
 
-const MicroEditor = lazy(() => import('../../Editor/MicroEditor/MicroEditor'))
+const MicroEditor = lazy(() => import('../../Editor/MicroEditor'))
 const GrowingTextarea = lazy(() => import('~/components/_shared/GrowingTextarea/GrowingTextarea'))
 
 type Props = {
@@ -174,7 +174,7 @@ export const PlayerPlaylist = (props: Props) => {
                   <MicroEditor
                     content={mi.body}
                     placeholder={`${t('Description')}...`}
-                    onChange={(value) => handleMediaItemFieldChange('body', value)}
+                    onChange={(value: string) => handleMediaItemFieldChange('body', value)}
                   />
                   <GrowingTextarea
                     allowEnterKey={true}

src/components/Article/Comment/Comment.tsx

@@ -21,7 +21,7 @@ import { CommentDate } from '../CommentDate'
 import { CommentRatingControl } from '../CommentRatingControl'
 import styles from './Comment.module.scss'
 
-const MiniEditor = lazy(() => import('../../Editor/MiniEditor/MiniEditor'))
+const MiniEditor = lazy(() => import('../../Editor/MiniEditor'))
 
 type Props = {
   comment: Reaction

src/components/Article/CommentsTree.tsx

@@ -14,7 +14,7 @@ import { ShowIfAuthenticated } from '../_shared/ShowIfAuthenticated'
 import styles from './Article.module.scss'
 import { Comment } from './Comment'
 
-const MiniEditor = lazy(() => import('../Editor/MiniEditor/MiniEditor'))
+const MiniEditor = lazy(() => import('../Editor/MiniEditor'))
 
 type Props = {
   articleAuthors: Author[]

src/components/Editor/BubbleMenu/index.ts

@@ -1,3 +0,0 @@
-export { FigureBubbleMenu } from './FigureBubbleMenu'
-export { BlockquoteBubbleMenu } from './BlockquoteBubbleMenu'
-export { IncutBubbleMenu } from './IncutBubbleMenu'

src/components/Editor/Editor.tsx

@@ -17,9 +17,11 @@ import { Author } from '~/graphql/schema/core.gen'
 import { base, custom, extended } from '~/lib/editorExtensions'
 import { handleImageUpload } from '~/lib/handleImageUpload'
 import { renderUploadedImage } from '../Upload/renderUploadedImage'
-import { BlockquoteBubbleMenu, FigureBubbleMenu, IncutBubbleMenu } from './BubbleMenu'
+import { BlockquoteBubbleMenu } from './Toolbar/BlockquoteBubbleMenu'
-import { TextBubbleMenu } from './BubbleMenu/TextBubbleMenu'
+import { EditorFloatingMenu } from './Toolbar/EditorFloatingMenu'
-import { EditorFloatingMenu } from './EditorFloatingMenu'
+import { FigureBubbleMenu } from './Toolbar/FigureBubbleMenu'
+import { IncutBubbleMenu } from './Toolbar/IncutBubbleMenu'
+import { TextBubbleMenu } from './Toolbar/TextBubbleMenu'
 
 import './Editor.module.scss'
 

src/components/Editor/EditorFloatingMenu/index.ts

@@ -1 +0,0 @@
-export { EditorFloatingMenu } from './EditorFloatingMenu'

src/components/Editor/MicroEditor.tsx

@@ -4,9 +4,9 @@ import clsx from 'clsx'
 import { type JSX, createEffect, createSignal, on } from 'solid-js'
 import { createTiptapEditor, useEditorHTML } from 'solid-tiptap'
 import { minimal } from '~/lib/editorExtensions'
-import { MicroBubbleMenu } from './MicroBubbleMenu'
+import { MicroBubbleMenu } from './Toolbar/MicroBubbleMenu'
 
-import styles from '../MiniEditor/MiniEditor.module.scss'
+import styles from './MiniEditor.module.scss'
 
 interface MicroEditorProps {
   content?: string

src/components/Editor/MiniEditor.tsx

@@ -6,7 +6,7 @@ import { createTiptapEditor, useEditorHTML, useEditorIsEmpty } from 'solid-tipta
 import { Button } from '~/components/_shared/Button'
 import { useLocalize } from '~/context/localize'
 import { base } from '~/lib/editorExtensions'
-import { ToolbarControl as Control } from '../Toolbar/ToolbarControl'
+import { ToolbarControl as Control } from './Toolbar/ToolbarControl'
 
 import { Editor } from '@tiptap/core'
 import { Portal } from 'solid-js/web'
@@ -16,8 +16,8 @@ import { Icon } from '~/components/_shared/Icon/Icon'
 import { Modal } from '~/components/_shared/Modal'
 import { useUI } from '~/context/ui'
 import { UploadedFile } from '~/types/upload'
-import { InsertLinkForm } from '../Toolbar/InsertLinkForm'
 import styles from './MiniEditor.module.scss'
+import { InsertLinkForm } from './Toolbar/InsertLinkForm'
 
 interface MiniEditorProps {
   content?: string

src/components/Editor/Toolbar/MicroBubbleMenu.tsx

@@ -5,7 +5,7 @@ import { createEditorTransaction } from 'solid-tiptap'
 import { Icon } from '~/components/_shared/Icon'
 import { Popover } from '~/components/_shared/Popover'
 import { useLocalize } from '~/context/localize'
-import { InsertLinkForm } from '../Toolbar/InsertLinkForm'
+import { InsertLinkForm } from './InsertLinkForm'
 
 import styles from './MicroBubbleMenu.module.scss'
 

src/components/Editor/Toolbar/TextBubbleMenu.tsx

@@ -5,11 +5,11 @@ import { createEditorTransaction } from 'solid-tiptap'
 import { Icon } from '~/components/_shared/Icon'
 import { Popover } from '~/components/_shared/Popover'
 import { useLocalize } from '~/context/localize'
-import { InsertLinkForm } from '../Toolbar/InsertLinkForm'
+import { InsertLinkForm } from './InsertLinkForm'
 
 import styles from './TextBubbleMenu.module.scss'
 
-const MiniEditor = lazy(() => import('../MiniEditor/MiniEditor'))
+const MiniEditor = lazy(() => import('../MiniEditor'))
 
 type BubbleMenuProps = {
   editor: Editor

src/components/Views/EditView/EditView.tsx

@@ -29,7 +29,7 @@ import { Modal } from '../../_shared/Modal'
 import { TableOfContents } from '../../_shared/TableOfContents'
 import styles from './EditView.module.scss'
 
-const MicroEditor = lazy(() => import('../../Editor/MicroEditor/MicroEditor'))
+const MicroEditor = lazy(() => import('../../Editor/MicroEditor'))
 const GrowingTextarea = lazy(() => import('~/components/_shared/GrowingTextarea/GrowingTextarea'))
 
 type Props = {

src/components/Views/Inbox/Inbox.tsx

@@ -25,7 +25,7 @@ import Search from '../../Inbox/Search'
 import { Modal } from '../../_shared/Modal'
 import styles from './Inbox.module.scss'
 
-const MiniEditor = lazy(() => import('../../Editor/MiniEditor/MiniEditor'))
+const MiniEditor = lazy(() => import('../../Editor/MiniEditor'))
 
 const userSearch = (array: Author[], keyword: string) => {
   return array.filter((value) => new RegExp(keyword.trim(), 'gi').test(value.name || ''))

src/components/Views/Profile/ProfileSettings.tsx

@@ -34,7 +34,7 @@ import { SocialNetworkInput } from '../../_shared/SocialNetworkInput'
 import styles from './Settings.module.scss'
 import { profileSocialLinks } from './profileSocialLinks'
 
-const MicroEditor = lazy(() => import('../../Editor/MicroEditor/MicroEditor'))
+const MicroEditor = lazy(() => import('../../Editor/MicroEditor'))
 const GrowingTextarea = lazy(() => import('~/components/_shared/GrowingTextarea/GrowingTextarea'))
 
 function filterNulls(arr: InputMaybe<string>[]): string[] {

src/components/Views/PublishSettings/PublishSettings.tsx

@@ -19,7 +19,7 @@ import { UploadModalContent } from '~/components/Upload/UploadModalContent/Uploa
 import stylesBeside from '../../Feed/Beside.module.scss'
 import styles from './PublishSettings.module.scss'
 
-const MicroEditor = lazy(() => import('../../Editor/MicroEditor/MicroEditor'))
+const MicroEditor = lazy(() => import('../../Editor/MicroEditor'))
 const GrowingTextarea = lazy(() => import('~/components/_shared/GrowingTextarea/GrowingTextarea'))
 const DESCRIPTION_MAX_LENGTH = 400
 

src/components/_shared/SolidSwiper/EditorSwiper.tsx

@@ -22,7 +22,7 @@ import { MediaItem } from '~/types/mediaitem'
 import { UploadedFile } from '~/types/upload'
 import styles from './Swiper.module.scss'
 
-const MicroEditor = lazy(() => import('../../Editor/MicroEditor/MicroEditor'))
+const MicroEditor = lazy(() => import('../../Editor/MicroEditor'))
 
 type Props = {
   images: MediaItem[]