Skip to content

Commit 55238a7

Browse files
committed
save
1 parent b24516a commit 55238a7

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- "1081:1080"
1616

1717
minio:
18-
user: ${DOCKER_USER:-1000}
18+
# user: ${DOCKER_USER:-1000}
1919
image: minio/minio
2020
environment:
2121
- MINIO_ROOT_USER=impress
@@ -166,6 +166,8 @@ services:
166166
- env.d/development/common
167167
ports:
168168
- "4444:4444"
169+
volumes:
170+
- ./src/frontend/servers/y-provider:/home/frontend/servers/y-provider
169171

170172
kc_postgresql:
171173
image: postgres:14.3

src/frontend/apps/impress/src/features/docs/doc-editor/components/BlockNoteEditor.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ export const BlockNoteEditor = ({ doc, provider }: BlockNoteEditorProps) => {
7474
const { setEditor } = useEditorStore();
7575
const { t } = useTranslation();
7676

77-
const readOnly = !doc.abilities.partial_update;
77+
//const readOnly = !doc.abilities.partial_update;
78+
const readOnly = false;
7879
useSaveDoc(doc.id, provider.document, !readOnly);
7980
const { i18n } = useTranslation();
8081
const lang = i18n.language;

src/frontend/apps/impress/src/features/docs/doc-management/stores/useProviderStore.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as Y from 'yjs';
33
import { create } from 'zustand';
44

55
import { Base64 } from '@/features/docs/doc-management';
6+
import { isFirefox } from '@/utils';
67

78
export interface UseCollaborationStore {
89
createProvider: (
@@ -35,8 +36,13 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
3536
Y.applyUpdate(doc, Buffer.from(initialDoc, 'base64'));
3637
}
3738

39+
// console.log('navigator.userAgent', navigator.userAgent);
40+
// console.log('providerUrl', wsUrl);
41+
const withWS = isFirefox();
42+
//const withWS = true;
43+
3844
const provider = new HocuspocusProvider({
39-
url: wsUrl,
45+
url: !withWS ? 'ws://localhost:6666' : wsUrl,
4046
name: storeId,
4147
document: doc,
4248
onConnect: () => {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
export const isFirefox = () =>
22
navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
3+
4+
export const isEdge = () =>
5+
navigator.userAgent.toLowerCase().indexOf('edg') > -1;

0 commit comments

Comments
 (0)