refactor: switch how tabs work in an effort to make downstream stuff

easier
This commit is contained in:
Andy Burke 2026-02-23 11:49:23 -08:00
parent 7c4649924e
commit 873773bc91
14 changed files with 846 additions and 947 deletions

View file

@ -1,10 +1,10 @@
#chat #chat-container {
#chat-container {
position: relative;
width: 100%;
height: 100%;
}
#chat #chat-content {
#chat-container #chat-content {
overflow-y: scroll;
scroll-behavior: smooth;
position: absolute;
@ -14,13 +14,14 @@
bottom: 5rem;
padding: 1.5rem 1.5rem 0.75rem 1.5rem;
}
@media screen and (max-width: 1200px) {
#chat #chat-content {
#chat-container #chat-content {
padding: 0.75rem;
}
}
#chat #chat-entry-container {
#chat-container #chat-entry-container {
position: absolute;
bottom: 0;
left: 0;
@ -29,18 +30,18 @@
padding: 1rem;
}
#chat #chat-entry-container form {
#chat-container #chat-entry-container form {
display: flex;
flex-direction: row;
}
#chat #chat-entry-container form input[type="file"] {
#chat-container #chat-entry-container form input[type="file"] {
opacity: 0;
display: none;
}
#chat #chat-entry-container form button,
#chat #chat-entry-container form label {
#chat-container #chat-entry-container form button,
#chat-container #chat-entry-container form label {
position: relative;
top: inherit;
font-size: inherit;
@ -54,12 +55,12 @@
border: 1px solid rgba(128, 128, 128, 0.2);
}
#chat #chat-entry-container form textarea {
#chat-container #chat-entry-container form textarea {
flex-grow: 1;
resize: none;
}
#chat .message-container {
#chat-container .message-container {
position: relative;
transition: all 0.33s;
background: var(--bg-lighter);
@ -68,7 +69,7 @@
border-radius: var(--border-radius);
}
#chat .message-container .html-from-markdown {
#chat-container .message-container .html-from-markdown {
padding: 0;
}
@ -100,45 +101,33 @@
padding-top: 0 !important;
}
.user-tock.time-tock + .user-tock.time-tick:has(+ .user-tock.time-tick),
.user-tock.time-tick + .user-tock.time-tock:has(+ .user-tock.time-tock),
.user-tick.time-tock + .user-tick.time-tick:has(+ .user-tick.time-tick),
.user-tick.time-tick + .user-tick.time-tock:has(+ .user-tick.time-tock),
.user-tock.time-tock + .user-tick.time-tick:has(+ .user-tick.time-tick),
.user-tock.time-tick + .user-tick.time-tock:has(+ .user-tick.time-tock),
.user-tick.time-tock + .user-tock.time-tick:has(+ .user-tock.time-tick),
.user-tick.time-tick + .user-tock.time-tock:has(+ .user-tock.time-tock) {
.user-tock.time-tock+.user-tock.time-tick:has(+ .user-tock.time-tick),
.user-tock.time-tick+.user-tock.time-tock:has(+ .user-tock.time-tock),
.user-tick.time-tock+.user-tick.time-tick:has(+ .user-tick.time-tick),
.user-tick.time-tick+.user-tick.time-tock:has(+ .user-tick.time-tock),
.user-tock.time-tock+.user-tick.time-tick:has(+ .user-tick.time-tick),
.user-tock.time-tick+.user-tick.time-tock:has(+ .user-tick.time-tock),
.user-tick.time-tock+.user-tock.time-tick:has(+ .user-tock.time-tick),
.user-tick.time-tick+.user-tock.time-tock:has(+ .user-tock.time-tock) {
/* border: 1px dotted green; */
margin-bottom: -0.75rem !important;
}
#chat
.message-container.user-tick.time-tick
+ .message-container.user-tick.time-tick
.info-container,
#chat
.message-container.user-tick.time-tock
+ .message-container.user-tick.time-tock
.info-container,
#chat
.message-container.user-tock.time-tick
+ .message-container.user-tock.time-tick
.info-container,
#chat
.message-container.user-tock.time-tock
+ .message-container.user-tock.time-tock
.info-container {
#chat .message-container.user-tick.time-tick+.message-container.user-tick.time-tick .info-container,
#chat .message-container.user-tick.time-tock+.message-container.user-tick.time-tock .info-container,
#chat .message-container.user-tock.time-tick+.message-container.user-tock.time-tick .info-container,
#chat .message-container.user-tock.time-tock+.message-container.user-tock.time-tock .info-container {
opacity: 0;
visibility: hidden;
height: 0;
margin: 0;
}
#chat .message-container.sending {
#chat-container .message-container.sending {
opacity: 0.75;
}
#chat .message-container button[commandfor] {
#chat-container .message-container button[commandfor] {
position: absolute;
top: 0.1rem;
right: 0.1rem;
@ -147,13 +136,13 @@
z-index: 10;
}
#chat .message-container .message-actions-container:has(input[type="checkbox"]:checked) {
#chat-container .message-container .message-actions-container:has(input[type="checkbox"]:checked) {
background: rgb(from var(--bg) r g b / 0.9);
border-color: var(--border-subtle);
z-index: 11;
}
#chat .message-container .message-actions-container .message-action {
#chat-container .message-container .message-actions-container .message-action {
border: none;
opacity: 0;
transition: 0.2s ease-in-out;
@ -169,79 +158,75 @@
background: none;
}
#chat .message-container .message-actions-container label {
#chat-container .message-container .message-actions-container label {
cursor: pointer;
width: 2rem;
text-align: right;
padding-top: 0.5rem;
}
#chat .message-container .message-actions-container input[type="checkbox"] {
#chat-container .message-container .message-actions-container input[type="checkbox"] {
opacity: 0;
display: none;
}
#chat
.message-container
.message-actions-container
input[type="checkbox"]:checked
~ .message-action {
#chat .message-container .message-actions-container input[type="checkbox"]:checked~.message-action {
opacity: 1;
width: 3.25rem;
margin-right: 1.25rem;
}
#chat .message-container .message-actions-container .message-action .action-name {
#chat-container .message-container .message-actions-container .message-action .action-name {
font-size: x-small;
}
#chat .message-container .info-container {
#chat-container .message-container .info-container {
display: flex;
margin-bottom: -1.75rem;
height: 3.75rem;
}
#chat .message-container .info-container .username-container {
#chat-container .message-container .info-container .username-container {
margin: 0 4px;
font-weight: bold;
padding-top: 0.5rem;
}
#chat .message-container .info-container .datetime-container {
#chat-container .message-container .info-container .datetime-container {
margin: 0 4px;
padding-top: 0.4rem;
}
#chat .message-container .info-container .datetime-container .long {
#chat-container .message-container .info-container .datetime-container .long {
font-size: x-small;
text-transform: uppercase;
}
#chat .message-container .info-container .datetime-container .short {
#chat-container .message-container .info-container .datetime-container .short {
font-size: xx-small;
visibility: hidden;
display: none;
}
#chat .message-container .message-content-container,
#chat .message-container .message-media-container,
#chat .message-container .reactions-container {
#chat-container .message-container .message-content-container,
#chat-container .message-container .message-media-container,
#chat-container .message-container .reactions-container {
padding-left: 8rem;
overflow-x: auto;
}
#chat .message-container .reactions-container:has(> .reaction-container) {
#chat-container .message-container .reactions-container:has(> .reaction-container) {
margin-top: 0.5rem;
margin-bottom: 0.25rem;
}
#chat .embed-container {
#chat-container .embed-container {
position: relative;
width: 100%;
max-width: 640px;
}
#chat .embed-container .embed-actions-container {
#chat-container .embed-container .embed-actions-container {
position: absolute;
z-index: 100;
top: 0.25rem;
@ -253,31 +238,31 @@
opacity: 0;
}
#chat .embed-container audio {
#chat-container .embed-container audio {
width: 100%;
}
#chat .embed-container.rounded {
#chat-container .embed-container.rounded {
border-radius: 6px;
}
#chat .embed-container.short {
#chat-container .embed-container.short {
height: 120px;
overflow: hidden;
overflow-y: auto;
}
#chat .embed-container.tidal {
#chat-container .embed-container.tidal {
border-radius: 12px;
}
#chat .embed-container.vertical {
#chat-container .embed-container.vertical {
max-width: 320px;
overflow: hidden;
aspect-ratio: 9 / 16 !important;
}
#chat .embed-container.letterbox {
#chat-container .embed-container.letterbox {
/* height: 0; */
overflow: hidden;
overflow-y: auto;
@ -285,14 +270,14 @@
aspect-ratio: 16 / 9 !important;
}
#chat .embed-container.square {
#chat-container .embed-container.square {
overflow: hidden;
overflow-y: auto;
aspect-ratio: 1 / 1 !important;
}
#chat .embed-container iframe,
#chat .embed-container video {
#chat-container .embed-container iframe,
#chat-container .embed-container video {
position: absolute;
top: 0;
left: 0;
@ -305,7 +290,7 @@
}
@media screen and (max-width: 1200px) {
#chat #chat-container {
#chat-container #chat-container {
position: absolute;
top: 0;
left: 0;
@ -313,28 +298,28 @@
bottom: 0;
}
#chat #chat-container #chat-entry-container,
#chat #chat-container #chat-entry-container form {
#chat-container #chat-container #chat-entry-container,
#chat-container #chat-container #chat-entry-container form {
padding: 0.25rem;
}
#chat #chat-container #chat-entry-container form button,
#chat #chat-container #chat-entry-container form label {
#chat-container #chat-container #chat-entry-container form button,
#chat-container #chat-container #chat-entry-container form label {
margin: 0 0.5rem;
}
#chat .message-container .message-content-container,
#chat .message-container .message-media-container,
#chat .message-container .reactions-container {
#chat-container .message-container .message-content-container,
#chat-container .message-container .message-media-container,
#chat-container .message-container .reactions-container {
padding-left: 4rem;
}
#chat .message-container .info-container .datetime-container .long {
#chat-container .message-container .info-container .datetime-container .long {
display: none;
visibility: hidden;
}
#chat .message-container .info-container .datetime-container .short {
#chat-container .message-container .info-container .datetime-container .short {
display: inline-block;
visibility: visible;
}

