Merge upstream element-hq/element-call tag v0.25.0 into the Lotus fork (previous base: v0.20.1; actual merge-base v0.20.1-rc.1). Every Lotus feature and all six io.lotus.* widget actions are preserved. Version bumped to 0.25.0-lotus.1. Conflict files and how each Lotus hunk was re-expressed: * src/state/CallViewModel/remoteMembers/ConnectionFactory.ts Upstream moved echoCancellation/noiseSuppression/autoGainControl from constructor params (fed by URL params) to persisted Settings (settings.ts) with a developer-settings UI. The cinny host still drives these per call via URL params (noiseSuppression=false / autoGainControl=false when the in-source ML denoiser is active, so the model gets a raw mic) - taking upstream verbatim would silently break the ML denoise tier. Re-wired as AND semantics in generateRoomOption(): a constraint is enabled only if BOTH the Setting and the URL param allow it. Params default to true, so with no params this is byte-for-byte upstream behaviour. Upstream's own echoCancellation / noiseSuppression URL params (still parsed but dead in v0.25.0) work again as a side effect. Lotus autoGainControl URL param kept in UrlParams.ts (auto-merged, unchanged). * src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts Took upstream (tests now drive via Settings). The lost Lotus coverage is restored in a NEW colocated file src/lotus/lotusAudioConstraints.test.ts (3 tests) so the upstream test file stays pristine. Verified the new test fails against pure-upstream ConnectionFactory and passes with the re-wiring. * src/state/CallViewModel/CallViewModel.ts Three small hunks: kept both the Lotus `userMedia$` interface member and upstream's new `keyRotationSuppressed$`; dropped the three Lotus audio constructor args (mechanism removed upstream, see above); kept both in the returned object. The [lotus #4] overrideSpotlight$ routing, manualSpotlightUserId$ and setManualSpotlight auto-merged; verified against upstream's changed ringingMedia$ (now single-or-null instead of array) - the merge correctly took upstream's outer branch and the inner screenShares$/spotlightSpeaker$ logic that lotusSpotlight.ts mirrors is unchanged upstream. * src/index.css Kept both: Lotus lotus-transparent / lotus-theme blocks and upstream's new body[data-background="gradient"]::before full-viewport gradient. The naive merge swallowed the closing brace of body.lotus-theme - restored. Added a rule hiding the new gradient pseudo-element under body.lotus-transparent, since it would otherwise paint over the transparent body and hide the host wallpaper. * src/components/CallFooterViewModel.tsx, src/components/CallFooter.stories.tsx No Lotus content - pure upstream-vs-upstream conflicts caused by the merge base being v0.20.1-rc.1. Took upstream (layoutMode -> layoutSwitchVm; setLayoutMode removed). No Lotus code uses setGridMode/layoutMode. Non-conflicting but reviewed: * src/widget.ts auto-merged cleanly. Upstream's removal of .well-known transport advertisement and the new RTC-transport capability request did not touch the action registration loop the LOTUS_TO_WIDGET_ACTIONS spread and widget.lazyActions ride on - nothing to re-wire. * src/room/InCallView.tsx, src/useAudioContext.tsx, src/useTheme.ts, src/tile/MediaView.tsx(+.module.css), src/UrlParams.ts(+test), all *.module.css and .gitea/workflows/ci.yml auto-merged; each diff against v0.25.0 was checked to equal the original Lotus hunk. * src/button/Button.module.css: the merge appended an exact duplicate of upstream's `.rotate`/`@keyframes spin` block (rc.1 merge-base artefact) - reset to upstream verbatim. * src/grid/OneOnOnePortraitLayout.module.css was renamed upstream to OneOnOneMobileLayout.module.css; git followed the rename and the Lotus safe-area PiP inset fix applies there (the --content-inset-* vars it uses still exist upstream). Tooling changes inherited from upstream that affect the fork: * eslint + prettier were replaced by oxlint + oxfmt (`pnpm lint:oxlint`, `pnpm format:check`). oxlint flagged 10 issues, all in src/lotus/*: 8x no-meaningless-void-operator (dropped the `void` before void-typed widget transport.reply / callbacks - no behaviour change), 1x consistent-type-imports (lotusWidget.ts: `import type`), and 2x unicorn/no-useless-spread in lotusAudioInject.ts which are FALSE POSITIVES - `[...activeClips]` is a required defensive copy because abort() deletes from the Set during iteration; suppressed with an explanatory eslint-disable-next-line. oxfmt reformatted 7 Lotus touched files (whitespace only). * packageManager bumped by upstream to pnpm@11.21.0, which requires Node >= 22.13 (uses node:sqlite). Node 20 cannot run it; pnpm 10.33 cannot read the new lockfile either (matrix-js-sdk is now a git dependency on develop, using a version-union pnpm 10 rejects). Fork CI already uses Node 24 (.node-version), so CI is unaffected. * matrix-js-sdk is now github:matrix-org/matrix-js-sdk#develop (pinned by commit in pnpm-lock.yaml). Lotus behaviour NOT preserved: none found. Verification (Node 24.11.1, pnpm 11.21.0): pnpm install --frozen-lockfile OK (lockfile taken from upstream unchanged, no regeneration needed); tsc clean; oxlint clean; oxfmt --check clean; knip exit 0 (2 config hints in upstream knip.ts only); vitest unit 84 files / 627 passed / 9 skipped; build:embedded OK, staged to embedded/web/dist (44M), all six io.lotus.* action strings present in the bundle. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PPmy3tPq869XDW4njjVaKA
176 lines
3.7 KiB
CSS
176 lines
3.7 KiB
CSS
/*
|
|
Copyright 2026 Element Creations Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
.footer {
|
|
position: sticky;
|
|
inset-block-end: 0;
|
|
z-index: var(--call-view-header-footer-layer);
|
|
display: grid;
|
|
grid-template-columns: 1fr auto 1fr;
|
|
grid-template-areas: ". buttons layout";
|
|
align-items: center;
|
|
gap: var(--cpd-space-3x);
|
|
/* Ensure that footer lies within the safe area */
|
|
padding-left: calc(env(safe-area-inset-left) + var(--cpd-space-6x));
|
|
padding-right: calc(env(safe-area-inset-right) + var(--cpd-space-6x));
|
|
padding-block: var(--cpd-space-10x)
|
|
calc(env(safe-area-inset-bottom) + var(--cpd-space-10x));
|
|
}
|
|
|
|
.footer.hidden {
|
|
display: none;
|
|
}
|
|
|
|
.footer.overlay {
|
|
/* Note that the footer is still position: sticky in this case so that certain
|
|
tiles can move up out of the way of the footer when visible. */
|
|
opacity: 1;
|
|
transition: opacity 0.15s;
|
|
}
|
|
|
|
.footer.overlay.hidden {
|
|
display: grid;
|
|
opacity: 0;
|
|
pointer-events: none;
|
|
/* Switch to position: absolute so the footer takes up no space in the layout
|
|
when hidden. */
|
|
position: absolute;
|
|
inset-block-end: 0;
|
|
inset-inline: 0;
|
|
}
|
|
|
|
.footer.overlay:has(:focus-visible) {
|
|
opacity: 1;
|
|
pointer-events: initial;
|
|
}
|
|
|
|
.settingsLogoContainer {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: var(--cpd-space-4x);
|
|
flex-direction: row;
|
|
flex-wrap: nowrap;
|
|
}
|
|
|
|
.logo {
|
|
justify-self: start;
|
|
display: flex;
|
|
align-items: center;
|
|
gap: var(--cpd-space-2x);
|
|
padding-inline-start: var(--cpd-space-1x);
|
|
}
|
|
|
|
.buttons {
|
|
grid-area: buttons;
|
|
justify-self: center;
|
|
display: flex;
|
|
gap: var(--cpd-space-3x);
|
|
}
|
|
|
|
.layout {
|
|
grid-area: layout;
|
|
justify-self: end;
|
|
}
|
|
|
|
/*First hide the logo*/
|
|
@media (max-width: 750px) {
|
|
.logo {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
.settingsOnlyShowNarrow {
|
|
display: none;
|
|
}
|
|
.settingsOnlyShowWide {
|
|
display: inherit;
|
|
}
|
|
|
|
/*
|
|
With the logo hidden >500px is enough space to show overflow, buttons, layout.
|
|
Once we exceed 500 we hide everything except the buttons.
|
|
*/
|
|
@media (max-width: 500px) {
|
|
.footer {
|
|
grid-template-areas: "buttons buttons buttons";
|
|
/* Reclaim horizontal budget so the control row fits on phones. */
|
|
padding-left: calc(env(safe-area-inset-left) + var(--cpd-space-3x));
|
|
padding-right: calc(env(safe-area-inset-right) + var(--cpd-space-3x));
|
|
}
|
|
|
|
.buttons {
|
|
/* Fill the row and wrap instead of overflowing: on the narrowest phones the
|
|
control set (mic/video/loudspeaker/hangup) exceeds the viewport, and the
|
|
parent's overflow-x: hidden would otherwise clip the outer buttons —
|
|
including the destructive hangup. Wrapping keeps every control reachable. */
|
|
justify-self: stretch;
|
|
flex-wrap: wrap;
|
|
justify-content: center;
|
|
gap: var(--cpd-space-2x);
|
|
}
|
|
|
|
.settingsOnlyShowNarrow {
|
|
display: inherit;
|
|
}
|
|
.settingsOnlyShowWide {
|
|
display: none;
|
|
}
|
|
|
|
.settingsLogoContainer {
|
|
display: none;
|
|
}
|
|
|
|
.layout {
|
|
display: none !important;
|
|
}
|
|
}
|
|
|
|
@media (max-height: 800px) {
|
|
.footer {
|
|
padding-block: var(--cpd-space-8x)
|
|
calc(env(safe-area-inset-bottom) + var(--cpd-space-8x));
|
|
}
|
|
}
|
|
|
|
@media (max-height: 400px) {
|
|
.footer {
|
|
padding-block: var(--cpd-space-4x)
|
|
calc(env(safe-area-inset-bottom) + var(--cpd-space-4x));
|
|
}
|
|
}
|
|
|
|
@media (max-width: 370px) {
|
|
.shareScreen {
|
|
display: none;
|
|
}
|
|
|
|
/* PIP custom css */
|
|
@media (max-height: 400px) {
|
|
.shareScreen {
|
|
display: flex;
|
|
}
|
|
.footer {
|
|
padding-block-start: var(--cpd-space-3x);
|
|
padding-block-end: calc(
|
|
env(safe-area-inset-bottom) + var(--cpd-space-2x)
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
@media (max-width: 320px) {
|
|
.raiseHand {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
@media (min-width: 800px) {
|
|
.buttons {
|
|
gap: var(--cpd-space-4x);
|
|
}
|
|
}
|