diff --git a/src/components/Editor/components/Sidebar.tsx b/src/components/Editor/components/Sidebar.tsx index f7fb7415..03141f07 100644 --- a/src/components/Editor/components/Sidebar.tsx +++ b/src/components/Editor/components/Sidebar.tsx @@ -1,14 +1,14 @@ -import { For, Show, createEffect, createSignal, onCleanup } from 'solid-js' +import { For, Show, createEffect, createSignal, onCleanup, onMount } from 'solid-js' import { unwrap } from 'solid-js/store' import { undo, redo } from 'prosemirror-history' import { Draft, useState } from '../store/context' -import { mod } from '../env' import * as remote from '../remote' import { isEmpty } from '../prosemirror/helpers' import type { Styled } from './Layout' import '../styles/Sidebar.scss' import { clsx } from 'clsx' import styles from './Sidebar.module.scss' +import { isServer } from 'solid-js/web' const Off = (props) =>
{props.children}
@@ -141,6 +141,12 @@ export const Sidebar = () => { onCleanup(() => clearTimeout(id)) }) + const [mod, setMod] = createSignal<'Ctrl' | 'Cmd'>('Ctrl') + + onMount(() => { + setMod(navigator.platform.includes('Mac') ? 'Cmd' : 'Ctrl') + }) + return (
@@ -149,55 +155,54 @@ export const Sidebar = () => { editorView().focus()}>
- -
- {store.path && ( - - )} - Пригласить соавторов - Настройки публикации - История правок -
- Ночная тема - - -
- - {discardText()} - - - Undo - - - Redo - - - Markdown mode {store.markdown && '✅'} - - Copy all as MD {lastAction() === 'copy-md' && '📋'} - 0}> -

Drafts:

-

- {(draft) => } -

- - - Collab {collabText()} - - 0}> - - {collabUsers()} {collabUsers() === 1 ? 'user' : 'users'} connected - - +
+ {store.path && ( + + )} + Пригласить соавторов + Настройки публикации + История правок + +
+ Ночная тема + +
- + + {discardText()} + + + Undo + + + Redo + + + Markdown mode {store.markdown && '✅'} + + Copy all as MD {lastAction() === 'copy-md' && '📋'} + 0}> +

Drafts:

+

+ {(draft) => } +

