+ {collaborators.map(collaborator => {
+ const uniqueKey = `${collaborator.user.username}-${
+ collaborator.current || 'no-current'
+ }`;
+ return (
+
+ );
+}
- set collaborators(value: ICollaboratorAwareness[]) {
- this._collaborators = value;
- this.update();
+export function Collaborator(props: {
+ collaborator: ICollaboratorAwareness;
+ fileopener: (path: string) => void;
+ docRegistry?: DocumentRegistry;
+}): JSX.Element {
+ const [open, setOpen] = useState
+
+ );
}
diff --git a/packages/collaboration/src/cursors.ts b/packages/collaboration/src/cursors.ts
index ff129d8d..aa850524 100644
--- a/packages/collaboration/src/cursors.ts
+++ b/packages/collaboration/src/cursors.ts
@@ -251,7 +251,7 @@ const userHover = hoverTooltip(
continue;
}
// Use some margin around the cursor to display the user.
- if (head.index - 1 <= pos && pos <= head.index + 1) {
+ if (head.index - 3 <= pos && pos <= head.index + 3) {
return {
pos: head.index,
above: true,
@@ -271,7 +271,8 @@ const userHover = hoverTooltip(
return null;
},
{
- hideOn: (tr, tooltip) => !!tr.annotation(remoteSelectionsAnnotation)
+ hideOn: (tr, tooltip) => !!tr.annotation(remoteSelectionsAnnotation),
+ hoverTime: 0
}
);
diff --git a/packages/collaboration/src/index.ts b/packages/collaboration/src/index.ts
index 05e4fff7..8b8209ca 100644
--- a/packages/collaboration/src/index.ts
+++ b/packages/collaboration/src/index.ts
@@ -11,3 +11,4 @@ export * from './cursors';
export * from './menu';
export * from './sharedlink';
export * from './userinfopanel';
+export * from './users-item';
diff --git a/packages/collaboration/src/tokens.ts b/packages/collaboration/src/tokens.ts
index 5f717390..84a313f1 100644
--- a/packages/collaboration/src/tokens.ts
+++ b/packages/collaboration/src/tokens.ts
@@ -5,8 +5,6 @@ import type { Menu } from '@lumino/widgets';
import { Token } from '@lumino/coreutils';
import type { User } from '@jupyterlab/services';
-import { IAwareness } from '@jupyter/ydoc';
-
/**
* The user menu token.
*
@@ -17,13 +15,6 @@ export const IUserMenu = new Token
+
+
-
- );
- });
- }
+ {collaborator.user.display_name}
+
- {value.user.initials}
-
- {displayName}
+ {collaborator.user.initials}
+
+ -
+ {docs.map(doc => {
+ return (
+
- fileopener(doc.fileLocation)}
+ >
+
+ + {doc.filename} + +
+ );
+ })}
+
+ {this.filterDuplicated(this.state.usersList).map(user => {
+ if (
+ this._model &&
+ user.userId !== this._model.sharedModel.awareness.clientID
+ ) {
+ return IconRenderer({ user, model: this._model });
+ }
+ })}
+
+ );
+ }
+
+ /**
+ * Triggered when a change occurs in the document awareness, to build again the users list.
+ */
+ private _awarenessChange = () => {
+ const clients = this._model?.sharedModel.awareness.getStates() as Map<
+ number,
+ User.IIdentity
+ >;
+
+ const users: UsersItem.IUserData[] = [];
+ if (clients) {
+ clients.forEach((val, key) => {
+ if (val.user) {
+ users.push({ userId: key, userData: val.user as User.IIdentity });
+ }
+ });
+ }
+ this.setState(old => ({ ...old, usersList: users }));
+ };
+
+ private _model: DocumentRegistry.IModel | null;
+ private _iconRenderer:
+ | ((props: UsersItem.IIconRendererProps) => JSX.Element)
+ | null;
+}
+
+/**
+ * Default renderer for the user icon.
+ */
+export function DefaultIconRenderer(
+ props: UsersItem.IIconRendererProps
+): JSX.Element {
+ let el: JSX.Element;
+
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const { user, model, ...htmlProps } = props;
+
+ const iconClasses = classes('lm-MenuBar-itemIcon', props.className || '');
+ if (user.userData.avatar_url) {
+ el = (
+
+ 
+
+ );
+ } else {
+ el = (
+
+ {user.userData.initials}
+
+ );
+ }
+
+ return el;
+}
diff --git a/packages/collaboration/style/base.css b/packages/collaboration/style/base.css
index 41d787b5..792ab3ac 100644
--- a/packages/collaboration/style/base.css
+++ b/packages/collaboration/style/base.css
@@ -5,6 +5,7 @@
@import url('./menu.css');
@import url('./sidepanel.css');
+@import url('./users-item.css');
.jp-shared-link-body {
user-select: none;
diff --git a/packages/collaboration/style/sidepanel.css b/packages/collaboration/style/sidepanel.css
index c2feff83..bbc14561 100644
--- a/packages/collaboration/style/sidepanel.css
+++ b/packages/collaboration/style/sidepanel.css
@@ -86,7 +86,7 @@
z-index: 1000;
}
-.jp-Collaborator {
+.jp-CollaboratorHeader {
padding: 10px;
display: flex;
align-items: center;
@@ -95,6 +95,10 @@
color: var(--jp-ui-font-color1);
}
+.jp-CollaboratorHeader > span {
+ padding-left: 7px;
+}
+
.jp-ClickableCollaborator:hover {
cursor: pointer;
background-color: var(--jp-layout-color2);
@@ -102,8 +106,18 @@
color: var(--jp-ui-font-color0);
}
-.jp-Collaborator > span {
- padding-left: 7px;
+.jp-CollaboratorHeaderCollapser {
+ transform: rotate(-90deg);
+ margin: auto 0;
+ height: 16px;
+}
+
+.jp-CollaboratorHeader:not(.jp-ClickableCollaborator) .jp-CollaboratorHeaderCollapser {
+ visibility: hidden;
+}
+
+.jp-CollaboratorHeaderCollapser.jp-mod-expanded {
+ transform: rotate(0deg);
}
.jp-CollaboratorIcon {
@@ -122,7 +136,9 @@
color: var(--jp-ui-font-color1);
}
-.jp-CollaboratorCurrent {
- position: absolute;
- right: 0;
+.jp-CollaboratorFiles {
+ padding-left: 1em;
+ margin-top: 0;
+ box-shadow: 0 2px 2px -2px rgb(0 0 0 / 24%);
+
}
diff --git a/packages/collaboration/style/users-item.css b/packages/collaboration/style/users-item.css
new file mode 100644
index 00000000..1bff7903
--- /dev/null
+++ b/packages/collaboration/style/users-item.css
@@ -0,0 +1,20 @@
+/* -----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|---------------------------------------------------------------------------- */
+
+.jp-toolbar-users-item {
+ flex-grow: 1;
+ display: flex;
+ flex-direction: row;
+}
+
+.jp-toolbar-users-item .jp-MenuBar-anonymousIcon,
+.jp-toolbar-users-item .jp-MenuBar-imageIcon {
+ position: relative;
+ left: 0;
+ height: 22px;
+ width: 22px;
+ box-sizing: border-box;
+ cursor: default;
+}
diff --git a/packages/collaborative-drive/package.json b/packages/collaborative-drive/package.json
new file mode 100644
index 00000000..d3522c5f
--- /dev/null
+++ b/packages/collaborative-drive/package.json
@@ -0,0 +1,57 @@
+{
+ "name": "@jupyter/collaborative-drive",
+ "version": "4.0.0-beta.0",
+ "description": "JupyterLab - Collaborative Drive",
+ "homepage": "https://github.com/jupyterlab/jupyter-collaboration",
+ "bugs": {
+ "url": "https://github.com/jupyterlab/jupyter-collaboration/issues"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/jupyterlab/jupyter-collaboration.git"
+ },
+ "license": "BSD-3-Clause",
+ "author": "Project Jupyter",
+ "sideEffects": [
+ "style/**/*"
+ ],
+ "main": "lib/index.js",
+ "types": "lib/index.d.ts",
+ "directories": {
+ "lib": "lib/"
+ },
+ "files": [
+ "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
+ "schema/*.json",
+ "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
+ "style/index.js"
+ ],
+ "scripts": {
+ "build": "tsc -b",
+ "build:prod": "jlpm run build",
+ "build:test": "tsc --build tsconfig.test.json",
+ "clean": "rimraf lib tsconfig.tsbuildinfo",
+ "clean:lib": "jlpm run clean:all",
+ "clean:all": "rimraf lib tsconfig.tsbuildinfo node_modules",
+ "install:extension": "jlpm run build",
+ "watch": "tsc -b --watch"
+ },
+ "dependencies": {
+ "@jupyter/ydoc": "^2.1.3 || ^3.0.0",
+ "@jupyterlab/services": "^7.4.0-alpha.2",
+ "@lumino/coreutils": "^2.1.0",
+ "@lumino/disposable": "^2.1.0"
+ },
+ "devDependencies": {
+ "rimraf": "^4.1.2",
+ "typescript": "~5.1.6"
+ },
+ "publishConfig": {
+ "access": "public"
+ },
+ "typedoc": {
+ "entryPoint": "./src/index.ts",
+ "displayName": "@jupyter/collaborative-drive",
+ "tsconfig": "./tsconfig.json"
+ }
+}
diff --git a/packages/docprovider/src/utils.ts b/packages/collaborative-drive/src/index.ts
similarity index 56%
rename from packages/docprovider/src/utils.ts
rename to packages/collaborative-drive/src/index.ts
index 9321995a..1bf51feb 100644
--- a/packages/docprovider/src/utils.ts
+++ b/packages/collaborative-drive/src/index.ts
@@ -2,17 +2,9 @@
| Copyright (c) Jupyter Development Team.
| Distributed under the terms of the Modified BSD License.
|----------------------------------------------------------------------------*/
+/**
+ * @packageDocumentation
+ * @module collaborative-drive
+ */
-export enum MessageType {
- ROOM = 124,
- CHAT = 125
-}
-
-export enum RoomMessage {
- RELOAD = 0,
- OVERWRITE = 1,
- FILE_CHANGED = 2,
- FILE_OVERWRITTEN = 3,
- DOC_OVERWRITTEN = 4,
- SESSION_TOKEN = 5
-}
+export * from './tokens';
diff --git a/packages/collaborative-drive/src/tokens.ts b/packages/collaborative-drive/src/tokens.ts
new file mode 100644
index 00000000..f985c771
--- /dev/null
+++ b/packages/collaborative-drive/src/tokens.ts
@@ -0,0 +1,60 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import { IAwareness } from '@jupyter/ydoc';
+import { Contents, SharedDocumentFactory } from '@jupyterlab/services';
+import { IDisposable } from '@lumino/disposable';
+
+import { Token } from '@lumino/coreutils';
+
+/**
+ * The collaborative drive.
+ */
+export const ICollaborativeContentProvider =
+ new Token
+
+ );
+};
diff --git a/packages/docprovider/src/forkManager.ts b/packages/docprovider/src/forkManager.ts
new file mode 100644
index 00000000..99031c17
--- /dev/null
+++ b/packages/docprovider/src/forkManager.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
+import { URLExt } from '@jupyterlab/coreutils';
+import { Event } from '@jupyterlab/services';
+import { ISignal, Signal } from '@lumino/signaling';
+
+import { requestAPI, ROOM_FORK_URL } from './requests';
+import {
+ IAllForksResponse,
+ IForkChangedEvent,
+ IForkCreationResponse,
+ IForkManager
+} from './tokens';
+import { IForkProvider } from './ydrive';
+
+export const JUPYTER_COLLABORATION_FORK_EVENTS_URI =
+ 'https://schema.jupyter.org/jupyter_collaboration/fork/v1';
+
+export class ForkManager implements IForkManager {
+ constructor(options: ForkManager.IOptions) {
+ const { contentProvider, eventManager } = options;
+ this._contentProvider = contentProvider;
+ this._eventManager = eventManager;
+ this._eventManager.stream.connect(this._handleEvent, this);
+ }
+
+ get isDisposed(): boolean {
+ return this._disposed;
+ }
+ get forkAdded(): ISignal {
+ fetchTimeline(extractFilenameFromURL(apiURL));
+ }}
+ className="jp-mod-highlighted"
+ title="Document Timeline"
+ >
+
+ {toggle && (
+
+
+
+ )}
+
+ {extractFilenameFromURL(apiURL).split('/').pop()} {' '}
+
+ {isBtn && (
+
+
+
+ )}
+