View file

@ -1,234 +1,232 @@
<div id="chat" class="tab">
<input
type="radio"
name="top-level-tabs"
id="chat-tab-input"
class="tab-switch"
data-view="chat"
/>
<label for="chat-tab-input" class="tab-label"
><div class="icon chat"></div>
<div class="label">Chat</div>
</label>
<div class="tab-content">
<style>
<!-- #include "./chat.css" -->
</style>
<script src="/js/external/mimetypes.js" type="text/javascript"></script>
<script src="/js/external/punycode.js" type="text/javascript"></script>
<input
type="radio"
name="top-level-tabs"
id="chat-tab-input"
class="tabswitch"
data-view="chat"
/>
<label for="chat-tab-input" class="tablabel"
><div class="icon chat"></div>
<div class="label">Chat</div>
</label>
<div class="panel">
<style>
<!-- #include "./chat.css" -->
</style>
<script src="/js/external/mimetypes.js" type="text/javascript"></script>
<script src="/js/external/punycode.js" type="text/javascript"></script>
<div id="chat-container">
<div
id="chat-content"
data-feed
data-precheck="!!document.body.dataset.user && document.body.dataset.user.indexOf( 'events.read.chat' ) !== -1 && document.body.dataset.channel"
data-source="/api/channels/${ document.body.dataset.channel }/events?type=chat,reaction&limit=100&sort=newest&wait=true&after_id=${ feed.__newest_id ?? 'able-able-able-able-able-able-able-able-able-able' }"
data-longpolling="true"
data-reverse="true"
data-insert="append"
data-autoscroll="true"
>
<script>
{
const feed = document.currentScript.closest("[data-feed]");
<div id="chat-container">
<div
id="chat-content"
data-feed
data-precheck="!!document.body.dataset.user && document.body.dataset.user.indexOf( 'events.read.chat' ) !== -1 && document.body.dataset.channel"
data-source="/api/channels/${ document.body.dataset.channel }/events?type=chat,reaction&limit=100&sort=newest&wait=true&after_id=${ feed.__newest_id ?? 'able-able-able-able-able-able-able-able-able-able' }"
data-longpolling="true"
data-reverse="true"
data-insert="append"
data-autoscroll="true"
>
<script>
{
const feed = document.currentScript.closest("[data-feed]");
APP.on("channel_changed", () => { feed.__reset && feed.__reset(); });
APP.on("user_logged_in", () => { feed.__reset && feed.__reset(); });
APP.on("channel_changed", () => { feed.__reset && feed.__reset(); });
APP.on("user_logged_in", () => { feed.__reset && feed.__reset(); });
const time_tick_tock_timeout = 60_000;
const time_tick_tock_timeout = 60_000;
let last_event_datetime_value = 0;
let time_tick_tock_class = "time-tock";
let last_event_datetime_value = 0;
let time_tick_tock_class = "time-tock";
let last_creator_id = "";
let user_tick_tock_class = "user-tock";
let last_creator_id = "";
let user_tick_tock_class = "user-tock";
feed.__context = async (item) => {
const event_datetime = datetime_to_local(item.timestamps.created);
feed.__context = async (item) => {
const event_datetime = datetime_to_local(item.timestamps.created);
if (
event_datetime.value - last_event_datetime_value >
time_tick_tock_timeout
) {
time_tick_tock_class =
time_tick_tock_class === "time-tick"
? "time-tock"
: "time-tick";
}
last_event_datetime_value = event_datetime.value;
if (
event_datetime.value - last_event_datetime_value >
time_tick_tock_timeout
) {
time_tick_tock_class =
time_tick_tock_class === "time-tick"
? "time-tock"
: "time-tick";
}
last_event_datetime_value = event_datetime.value;
if (last_creator_id !== item.creator_id) {
user_tick_tock_class =
user_tick_tock_class === "user-tick"
? "user-tock"
: "user-tick";
last_creator_id = item.creator_id;
}
if (last_creator_id !== item.creator_id) {
user_tick_tock_class =
user_tick_tock_class === "user-tick"
? "user-tock"
: "user-tick";
last_creator_id = item.creator_id;
}
return {
event: item,
creator: await APP.USERS.get(item.creator_id),
event_datetime,
time_tick_tock_class,
user_tick_tock_class,
};
return {
event: item,
creator: await APP.USERS.get(item.creator_id),
event_datetime,
time_tick_tock_class,
user_tick_tock_class,
};
};
feed.__target_element = (item) => {
let target = feed;
switch (item.type) {
case "reaction":
target = document.querySelector(
`.message-container[data-event_id='${item.parent_id}'] > .reactions-container`,
);
break;
case "chat":
default:
target =
document.querySelector(
`.message-container[data-event_id='${item.parent_id}'] > .replies-container`,
) ?? feed;
break;
}
feed.__target_element = (item) => {
let target = feed;
switch (item.type) {
case "reaction":
target = document.querySelector(
`.message-container[data-event_id='${item.parent_id}'] > .reactions-container`,
);
break;
case "chat":
default:
target =
document.querySelector(
`.message-container[data-event_id='${item.parent_id}'] > .replies-container`,
) ?? feed;
break;
}
return target;
};
}
</script>
<template data-for_type="chat">
<div
id="${context.event.id}"
class="message-container ${context.user_tick_tock_class} ${context.time_tick_tock_class}"
data-event_id="${context.event.id}"
data-creator_id="${context.creator.id}"
data-temp_id="${context.event.meta?.temp_id ?? ''}"
>
<button class="icon more" commandfor="eventactionspopover"></button>
<div class="info-container">
<div class="avatar-container inline">
<img
src="${context.creator.meta?.avatar ?? '/images/default_avatar.gif'}"
alt="user avatar"
loading="lazy"
/>
</div>
<div class="username-container">
<span class="username"
>${context.creator.username ?? 'unknown'}</span
>
</div>
<div class="datetime-container">
<span class="long">${context.event_datetime.long}</span>
<span class="short">${context.event_datetime.short}</span>
</div>
</div>
<div class="message-content-container">
${htmlify(md_to_html(context.event.data.content))}
</div>
<div class="message-media-container">
${htmlify(context.event.data.media?.join("\n") ?? "")}
</div>
<div class="reactions-container"></div>
<div class="replies-container"></div>
</div>
</template>
<template data-for_type="reaction">
<div
id="${context.event.id}"
class="reaction-container"
data-event_id="${context.event.id}"
data-creator_id="${context.creator.id}"
data-temp_id="${context.event.meta?.temp_id ?? ''}"
>
<span class="reaction">${ context.event.data.reaction }</span>
</div>
</template>
</div>
<div id="chat-entry-container">
<form
id="chat-entry"
data-smart="true"
action="/api/events"
data-requires-permission="events.write.chat"
method="POST"
class="post-creation-form collapsible"
style="
margin-top: 1rem
width: 100%;
transition: all 0.5s;
"
on_reply="async (event) => { await document.getElementById( 'chat-content' ).__render(event); document.getElementById(event.id)?.classList.remove('sending'); }"
on_parsed="async (event) => { await document.getElementById( 'chat-content' ).__render(event); document.getElementById(event.id)?.classList.add('sending'); }"
return target;
};
}
</script>
<template data-for_type="chat">
<div
id="${context.event.id}"
class="message-container ${context.user_tick_tock_class} ${context.time_tick_tock_class}"
data-event_id="${context.event.id}"
data-creator_id="${context.creator.id}"
data-temp_id="${context.event.meta?.temp_id ?? ''}"
>
<input type="hidden" name="type" value="chat" />
<button class="icon more" commandfor="eventactionspopover"></button>
<div class="info-container">
<div class="avatar-container inline">
<img
src="${context.creator.meta?.avatar ?? '/images/default_avatar.gif'}"
alt="user avatar"
loading="lazy"
/>
</div>
<div class="username-container">
<span class="username"
>${context.creator.username ?? 'unknown'}</span
>
</div>
<div class="datetime-container">
<span class="long">${context.event_datetime.long}</span>
<span class="short">${context.event_datetime.short}</span>
</div>
</div>
<div class="message-content-container">
${htmlify(md_to_html(context.event.data.content))}
</div>
<div class="message-media-container">
${htmlify(context.event.data.media?.join("\n") ?? "")}
</div>
<div class="reactions-container"></div>
<div class="replies-container"></div>
</div>
</template>
<template data-for_type="reaction">
<div
id="${context.event.id}"
class="reaction-container"
data-event_id="${context.event.id}"
data-creator_id="${context.creator.id}"
data-temp_id="${context.event.meta?.temp_id ?? ''}"
>
<span class="reaction">${ context.event.data.reaction }</span>
</div>
</template>
</div>
<div id="chat-entry-container">
<form
id="chat-entry"
data-smart="true"
action="/api/events"
data-requires-permission="events.write.chat"
method="POST"
class="post-creation-form collapsible"
style="
margin-top: 1rem
width: 100%;
transition: all 0.5s;
"
on_reply="async (event) => { await document.getElementById( 'chat-content' ).__render(event); document.getElementById(event.id)?.classList.remove('sending'); }"
on_parsed="async (event) => { await document.getElementById( 'chat-content' ).__render(event); document.getElementById(event.id)?.classList.add('sending'); }"
>
<input type="hidden" name="type" value="chat" />
<input
type="hidden"
name="id"
generator="(_input, form) => 'TEMP-' + form.__submitted_at.toISOString()"
reset-on-submit
/>
<input
type="hidden"
name="meta.temp_id"
generator="(_input, form) => 'TEMP-' + form.__submitted_at.toISOString()"
reset-on-submit
/>
<input
type="hidden"
name="creator_id"
generator="() => { return APP.user?.id; }"
/>
<input
type="hidden"
name="channel"
generator="() => { return document.body.dataset.channel; }"
/>
<input
type="hidden"
name="timestamps.created"
generator="(_input, form) => form.__submitted_at.toISOString()"
reset-on-submit
/>
<input
type="hidden"
name="timestamps.updated"
generator="(_input, form) => form.__submitted_at.toISOString()"
reset-on-submit
/>
<input type="hidden" name="parent_id" reset-on-submit />
<label>
<input
type="hidden"
name="id"
generator="(_input, form) => 'TEMP-' + form.__submitted_at.toISOString()"
reset-on-submit
/>
<input
type="hidden"
name="meta.temp_id"
generator="(_input, form) => 'TEMP-' + form.__submitted_at.toISOString()"
aria-label="Upload and share file"
type="file"
multiple
data-smartforms-save-to-home="true"
name="data.media"
reset-on-submit
/>
<div class="icon attachment"></div>
</label>
<input
type="hidden"
name="creator_id"
generator="() => { return APP.user?.id; }"
/>
<textarea
id="chat-input"
class="chat-input"
rows="1"
name="data.content"
reset-on-submit
focus-on-submit
enter-key-submits
></textarea>
<input
type="hidden"
name="channel"
generator="() => { return document.body.dataset.channel; }"
/>
<input
type="hidden"
name="timestamps.created"
generator="(_input, form) => form.__submitted_at.toISOString()"
reset-on-submit
/>
<input
type="hidden"
name="timestamps.updated"
generator="(_input, form) => form.__submitted_at.toISOString()"
reset-on-submit
/>
<input type="hidden" name="parent_id" reset-on-submit />
<label>
<input
aria-label="Upload and share file"
type="file"
multiple
data-smartforms-save-to-home="true"
name="data.media"
reset-on-submit
/>
<div class="icon attachment"></div>
</label>
<textarea
id="chat-input"
class="chat-input"
rows="1"
name="data.content"
reset-on-submit
focus-on-submit
enter-key-submits
></textarea>
<button id="chat-send" class="primary" aria-label="Send a message">
<i class="icon send"></i>
</button>
</form>
</div>
<button id="chat-send" class="primary" aria-label="Send a message">
<i class="icon send"></i>
</button>
</form>
</div>
</div>
</div>