An error occurred.
diff --git a/src/components/Editor/components/Sidebar.tsx b/src/components/Editor/components/Sidebar.tsx
index 7966d4a6..f2284c44 100644
--- a/src/components/Editor/components/Sidebar.tsx
+++ b/src/components/Editor/components/Sidebar.tsx
@@ -74,7 +74,7 @@ export const Sidebar = (props) => {
Советы и предложения
- editorView().focus()} data-tauri-drag-region="true">
+ editorView().focus()}>
diff --git a/src/components/Editor/prosemirror/setup.ts b/src/components/Editor/prosemirror/setup.ts
index 0ea9a21f..134c4061 100644
--- a/src/components/Editor/prosemirror/setup.ts
+++ b/src/components/Editor/prosemirror/setup.ts
@@ -1,5 +1,5 @@
import { keymap } from 'prosemirror-keymap'
-import { ProseMirrorExtension } from './helpers'
+import type { ProseMirrorExtension } from './helpers'
import { Schema } from 'prosemirror-model'
import base from './extension/base'
import markdown from './extension/markdown'
@@ -15,12 +15,13 @@ import dragHandle from './extension/drag-handle'
import pasteMarkdown from './extension/paste-markdown'
import table from './extension/table'
import collab from './extension/collab'
-import { Config, YOptions } from '../store'
+import type { Config, YOptions } from '../store'
import selectionMenu from './extension/selection'
+import type { Command } from 'prosemirror-state'
interface Props {
data?: unknown
- keymap?: any
+ keymap?: { [key: string]: Command; }
config: Config
markdown: boolean
path?: string
diff --git a/src/components/Editor/store/index.ts b/src/components/Editor/store/index.ts
index 66f3f72b..866f4f1a 100644
--- a/src/components/Editor/store/index.ts
+++ b/src/components/Editor/store/index.ts
@@ -5,7 +5,7 @@ import type { WebrtcProvider } from 'y-webrtc'
import type { ProseMirrorExtension, ProseMirrorState } from '../prosemirror/helpers'
import type { EditorView } from 'prosemirror-view'
import { createEmptyText } from '../prosemirror/setup'
-import type { Shout } from '../../../graphql/types.gen'
+import type { EditorState } from 'prosemirror-state'
export interface Args {
draft: string // path to draft
@@ -72,7 +72,7 @@ export interface Draft {
extensions?: ProseMirrorExtension[]
updatedAt: Date
body?: string
- text?: { doc: any; selection: { type: string; anchor: number; head: number } }
+ text?: { doc: EditorState['doc']; selection: { type: string; anchor: number; head: number } }
path?: string
markdown?: boolean
}
@@ -122,6 +122,6 @@ export const addToDrafts = (drafts: Draft[], state: State): Draft[] => {
export const createTextFromDraft = async (draft: Draft) => {
const created = createEmptyText()
- created.doc.content = Object.values(draft.text) // FIXME
+ created.doc.content = Object.values(draft.text) as any
return created
}
diff --git a/src/components/Feed/Beside.scss b/src/components/Feed/Beside.module.scss
similarity index 81%
rename from src/components/Feed/Beside.scss
rename to src/components/Feed/Beside.module.scss
index f248bcfa..18cd2468 100644
--- a/src/components/Feed/Beside.scss
+++ b/src/components/Feed/Beside.module.scss
@@ -1,4 +1,4 @@
-.beside-column {
+.besideColumn {
counter-reset: item;
list-style-type: none;
padding-left: 0;
@@ -29,17 +29,6 @@
text-align: center;
width: 2em;
}
-
- .shout-card--short {
- font-size: 1.4rem;
- margin-bottom: 0;
-
- .shout-card__title,
- .shout-card__subtitle {
- display: inline;
- @include font-size(1.4rem);
- }
- }
}
}
@@ -51,7 +40,7 @@
}
}
-.beside-column-title {
+.besideColumnTitle {
align-items: baseline;
justify-content: space-between;
display: flex;
@@ -87,14 +76,14 @@
}
}
-.beside-column__topic {
+.besideColumnTopic {
font-size: 1.2rem;
letter-spacing: 0.08em;
margin-bottom: 0.4rem;
text-transform: uppercase;
}
-.beside-column__shout {
+.besideColumnShout {
font-size: 1.4rem;
h4 {
diff --git a/src/components/Feed/Beside.tsx b/src/components/Feed/Beside.tsx
index 20da9f2b..9f510cbb 100644
--- a/src/components/Feed/Beside.tsx
+++ b/src/components/Feed/Beside.tsx
@@ -4,7 +4,7 @@ import { For, Show } from 'solid-js/web'
import { ArticleCard } from './Card'
import { AuthorCard } from '../Author/Card'
import { TopicCard } from '../Topic/Card'
-import './Beside.scss'
+import style from './Beside.module.scss'
import type { Author, Shout, Topic, User } from '../../graphql/types.gen'
import { Icon } from '../Nav/Icon'
import { t } from '../../utils/intl'
@@ -15,8 +15,10 @@ interface BesideProps {
beside: Shout
wrapper: 'topic' | 'author' | 'article' | 'top-article'
isTopicCompact?: boolean
+ isTopicInRow?: boolean
topicShortDescription?: boolean
topicsBySlug?: { [slug: string]: Topic }
+ iconButton?: boolean
}
export default (props: BesideProps) => {
@@ -27,7 +29,7 @@ export default (props: BesideProps) => {
-
+
{props.title}
@@ -38,15 +40,17 @@ export default (props: BesideProps) => {
-
+
{(value: Shout | User | Topic | Author) => (
- -
+
-
@@ -58,7 +62,7 @@ export default (props: BesideProps) => {
@@ -68,7 +72,7 @@ export default (props: BesideProps) => {