+ + + Collab {collabText()} + + 0}> + + {collabUsers()} {collabUsers() === 1 ? 'user' : 'users'} connected + + +
) diff --git a/src/components/Editor/db.ts b/src/components/Editor/db.ts index 0abad504..2cdb318d 100644 --- a/src/components/Editor/db.ts +++ b/src/components/Editor/db.ts @@ -1,5 +1,6 @@ -const dbPromise = async () => { - const { openDB } = await import('idb') +import { openDB } from 'idb' + +const dbPromise = () => { return openDB('discours.io', 2, { upgrade(db) { db.createObjectStore('keyval') diff --git a/src/components/Editor/env.ts b/src/components/Editor/env.ts index faf6a874..f4d95615 100644 --- a/src/components/Editor/env.ts +++ b/src/components/Editor/env.ts @@ -1,3 +1,2 @@ -export const isDark = () => (window as any).matchMedia('(prefers-color-scheme: dark)').matches -export const mod = 'Ctrl' -export const alt = 'Alt' +export const isDark = () => + typeof window !== undefined && window.matchMedia('(prefers-color-scheme: dark)').matches diff --git a/src/components/Editor/store/actions.ts b/src/components/Editor/store/actions.ts index 0c790a24..cbcb1578 100644 --- a/src/components/Editor/store/actions.ts +++ b/src/components/Editor/store/actions.ts @@ -7,7 +7,6 @@ import { undo as yUndo, redo as yRedo } from 'y-prosemirror' import debounce from 'lodash/debounce' import { createSchema, createExtensions, createEmptyText } from '../prosemirror/setup' import { State, Draft, Config, ServiceError, newState, ExtensionsProps, EditorActions } from './context' -import { mod } from '../env' import { serialize, createMarkdownParser } from '../markdown' import db from '../db' import { isEmpty, isInitialized } from '../prosemirror/helpers' @@ -102,13 +101,13 @@ export const createCtrl = (initial: State): [Store, EditorActions] => { return true } - const keymap = { - [`${mod}-w`]: discard, - [`${mod}-z`]: onUndo, - [`Shift-${mod}-z`]: onRedo, - [`${mod}-y`]: onRedo, - [`${mod}-m`]: toggleMarkdown - } as ExtensionsProps['keymap'] + const keymap: ExtensionsProps['keymap'] = { + [`Mod-w`]: discard, + [`Mod-z`]: onUndo, + [`Shift-Mod-z`]: onRedo, + [`Mod-y`]: onRedo, + [`Mod-m`]: toggleMarkdown + } const createTextFromDraft = async (draft: Draft) => { const state = unwrap(store) diff --git a/src/components/Editor/store/context.ts b/src/components/Editor/store/context.ts index 0061cb4c..5b55b1d4 100644 --- a/src/components/Editor/store/context.ts +++ b/src/components/Editor/store/context.ts @@ -63,7 +63,6 @@ export interface Collab { export type LoadingType = 'loading' | 'initialized' export interface State { - isMac?: boolean text?: ProseMirrorState editorView?: EditorView extensions?: ProseMirrorExtension[] diff --git a/src/components/Editor/styles/ArticlesList.scss b/src/components/Editor/styles/ArticlesList.scss.bak similarity index 100% rename from src/components/Editor/styles/ArticlesList.scss rename to src/components/Editor/styles/ArticlesList.scss.bak diff --git a/src/components/Editor/styles/Index.scss b/src/components/Editor/styles/Index.scss deleted file mode 100644 index 682d6228..00000000 --- a/src/components/Editor/styles/Index.scss +++ /dev/null @@ -1,3 +0,0 @@ -.index { - width: 350px; -} diff --git a/src/components/Nav/Header.tsx b/src/components/Nav/Header.tsx index aa29bb56..e9d6b598 100644 --- a/src/components/Nav/Header.tsx +++ b/src/components/Nav/Header.tsx @@ -134,7 +134,7 @@ export const Header = (props: Props) => {
- + {t('Create post')} diff --git a/src/components/Pages/CreatePage.tsx b/src/components/Pages/CreatePage.tsx index 2bfac823..3662483d 100644 --- a/src/components/Pages/CreatePage.tsx +++ b/src/components/Pages/CreatePage.tsx @@ -1,11 +1,15 @@ -import { newState } from '../Editor/store/context' +import { lazy, Suspense } from 'solid-js' import { MainLayout } from '../Layouts/MainLayout' -import { CreateView } from '../Views/Create' +import { Loading } from '../Loading' + +const CreateView = lazy(() => import('../Views/Create')) export const CreatePage = () => { return ( - + }> + + ) } diff --git a/src/components/Views/Create.tsx b/src/components/Views/Create.tsx index 1239260b..c4caf14f 100644 --- a/src/components/Views/Create.tsx +++ b/src/components/Views/Create.tsx @@ -1,6 +1,6 @@ import { Show, onCleanup, createEffect, onError, onMount, untrack } from 'solid-js' import { createMutable, unwrap } from 'solid-js/store' -import { State, StateContext } from '../Editor/store/context' +import { State, StateContext, newState } from '../Editor/store/context' import { createCtrl } from '../Editor/store/actions' import { Layout } from '../Editor/components/Layout' import { Editor } from '../Editor/components/Editor' @@ -9,16 +9,14 @@ import ErrorView from '../Editor/components/Error' const matchDark = () => window.matchMedia('(prefers-color-scheme: dark)') -export const CreateView = (props: { state: State }) => { - let isMac = false +export const CreateView = () => { const onChangeTheme = () => ctrl.updateTheme() onMount(() => { - isMac = window?.navigator.platform.includes('Mac') matchDark().addEventListener('change', onChangeTheme) onCleanup(() => matchDark().removeEventListener('change', onChangeTheme)) }) - const [store, ctrl] = createCtrl({ ...props.state, isMac }) + const [store, ctrl] = createCtrl(newState()) const mouseEnterCoords = createMutable({ x: 0, y: 0 }) const onMouseEnter = (e: MouseEvent) => { @@ -66,3 +64,5 @@ export const CreateView = (props: { state: State }) => { ) } + +export default CreateView