-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
);
diff --git a/packages/pkg.module.board/package.json b/packages/pkg.module.board/package.json
index 1ed4be4b..07fa870e 100644
--- a/packages/pkg.module.board/package.json
+++ b/packages/pkg.module.board/package.json
@@ -8,21 +8,21 @@
"lint": "eslint \"**/*.{ts,tsx}\""
},
"dependencies": {
- "@tldraw/editor": "3.4.0",
+ "@tldraw/editor": "3.6.1",
"@xipkg/button": "2.2.0",
- "@xipkg/dropdown": "^2.4.0",
+ "@xipkg/dropdown": "^2.5.0",
"@xipkg/icons": "1.6.0",
"@xipkg/tooltip": "1.3.0",
"@xipkg/slider": "1.2.0",
"pkg.logo": "*",
"pkg.utils.client": "*",
"sonner": "^1.5.0",
- "tldraw": "^3.4.0",
+ "tldraw": "^3.6.1",
"@tlsync-yjs/core": "0.2.1",
"pkg.utils": "*",
"pkg.stores": "*",
- "@hocuspocus/provider": "2.13.6",
- "yjs": "13.6.19",
+ "@hocuspocus/provider": "2.15.0",
+ "yjs": "13.6.21",
"y-utility": "0.1.4"
},
"devDependencies": {
diff --git a/packages/pkg.module.board/tsconfig.json b/packages/pkg.module.board/tsconfig.json
index ae94cb7e..bb768fa6 100644
--- a/packages/pkg.module.board/tsconfig.json
+++ b/packages/pkg.module.board/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "@xipkg/typescript/react-library.json",
"include": [
"*",
- "components/Header.tsx",
+ "components/Header/Header.tsx",
"components/NavbarAction.tsx",
"components/Navbar.tsx",
"components/ZoomMenu.tsx",
diff --git a/packages/pkg.module.board/useYjsStore.ts b/packages/pkg.module.board/useYjsStore.ts
index ac9946cf..054e1efb 100644
--- a/packages/pkg.module.board/useYjsStore.ts
+++ b/packages/pkg.module.board/useYjsStore.ts
@@ -21,6 +21,7 @@ import { useEffect, useMemo, useState } from 'react';
import { YKeyValue } from 'y-utility/y-keyvalue';
import { HocuspocusProvider } from '@hocuspocus/provider';
import * as Y from 'yjs';
+import { toast } from 'sonner';
export function useYjsStore({
roomId = 'test/slate-yjs-demo',
@@ -64,6 +65,7 @@ export function useYjsStore({
onAuthenticationFailed: (data) => {
console.log('onAuthenticationFailed', data);
if (data.reason === 'permission-denied') {
+ toast('Ошибка доступа к серверу совместного редактирования');
console.error('hocuspocus: permission-denied');
}
},
diff --git a/packages/pkg.module.call/Call.tsx b/packages/pkg.module.call/Call.tsx
deleted file mode 100644
index e296e984..00000000
--- a/packages/pkg.module.call/Call.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-'use client';
-
-import React, { useEffect, useState } from 'react';
-import { Room } from 'livekit-client';
-import { ActiveRoom } from './components/ActiveRoom';
-import { PreJoinSection } from './components/PreJoin';
-
-type CallPropsT = {
- token: string;
-};
-
-export type LocalUserChoiceT = {
- audioEnabled: boolean;
- videoEnabled: boolean;
-};
-
-export const Call = ({ token }: CallPropsT) => {
- const [userChoice, setUserChoice] = useState
(undefined);
- const room = new Room();
- const [connect, setConnect] = useState(false);
- const [isConnected, setIsConnected] = useState(false);
- const [isStarted, setIsStarted] = useState(false);
-
- useEffect(() => {
- setIsStarted(connect);
- }, [isConnected || connect]);
-
- const preJoinDefaults = React.useMemo(
- () => ({
- username: '',
- videoEnabled: true,
- audioEnabled: true,
- }),
- [],
- );
-
- const onSubmit = (userChoices: LocalUserChoiceT) => {
- setUserChoice(userChoices);
- setConnect(true);
- };
-
- return (
-
- {isStarted ? (
-
- ) : (
-
- )}
-
+ {isStarted && token ? (
+
+ ) : (
+
+ )}
+
-
-
-
- {isConnected && }
-
-
-
-
-
-
-
-
- {videoTrack && videoEnabled && (
-
- {/* eslint-disable-next-line jsx-a11y/media-has-caption */}
-
-
- )}
- {(!videoTrack || !videoEnabled) && (
-
- )}
-
-
-
- permissionByBrowser && setAudioEnabled(enabled),
- }}
- videoTrack={videoTrack}
- videoEnabled={videoEnabled}
- videoTrackToggle={{
- initialState: videoEnabled,
- showIcon: false,
- source: Track.Source.Camera,
- onChange: (enabled) => permissionByBrowser && setVideoEnabled(enabled),
- }}
- />
-
-
-
-
-
- {/* eslint-disable-next-line no-nested-ternary */}
- {!permissionByBrowser ? (
-
- ) : !connect ? (
-
- ) : null}
-
-
Камера
- setVideoDeviceId(id)}
- />
-
-
-
Звук
-
- setAudioDeviceId(id)}
- />
- setAudioDeviceId(id)}
- />
-
-
-
-
-
-
-