Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '@app/styles.css';
// React MoQ Publisher sandbox
// http://localhost:5173/react-moq-publisher/
// http://localhost:5173/moq-publisher-react/
//
// Renders the React publisher preset (`PublisherSkin` over `publisherFeatures`).
// The default mode reuses the fake publish host from the HTML publisher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ with no measured bandwidth need. Revisit with data, in
independently" — call sites are unaffected). State fields become
`cameraActive`, `screenShareActive`, `cameraState`, `screenShareState`,
and (added after review) the read-only `micState`.
- **`screen-share-button-core.ts`**: `sharing` becomes
- **`screen-share-button/core.ts`**: `sharing` becomes
Comment thread
mmcc marked this conversation as resolved.
Resolved
`media.screenShareActive` directly, replacing
`media.captureSource === 'screen'`.
- **`capture-placeholder-core.ts`**: the placeholder is shown before
- **`capture-placeholder/core.ts`**: the placeholder is shown before
*any* source is active — `captureState` becomes a derived aggregate,
`active` if either `cameraState` or `screenShareState` is `active`,
else the more "in-progress" of the two (`acquiring` > `denied` >
Expand Down Expand Up @@ -272,7 +272,7 @@ plus what this record defers beyond the RFC:
intent/fact slots, adapter properties (`cameraActive`, `screenShareActive`,
`previewSource`, plural state/stream getters).
- `packages/core/src/dom/store/features/capture-source.ts`,
`packages/core/src/core/ui/{screen-share-button,capture-placeholder,enable-devices-button}/*-core.ts`.
`packages/core/src/core/ui/{screen-share-button,capture-placeholder,enable-devices-button}/core.ts`.

## See also

Expand Down
44 changes: 22 additions & 22 deletions packages/core/src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@ export * from './ui/audio-track-radio-group/core';
export * from './ui/audio-track-radio-group/data';
export * from './ui/buffering-indicator/core';
export * from './ui/buffering-indicator/data';
export * from './ui/camera-button/camera-button-core';
export * from './ui/camera-button/camera-button-data-attrs';
export * from './ui/camera-radio-group/camera-radio-group-core';
export * from './ui/camera-radio-group/camera-radio-group-data-attrs';
export * from './ui/camera-button/core';
export * from './ui/camera-button/data';
export * from './ui/camera-radio-group/core';
export * from './ui/camera-radio-group/data';
export * from './ui/captions-button/core';
export * from './ui/captions-button/data';
export * from './ui/captions-radio-group/core';
export * from './ui/captions-radio-group/data';
export * from './ui/capture-placeholder/capture-placeholder-core';
export * from './ui/capture-placeholder/capture-placeholder-data-attrs';
export * from './ui/capture-placeholder/core';
export * from './ui/capture-placeholder/data';
export * from './ui/cast-button/core';
export * from './ui/cast-button/data';
export * from './ui/connection-indicator/connection-indicator-core';
export * from './ui/connection-indicator/connection-indicator-data-attrs';
export * from './ui/connection-indicator/core';
export * from './ui/connection-indicator/data';
export * from './ui/container/core';
export * from './ui/container/data';
export * from './ui/controls/core';
export * from './ui/controls/data';
export * from './ui/constants';
export * from './ui/dialog/core';
export * from './ui/dialog/data';
export * from './ui/enable-devices-button/enable-devices-button-core';
export * from './ui/enable-devices-button/enable-devices-button-data-attrs';
export * from './ui/enable-devices-button/core';
export * from './ui/enable-devices-button/data';
export * from './ui/error-dialog/core';
export * from './ui/error-dialog/data';
export * from './ui/error-dialog/i18n';
Expand All @@ -45,10 +45,10 @@ export * from './ui/menu/core';
export * from './ui/menu/data';
export * from './ui/menu/item';
export * from './ui/menu/vars';
export * from './ui/mic-button/mic-button-core';
export * from './ui/mic-button/mic-button-data-attrs';
export * from './ui/mic-radio-group/mic-radio-group-core';
export * from './ui/mic-radio-group/mic-radio-group-data-attrs';
export * from './ui/mic-button/core';
export * from './ui/mic-button/data';
export * from './ui/mic-radio-group/core';
export * from './ui/mic-radio-group/data';
export * from './ui/mute-button/core';
export * from './ui/mute-button/data';
export * from './ui/pip-button/core';
Expand All @@ -65,16 +65,16 @@ export * from './ui/popover/host';
export * from './ui/popover/vars';
export * from './ui/poster/core';
export * from './ui/poster/data';
export * from './ui/publish-badge/publish-badge-core';
export * from './ui/publish-badge/publish-badge-data-attrs';
export * from './ui/publish-button/publish-button-core';
export * from './ui/publish-button/publish-button-data-attrs';
export * from './ui/publish-timer/publish-timer-core';
export * from './ui/publish-timer/publish-timer-data-attrs';
export * from './ui/publish-badge/core';
export * from './ui/publish-badge/data';
export * from './ui/publish-button/core';
export * from './ui/publish-button/data';
export * from './ui/publish-timer/core';
export * from './ui/publish-timer/data';
export * from './ui/quality-radio-group/core';
export * from './ui/quality-radio-group/data';
export * from './ui/screen-share-button/screen-share-button-core';
export * from './ui/screen-share-button/screen-share-button-data-attrs';
export * from './ui/screen-share-button/core';
export * from './ui/screen-share-button/data';
export * from './ui/seek-button/core';
export * from './ui/seek-button/data';
export * from './ui/seek-indicator/core';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { CameraButtonState } from './camera-button-core';
import type { CameraButtonState } from './core';

export const CameraButtonDataAttrs = {
/** Present when outgoing video is muted. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureTracksState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { CameraButtonState } from '../camera-button-core';
import { CameraButtonCore } from '../camera-button-core';
import type { CameraButtonState } from '../core';
import { CameraButtonCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureTracksState> = {}): MediaCaptureTracksState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { CameraRadioGroupState } from './camera-radio-group-core';
import type { CameraRadioGroupState } from './core';

export const CameraRadioGroupDataAttrs = {
/** Currently selected camera device id. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureDevicesState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { CameraRadioGroupState } from '../camera-radio-group-core';
import { CameraRadioGroupCore } from '../camera-radio-group-core';
import type { CameraRadioGroupState } from '../core';
import { CameraRadioGroupCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureDevicesState> = {}): MediaCaptureDevicesState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { CapturePlaceholderState } from './capture-placeholder-core';
import type { CapturePlaceholderState } from './core';

export const CapturePlaceholderDataAttrs = {
/** Current capture lifecycle. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureSourceState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { CapturePlaceholderState } from '../capture-placeholder-core';
import { CapturePlaceholderCore } from '../capture-placeholder-core';
import type { CapturePlaceholderState } from '../core';
import { CapturePlaceholderCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureSourceState> = {}): MediaCaptureSourceState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { ConnectionIndicatorState } from './connection-indicator-core';
import type { ConnectionIndicatorState } from './core';

export const ConnectionIndicatorDataAttrs = {
/** Coarse connection health (`unknown`, `good`, `fair`, or `poor`). */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaPublishStatsState } from '@videojs/media';
import { describe, expect, it } from 'vite-plus/test';

import type { ConnectionIndicatorState } from '../connection-indicator-core';
import { ConnectionIndicatorCore } from '../connection-indicator-core';
import type { ConnectionIndicatorState } from '../core';
import { ConnectionIndicatorCore } from '../core';

function createMediaState(overrides: Partial<MediaPublishStatsState> = {}): MediaPublishStatsState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { EnableDevicesButtonState } from './enable-devices-button-core';
import type { EnableDevicesButtonState } from './core';

export const EnableDevicesButtonDataAttrs = {
/** Current capture lifecycle. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureSourceState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { EnableDevicesButtonState } from '../enable-devices-button-core';
import { EnableDevicesButtonCore } from '../enable-devices-button-core';
import type { EnableDevicesButtonState } from '../core';
import { EnableDevicesButtonCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureSourceState> = {}): MediaCaptureSourceState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { MicButtonState } from './mic-button-core';
import type { MicButtonState } from './core';

export const MicButtonDataAttrs = {
/** Present when outgoing audio is muted. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureTracksState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { MicButtonState } from '../mic-button-core';
import { MicButtonCore } from '../mic-button-core';
import type { MicButtonState } from '../core';
import { MicButtonCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureTracksState> = {}): MediaCaptureTracksState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { MicRadioGroupState } from './mic-radio-group-core';
import type { MicRadioGroupState } from './core';

export const MicRadioGroupDataAttrs = {
/** Currently selected microphone device id. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureDevicesState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { MicRadioGroupState } from '../mic-radio-group-core';
import { MicRadioGroupCore } from '../mic-radio-group-core';
import type { MicRadioGroupState } from '../core';
import { MicRadioGroupCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureDevicesState> = {}): MediaCaptureDevicesState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { PublishBadgeState } from './publish-badge-core';
import type { PublishBadgeState } from './core';

export const PublishBadgeDataAttrs = {
/** Current publish session lifecycle. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaPublishState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { PublishBadgeState } from '../publish-badge-core';
import { PublishBadgeCore } from '../publish-badge-core';
import type { PublishBadgeState } from '../core';
import { PublishBadgeCore } from '../core';

function createMediaState(overrides: Partial<MediaPublishState> = {}): MediaPublishState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { PublishButtonState } from './publish-button-core';
import type { PublishButtonState } from './core';

export const PublishButtonDataAttrs = {
/** Current publish session lifecycle. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, expect, it, vi } from 'vite-plus/test';

import type { PublishButtonMediaState, PublishButtonState } from '../publish-button-core';
import { PublishButtonCore } from '../publish-button-core';
import type { PublishButtonMediaState, PublishButtonState } from '../core';
import { PublishButtonCore } from '../core';

function createMediaState(overrides: Partial<PublishButtonMediaState> = {}): PublishButtonMediaState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { PublishTimerState } from './publish-timer-core';
import type { PublishTimerState } from './core';

export const PublishTimerDataAttrs = {
/** Current publish session lifecycle. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaPublishState } from '@videojs/media';
import { afterEach, describe, expect, it, vi } from 'vite-plus/test';

import type { PublishTimerState } from '../publish-timer-core';
import { PublishTimerCore } from '../publish-timer-core';
import type { PublishTimerState } from '../core';
import { PublishTimerCore } from '../core';

function createMediaState(overrides: Partial<MediaPublishState> = {}): MediaPublishState {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StateAttrMap } from '../types';
import type { ScreenShareButtonState } from './screen-share-button-core';
import type { ScreenShareButtonState } from './core';

export const ScreenShareButtonDataAttrs = {
/** Present when the screen is the active capture source. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { MediaCaptureSourceState } from '@videojs/media';
import { describe, expect, it, vi } from 'vite-plus/test';

import type { ScreenShareButtonState } from '../screen-share-button-core';
import { ScreenShareButtonCore } from '../screen-share-button-core';
import type { ScreenShareButtonState } from '../core';
import { ScreenShareButtonCore } from '../core';

function createMediaState(overrides: Partial<MediaCaptureSourceState> = {}): MediaCaptureSourceState {
return {
Expand Down
22 changes: 11 additions & 11 deletions packages/html/src/define/publisher/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ import { I18nProviderElement } from '../../i18n/provider-element';
import { VideoPublisherElement } from '../../presets/publisher/player';
import { safeDefine } from '../../registration/safe-define';
import { defineControls, defineErrorDialog, defineMenu, defineTooltip } from '../../registration/ui-compounds';
import { CameraButtonElement } from '../../ui/camera-button/camera-button-element';
import { CameraRadioGroupElement } from '../../ui/camera-radio-group/camera-radio-group-element';
import { CapturePlaceholderElement } from '../../ui/capture-placeholder/capture-placeholder-element';
import { ConnectionIndicatorElement } from '../../ui/connection-indicator/connection-indicator-element';
import { CameraButtonElement } from '../../ui/camera-button/element';
import { CameraRadioGroupElement } from '../../ui/camera-radio-group/element';
import { CapturePlaceholderElement } from '../../ui/capture-placeholder/element';
import { ConnectionIndicatorElement } from '../../ui/connection-indicator/element';
import { ContainerElement } from '../../ui/container/element';
import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/enable-devices-button-element';
import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/element';
import { FullscreenButtonElement } from '../../ui/fullscreen-button/element';
import { HotkeyElement } from '../../ui/hotkey/element';
import { MicButtonElement } from '../../ui/mic-button/mic-button-element';
import { MicRadioGroupElement } from '../../ui/mic-radio-group/mic-radio-group-element';
import { MicButtonElement } from '../../ui/mic-button/element';
import { MicRadioGroupElement } from '../../ui/mic-radio-group/element';
import { PopoverElement } from '../../ui/popover/element';
import { PublishBadgeElement } from '../../ui/publish-badge/publish-badge-element';
import { PublishButtonElement } from '../../ui/publish-button/publish-button-element';
import { PublishTimerElement } from '../../ui/publish-timer/publish-timer-element';
import { ScreenShareButtonElement } from '../../ui/screen-share-button/screen-share-button-element';
import { PublishBadgeElement } from '../../ui/publish-badge/element';
import { PublishButtonElement } from '../../ui/publish-button/element';
import { PublishTimerElement } from '../../ui/publish-timer/element';
import { ScreenShareButtonElement } from '../../ui/screen-share-button/element';
import { TextElement } from '../../ui/text/element';

// ── Registration (providers / parents first) ────────────────────────────
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/camera-button.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { CameraButtonElement } from '../../ui/camera-button/camera-button-element';
import { CameraButtonElement } from '../../ui/camera-button/element';

safeDefine(CameraButtonElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/camera-radio-group.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { CameraRadioGroupElement } from '../../ui/camera-radio-group/camera-radio-group-element';
import { CameraRadioGroupElement } from '../../ui/camera-radio-group/element';

safeDefine(CameraRadioGroupElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/capture-placeholder.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { CapturePlaceholderElement } from '../../ui/capture-placeholder/capture-placeholder-element';
import { CapturePlaceholderElement } from '../../ui/capture-placeholder/element';

safeDefine(CapturePlaceholderElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/connection-indicator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { ConnectionIndicatorElement } from '../../ui/connection-indicator/connection-indicator-element';
import { ConnectionIndicatorElement } from '../../ui/connection-indicator/element';

safeDefine(ConnectionIndicatorElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/enable-devices-button.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/enable-devices-button-element';
import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/element';

safeDefine(EnableDevicesButtonElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/mic-button.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { MicButtonElement } from '../../ui/mic-button/mic-button-element';
import { MicButtonElement } from '../../ui/mic-button/element';

safeDefine(MicButtonElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/mic-radio-group.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { MicRadioGroupElement } from '../../ui/mic-radio-group/mic-radio-group-element';
import { MicRadioGroupElement } from '../../ui/mic-radio-group/element';

safeDefine(MicRadioGroupElement);

Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/define/ui/publish-badge.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeDefine } from '../../registration/safe-define';
import { PublishBadgeElement } from '../../ui/publish-badge/publish-badge-element';
import { PublishBadgeElement } from '../../ui/publish-badge/element';

safeDefine(PublishBadgeElement);

Expand Down
Loading
Loading