gru/rustpad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

line multi authors

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2026-07-25 18:12:41 +02:00
parent 5d9c1cb677
commit be374980d4
7 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -2433,7 +2433,7 @@ dependencies = [
[[package]]
name = "rustpad"
version = "0.0.22"
version = "0.0.24"
dependencies = [
"argon2",
"aws-config",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "rustpad"
version = "0.0.23"
version = "0.0.24"
edition = "2024"
rust-version = "1.94"
description = "Collaborative Markdown notepad built with Axum, WebSockets and SQLite, PostgreSQL and MySQL"
static/css/styles.css
+25
View File
@@ -4058,6 +4058,31 @@ dialog::backdrop {
}
}
.editor-column-label {
display: flex;
align-items: center;
justify-content: space-between;
gap: 10px;
}
.document-owner-badge {
max-width: 50%;
overflow: hidden;
padding: 2px 8px;
border: 1px solid color-mix(in srgb, var(--owner) 58%, transparent);
border-radius: 999px;
background: color-mix(in srgb, var(--owner) 14%, transparent);
color: var(--text);
font-size: .7rem;
font-weight: 600;
line-height: 1.35;
text-overflow: ellipsis;
white-space: nowrap;
}
.document-owner-badge[hidden] { display: none; }
/* Per-character authorship overlay. The textarea remains the editable surface. */
.authorship-layer {
position: absolute;
static/js/note.js
+14 -2
View File
@@ -15,7 +15,7 @@ import { askConfirm } from "@rustpad/modal";
import { currentShareUrl, readEditorState, writeEditorState } from "@rustpad/url-state";
const parts = location.pathname.split("/").filter(Boolean), workspaceSlug = parts[1], noteSlug = parts[3];
const editor = document.querySelector("#editor"), preview = document.querySelector("#preview"), editorWorkspace = document.querySelector("#editor-workspace"), gutter = document.querySelector("#line-gutter"), ownerLabels = document.querySelector("#owner-labels"), authorshipLayer = document.querySelector("#authorship-layer");
const editor = document.querySelector("#editor"), preview = document.querySelector("#preview"), editorWorkspace = document.querySelector("#editor-workspace"), gutter = document.querySelector("#line-gutter"), ownerLabels = document.querySelector("#owner-labels"), authorshipLayer = document.querySelector("#authorship-layer"), documentOwnerBadge = document.querySelector("#document-owner-badge");
const modeToggle = document.querySelector("#mode-toggle"), passwordDialog = document.querySelector("#password-dialog"), identityDialog = document.querySelector("#identity-dialog");
const roomDetails = document.querySelector("#room-details"), roomUsers = document.querySelector("#room-users"), roomCount = document.querySelector("#room-count"), socketLatency = document.querySelector("#socket-latency"), chatMessages = document.querySelector("#chat-messages"), chatForm = document.querySelector("#chat-form"), chatInput = document.querySelector("#chat-input"), chatUnread = document.querySelector("#chat-unread");
let unreadChat = 0;
@@ -52,8 +52,20 @@ async function renderCodeHighlight() { const nodes = preview.querySelectorAll('p
function renderGutter() {
const lineCount = Math.max(1, (editor.value.match(/\n/g) || []).length + 1);
const lines = Array.from({ length: lineCount });
const showAuthorship = authorshipOwners(authorship).length > 1;
const owners = authorshipOwners(authorship);
const showSingleOwner = owners.length === 1;
const showAuthorship = owners.length > 1;
const authorsByLine = showAuthorship ? lineAuthors(editor.value, authorship) : [];
if (documentOwnerBadge) {
documentOwnerBadge.hidden = !showSingleOwner;
if (showSingleOwner) {
documentOwnerBadge.textContent = ownerName(owners[0]);
documentOwnerBadge.style.setProperty("--owner", colorFor(owners[0]));
} else {
documentOwnerBadge.textContent = "";
documentOwnerBadge.style.removeProperty("--owner");
}
}
authorshipLayer.hidden = !showAuthorship;
ownerLabels.hidden = !showAuthorship;
const style = getComputedStyle(editor), lineHeight = parseFloat(style.lineHeight) || 29, paddingTop = parseFloat(style.paddingTop) || 24, paddingBottom = parseFloat(style.paddingBottom) || 24;
static/js/pad.js
+14 -2
View File
@@ -14,7 +14,7 @@ import { PadSocket } from "@rustpad/socket";
import { currentShareUrl, readEditorState, writeEditorState } from "@rustpad/url-state";
const slug = location.pathname.split("/").filter(Boolean)[1];
const editor = document.querySelector("#editor"), preview = document.querySelector("#preview"), editorWorkspace = document.querySelector("#editor-workspace"), gutter = document.querySelector("#line-gutter"), ownerLabels = document.querySelector("#owner-labels"), authorshipLayer = document.querySelector("#authorship-layer");
const editor = document.querySelector("#editor"), preview = document.querySelector("#preview"), editorWorkspace = document.querySelector("#editor-workspace"), gutter = document.querySelector("#line-gutter"), ownerLabels = document.querySelector("#owner-labels"), authorshipLayer = document.querySelector("#authorship-layer"), documentOwnerBadge = document.querySelector("#document-owner-badge");
const modeToggle = document.querySelector("#mode-toggle"), passwordDialog = document.querySelector("#password-dialog"), identityDialog = document.querySelector("#identity-dialog");
const roomDetails = document.querySelector("#room-details"), roomUsers = document.querySelector("#room-users"), roomCount = document.querySelector("#room-count"), socketLatency = document.querySelector("#socket-latency"), chatMessages = document.querySelector("#chat-messages"), chatForm = document.querySelector("#chat-form"), chatInput = document.querySelector("#chat-input"), chatUnread = document.querySelector("#chat-unread");
let unreadChat = 0;
@@ -50,8 +50,20 @@ async function renderCodeHighlight() { const nodes = preview.querySelectorAll('p
function renderGutter() {
const lineCount = Math.max(1, (editor.value.match(/\n/g) || []).length + 1);
const lines = Array.from({ length: lineCount });
const showAuthorship = authorshipOwners(authorship).length > 1;
const owners = authorshipOwners(authorship);
const showSingleOwner = owners.length === 1;
const showAuthorship = owners.length > 1;
const authorsByLine = showAuthorship ? lineAuthors(editor.value, authorship) : [];
if (documentOwnerBadge) {
documentOwnerBadge.hidden = !showSingleOwner;
if (showSingleOwner) {
documentOwnerBadge.textContent = ownerName(owners[0]);
documentOwnerBadge.style.setProperty("--owner", colorFor(owners[0]));
} else {
documentOwnerBadge.textContent = "";
documentOwnerBadge.style.removeProperty("--owner");
}
}
authorshipLayer.hidden = !showAuthorship;
ownerLabels.hidden = !showAuthorship;
const style = getComputedStyle(editor), lineHeight = parseFloat(style.lineHeight) || 29, paddingTop = parseFloat(style.paddingTop) || 24, paddingBottom = parseFloat(style.paddingBottom) || 24;
static/note.html
+1 -1
View File
@@ -97,7 +97,7 @@
</div>
<div id="editor-workspace" class="workspace view-split">
<div class="editor-column">
<div class="column-label">Editor</div>
<div class="column-label editor-column-label"><span>Editor</span><span id="document-owner-badge" class="document-owner-badge" hidden></span></div>
<div class="editor-shell">
<div id="line-gutter" class="line-gutter" aria-hidden="true"></div>
<div id="authorship-layer" class="authorship-layer" aria-hidden="true"></div><div id="owner-labels" class="owner-labels" aria-hidden="true"></div><textarea id="editor"
static/pad.html
+1 -1
View File
@@ -95,7 +95,7 @@
</div>
<div id="editor-workspace" class="workspace view-split">
<div class="editor-column">
<div class="column-label">Editor</div>
<div class="column-label editor-column-label"><span>Editor</span><span id="document-owner-badge" class="document-owner-badge" hidden></span></div>
<div class="editor-shell">
<div id="line-gutter" class="line-gutter" aria-hidden="true"></div>
<div id="authorship-layer" class="authorship-layer" aria-hidden="true"></div><div id="owner-labels" class="owner-labels" aria-hidden="true"></div><textarea id="editor"