Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43a5e93c37 | ||
|
|
0f93368a7e | ||
|
|
dfb72bd9a5 | ||
|
|
e0eecc5271 | ||
|
|
c4f6193888 | ||
|
|
7855a0c22f |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@lotusguild/element-call-embedded",
|
||||
"version": "0.25.0-lotus.17",
|
||||
"version": "0.25.0-lotus.20",
|
||||
"files": [
|
||||
"README.md",
|
||||
"LICENSE-AGPL-3.0",
|
||||
|
||||
+14
-1
@@ -90,16 +90,29 @@ body.lotus-transparent[data-background="gradient"]::before {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* [cinny #43] lotusHostControls=1: the host renders its own call bar, so EC's
|
||||
footer is hidden (kept in the DOM but out of the layout flow). */
|
||||
body.lotus-host-controls [data-testid="footer-container"] {
|
||||
position: absolute !important;
|
||||
visibility: hidden !important;
|
||||
}
|
||||
|
||||
/* [lotus] Native Lotus/TDS theme, applied when lotusTheme=1, instead of the
|
||||
host injecting CSS into the iframe after load. Overrides Compound design tokens
|
||||
with Lotus values at the source so theming is complete and flash-free. Extend
|
||||
this block with the full Lotus token map from the design system; the canvas
|
||||
override below is a safe starting point that matches the Lotus dark surface. */
|
||||
body.lotus-theme {
|
||||
--cpd-color-bg-canvas-default: #0c0d10;
|
||||
--video-tile-background: var(--cpd-color-bg-subtle-secondary);
|
||||
}
|
||||
|
||||
/* Dark themes only: in the light theme this near-black canvas sat behind
|
||||
light-theme (dark) text, e.g. the tile name tags were unreadable. */
|
||||
body.lotus-theme.cpd-theme-dark,
|
||||
body.lotus-theme.cpd-theme-dark-hc {
|
||||
--cpd-color-bg-canvas-default: #0c0d10;
|
||||
}
|
||||
|
||||
/* [lotus #21] Subtle contrast guard for elements that sit directly on the
|
||||
transparent canvas (no opaque tile background behind them) when
|
||||
lotusTransparent is set: the host's real wallpaper is unknown to us, so a
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
/* [cinny #43] EC's screenshare button, floating in the frame's bottom-right
|
||||
corner while the host draws the rest of the call bar. */
|
||||
.floating {
|
||||
position: fixed;
|
||||
right: var(--cpd-space-4x);
|
||||
bottom: calc(env(safe-area-inset-bottom) + var(--cpd-space-4x));
|
||||
z-index: 1;
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
/*
|
||||
Copyright 2026 Lotus Guild
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
Please see LICENSE in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { act, render, screen } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { TooltipProvider } from "@vector-im/compound-web";
|
||||
import { BehaviorSubject } from "rxjs";
|
||||
|
||||
import { type CallViewModel } from "../state/CallViewModel/CallViewModel";
|
||||
import { LotusFrameScreenshare } from "./LotusFrameScreenshare";
|
||||
import {
|
||||
lotusFrameScreenshareEnabled,
|
||||
lotusFrameScreenshareVisible$,
|
||||
parseFrameScreensharePayload,
|
||||
} from "./lotusControls";
|
||||
|
||||
// lotusFlag memoizes the URL params on first read, so set them once here.
|
||||
window.history.pushState(
|
||||
{},
|
||||
"",
|
||||
"/?lotusHostControls=1&lotusFrameScreenshare=1",
|
||||
);
|
||||
|
||||
const mockVm = (
|
||||
toggle: (() => void) | null,
|
||||
sharing = new BehaviorSubject(false),
|
||||
): CallViewModel =>
|
||||
({
|
||||
sharingScreen$: sharing,
|
||||
toggleScreenSharing: toggle,
|
||||
}) as unknown as CallViewModel;
|
||||
|
||||
const renderButton = (vm: CallViewModel): void => {
|
||||
render(
|
||||
<TooltipProvider>
|
||||
<LotusFrameScreenshare vm={vm} />
|
||||
</TooltipProvider>,
|
||||
);
|
||||
};
|
||||
|
||||
describe("LotusFrameScreenshare", () => {
|
||||
it("is enabled by lotusHostControls + lotusFrameScreenshare", () => {
|
||||
expect(lotusFrameScreenshareEnabled()).toBe(true);
|
||||
});
|
||||
|
||||
it("toggles the share from a click inside the frame", async () => {
|
||||
const toggle = vi.fn();
|
||||
renderButton(mockVm(toggle));
|
||||
await userEvent.click(screen.getByTestId("lotus_frame_screenshare"));
|
||||
expect(toggle).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("follows the sharing state", () => {
|
||||
const sharing = new BehaviorSubject(false);
|
||||
renderButton(mockVm(vi.fn(), sharing));
|
||||
const button = screen.getByTestId("lotus_frame_screenshare");
|
||||
expect(button).toHaveAttribute("aria-checked", "false");
|
||||
act(() => sharing.next(true));
|
||||
expect(button).toHaveAttribute("aria-checked", "true");
|
||||
});
|
||||
|
||||
it("hides while the host's policy forbids sharing, unless a share is live", () => {
|
||||
const sharing = new BehaviorSubject(false);
|
||||
act(() => lotusFrameScreenshareVisible$.next(false));
|
||||
renderButton(mockVm(vi.fn(), sharing));
|
||||
expect(screen.queryByTestId("lotus_frame_screenshare")).toBeNull();
|
||||
act(() => sharing.next(true));
|
||||
expect(screen.getByTestId("lotus_frame_screenshare")).toBeInTheDocument();
|
||||
act(() => lotusFrameScreenshareVisible$.next(true));
|
||||
});
|
||||
|
||||
it("parses the set_frame_screenshare payload", () => {
|
||||
expect(parseFrameScreensharePayload({ visible: false })).toBe(false);
|
||||
expect(parseFrameScreensharePayload({ visible: true })).toBe(true);
|
||||
expect(parseFrameScreensharePayload({})).toBeUndefined();
|
||||
expect(parseFrameScreensharePayload(null)).toBeUndefined();
|
||||
});
|
||||
|
||||
it("renders nothing when screensharing is unavailable", () => {
|
||||
renderButton(mockVm(null));
|
||||
expect(screen.queryByTestId("lotus_frame_screenshare")).toBeNull();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
Copyright 2026 Lotus Guild
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
Please see LICENSE in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { type FC } from "react";
|
||||
|
||||
import { ShareScreenButton } from "../button";
|
||||
import { type CallViewModel } from "../state/CallViewModel/CallViewModel";
|
||||
import { useBehavior } from "../useBehavior";
|
||||
import {
|
||||
lotusFrameScreenshareEnabled,
|
||||
lotusFrameScreenshareVisible$,
|
||||
} from "./lotusControls";
|
||||
import styles from "./LotusFrameScreenshare.module.css";
|
||||
|
||||
/**
|
||||
* [cinny #43] EC's screenshare button, shown inside the frame when the host
|
||||
* can't start a share for us (`lotusFrameScreenshare`). The rest of EC's
|
||||
* footer stays hidden behind the host's call bar.
|
||||
*/
|
||||
export const LotusFrameScreenshare: FC<{ vm: CallViewModel }> = ({ vm }) => {
|
||||
const sharing = useBehavior(vm.sharingScreen$);
|
||||
const visible = useBehavior(lotusFrameScreenshareVisible$);
|
||||
if (!lotusFrameScreenshareEnabled() || !vm.toggleScreenSharing) return null;
|
||||
// Hidden by the host's call policy, but never while a share is live: the
|
||||
// user must still be able to stop it.
|
||||
if (!visible && !sharing) return null;
|
||||
return (
|
||||
<div className={styles.floating}>
|
||||
<ShareScreenButton
|
||||
size="md"
|
||||
enabled={sharing}
|
||||
onClick={vm.toggleScreenSharing}
|
||||
data-testid="lotus_frame_screenshare"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -31,6 +31,8 @@ describe("LotusWidgetActions", () => {
|
||||
LotusWidgetActions.OpenSettings,
|
||||
LotusWidgetActions.ToggleReactions,
|
||||
LotusWidgetActions.SetScreenshare,
|
||||
LotusWidgetActions.SetHotkeys,
|
||||
LotusWidgetActions.SetFrameScreenshare,
|
||||
];
|
||||
|
||||
expect(new Set(LOTUS_TO_WIDGET_ACTIONS)).toEqual(new Set(expectedToWidget));
|
||||
@@ -52,5 +54,6 @@ describe("LotusWidgetActions", () => {
|
||||
LotusWidgetActions.ControlsState,
|
||||
);
|
||||
expect(LOTUS_TO_WIDGET_ACTIONS).not.toContain(LotusWidgetActions.MicLevel);
|
||||
expect(LOTUS_TO_WIDGET_ACTIONS).not.toContain(LotusWidgetActions.Hotkey);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -81,9 +81,25 @@ export enum LotusWidgetActions {
|
||||
* without it the browser rejects the share.
|
||||
*/
|
||||
SetScreenshare = "io.lotus.set_screenshare",
|
||||
/**
|
||||
* toWidget: `{ codes: string[] }` — KeyboardEvent.code values (PTT, deafen)
|
||||
* to report while focus is inside this frame (cinny #43). `[]` stops.
|
||||
*/
|
||||
SetHotkeys = "io.lotus.set_hotkeys",
|
||||
/**
|
||||
* toWidget: `{ visible: boolean }` — whether the in-frame screenshare button
|
||||
* (`lotusFrameScreenshare`) may show, e.g. false while the room's call
|
||||
* policy forbids screensharing (cinny #43). Defaults to visible.
|
||||
*/
|
||||
SetFrameScreenshare = "io.lotus.set_frame_screenshare",
|
||||
/**
|
||||
* fromWidget: a watched key went down/up here, or this window's focus
|
||||
* changed; see `LotusHotkeyReport` (cinny #43).
|
||||
*/
|
||||
Hotkey = "io.lotus.hotkey",
|
||||
/**
|
||||
* fromWidget: `{ screensharing: boolean, layout: "grid" | "spotlight" | null,
|
||||
* screenshareAction: true }`
|
||||
* screenshareAction: true, hotkeys: true, frameScreenshare: boolean }`
|
||||
* whenever either changes (cinny #43), so the host stops reading EC's DOM for
|
||||
* them. Its arrival also tells the host this fork supports the actions above.
|
||||
*/
|
||||
@@ -107,4 +123,6 @@ export const LOTUS_TO_WIDGET_ACTIONS: LotusWidgetActions[] = [
|
||||
LotusWidgetActions.OpenSettings,
|
||||
LotusWidgetActions.ToggleReactions,
|
||||
LotusWidgetActions.SetScreenshare,
|
||||
LotusWidgetActions.SetHotkeys,
|
||||
LotusWidgetActions.SetFrameScreenshare,
|
||||
];
|
||||
|
||||
@@ -6,13 +6,13 @@ Please see LICENSE in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { type IWidgetApiRequest } from "matrix-widget-api";
|
||||
import { combineLatest, of, type Subscription } from "rxjs";
|
||||
import { BehaviorSubject, combineLatest, of, type Subscription } from "rxjs";
|
||||
import { distinctUntilChanged, map, switchMap } from "rxjs/operators";
|
||||
|
||||
import { type CallViewModel } from "../state/CallViewModel/CallViewModel";
|
||||
import { type LayoutMode } from "../state/LayoutSwitchViewModel";
|
||||
import { widget } from "../widget";
|
||||
import { LotusWidgetActions, lotusSendToHost } from "./lotusWidget";
|
||||
import { LotusWidgetActions, lotusFlag, lotusSendToHost } from "./lotusWidget";
|
||||
|
||||
/** Window event the reactions button listens for (see ReactionToggleButton). */
|
||||
export const LOTUS_TOGGLE_REACTIONS_EVENT = "lotus:toggle-reactions";
|
||||
@@ -23,6 +23,40 @@ export interface LotusControlsState {
|
||||
layout: LayoutMode | null;
|
||||
/** This fork handles `io.lotus.set_screenshare` (always true). */
|
||||
screenshareAction: true;
|
||||
/** This fork handles `io.lotus.set_hotkeys` (always true). */
|
||||
hotkeys: true;
|
||||
/**
|
||||
* EC's own screenshare button is shown inside the frame (see
|
||||
* `lotusFrameScreenshare`), so the host should hide its own.
|
||||
*/
|
||||
frameScreenshare: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* [cinny #43] `lotusFrameScreenshare=1` (with `lotusHostControls`): the host
|
||||
* can't hand the user's click into this frame (no Capability Delegation:
|
||||
* Firefox, Safari, WebKitGTK), and `getDisplayMedia` needs that click here.
|
||||
* So EC's own screenshare button stays visible in the frame, where the click
|
||||
* is native, instead of the host clicking it through the DOM.
|
||||
*/
|
||||
export function lotusFrameScreenshareEnabled(): boolean {
|
||||
return lotusFlag("lotusHostControls") && lotusFlag("lotusFrameScreenshare");
|
||||
}
|
||||
|
||||
/**
|
||||
* Host-controlled visibility of the in-frame screenshare button
|
||||
* (`io.lotus.set_frame_screenshare`): the host hides it while the room's
|
||||
* call policy forbids screensharing, as it does its own call-bar button.
|
||||
*/
|
||||
export const lotusFrameScreenshareVisible$ = new BehaviorSubject(true);
|
||||
|
||||
/** `{ visible }` payload → the visibility to apply, or undefined. Exported for tests. */
|
||||
export function parseFrameScreensharePayload(
|
||||
data: unknown,
|
||||
): boolean | undefined {
|
||||
if (typeof data !== "object" || data === null) return undefined;
|
||||
const { visible } = data as { visible?: unknown };
|
||||
return typeof visible === "boolean" ? visible : undefined;
|
||||
}
|
||||
|
||||
/** `{ layout }` payload → a layout mode, or undefined if invalid. Exported for tests. */
|
||||
@@ -98,7 +132,17 @@ export function startLotusControls(vm: CallViewModel): () => void {
|
||||
w.lazyActions.on(LotusWidgetActions.SetLayout, onSetLayout);
|
||||
w.lazyActions.on(LotusWidgetActions.OpenSettings, onOpenSettings);
|
||||
w.lazyActions.on(LotusWidgetActions.ToggleReactions, onToggleReactions);
|
||||
const onSetFrameScreenshare = (ev: CustomEvent<IWidgetApiRequest>): void => {
|
||||
w.api.transport.reply(ev.detail, {});
|
||||
const visible = parseFrameScreensharePayload(ev.detail.data);
|
||||
if (visible !== undefined) lotusFrameScreenshareVisible$.next(visible);
|
||||
};
|
||||
|
||||
w.lazyActions.on(LotusWidgetActions.SetScreenshare, onSetScreenshare);
|
||||
w.lazyActions.on(
|
||||
LotusWidgetActions.SetFrameScreenshare,
|
||||
onSetFrameScreenshare,
|
||||
);
|
||||
|
||||
const sub: Subscription = combineLatest([
|
||||
vm.sharingScreen$,
|
||||
@@ -112,6 +156,8 @@ export function startLotusControls(vm: CallViewModel): () => void {
|
||||
screensharing,
|
||||
layout,
|
||||
screenshareAction: true,
|
||||
hotkeys: true,
|
||||
frameScreenshare: lotusFrameScreenshareEnabled(),
|
||||
}),
|
||||
),
|
||||
distinctUntilChanged(
|
||||
@@ -128,5 +174,9 @@ export function startLotusControls(vm: CallViewModel): () => void {
|
||||
w.lazyActions.off(LotusWidgetActions.OpenSettings, onOpenSettings);
|
||||
w.lazyActions.off(LotusWidgetActions.ToggleReactions, onToggleReactions);
|
||||
w.lazyActions.off(LotusWidgetActions.SetScreenshare, onSetScreenshare);
|
||||
w.lazyActions.off(
|
||||
LotusWidgetActions.SetFrameScreenshare,
|
||||
onSetFrameScreenshare,
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
Copyright 2026 Lotus Guild
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
Please see LICENSE in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import {
|
||||
isEditableTarget,
|
||||
isInteractiveTarget,
|
||||
parseHotkeyCodes,
|
||||
} from "./lotusHotkeys";
|
||||
|
||||
describe("parseHotkeyCodes", () => {
|
||||
it("keeps KeyboardEvent.code-like strings", () => {
|
||||
expect(parseHotkeyCodes({ codes: ["Space", "KeyM", "F13"] })).toEqual([
|
||||
"Space",
|
||||
"KeyM",
|
||||
"F13",
|
||||
]);
|
||||
});
|
||||
it("drops junk and caps the list", () => {
|
||||
expect(parseHotkeyCodes({ codes: ["Space", 3, "", "a b", "<x>"] })).toEqual(
|
||||
["Space"],
|
||||
);
|
||||
expect(parseHotkeyCodes({ codes: Array(20).fill("KeyA") })).toHaveLength(8);
|
||||
expect(parseHotkeyCodes({})).toEqual([]);
|
||||
expect(parseHotkeyCodes(null)).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("target checks", () => {
|
||||
it("treats inputs and contenteditable as editable", () => {
|
||||
document.body.innerHTML =
|
||||
'<input id="i"><div contenteditable="true"><span id="s">x</span></div><div id="d"></div>';
|
||||
expect(isEditableTarget(document.getElementById("i"))).toBe(true);
|
||||
expect(isEditableTarget(document.getElementById("s"))).toBe(true);
|
||||
expect(isEditableTarget(document.getElementById("d"))).toBe(false);
|
||||
expect(isEditableTarget(null)).toBe(false);
|
||||
});
|
||||
it("treats buttons, links and button roles as interactive", () => {
|
||||
document.body.innerHTML =
|
||||
'<button id="b">b</button><div role="menuitem"><span id="m">m</span></div><p id="p"></p>';
|
||||
expect(isInteractiveTarget(document.getElementById("b"))).toBe(true);
|
||||
expect(isInteractiveTarget(document.getElementById("m"))).toBe(true);
|
||||
expect(isInteractiveTarget(document.getElementById("p"))).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,159 @@
|
||||
/*
|
||||
Copyright 2026 Lotus Guild
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
Please see LICENSE in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { type IWidgetApiRequest } from "matrix-widget-api";
|
||||
|
||||
import { widget } from "../widget";
|
||||
import { LotusWidgetActions, lotusSendToHost } from "./lotusWidget";
|
||||
|
||||
/** fromWidget `io.lotus.hotkey` payload. */
|
||||
export type LotusHotkeyReport =
|
||||
| {
|
||||
type: "keydown" | "keyup";
|
||||
code: string;
|
||||
repeat: boolean;
|
||||
ctrlKey: boolean;
|
||||
altKey: boolean;
|
||||
metaKey: boolean;
|
||||
shiftKey: boolean;
|
||||
/** The key went to a text field (typing, not a hotkey). */
|
||||
editable: boolean;
|
||||
/** The key went to a button/link/etc. (Space activates it). */
|
||||
interactive: boolean;
|
||||
}
|
||||
/** This window gained or lost focus: the host releases a held PTT. */
|
||||
| { type: "focus" };
|
||||
|
||||
const MAX_CODES = 8;
|
||||
|
||||
// Codes the host currently owns. Module-level so EC's own shortcuts
|
||||
// (useCallViewKeyboardShortcuts) can stand down for them.
|
||||
let hostCodes = new Set<string>();
|
||||
|
||||
/**
|
||||
* Whether `code` is one of the host's call hotkeys (its PTT or deafen key).
|
||||
* EC's built-in shortcuts ignore such keys: with the defaults, M would
|
||||
* otherwise both toggle EC's mic and the host's deafen, and Space would open
|
||||
* EC's own push-to-talk alongside the host's.
|
||||
*/
|
||||
export function isLotusHostHotkey(code: string): boolean {
|
||||
return hostCodes.has(code);
|
||||
}
|
||||
|
||||
/** `{ codes }` payload → the KeyboardEvent.code values to watch. Exported for tests. */
|
||||
export function parseHotkeyCodes(data: unknown): string[] {
|
||||
if (typeof data !== "object" || data === null) return [];
|
||||
const { codes } = data as { codes?: unknown };
|
||||
if (!Array.isArray(codes)) return [];
|
||||
return codes
|
||||
.filter(
|
||||
(c): c is string =>
|
||||
typeof c === "string" && /^[A-Za-z0-9]{1,32}$/.test(c),
|
||||
)
|
||||
.slice(0, MAX_CODES);
|
||||
}
|
||||
|
||||
/** Same rules as the host's useCallHotkeys. Exported for tests. */
|
||||
export function isEditableTarget(el: Element | null): boolean {
|
||||
if (!(el instanceof HTMLElement)) return false;
|
||||
const tag = el.tagName;
|
||||
if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return true;
|
||||
let node: HTMLElement | null = el;
|
||||
while (node && node !== el.ownerDocument.body) {
|
||||
const ce = node.getAttribute("contenteditable");
|
||||
if (ce === "" || ce === "true" || ce === "plaintext-only") return true;
|
||||
if (ce === "false") return false;
|
||||
node = node.parentElement;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Exported for tests. */
|
||||
export function isInteractiveTarget(el: Element | null): boolean {
|
||||
if (!(el instanceof HTMLElement)) return false;
|
||||
const tag = el.tagName;
|
||||
if (tag === "BUTTON" || tag === "A" || tag === "SELECT") return true;
|
||||
let node: HTMLElement | null = el;
|
||||
while (node && node !== el.ownerDocument.body) {
|
||||
const role = node.getAttribute("role");
|
||||
if (
|
||||
role === "button" ||
|
||||
role === "link" ||
|
||||
role === "menuitem" ||
|
||||
role === "tab"
|
||||
)
|
||||
return true;
|
||||
node = node.parentElement;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* [cinny #43] Call hotkeys (push-to-talk, deafen) while focus is inside this
|
||||
* frame. The host used to add key listeners to this window directly, which
|
||||
* needs same-origin access. Now it sends `io.lotus.set_hotkeys { codes }` and
|
||||
* we report those keys back as `io.lotus.hotkey`. The default action is
|
||||
* cancelled here, synchronously (it can't be across frames), with the host's
|
||||
* rules: never while typing in a field, and not on a focused button/link so
|
||||
* keyboard users can still activate it. Returns a teardown function.
|
||||
*/
|
||||
export function startLotusHotkeys(): () => void {
|
||||
const w = widget;
|
||||
if (!w) return (): void => undefined;
|
||||
hostCodes = new Set<string>();
|
||||
|
||||
const onSetHotkeys = (ev: CustomEvent<IWidgetApiRequest>): void => {
|
||||
w.api.transport.reply(ev.detail, {});
|
||||
hostCodes = new Set(parseHotkeyCodes(ev.detail.data));
|
||||
};
|
||||
const onKey = (e: KeyboardEvent): void => {
|
||||
if (!hostCodes.has(e.code)) return;
|
||||
const target = e.target instanceof Element ? e.target : null;
|
||||
const editable = isEditableTarget(target);
|
||||
const interactive = isInteractiveTarget(target);
|
||||
if (
|
||||
e.type === "keydown" &&
|
||||
!editable &&
|
||||
!interactive &&
|
||||
!e.ctrlKey &&
|
||||
!e.altKey &&
|
||||
!e.metaKey
|
||||
) {
|
||||
e.preventDefault();
|
||||
}
|
||||
const report: LotusHotkeyReport = {
|
||||
type: e.type === "keyup" ? "keyup" : "keydown",
|
||||
code: e.code,
|
||||
repeat: e.repeat,
|
||||
ctrlKey: e.ctrlKey,
|
||||
altKey: e.altKey,
|
||||
metaKey: e.metaKey,
|
||||
shiftKey: e.shiftKey,
|
||||
editable,
|
||||
interactive,
|
||||
};
|
||||
lotusSendToHost(LotusWidgetActions.Hotkey, report);
|
||||
};
|
||||
const onFocusChange = (): void => {
|
||||
if (hostCodes.size > 0)
|
||||
lotusSendToHost(LotusWidgetActions.Hotkey, { type: "focus" });
|
||||
};
|
||||
|
||||
w.lazyActions.on(LotusWidgetActions.SetHotkeys, onSetHotkeys);
|
||||
window.addEventListener("keydown", onKey, true);
|
||||
window.addEventListener("keyup", onKey, true);
|
||||
window.addEventListener("blur", onFocusChange);
|
||||
window.addEventListener("focus", onFocusChange);
|
||||
return (): void => {
|
||||
w.lazyActions.off(LotusWidgetActions.SetHotkeys, onSetHotkeys);
|
||||
window.removeEventListener("keydown", onKey, true);
|
||||
window.removeEventListener("keyup", onKey, true);
|
||||
window.removeEventListener("blur", onFocusChange);
|
||||
window.removeEventListener("focus", onFocusChange);
|
||||
hostCodes = new Set<string>();
|
||||
};
|
||||
}
|
||||
@@ -32,6 +32,8 @@ import { widget } from "../widget";
|
||||
import { startLotusCallState } from "../lotus/lotusCallState";
|
||||
import { startLotusFocus } from "../lotus/lotusFocus";
|
||||
import { startLotusControls } from "../lotus/lotusControls";
|
||||
import { startLotusHotkeys } from "../lotus/lotusHotkeys";
|
||||
import { LotusFrameScreenshare } from "../lotus/LotusFrameScreenshare";
|
||||
import { startLotusMicLevel } from "../lotus/lotusMicLevel";
|
||||
import { startLotusAudioInject } from "../lotus/lotusAudioInject";
|
||||
import { startLotusQuality } from "../lotus/lotusQuality";
|
||||
@@ -305,6 +307,7 @@ export const InCallView: FC<InCallViewProps> = ({
|
||||
// [cinny #43] layout / settings / reactions over the widget API, plus a
|
||||
// screensharing + layout report, replacing the host's DOM access.
|
||||
useEffect(() => startLotusControls(vm), [vm]);
|
||||
useEffect(() => startLotusHotkeys(), []);
|
||||
// [cinny #146] Local mic level for the host's mute-button meter.
|
||||
useEffect(() => startLotusMicLevel(vm), [vm]);
|
||||
// [lotus] Handle the host's io.lotus.inject_audio action to mix a soundboard
|
||||
@@ -690,6 +693,7 @@ export const InCallView: FC<InCallViewProps> = ({
|
||||
{earpieceOverlay}
|
||||
<ReactionsOverlay vm={vm} />
|
||||
{footer}
|
||||
<LotusFrameScreenshare vm={vm} />
|
||||
{showModals && (
|
||||
<>
|
||||
<RageshakeRequestModal {...rageshakeRequestModalProps} />
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
ReactionSet,
|
||||
ReactionsRowSize,
|
||||
} from "./reactions";
|
||||
import { isLotusHostHotkey } from "./lotus/lotusHotkeys";
|
||||
|
||||
/**
|
||||
* Determines whether focus is in the same part of the tree as the given
|
||||
@@ -86,6 +87,8 @@ export function useCallViewKeyboardShortcuts(
|
||||
useCallback(
|
||||
(event: KeyboardEvent) => {
|
||||
logger.info("Keydown event", event);
|
||||
// [lotus] The Lotus host owns its PTT / deafen keys (cinny #43).
|
||||
if (isLotusHostHotkey(event.code)) return;
|
||||
if (!mayReceiveKeyEvents()) return;
|
||||
if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey)
|
||||
return;
|
||||
@@ -132,6 +135,7 @@ export function useCallViewKeyboardShortcuts(
|
||||
"keyup",
|
||||
useCallback(
|
||||
(event: KeyboardEvent) => {
|
||||
if (isLotusHostHotkey(event.code)) return;
|
||||
if (!mayReceiveKeyEvents() || !mayReceiveSpaceKeyEvents()) return;
|
||||
if (event.key === " ") {
|
||||
spacebarHeld.current = false;
|
||||
|
||||
+11
-1
@@ -76,7 +76,17 @@ export const useTheme = (): void => {
|
||||
"lotusTheme anyway since the two flags are only meaningful together.",
|
||||
);
|
||||
}
|
||||
if (lotusTheme || lotusTransparent)
|
||||
if (lotusTheme || lotusTransparent) {
|
||||
document.body.classList.add("lotus-theme");
|
||||
// [cinny #43] The frame's root colour scheme must match the host's, or
|
||||
// the browser paints an opaque backdrop behind the transparent frame.
|
||||
// (The host used to inject `:root { color-scheme }` for this.)
|
||||
document.documentElement.style.colorScheme = theme;
|
||||
}
|
||||
// [cinny #43] The host draws its own call bar: hide EC's footer. Replaces
|
||||
// the host's injected styles. Where the host can't start a share for us,
|
||||
// LotusFrameScreenshare shows EC's screenshare button on its own.
|
||||
if (lotusFlag("lotusHostControls"))
|
||||
document.body.classList.add("lotus-host-controls");
|
||||
}, [previousTheme, requestedTheme]);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user