theme-fix+draftslist-fix+minieditor-cancel-fix

README.en.md

@@ -42,12 +42,8 @@ bun run e2e:tests    # Run tests
 bun run e2e:tests:ci # Run tests in CI
 ```
 
-Structure:
-- `/tests/*`: Tests without authentication
-- `/tests-with-auth/*`: Tests with authentication
-
 ## CI/CD
 
 Tests are executed in GitHub Actions. Make sure `BASE_URL` is correctly configured in CI.
 
-## Project version: 0.9.7
+## Version: 0.9.7

README.md

@@ -43,12 +43,8 @@ bun run e2e:tests    # Запуск тестов
 bun run e2e:tests:ci # Запуск тестов в CI
 ```
 
-Структура:
-- `/tests/*`: Тесты без аутентификации
-- `/tests-with-auth/*`: Тесты с аутентификацией
-
 ## CI/CD
 
 Тесты выполняются в GitHub Actions. Убедитесь, что `BASE_URL` корректно настроен в CI.
 
-## Версия проекта: 0.9.7
+## Версия: 0.9.7

src/components/Draft/Draft.tsx

@@ -53,7 +53,7 @@ export const Draft = (props: Props) => {
         <span class={styles.title}>{props.shout.title || t('Unnamed draft')}</span> {props.shout.subtitle}
       </div>
       <div class={styles.actions}>
-        <A class={styles.actionItem} href={`edit/${props.shout?.id.toString()}`}>
+        <A class={styles.actionItem} href={`/edit/${props.shout?.id.toString()}`}>
           {t('Edit')}
         </A>
         <span onClick={handlePublishLinkClick} class={clsx(styles.actionItem, styles.publish)}>

src/components/Editor/Editor.tsx

@@ -1,6 +1,6 @@
 import { HocuspocusProvider } from '@hocuspocus/provider'
 import { UploadFile } from '@solid-primitives/upload'
-import { Editor, EditorOptions } from '@tiptap/core'
+import { Editor, EditorOptions, isTextSelection } from '@tiptap/core'
 import { BubbleMenu } from '@tiptap/extension-bubble-menu'
 import { CharacterCount } from '@tiptap/extension-character-count'
 import { Collaboration } from '@tiptap/extension-collaboration'
@@ -43,13 +43,8 @@ export const EditorComponent = (props: EditorComponentProps) => {
   const { t } = useLocalize()
   const { session, requireAuthentication } = useSession()
   const author = createMemo<Author>(() => session()?.user?.app_data?.profile as Author)
-  const [isCommonMarkup, _setIsCommonMarkup] = createSignal(false)
-  const createMenuSignal = () => createSignal(false)
-  const [shouldShowTextBubbleMenu, _setShouldShowTextBubbleMenu] = createMenuSignal()
-  const [shouldShowBlockquoteBubbleMenu, _setShouldShowBlockquoteBubbleMenu] = createMenuSignal()
-  const [shouldShowFigureBubbleMenu, _setShouldShowFigureBubbleMenu] = createMenuSignal()
-  const [shouldShowIncutBubbleMenu, _setShouldShowIncutBubbleMenu] = createMenuSignal()
-  const [shouldShowFloatingMenu, _setShouldShowFloatingMenu] = createMenuSignal()
+  const [isCommonMarkup, setIsCommonMarkup] = createSignal(false)
+  const [shouldShowTextBubbleMenu, setShouldShowTextBubbleMenu] = createSignal(false)
   const { showSnackbar } = useSnackbar()
   const { countWords, setEditing } = useEditorContext()
   const [editorOptions, setEditorOptions] = createSignal<Partial<EditorOptions>>({})
@@ -180,14 +175,8 @@ export const EditorComponent = (props: EditorComponentProps) => {
     requireAuthentication(() => {
       setTimeout(() => {
         setupEditor()
-
-        // Создаем экземпляр редактора после монтирования
         createEditorInstance(editorOptions())
-
-        // Инициализируем меню после создания редактора
-        if (editor()) {
-          initializeMenus()
-        }
+        initializeMenus()
       }, 1200)
     }, 'edit')
   })
@@ -196,30 +185,80 @@ export const EditorComponent = (props: EditorComponentProps) => {
     if (menusInitialized() || !editor()) return
     if (blockquoteBubbleMenuRef() && figureBubbleMenuRef() && incutBubbleMenuRef() && floatingMenuRef()) {
       console.log('stage 3: initialize menus when editor instance is ready')
-      const menuConfigs = [
-        { key: 'textBubbleMenu', ref: textBubbleMenuRef, shouldShow: shouldShowTextBubbleMenu },
-        {
-          key: 'blockquoteBubbleMenu',
-          ref: blockquoteBubbleMenuRef,
-          shouldShow: shouldShowBlockquoteBubbleMenu
-        },
-        { key: 'figureBubbleMenu', ref: figureBubbleMenuRef, shouldShow: shouldShowFigureBubbleMenu },
-        { key: 'incutBubbleMenu', ref: incutBubbleMenuRef, shouldShow: shouldShowIncutBubbleMenu },
-        { key: 'floatingMenu', ref: floatingMenuRef, shouldShow: shouldShowFloatingMenu, isFloating: true }
+      const menus = [
+        BubbleMenu.configure({
+          pluginKey: 'textBubbleMenu',
+          element: textBubbleMenuRef()!,
+          shouldShow: ({ editor: e, view, state: { doc, selection }, from, to }) => {
+            const isEmptyTextBlock =
+              doc.textBetween(from, to).length === 0 && isTextSelection(selection)
+            if (isEmptyTextBlock) {
+              e?.chain().focus().removeTextWrap({ class: 'highlight-fake-selection' }).run()
+            }
+            const hasSelection = !selection.empty && from !== to
+            const isFootnoteOrFigcaption = e.isActive('footnote') || (e.isActive('figcaption') && hasSelection)
+            
+            setIsCommonMarkup(e?.isActive('figcaption'))
+            
+            const result = view.hasFocus() && 
+              hasSelection && 
+              !e.isActive('image') && 
+              !e.isActive('figure') &&
+              (isFootnoteOrFigcaption || !e.isActive('figcaption'))
+            
+            setShouldShowTextBubbleMenu(result)
+            return result
+          },
+          tippyOptions: {
+            sticky: true,
+            // onHide: () => { editor()?.commands.focus() }
+          }
+        }),
+        BubbleMenu.configure({
+          pluginKey: 'blockquoteBubbleMenu',
+          element: blockquoteBubbleMenuRef()!,
+          shouldShow: ({ editor: e, state: { selection } }) => e.isFocused && !selection.empty && e.isActive('blockquote'),
+          tippyOptions: {
+            offset: [0, 0],
+            placement: 'top',
+            getReferenceClientRect: () => {
+              const selectedElement = editor()?.view.dom.querySelector('.has-focus')
+              return selectedElement?.getBoundingClientRect() || new DOMRect()
+            }
+          }
+        }),
+        BubbleMenu.configure({
+          pluginKey: 'figureBubbleMenu',
+          element: figureBubbleMenuRef()!,
+          shouldShow: ({ editor: e, view }) => view.hasFocus() && e.isActive('figure')
+        }),
+        BubbleMenu.configure({
+          pluginKey: 'incutBubbleMenu',
+          element: incutBubbleMenuRef()!,
+          shouldShow: ({ editor: e, state: { selection } }) => e.isFocused && !selection.empty && e.isActive('figcaption'),
+          tippyOptions: {
+            offset: [0, -16],
+            placement: 'top',
+            getReferenceClientRect: () => {
+              const selectedElement = editor()?.view.dom.querySelector('.has-focus')
+              return selectedElement?.getBoundingClientRect() || new DOMRect()
+            },
+          },
+        }),
+        FloatingMenu.configure({
+          element: floatingMenuRef()!,
+          pluginKey: 'floatingMenu',
+          shouldShow: ({ editor: e, state: { selection } }) => {
+            const { $anchor, empty } = selection
+            const isRootDepth = $anchor.depth === 1
+            if (!(isRootDepth && empty)) return false
+            return !(e.isActive('codeBlock') || e.isActive('heading'))
+          },
+          tippyOptions: {
+            placement: 'left',
+          }
+        })
       ]
-      const menus = menuConfigs.map((config) =>
-        config.isFloating
-          ? FloatingMenu.configure({
-              pluginKey: config.key,
-              element: config.ref(),
-              shouldShow: config.shouldShow
-            })
-          : BubbleMenu.configure({
-              pluginKey: config.key,
-              element: config.ref(),
-              shouldShow: config.shouldShow
-            })
-      )
       setEditorOptions((prev) => ({ ...prev, extensions: [...(prev.extensions || []), ...menus] }))
       setMenusInitialized(true)
     } else {
@@ -311,12 +350,12 @@ export const EditorComponent = (props: EditorComponentProps) => {
         <Show when={editor()} keyed>
           {(ed: Editor) => (
             <>
-              <TextBubbleMenu
-                shouldShow={shouldShowTextBubbleMenu()}
-                isCommonMarkup={isCommonMarkup()}
-                editor={ed}
-                ref={setTextBubbleMenuRef}
-              />
+            <TextBubbleMenu
+            shouldShow={shouldShowTextBubbleMenu()}
+            isCommonMarkup={isCommonMarkup()}
+            editor={ed}
+            ref={setTextBubbleMenuRef}
+          />
               <BlockquoteBubbleMenu editor={ed} ref={setBlockquoteBubbleMenuRef} />
               <FigureBubbleMenu editor={ed} ref={setFigureBubbleMenuRef} />
               <IncutBubbleMenu editor={ed} ref={setIncutBubbleMenuRef} />
@@ -338,4 +377,4 @@ export const EditorComponent = (props: EditorComponentProps) => {
       </Show>
     </>
   )
-}
+}

src/components/Editor/MiniEditor.tsx

@@ -162,11 +162,14 @@ export function MiniEditor(props: MiniEditorProps): JSX.Element {
       <div class={styles.buttons}>
         <Button
           value={t('Cancel')}
-          disabled={isEmpty()}
           variant="secondary"
-          onClick={() => editor()?.commands.clearContent()}
+          onClick={() => {
+              editor()?.commands.clearContent()
+              props.onCancel?.()
+            }
+          }
         />
-        <Button value={t('Send')} variant="primary" disabled={isEmpty()} onClick={handleSubmit} />
+        <Button value={t('Save')} variant="primary" disabled={isEmpty()} onClick={handleSubmit} />
       </div>
 
       <Show when={counter() > 0}>

src/components/Editor/Toolbar/TextBubbleMenu.tsx

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

src/components/Inbox/DialogCard.module.scss

@@ -77,7 +77,7 @@
     .name,
     .message,
     .time {
-      color: #fff !important;
+      color: var(--default-color-invert) !important;
     }
   }
-}
+}

src/components/_shared/LoadMoreWrapper.module.scss

@@ -0,0 +1,8 @@
+
+.loadMoreWrapper {
+    text-align: center;
+  
+    button {
+      padding: 0.6em 1.5em;
+    }
+  }

src/components/_shared/LoadMoreWrapper.tsx

@@ -6,6 +6,8 @@ import { SortFunction } from '~/types/common'
 import { restoreScrollPosition, saveScrollPosition } from '~/utils/scroll'
 import { byCreated } from '~/utils/sort'
 
+import styles from './LoadMoreWrapper.module.scss'
+
 export type LoadMoreItems = Shout[] | Author[] | Reaction[]
 
 type LoadMoreProps = {
@@ -58,7 +60,7 @@ export const LoadMoreWrapper = (props: LoadMoreProps) => {
       {props.children}
       <div>
         <Show when={isLoadMoreButtonVisible() && !props.hidden}>
-          <div class="load-more-container">
+          <div class={styles.loadMoreWrapper}>
             <Button
               onClick={loadItems}
               disabled={isLoading()}

src/styles/_global.scss

@@ -1,3 +1,5 @@
+@import 'theme';
+
 $include-column-box-sizing: true !default;
 $rfs-breakpoint: 1460px !default;
 $rfs-base-value: 1.6rem !default;
@@ -30,10 +32,10 @@ $font-family: muller, arial, helvetica, sans-serif;
 $font-size-base: 2rem;
 $line-height-base: 1.6;
 
-// Базовые цвета (не зависящие от темы)
-$color-primary: #2638d9;
-$color-danger: #d00820;
-$default-color: #141414;
+// цвета
+$color-primary: var(--blue-500);
+$color-danger: var(--danger-color);
+$default-color: var(--black-500);
 
 // Другие переменные
 $border-radius: 2px;

src/styles/_theme.scss

@@ -9,14 +9,15 @@
   --secondary-color: #85878a;
   --placeholder-color: #9fa1a7;
   --placeholder-color-semi: rgb(159 169 167 / 20%);
-  --danger-color: $color-danger;
+  --danger-color: #ff0000;
   --lightgray-color: rgb(84 16 17 / 6%);
   --selection-background: #000;
   --selection-color: #fff;
   --icon-filter: invert(0);
   --icon-filter-hover: invert(1);
   --editor-bubble-menu-background: #fff;
-  --blue-link: $link-color;
+  --editor-bubble-menu-border: #000;
+  --blue-link: #2638d9;
 
   // names from figma
   --black-50: #f7f7f8;

src/styles/app.scss

@@ -1,5 +1,4 @@
 @import 'fonts';
-@import 'theme';
 @import 'grid';
 
 *,
@@ -603,8 +602,7 @@ figure {
 }
 
 .view-switcher__counter {
-  align-items: center;
-  background: #f7f7f8;
+  background: var(--black-50);
   border-radius: 0.8rem;
   display: inline-flex;
   font-size: 1.2rem;
@@ -838,14 +836,6 @@ figure {
   }
 }
 
-.load-more-container {
-  text-align: center;
-
-  button {
-    padding: 0.6em 1.5em;
-  }
-}
-
 details {
   @include media-breakpoint-down(md) {
     padding-left: 3rem;
@@ -960,4 +950,32 @@ iframe {
 
 .img-align-column {
   clear: both;
+}
+
+.view-switcher__counter {
+  align-items: center;
+  background: var(--black-50);
+  border-radius: 0.8rem;
+  display: inline-flex;
+  font-size: 1.2rem;
+  font-weight: bold;
+  height: 2.2rem;
+  justify-content: center;
+  line-height: 2.2rem;
+  margin-left: 0.4rem;
+  min-width: 2.2rem;
+  padding: 0 0.6rem;
+  text-align: center;
+
+  .view-switcher__item--selected & {
+    background: var(--background-color-invert);
+    color: var(--default-color-invert);
+  }
+}
+
+// Добавим глобальный стиль для SVG
+[data-theme='dark'] {
+  svg {
+    filter: invert(1);
+  }
 }

src/styles/views/Inbox.module.scss

@@ -12,7 +12,7 @@ main {
   right: 0;
   padding-left: 42px;
   padding-right: 26px;
-  background: #fff;
+  background: var(--background-color);
   display: flex;
   flex: 1;
   flex-direction: column;
@@ -65,7 +65,7 @@ main {
 }
 
 .chat-list__search {
-  border-bottom: 3px solid #141414;
+  border-bottom: 3px solid var(--default-color);
   padding: 1em 0;
 }