@remotion/studio 4.0.500 → 4.0.502
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Studio.js +1 -1
- package/dist/api/delete-static-file.js +8 -3
- package/dist/api/rename-static-file.js +8 -0
- package/dist/api/watch-public-folder.js +2 -1
- package/dist/api/watch-static-file.js +2 -1
- package/dist/api/write-static-file.js +8 -3
- package/dist/components/AssetSelector.js +3 -1
- package/dist/components/AssetSelectorItem.d.ts +2 -1
- package/dist/components/AssetSelectorItem.js +7 -4
- package/dist/components/Canvas.js +9 -4
- package/dist/components/CaptionInspector.d.ts +10 -0
- package/dist/components/CaptionInspector.js +24 -0
- package/dist/components/CaptionTextEditor.d.ts +9 -0
- package/dist/components/CaptionTextEditor.js +132 -0
- package/dist/components/CompositionSelector.js +4 -4
- package/dist/components/CompositionSelectorItem.js +5 -5
- package/dist/components/CurrentAsset.js +3 -2
- package/dist/components/EditorContent.js +1 -1
- package/dist/components/EditorContexts.d.ts +0 -1
- package/dist/components/EditorContexts.js +2 -2
- package/dist/components/FpsCounter.js +3 -3
- package/dist/components/FullscreenToggle.d.ts +3 -1
- package/dist/components/FullscreenToggle.js +3 -2
- package/dist/components/GlobalKeybindings.js +2 -0
- package/dist/components/InitialCompositionLoader.d.ts +1 -1
- package/dist/components/InlineAction.js +2 -1
- package/dist/components/InlineCaptionInspector.d.ts +11 -0
- package/dist/components/InlineCaptionInspector.js +108 -0
- package/dist/components/InspectorPanel/CompositionInspector.js +5 -3
- package/dist/components/InspectorPanel/SelectedInspector.d.ts +1 -0
- package/dist/components/InspectorPanel/SelectedInspector.js +2 -2
- package/dist/components/InspectorPanel/SequenceSelectionInspector.d.ts +1 -0
- package/dist/components/InspectorPanel/SequenceSelectionInspector.js +4 -4
- package/dist/components/InspectorPanel/inspector-section-collapse.d.ts +22 -0
- package/dist/components/InspectorPanel/inspector-section-collapse.js +165 -0
- package/dist/components/InspectorPanel/styles.js +7 -1
- package/dist/components/InspectorPanel/use-composition-actions.d.ts +4 -1
- package/dist/components/InspectorPanel/use-composition-actions.js +135 -7
- package/dist/components/InspectorPanel.js +2 -2
- package/dist/components/InspectorSequenceSection.d.ts +2 -1
- package/dist/components/InspectorSequenceSection.js +238 -8
- package/dist/components/LoopToggle.d.ts +1 -0
- package/dist/components/LoopToggle.js +9 -5
- package/dist/components/Menu/MenuSubItem.js +9 -1
- package/dist/components/MenuToolbar.js +8 -1
- package/dist/components/Modals.js +1 -1
- package/dist/components/ObserveDefaultPropsContext.js +7 -4
- package/dist/components/PlayPause.d.ts +1 -0
- package/dist/components/PlayPause.js +2 -4
- package/dist/components/PlaybackRateSelector.d.ts +9 -2
- package/dist/components/PlaybackRateSelector.js +21 -10
- package/dist/components/PreviewToolbar.js +19 -109
- package/dist/components/PreviewToolbarOverflowButton.d.ts +12 -0
- package/dist/components/PreviewToolbarOverflowButton.js +217 -0
- package/dist/components/QuickSwitcher/ExplorerQuickSwitcherTrigger.js +1 -0
- package/dist/components/QuickSwitcher/QuickSwitcher.d.ts +6 -0
- package/dist/components/QuickSwitcher/QuickSwitcher.js +2 -2
- package/dist/components/QuickSwitcher/QuickSwitcherContent.d.ts +6 -0
- package/dist/components/QuickSwitcher/QuickSwitcherContent.js +42 -9
- package/dist/components/QuickSwitcher/QuickSwitcherResult.d.ts +2 -0
- package/dist/components/QuickSwitcher/QuickSwitcherResult.js +7 -1
- package/dist/components/RenderButton.d.ts +1 -0
- package/dist/components/RenderButton.js +6 -4
- package/dist/components/RenderQueue/ClientRenderQueueProcessor.d.ts +0 -1
- package/dist/components/RenderQueue/ClientRenderQueueProcessor.js +3 -14
- package/dist/components/RenderQueue/RenderQueueDownloadItem.js +2 -2
- package/dist/components/SelectedOutlineElement.js +1 -4
- package/dist/components/SelectedOutlineOverlay.js +17 -8
- package/dist/components/ShowOutlinesProvider.js +4 -1
- package/dist/components/SizeSelector.d.ts +6 -0
- package/dist/components/SizeSelector.js +17 -8
- package/dist/components/Splitter/SplitterContainer.d.ts +1 -0
- package/dist/components/Splitter/SplitterContainer.js +23 -3
- package/dist/components/Splitter/SplitterContext.d.ts +14 -0
- package/dist/components/Splitter/SplitterContext.js +16 -1
- package/dist/components/Splitter/SplitterHandle.js +8 -6
- package/dist/components/Timeline/Timeline.js +21 -6
- package/dist/components/Timeline/TimelineAssetField.d.ts +1 -1
- package/dist/components/Timeline/TimelineAssetField.js +37 -1
- package/dist/components/Timeline/TimelineDragHandler.js +1 -1
- package/dist/components/Timeline/TimelineExpandedKeyframeRow.js +8 -2
- package/dist/components/Timeline/TimelinePrimitiveFieldValue.d.ts +7 -2
- package/dist/components/Timeline/TimelinePrimitiveFieldValue.js +3 -1
- package/dist/components/Timeline/TimelineRowChrome.d.ts +3 -0
- package/dist/components/Timeline/TimelineRowChrome.js +4 -3
- package/dist/components/Timeline/TimelineSelection.d.ts +4 -2
- package/dist/components/Timeline/TimelineSelection.js +9 -6
- package/dist/components/Timeline/TimelineSequence.js +1 -4
- package/dist/components/Timeline/TimelineSequenceItem.js +4 -5
- package/dist/components/Timeline/TimelineSequencePropItem.js +9 -10
- package/dist/components/Timeline/TimelineStack/get-stack.js +8 -0
- package/dist/components/Timeline/TimelineTrack.js +4 -2
- package/dist/components/Timeline/border-radius-representation.d.ts +16 -0
- package/dist/components/Timeline/border-radius-representation.js +60 -0
- package/dist/components/Timeline/delete-selected-timeline-item.js +1 -6
- package/dist/components/Timeline/get-sequence-prop-reset-changes.d.ts +10 -0
- package/dist/components/Timeline/get-sequence-prop-reset-changes.js +33 -0
- package/dist/components/Timeline/reset-selected-timeline-props.js +2 -8
- package/dist/components/Timeline/save-sequence-prop.d.ts +12 -1
- package/dist/components/Timeline/save-sequence-prop.js +28 -4
- package/dist/components/Timeline/sequence-props-subscription-store.d.ts +2 -2
- package/dist/components/Timeline/sequence-props-subscription-store.js +3 -3
- package/dist/components/Timeline/timeline-field-display-utils.js +1 -0
- package/dist/components/Timeline/use-timeline-asset-drop.js +4 -0
- package/dist/components/TopPanel.js +1 -1
- package/dist/components/UndoRedoButtons.js +15 -6
- package/dist/components/UpdateCheck.js +11 -4
- package/dist/components/default-props-api.d.ts +3 -0
- package/dist/components/default-props-api.js +19 -0
- package/dist/components/drop-handler-data.d.ts +1 -1
- package/dist/components/drop-handler-data.js +6 -6
- package/dist/components/effect-drag-and-drop.d.ts +1 -1
- package/dist/components/effect-drag-and-drop.js +3 -3
- package/dist/components/element-drag-and-drop.d.ts +1 -1
- package/dist/components/element-drag-and-drop.js +3 -3
- package/dist/components/handle-drop.d.ts +3 -2
- package/dist/components/handle-drop.js +2 -1
- package/dist/components/import-assets.d.ts +8 -6
- package/dist/components/import-assets.js +20 -7
- package/dist/components/sequence-props-api.d.ts +4 -0
- package/dist/components/sequence-props-api.js +26 -0
- package/dist/components/use-element-overwrite-confirmation.d.ts +2 -0
- package/dist/components/use-element-overwrite-confirmation.js +73 -0
- package/dist/components/use-static-files.js +7 -2
- package/dist/error-overlay/react-overlay/effects/resolve-file-source.js +13 -2
- package/dist/error-overlay/remotion-overlay/ErrorDisplay.d.ts +1 -0
- package/dist/error-overlay/remotion-overlay/ErrorDisplay.js +29 -5
- package/dist/error-overlay/remotion-overlay/ErrorLoader.js +4 -20
- package/dist/esm/{chunk-dr1y1vm3.js → chunk-fjv75ty4.js} +8478 -6609
- package/dist/esm/index.mjs +24 -8
- package/dist/esm/internals.mjs +8478 -6609
- package/dist/esm/previewEntry.mjs +8535 -6666
- package/dist/esm/renderEntry.mjs +1 -1
- package/dist/helpers/browser-studio-operations.d.ts +3 -0
- package/dist/helpers/browser-studio-operations.js +14 -0
- package/dist/helpers/client-id.d.ts +0 -1
- package/dist/helpers/client-id.js +15 -10
- package/dist/helpers/download-blob.d.ts +1 -0
- package/dist/helpers/download-blob.js +15 -0
- package/dist/helpers/inject-css.js +5 -3
- package/dist/helpers/open-in-editor.js +26 -5
- package/dist/helpers/preview-server-events.js +46 -9
- package/dist/helpers/use-create-composition.js +8 -6
- package/dist/helpers/use-menu-structure.js +29 -0
- package/dist/hot-middleware-client/client.js +3 -3
- package/dist/icons/border-radius.d.ts +4 -0
- package/dist/icons/border-radius.js +8 -0
- package/dist/icons/fullscreen.d.ts +4 -0
- package/dist/icons/fullscreen.js +6 -0
- package/dist/icons/upload.d.ts +4 -0
- package/dist/icons/upload.js +8 -0
- package/dist/previewEntry.js +1 -1
- package/dist/state/modals.d.ts +5 -0
- package/dist/state/timeline-sequence-hover.d.ts +17 -0
- package/dist/state/timeline-sequence-hover.js +33 -0
- package/package.json +13 -12
|
@@ -36,6 +36,6 @@ const Modals = ({ readOnlyStudio }) => {
|
|
|
36
36
|
'connected';
|
|
37
37
|
return (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [modalContextType && modalContextType.type === 'new-comp' && (jsx_runtime_1.jsx(NewComposition_1.NewComposition, { folderName: modalContextType.folderName, parentName: modalContextType.parentName, stack: modalContextType.stack })), modalContextType && modalContextType.type === 'new-folder' && (jsx_runtime_1.jsx(NewFolder_1.NewFolder, { parentName: modalContextType.parentName, stack: modalContextType.stack })), modalContextType && modalContextType.type === 'duplicate-comp' && (jsx_runtime_1.jsx(DuplicateComposition_1.DuplicateComposition, { compositionType: modalContextType.compositionType, compositionId: modalContextType.compositionId })), modalContextType && modalContextType.type === 'delete-comp' && (jsx_runtime_1.jsx(DeleteComposition_1.DeleteComposition, { compositionId: modalContextType.compositionId })), modalContextType && modalContextType.type === 'rename-comp' && (jsx_runtime_1.jsx(RenameComposition_1.RenameComposition, { compositionId: modalContextType.compositionId })), modalContextType && modalContextType.type === 'delete-folder' && (jsx_runtime_1.jsx(DeleteFolder_1.DeleteFolder, { folderName: modalContextType.folderName, parentName: modalContextType.parentName, stack: modalContextType.stack })), modalContextType && modalContextType.type === 'rename-folder' && (jsx_runtime_1.jsx(RenameFolder_1.RenameFolder, { folderName: modalContextType.folderName, parentName: modalContextType.parentName, stack: modalContextType.stack })), modalContextType && modalContextType.type === 'rename-static-file' && (jsx_runtime_1.jsx(RenameStaticFile_1.RenameStaticFileModal, { relativePath: modalContextType.relativePath })), modalContextType && modalContextType.type === 'input-props-override' && (jsx_runtime_1.jsx(OverrideInputProps_1.OverrideInputPropsModal, {})), modalContextType && modalContextType.type === 'configure-license' && (jsx_runtime_1.jsx(ConfigureLicenseModal_1.ConfigureLicenseModal, { initialPublicLicenseKey: modalContextType.initialPublicLicenseKey })), modalContextType && modalContextType.type === 'web-render' && (jsx_runtime_1.jsx(WebRenderModal_1.WebRenderModalWithLoader, { ...modalContextType })), modalContextType &&
|
|
38
38
|
modalContextType.type === 'server-render' &&
|
|
39
|
-
(canRender || modalContextType.readOnlyStudio) ? (jsx_runtime_1.jsx(ServerRenderModal_1.RenderModalWithLoader, { readOnlyStudio: (_a = modalContextType.readOnlyStudio) !== null && _a !== void 0 ? _a : false, initialFrame: modalContextType.initialFrame, initialDarkMode: modalContextType.initialDarkMode, compositionId: modalContextType.compositionId, initialVideoImageFormat: modalContextType.initialVideoImageFormat, initialJpegQuality: modalContextType.initialJpegQuality, initialScale: modalContextType.initialScale, initialLogLevel: modalContextType.initialLogLevel, initialOffthreadVideoCacheSizeInBytes: modalContextType.initialOffthreadVideoCacheSizeInBytes, initialOffthreadVideoThreads: modalContextType.initialOffthreadVideoThreads, initialMediaCacheSizeInBytes: modalContextType.initialMediaCacheSizeInBytes, initialConcurrency: modalContextType.initialConcurrency, maxConcurrency: modalContextType.maxConcurrency, minConcurrency: modalContextType.minConcurrency, initialStillImageFormat: modalContextType.initialStillImageFormat, initialMuted: modalContextType.initialMuted, initialEnforceAudioTrack: modalContextType.initialEnforceAudioTrack, initialProResProfile: modalContextType.initialProResProfile, initialx264Preset: modalContextType.initialx264Preset, initialGopSize: modalContextType.initialGopSize, initialPixelFormat: modalContextType.initialPixelFormat, initialAudioBitrate: modalContextType.initialAudioBitrate, initialVideoBitrate: modalContextType.initialVideoBitrate, initialEveryNthFrame: modalContextType.initialEveryNthFrame, initialNumberOfGifLoops: modalContextType.initialNumberOfGifLoops, initialDelayRenderTimeout: modalContextType.initialDelayRenderTimeout, initialEnvVariables: modalContextType.initialEnvVariables, initialDisableWebSecurity: modalContextType.initialDisableWebSecurity, initialGl: modalContextType.initialOpenGlRenderer, initialHeadless: modalContextType.initialHeadless, initialIgnoreCertificateErrors: modalContextType.initialIgnoreCertificateErrors, initialEncodingBufferSize: modalContextType.initialEncodingBufferSize, initialEncodingMaxRate: modalContextType.initialEncodingMaxRate, initialUserAgent: modalContextType.initialUserAgent, initialColorSpace: modalContextType.initialColorSpace, initialMultiProcessOnLinux: modalContextType.initialMultiProcessOnLinux, initialRepro: modalContextType.initialRepro, initialBeep: modalContextType.initialBeep, initialForSeamlessAacConcatenation: modalContextType.initialForSeamlessAacConcatenation, defaultProps: modalContextType.defaultProps, inFrameMark: modalContextType.inFrameMark, outFrameMark: modalContextType.outFrameMark, defaultConfigurationAudioCodec: modalContextType.defaultConfigurationAudioCodec, defaultConfigurationVideoCodec: modalContextType.defaultConfigurationVideoCodec, renderTypeOfLastRender: modalContextType.renderTypeOfLastRender, defaultMetadata: modalContextType.defaulMetadata, initialHardwareAcceleration: modalContextType.initialHardwareAcceleration, initialSampleRate: modalContextType.initialSampleRate, initialChromeMode: modalContextType.initialChromeMode, renderDefaults: modalContextType.renderDefaults })) : null, modalContextType && modalContextType.type === 'render-progress' && (jsx_runtime_1.jsx(RenderStatusModal_1.RenderStatusModal, { jobId: modalContextType.jobId })), modalContextType && modalContextType.type === 'update' && (jsx_runtime_1.jsx(UpdateModal_1.UpdateModal, { info: modalContextType.info, knownBugs: modalContextType.knownBugs })), modalContextType && modalContextType.type === 'install-packages' && (jsx_runtime_1.jsx(InstallPackage_1.InstallPackageModal, { packageManager: modalContextType.packageManager })), modalContextType && modalContextType.type === 'quick-switcher' && (jsx_runtime_1.jsx(QuickSwitcher_1.default, { readOnlyStudio: readOnlyStudio, invocationTimestamp: modalContextType.invocationTimestamp, initialMode: modalContextType.mode, assetSelection: modalContextType.assetSelection })), modalContextType && modalContextType.type === 'add-effect' && (jsx_runtime_1.jsx(EffectPickerModal_1.EffectPickerModal, { state: modalContextType })), modalContextType && modalContextType.type === 'confirmation-dialog' && (jsx_runtime_1.jsx(ConfirmationDialog_1.ConfirmationDialog, { state: modalContextType })), modalContextType && modalContextType.type === 'svg-import-dialog' && (jsx_runtime_1.jsx(SvgImportDialog_1.SvgImportDialog, { state: modalContextType })), (0, studio_runtime_config_1.getStudioAskAIEnabled)() && jsx_runtime_1.jsx(AskAiModal_1.AskAiModal, {})] }));
|
|
39
|
+
(canRender || modalContextType.readOnlyStudio) ? (jsx_runtime_1.jsx(ServerRenderModal_1.RenderModalWithLoader, { readOnlyStudio: (_a = modalContextType.readOnlyStudio) !== null && _a !== void 0 ? _a : false, initialFrame: modalContextType.initialFrame, initialDarkMode: modalContextType.initialDarkMode, compositionId: modalContextType.compositionId, initialVideoImageFormat: modalContextType.initialVideoImageFormat, initialJpegQuality: modalContextType.initialJpegQuality, initialScale: modalContextType.initialScale, initialLogLevel: modalContextType.initialLogLevel, initialOffthreadVideoCacheSizeInBytes: modalContextType.initialOffthreadVideoCacheSizeInBytes, initialOffthreadVideoThreads: modalContextType.initialOffthreadVideoThreads, initialMediaCacheSizeInBytes: modalContextType.initialMediaCacheSizeInBytes, initialConcurrency: modalContextType.initialConcurrency, maxConcurrency: modalContextType.maxConcurrency, minConcurrency: modalContextType.minConcurrency, initialStillImageFormat: modalContextType.initialStillImageFormat, initialMuted: modalContextType.initialMuted, initialEnforceAudioTrack: modalContextType.initialEnforceAudioTrack, initialProResProfile: modalContextType.initialProResProfile, initialx264Preset: modalContextType.initialx264Preset, initialGopSize: modalContextType.initialGopSize, initialPixelFormat: modalContextType.initialPixelFormat, initialAudioBitrate: modalContextType.initialAudioBitrate, initialVideoBitrate: modalContextType.initialVideoBitrate, initialEveryNthFrame: modalContextType.initialEveryNthFrame, initialNumberOfGifLoops: modalContextType.initialNumberOfGifLoops, initialDelayRenderTimeout: modalContextType.initialDelayRenderTimeout, initialEnvVariables: modalContextType.initialEnvVariables, initialDisableWebSecurity: modalContextType.initialDisableWebSecurity, initialGl: modalContextType.initialOpenGlRenderer, initialHeadless: modalContextType.initialHeadless, initialIgnoreCertificateErrors: modalContextType.initialIgnoreCertificateErrors, initialEncodingBufferSize: modalContextType.initialEncodingBufferSize, initialEncodingMaxRate: modalContextType.initialEncodingMaxRate, initialUserAgent: modalContextType.initialUserAgent, initialColorSpace: modalContextType.initialColorSpace, initialMultiProcessOnLinux: modalContextType.initialMultiProcessOnLinux, initialRepro: modalContextType.initialRepro, initialBeep: modalContextType.initialBeep, initialForSeamlessAacConcatenation: modalContextType.initialForSeamlessAacConcatenation, defaultProps: modalContextType.defaultProps, inFrameMark: modalContextType.inFrameMark, outFrameMark: modalContextType.outFrameMark, defaultConfigurationAudioCodec: modalContextType.defaultConfigurationAudioCodec, defaultConfigurationVideoCodec: modalContextType.defaultConfigurationVideoCodec, renderTypeOfLastRender: modalContextType.renderTypeOfLastRender, defaultMetadata: modalContextType.defaulMetadata, initialHardwareAcceleration: modalContextType.initialHardwareAcceleration, initialSampleRate: modalContextType.initialSampleRate, initialChromeMode: modalContextType.initialChromeMode, renderDefaults: modalContextType.renderDefaults })) : null, modalContextType && modalContextType.type === 'render-progress' && (jsx_runtime_1.jsx(RenderStatusModal_1.RenderStatusModal, { jobId: modalContextType.jobId })), modalContextType && modalContextType.type === 'update' && (jsx_runtime_1.jsx(UpdateModal_1.UpdateModal, { info: modalContextType.info, knownBugs: modalContextType.knownBugs })), modalContextType && modalContextType.type === 'install-packages' && (jsx_runtime_1.jsx(InstallPackage_1.InstallPackageModal, { packageManager: modalContextType.packageManager })), modalContextType && modalContextType.type === 'quick-switcher' && (jsx_runtime_1.jsx(QuickSwitcher_1.default, { readOnlyStudio: readOnlyStudio, invocationTimestamp: modalContextType.invocationTimestamp, initialMode: modalContextType.mode, assetSelection: modalContextType.assetSelection, compositionSelection: modalContextType.compositionSelection })), modalContextType && modalContextType.type === 'add-effect' && (jsx_runtime_1.jsx(EffectPickerModal_1.EffectPickerModal, { state: modalContextType })), modalContextType && modalContextType.type === 'confirmation-dialog' && (jsx_runtime_1.jsx(ConfirmationDialog_1.ConfirmationDialog, { state: modalContextType })), modalContextType && modalContextType.type === 'svg-import-dialog' && (jsx_runtime_1.jsx(SvgImportDialog_1.SvgImportDialog, { state: modalContextType })), (0, studio_runtime_config_1.getStudioAskAIEnabled)() && jsx_runtime_1.jsx(AskAiModal_1.AskAiModal, {})] }));
|
|
40
40
|
};
|
|
41
41
|
exports.Modals = Modals;
|
|
@@ -38,8 +38,9 @@ const jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
38
38
|
const react_1 = __importStar(require("react"));
|
|
39
39
|
const remotion_1 = require("remotion");
|
|
40
40
|
const no_react_1 = require("remotion/no-react");
|
|
41
|
+
const browser_studio_operations_1 = require("../helpers/browser-studio-operations");
|
|
41
42
|
const client_id_1 = require("../helpers/client-id");
|
|
42
|
-
const
|
|
43
|
+
const default_props_api_1 = require("./default-props-api");
|
|
43
44
|
exports.ObserveDefaultPropsContext = react_1.default.createContext(null);
|
|
44
45
|
const ObserveDefaultProps = ({ compositionId, readOnlyStudio, children }) => {
|
|
45
46
|
const { previewServerState, subscribeToEvent } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
|
|
@@ -82,10 +83,12 @@ const ObserveDefaultProps = ({ compositionId, readOnlyStudio, children }) => {
|
|
|
82
83
|
}
|
|
83
84
|
}, [updateProps]);
|
|
84
85
|
(0, react_1.useEffect)(() => {
|
|
85
|
-
if (readOnlyStudio
|
|
86
|
+
if ((readOnlyStudio && !(0, browser_studio_operations_1.getBrowserStudioOperations)()) ||
|
|
87
|
+
!clientId ||
|
|
88
|
+
compositionId === null) {
|
|
86
89
|
return;
|
|
87
90
|
}
|
|
88
|
-
(0,
|
|
91
|
+
(0, default_props_api_1.subscribeToDefaultProps)({ compositionId, clientId })
|
|
89
92
|
.then((can) => {
|
|
90
93
|
applyResult(compositionId, can);
|
|
91
94
|
})
|
|
@@ -96,7 +99,7 @@ const ObserveDefaultProps = ({ compositionId, readOnlyStudio, children }) => {
|
|
|
96
99
|
});
|
|
97
100
|
});
|
|
98
101
|
return () => {
|
|
99
|
-
(0,
|
|
102
|
+
(0, default_props_api_1.unsubscribeFromDefaultProps)({
|
|
100
103
|
compositionId,
|
|
101
104
|
clientId,
|
|
102
105
|
}).catch(() => {
|
|
@@ -30,7 +30,7 @@ const iconButton = {
|
|
|
30
30
|
width: 14,
|
|
31
31
|
color: colors_1.WHITE,
|
|
32
32
|
};
|
|
33
|
-
const PlayPause = ({ playbackRate, loop, bufferStateDelayInMilliseconds, muted }) => {
|
|
33
|
+
const PlayPause = ({ playbackRate, loop, bufferStateDelayInMilliseconds, muted, hideNavigationControls, }) => {
|
|
34
34
|
const { inFrame, outFrame } = (0, in_out_1.useTimelineInOutFramePosition)();
|
|
35
35
|
const videoConfig = remotion_1.Internals.useUnsafeVideoConfig();
|
|
36
36
|
const [showBufferIndicator, setShowBufferState] = (0, react_1.useState)(false);
|
|
@@ -198,8 +198,6 @@ const PlayPause = ({ playbackRate, loop, bufferStateDelayInMilliseconds, muted }
|
|
|
198
198
|
stopped = true;
|
|
199
199
|
};
|
|
200
200
|
}, [bufferStateDelayInMilliseconds, emitter]);
|
|
201
|
-
return (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
|
|
202
|
-
jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": "Jump to beginning", title: "Jump to beginning", disabled: !videoConfig || isFirstFrame, onClick: jumpToStart, children: jsx_runtime_1.jsx(jump_to_start_1.JumpToStart, { style: backStyle }) }), jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": "Step back one frame", title: "Step back one frame", disabled: !videoConfig || isFirstFrame, onClick: oneFrameBack, children: jsx_runtime_1.jsx(step_back_1.StepBack, { style: forwardBackStyle }) }), jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": playing ? 'Pause' : 'Play', title: playing ? 'Pause' : 'Play', onClick: playing ? pause : play, disabled: !videoConfig, children: playing ? (showBufferIndicator ? (jsx_runtime_1.jsx(player_1.PlayerInternals.BufferingIndicator, { type: "studio" })) : (jsx_runtime_1.jsx(pause_1.Pause, { style: iconButton }))) : (jsx_runtime_1.jsx(play_1.Play, { style: iconButton })) }), jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": "Step forward one frame", title: "Step forward one frame", disabled: !videoConfig || isLastFrame, onClick: oneFrameForward, children: jsx_runtime_1.jsx(step_forward_1.StepForward, { style: forwardBackStyle }) })
|
|
203
|
-
] }));
|
|
201
|
+
return (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [hideNavigationControls ? null : (jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": "Jump to beginning", title: "Jump to beginning", disabled: !videoConfig || isFirstFrame, onClick: jumpToStart, children: jsx_runtime_1.jsx(jump_to_start_1.JumpToStart, { style: backStyle }) })), hideNavigationControls ? null : (jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": "Step back one frame", title: "Step back one frame", disabled: !videoConfig || isFirstFrame, onClick: oneFrameBack, children: jsx_runtime_1.jsx(step_back_1.StepBack, { style: forwardBackStyle }) })), jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": playing ? 'Pause' : 'Play', title: playing ? 'Pause' : 'Play', onClick: playing ? pause : play, disabled: !videoConfig, children: playing ? (showBufferIndicator ? (jsx_runtime_1.jsx(player_1.PlayerInternals.BufferingIndicator, { type: "studio" })) : (jsx_runtime_1.jsx(pause_1.Pause, { style: iconButton }))) : (jsx_runtime_1.jsx(play_1.Play, { style: iconButton })) }), hideNavigationControls ? null : (jsx_runtime_1.jsx(ControlButton_1.ControlButton, { "aria-label": "Step forward one frame", title: "Step forward one frame", disabled: !videoConfig || isLastFrame, onClick: oneFrameForward, children: jsx_runtime_1.jsx(step_forward_1.StepForward, { style: forwardBackStyle }) }))] }));
|
|
204
202
|
};
|
|
205
203
|
exports.PlayPause = PlayPause;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
2
|
+
import type { ComboboxValue } from './NewComposition/ComboBox';
|
|
3
|
+
type PlaybackRateMenuItemsProps = {
|
|
3
4
|
readonly playbackRate: number;
|
|
4
5
|
readonly setPlaybackRate: React.Dispatch<React.SetStateAction<number>>;
|
|
5
|
-
}
|
|
6
|
+
};
|
|
7
|
+
export declare const usePlaybackRateMenuItems: ({ playbackRate, setPlaybackRate, }: PlaybackRateMenuItemsProps) => {
|
|
8
|
+
items: ComboboxValue[];
|
|
9
|
+
selectedId: string;
|
|
10
|
+
};
|
|
11
|
+
export declare const PlaybackRateSelector: React.FC<PlaybackRateMenuItemsProps>;
|
|
12
|
+
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PlaybackRateSelector = void 0;
|
|
3
|
+
exports.PlaybackRateSelector = exports.usePlaybackRateMenuItems = void 0;
|
|
4
4
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
5
|
const react_1 = require("react");
|
|
6
6
|
const remotion_1 = require("remotion");
|
|
@@ -17,14 +17,7 @@ const getPlaybackRateLabel = (playbackRate) => {
|
|
|
17
17
|
};
|
|
18
18
|
const accessibilityLabel = 'Change the playback rate';
|
|
19
19
|
const comboStyle = { width: 64 };
|
|
20
|
-
const
|
|
21
|
-
const { canvasContent } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
|
|
22
|
-
const isStill = (0, is_current_selected_still_1.useIsStill)();
|
|
23
|
-
const style = (0, react_1.useMemo)(() => {
|
|
24
|
-
return {
|
|
25
|
-
padding: ControlButton_1.CONTROL_BUTTON_PADDING - 2,
|
|
26
|
-
};
|
|
27
|
-
}, []);
|
|
20
|
+
const usePlaybackRateMenuItems = ({ playbackRate, setPlaybackRate, }) => {
|
|
28
21
|
const items = (0, react_1.useMemo)(() => {
|
|
29
22
|
const divider = {
|
|
30
23
|
type: 'divider',
|
|
@@ -51,9 +44,27 @@ const PlaybackRateSelector = ({ playbackRate, setPlaybackRate }) => {
|
|
|
51
44
|
const middle = Math.floor(commonPlaybackRates.length / 2);
|
|
52
45
|
return [...values.slice(0, middle), divider, ...values.slice(middle)];
|
|
53
46
|
}, [playbackRate, setPlaybackRate]);
|
|
47
|
+
return {
|
|
48
|
+
items,
|
|
49
|
+
selectedId: String(playbackRate),
|
|
50
|
+
};
|
|
51
|
+
};
|
|
52
|
+
exports.usePlaybackRateMenuItems = usePlaybackRateMenuItems;
|
|
53
|
+
const PlaybackRateSelector = ({ playbackRate, setPlaybackRate, }) => {
|
|
54
|
+
const { canvasContent } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
|
|
55
|
+
const isStill = (0, is_current_selected_still_1.useIsStill)();
|
|
56
|
+
const { items, selectedId } = (0, exports.usePlaybackRateMenuItems)({
|
|
57
|
+
playbackRate,
|
|
58
|
+
setPlaybackRate,
|
|
59
|
+
});
|
|
60
|
+
const style = (0, react_1.useMemo)(() => {
|
|
61
|
+
return {
|
|
62
|
+
padding: ControlButton_1.CONTROL_BUTTON_PADDING - 2,
|
|
63
|
+
};
|
|
64
|
+
}, []);
|
|
54
65
|
if (isStill || canvasContent === null || canvasContent.type === 'asset') {
|
|
55
66
|
return null;
|
|
56
67
|
}
|
|
57
|
-
return (jsx_runtime_1.jsx("div", { style: style, "aria-label": accessibilityLabel, children: jsx_runtime_1.jsx(ComboBox_1.Combobox, { size: "compact", title: accessibilityLabel, style: comboStyle, selectedId:
|
|
68
|
+
return (jsx_runtime_1.jsx("div", { style: style, "aria-label": accessibilityLabel, children: jsx_runtime_1.jsx(ComboBox_1.Combobox, { size: "compact", title: accessibilityLabel, style: comboStyle, selectedId: selectedId, values: items }) }));
|
|
58
69
|
};
|
|
59
70
|
exports.PlaybackRateSelector = PlaybackRateSelector;
|
|
@@ -21,6 +21,7 @@ const PlaybackKeyboardShortcutsManager_1 = require("./PlaybackKeyboardShortcutsM
|
|
|
21
21
|
const PlaybackRatePersistor_1 = require("./PlaybackRatePersistor");
|
|
22
22
|
const PlaybackRateSelector_1 = require("./PlaybackRateSelector");
|
|
23
23
|
const PlayPause_1 = require("./PlayPause");
|
|
24
|
+
const PreviewToolbarOverflowButton_1 = require("./PreviewToolbarOverflowButton");
|
|
24
25
|
const RenderButton_1 = require("./RenderButton");
|
|
25
26
|
const SizeSelector_1 = require("./SizeSelector");
|
|
26
27
|
const SnappingToggle_1 = require("./SnappingToggle");
|
|
@@ -29,6 +30,7 @@ const TimelineInOutToggle_1 = require("./TimelineInOutToggle");
|
|
|
29
30
|
const TOOLBAR_HEIGHT = 40;
|
|
30
31
|
const container = {
|
|
31
32
|
display: 'flex',
|
|
33
|
+
position: 'relative',
|
|
32
34
|
justifyContent: 'center',
|
|
33
35
|
borderTop: colors_1.BORDER_BLACK_ALPHA_50,
|
|
34
36
|
alignItems: 'center',
|
|
@@ -36,45 +38,21 @@ const container = {
|
|
|
36
38
|
background: colors_1.BACKGROUND,
|
|
37
39
|
height: TOOLBAR_HEIGHT,
|
|
38
40
|
};
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
overflowX: 'auto',
|
|
43
|
-
justifyContent: 'flex-start',
|
|
44
|
-
};
|
|
45
|
-
const scrollIndicatorLeft = {
|
|
46
|
-
position: 'fixed',
|
|
47
|
-
display: 'none',
|
|
41
|
+
const centeredPlayButton = {
|
|
42
|
+
position: 'absolute',
|
|
43
|
+
left: '50%',
|
|
48
44
|
top: 0,
|
|
49
|
-
|
|
50
|
-
width: 40,
|
|
51
|
-
height: '100%',
|
|
52
|
-
pointerEvents: 'none',
|
|
53
|
-
background: `linear-gradient(to right, ${colors_1.BACKGROUND}, ${colors_1.BACKGROUND__TRANSPARENT})`,
|
|
54
|
-
};
|
|
55
|
-
const scrollIndicatorRight = {
|
|
56
|
-
position: 'fixed',
|
|
57
|
-
display: 'none',
|
|
58
|
-
top: 0,
|
|
59
|
-
right: 0,
|
|
60
|
-
width: 40,
|
|
61
|
-
height: '100%',
|
|
62
|
-
pointerEvents: 'none',
|
|
63
|
-
background: `linear-gradient(to left, ${colors_1.BACKGROUND}, ${colors_1.BACKGROUND__TRANSPARENT})`,
|
|
64
|
-
};
|
|
65
|
-
const sideContainer = {
|
|
66
|
-
width: 300,
|
|
67
|
-
height: 30,
|
|
45
|
+
height: TOOLBAR_HEIGHT,
|
|
68
46
|
display: 'flex',
|
|
69
|
-
flexDirection: 'row',
|
|
70
47
|
alignItems: 'center',
|
|
48
|
+
transform: 'translateX(-50%)',
|
|
71
49
|
};
|
|
72
|
-
const
|
|
50
|
+
const sideContainer = {
|
|
51
|
+
width: 300,
|
|
73
52
|
height: 30,
|
|
74
53
|
display: 'flex',
|
|
75
54
|
flexDirection: 'row',
|
|
76
55
|
alignItems: 'center',
|
|
77
|
-
flexShrink: 0,
|
|
78
56
|
};
|
|
79
57
|
const padding = {
|
|
80
58
|
width: timeline_layout_1.TIMELINE_PADDING,
|
|
@@ -95,88 +73,20 @@ const PreviewToolbar = ({ readOnlyStudio, bufferStateDelayInMilliseconds }) => {
|
|
|
95
73
|
const { setPlayerMuted } = (0, react_1.useContext)(remotion_1.Internals.SetMediaVolumeContext);
|
|
96
74
|
const { canvasContent } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
|
|
97
75
|
const isVideoComposition = (0, is_current_selected_still_1.useIsVideoComposition)();
|
|
98
|
-
const previewToolbarRef = (0, react_1.useRef)(null);
|
|
99
|
-
const leftScrollIndicatorRef = (0, react_1.useRef)(null);
|
|
100
|
-
const rightScrollIndicatorRef = (0, react_1.useRef)(null);
|
|
101
76
|
const isStill = (0, is_current_selected_still_1.useIsStill)();
|
|
102
77
|
const [loop, setLoop] = (0, react_1.useState)((0, loop_1.loadLoopOption)());
|
|
103
78
|
const isFullscreenSupported = (0, check_fullscreen_support_1.checkFullscreenSupport)();
|
|
104
79
|
const isMobileLayout = (0, mobile_layout_1.useMobileLayout)();
|
|
105
|
-
(
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
if (rightScrollIndicatorRef.current) {
|
|
116
|
-
rightScrollIndicatorRef.current.style.display = 'none';
|
|
117
|
-
}
|
|
118
|
-
return;
|
|
119
|
-
}
|
|
120
|
-
if (previewToolbarRef.current) {
|
|
121
|
-
const updateScrollableIndicatorProps = (target) => {
|
|
122
|
-
var _a;
|
|
123
|
-
const boundingBox = target.getBoundingClientRect();
|
|
124
|
-
const { scrollLeft, scrollWidth, clientWidth } = target;
|
|
125
|
-
const scrollRight = scrollWidth - clientWidth - scrollLeft;
|
|
126
|
-
if (!leftScrollIndicatorRef.current ||
|
|
127
|
-
!rightScrollIndicatorRef.current) {
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
if (scrollLeft !== 0) {
|
|
131
|
-
Object.assign(leftScrollIndicatorRef.current.style, {
|
|
132
|
-
display: 'block',
|
|
133
|
-
height: `${boundingBox.height}px`,
|
|
134
|
-
top: `${boundingBox.top}px`,
|
|
135
|
-
left: `${boundingBox.left}px`,
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
else {
|
|
139
|
-
Object.assign(leftScrollIndicatorRef.current.style, {
|
|
140
|
-
display: 'none',
|
|
141
|
-
});
|
|
142
|
-
}
|
|
143
|
-
if (scrollRight !== 0) {
|
|
144
|
-
const itemWidth = ((_a = rightScrollIndicatorRef.current) === null || _a === void 0 ? void 0 : _a.clientWidth) || 0;
|
|
145
|
-
Object.assign(rightScrollIndicatorRef.current.style, {
|
|
146
|
-
display: 'block',
|
|
147
|
-
height: `${boundingBox.height}px`,
|
|
148
|
-
top: `${boundingBox.top}px`,
|
|
149
|
-
left: `${boundingBox.left + boundingBox.width - itemWidth}px`,
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
Object.assign(rightScrollIndicatorRef.current.style, {
|
|
154
|
-
display: 'none',
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
};
|
|
158
|
-
const previewToolbar = previewToolbarRef.current;
|
|
159
|
-
const scrollHandler = () => {
|
|
160
|
-
updateScrollableIndicatorProps(previewToolbar);
|
|
161
|
-
};
|
|
162
|
-
previewToolbar.addEventListener('scroll', scrollHandler);
|
|
163
|
-
scrollHandler();
|
|
164
|
-
return () => {
|
|
165
|
-
previewToolbar.removeEventListener('scroll', scrollHandler);
|
|
166
|
-
};
|
|
167
|
-
}
|
|
168
|
-
});
|
|
169
|
-
return (jsx_runtime_1.jsxs("div", { ref: previewToolbarRef, style: isMobileLayout ? mobileContainer : container, className: "css-reset", children: [
|
|
170
|
-
jsx_runtime_1.jsx("div", { ref: leftScrollIndicatorRef, style: scrollIndicatorLeft }), isMobileLayout ? null : (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
|
|
171
|
-
jsx_runtime_1.jsxs("div", { style: sideContainer, children: [
|
|
172
|
-
jsx_runtime_1.jsx("div", { style: padding }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(TimelineZoomControls_1.TimelineZoomControls, {}) })
|
|
173
|
-
] }), jsx_runtime_1.jsx(layout_1.Flex, {}), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(SizeSelector_1.SizeSelector, {}) }), isStill || isVideoComposition ? (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(PlaybackRateSelector_1.PlaybackRateSelector, { setPlaybackRate: setPlaybackRate, playbackRate: playbackRate }) })) : null] })), isVideoComposition ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
|
|
174
|
-
jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(PlayPause_1.PlayPause, { bufferStateDelayInMilliseconds: bufferStateDelayInMilliseconds, loop: loop, playbackRate: playbackRate, muted: playerMuted }) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(LoopToggle_1.LoopToggle, { loop: loop, setLoop: setLoop }) }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(MuteToggle_1.MuteToggle, { muted: playerMuted, setMuted: setPlayerMuted }) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(TimelineInOutToggle_1.TimelineInOutPointToggle, {}) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 })
|
|
175
|
-
] })) : null, (canvasContent === null || canvasContent === void 0 ? void 0 : canvasContent.type) === 'composition' ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
|
|
176
|
-
jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(CheckboardToggle_1.CheckboardToggle, {}) }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(OutlineToggle_1.OutlineToggle, {}) }), readOnlyStudio ? null : (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(SnappingToggle_1.SnappingToggle, {}) }))] })) : null, jsx_runtime_1.jsx(layout_1.Spacing, { x: 1 }), canvasContent && isFullscreenSupported ? (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(FullscreenToggle_1.FullScreenToggle, {}) })) : null, jsx_runtime_1.jsx(layout_1.Flex, {}), isMobileLayout && (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
|
|
177
|
-
jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(SizeSelector_1.SizeSelector, {}) }), isStill || isVideoComposition ? (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(PlaybackRateSelector_1.PlaybackRateSelector, { setPlaybackRate: setPlaybackRate, playbackRate: playbackRate }) })) : null] })), jsx_runtime_1.jsxs("div", { style: isMobileLayout ? mobileSideContainer : sideContainer, children: [
|
|
178
|
-
jsx_runtime_1.jsx(layout_1.Flex, {}), !isMobileLayout && jsx_runtime_1.jsx(FpsCounter_1.FpsCounter, { playbackSpeed: playbackRate }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(RenderButton_1.RenderButton, { readOnlyStudio: readOnlyStudio, size: "compact" }) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 1.5 })
|
|
179
|
-
] }), jsx_runtime_1.jsx(PlaybackKeyboardShortcutsManager_1.PlaybackKeyboardShortcutsManager, { setPlaybackRate: setPlaybackRate }), jsx_runtime_1.jsx(PlaybackRatePersistor_1.PlaybackRatePersistor, {}), jsx_runtime_1.jsx("div", { ref: rightScrollIndicatorRef, style: scrollIndicatorRight })
|
|
80
|
+
const playPause = (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(PlayPause_1.PlayPause, { bufferStateDelayInMilliseconds: bufferStateDelayInMilliseconds, loop: loop, playbackRate: playbackRate, muted: playerMuted, hideNavigationControls: isMobileLayout }) }));
|
|
81
|
+
return (jsx_runtime_1.jsxs("div", { style: container, className: "css-reset", children: [
|
|
82
|
+
jsx_runtime_1.jsxs("div", { style: sideContainer, children: [
|
|
83
|
+
jsx_runtime_1.jsx("div", { style: padding }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(TimelineZoomControls_1.TimelineZoomControls, {}) })
|
|
84
|
+
] }), jsx_runtime_1.jsx(layout_1.Flex, {}), isMobileLayout ? null : (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(SizeSelector_1.SizeSelector, {}) })), !isMobileLayout && (isStill || isVideoComposition) ? (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(PlaybackRateSelector_1.PlaybackRateSelector, { setPlaybackRate: setPlaybackRate, playbackRate: playbackRate }) })) : null, isVideoComposition && isMobileLayout ? (jsx_runtime_1.jsx("div", { style: centeredPlayButton, children: playPause })) : null, isVideoComposition && !isMobileLayout ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
|
|
85
|
+
jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), playPause, jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(LoopToggle_1.LoopToggle, { loop: loop, setLoop: setLoop }) }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(MuteToggle_1.MuteToggle, { muted: playerMuted, setMuted: setPlayerMuted }) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(TimelineInOutToggle_1.TimelineInOutPointToggle, {}) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 })
|
|
86
|
+
] })) : null, (canvasContent === null || canvasContent === void 0 ? void 0 : canvasContent.type) === 'composition' ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [isMobileLayout ? null : (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(CheckboardToggle_1.CheckboardToggle, {}) })), isMobileLayout ? null : (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(OutlineToggle_1.OutlineToggle, {}) })), readOnlyStudio || isMobileLayout ? null : (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(SnappingToggle_1.SnappingToggle, {}) }))] })) : null, jsx_runtime_1.jsx(layout_1.Spacing, { x: 1 }), canvasContent && isFullscreenSupported ? (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(FullscreenToggle_1.FullScreenToggle, { hidden: isMobileLayout }) })) : null, jsx_runtime_1.jsx(layout_1.Flex, {}), jsx_runtime_1.jsxs("div", { style: sideContainer, children: [
|
|
87
|
+
jsx_runtime_1.jsx(layout_1.Flex, {}), jsx_runtime_1.jsx(FpsCounter_1.FpsCounter, { playbackSpeed: playbackRate }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }), jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(RenderButton_1.RenderButton, { readOnlyStudio: readOnlyStudio, size: "compact", hidden: isMobileLayout }) }), isMobileLayout ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [isVideoComposition ? (jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(MuteToggle_1.MuteToggle, { muted: playerMuted, setMuted: setPlayerMuted }) })) : null, jsx_runtime_1.jsx(PreviewToolbarControl, { children: jsx_runtime_1.jsx(PreviewToolbarOverflowButton_1.PreviewToolbarOverflowButton, { readOnlyStudio: readOnlyStudio, showFullscreen: Boolean(canvasContent && isFullscreenSupported), showPlaybackRate: isVideoComposition, showLoop: isVideoComposition, showCompositionControls: (canvasContent === null || canvasContent === void 0 ? void 0 : canvasContent.type) === 'composition', playbackRate: playbackRate, setPlaybackRate: setPlaybackRate, loop: loop, setLoop: setLoop }) })
|
|
88
|
+
] })) : null, jsx_runtime_1.jsx(layout_1.Spacing, { x: 1.5 })
|
|
89
|
+
] }), jsx_runtime_1.jsx(PlaybackKeyboardShortcutsManager_1.PlaybackKeyboardShortcutsManager, { setPlaybackRate: setPlaybackRate }), jsx_runtime_1.jsx(PlaybackRatePersistor_1.PlaybackRatePersistor, {})
|
|
180
90
|
] }));
|
|
181
91
|
};
|
|
182
92
|
exports.PreviewToolbar = PreviewToolbar;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
export declare const PreviewToolbarOverflowButton: React.FC<{
|
|
3
|
+
readonly readOnlyStudio: boolean;
|
|
4
|
+
readonly showFullscreen: boolean;
|
|
5
|
+
readonly showPlaybackRate: boolean;
|
|
6
|
+
readonly showLoop: boolean;
|
|
7
|
+
readonly showCompositionControls: boolean;
|
|
8
|
+
readonly playbackRate: number;
|
|
9
|
+
readonly setPlaybackRate: React.Dispatch<React.SetStateAction<number>>;
|
|
10
|
+
readonly loop: boolean;
|
|
11
|
+
readonly setLoop: React.Dispatch<React.SetStateAction<boolean>>;
|
|
12
|
+
}>;
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PreviewToolbarOverflowButton = void 0;
|
|
4
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
+
const react_1 = require("react");
|
|
6
|
+
const remotion_1 = require("remotion");
|
|
7
|
+
const colors_1 = require("../helpers/colors");
|
|
8
|
+
const use_keybinding_1 = require("../helpers/use-keybinding");
|
|
9
|
+
const Checkmark_1 = require("../icons/Checkmark");
|
|
10
|
+
const ellipsis_1 = require("../icons/ellipsis");
|
|
11
|
+
const checkerboard_1 = require("../state/checkerboard");
|
|
12
|
+
const editor_outlines_1 = require("../state/editor-outlines");
|
|
13
|
+
const InlineDropdown_1 = require("./InlineDropdown");
|
|
14
|
+
const LoopToggle_1 = require("./LoopToggle");
|
|
15
|
+
const PlaybackRateSelector_1 = require("./PlaybackRateSelector");
|
|
16
|
+
const SizeSelector_1 = require("./SizeSelector");
|
|
17
|
+
const clickButton = (id) => {
|
|
18
|
+
var _a;
|
|
19
|
+
(_a = document.getElementById(id)) === null || _a === void 0 ? void 0 : _a.click();
|
|
20
|
+
};
|
|
21
|
+
const PreviewToolbarOverflowButton = ({ readOnlyStudio, showFullscreen, showPlaybackRate, showLoop, showCompositionControls, playbackRate, setPlaybackRate, loop, setLoop, }) => {
|
|
22
|
+
const video = remotion_1.Internals.useVideo();
|
|
23
|
+
const { checkerboard, setCheckerboard } = (0, react_1.useContext)(checkerboard_1.CheckerboardContext);
|
|
24
|
+
const { editorShowOutlines, setEditorShowOutlines } = (0, react_1.useContext)(editor_outlines_1.EditorShowOutlinesContext);
|
|
25
|
+
const { items: previewSizeItems, selectedId: selectedPreviewSize, zoomable, } = (0, SizeSelector_1.usePreviewSizeMenuItems)();
|
|
26
|
+
const { items: playbackRateItems, selectedId: selectedPlaybackRate } = (0, PlaybackRateSelector_1.usePlaybackRateMenuItems)({ playbackRate, setPlaybackRate });
|
|
27
|
+
const iconStyle = (0, react_1.useMemo)(() => {
|
|
28
|
+
return {
|
|
29
|
+
style: {
|
|
30
|
+
width: 14,
|
|
31
|
+
height: 14,
|
|
32
|
+
flexShrink: 0,
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
}, []);
|
|
36
|
+
const renderAction = (0, react_1.useCallback)((color) => jsx_runtime_1.jsx(ellipsis_1.EllipsisIcon, { fill: color, svgProps: iconStyle }), [iconStyle]);
|
|
37
|
+
const renderItems = (0, react_1.useMemo)(() => {
|
|
38
|
+
if (readOnlyStudio) {
|
|
39
|
+
return [
|
|
40
|
+
{
|
|
41
|
+
type: 'item',
|
|
42
|
+
id: 'client-render',
|
|
43
|
+
label: 'Render on web',
|
|
44
|
+
value: 'client-render',
|
|
45
|
+
onClick: () => clickButton('render-modal-button-client'),
|
|
46
|
+
keyHint: null,
|
|
47
|
+
leftItem: null,
|
|
48
|
+
subMenu: null,
|
|
49
|
+
quickSwitcherLabel: null,
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
type: 'item',
|
|
53
|
+
id: 'render-command',
|
|
54
|
+
label: 'Render via CLI',
|
|
55
|
+
value: 'render-command',
|
|
56
|
+
onClick: () => clickButton('render-modal-button-command'),
|
|
57
|
+
keyHint: null,
|
|
58
|
+
leftItem: null,
|
|
59
|
+
subMenu: null,
|
|
60
|
+
quickSwitcherLabel: null,
|
|
61
|
+
},
|
|
62
|
+
];
|
|
63
|
+
}
|
|
64
|
+
return [
|
|
65
|
+
{
|
|
66
|
+
type: 'item',
|
|
67
|
+
id: 'server-render',
|
|
68
|
+
label: 'Server-side render',
|
|
69
|
+
value: 'server-render',
|
|
70
|
+
onClick: () => clickButton('render-modal-button-server'),
|
|
71
|
+
keyHint: null,
|
|
72
|
+
leftItem: null,
|
|
73
|
+
subMenu: null,
|
|
74
|
+
quickSwitcherLabel: null,
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
type: 'item',
|
|
78
|
+
id: 'client-render',
|
|
79
|
+
label: 'Client-side render',
|
|
80
|
+
value: 'client-render',
|
|
81
|
+
onClick: () => clickButton('render-modal-button-client'),
|
|
82
|
+
keyHint: null,
|
|
83
|
+
leftItem: null,
|
|
84
|
+
subMenu: null,
|
|
85
|
+
quickSwitcherLabel: null,
|
|
86
|
+
},
|
|
87
|
+
];
|
|
88
|
+
}, [readOnlyStudio]);
|
|
89
|
+
const values = (0, react_1.useMemo)(() => {
|
|
90
|
+
const items = [];
|
|
91
|
+
if (zoomable) {
|
|
92
|
+
items.push({
|
|
93
|
+
type: 'item',
|
|
94
|
+
id: 'preview-size',
|
|
95
|
+
label: 'Preview Size',
|
|
96
|
+
value: 'preview-size',
|
|
97
|
+
onClick: () => undefined,
|
|
98
|
+
keyHint: null,
|
|
99
|
+
leftItem: null,
|
|
100
|
+
subMenu: {
|
|
101
|
+
items: previewSizeItems,
|
|
102
|
+
leaveLeftSpace: true,
|
|
103
|
+
preselectIndex: previewSizeItems.findIndex((item) => item.id === selectedPreviewSize),
|
|
104
|
+
},
|
|
105
|
+
quickSwitcherLabel: null,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
if (showPlaybackRate) {
|
|
109
|
+
items.push({
|
|
110
|
+
type: 'item',
|
|
111
|
+
id: 'playback-rate',
|
|
112
|
+
label: 'Playback Rate',
|
|
113
|
+
value: 'playback-rate',
|
|
114
|
+
onClick: () => undefined,
|
|
115
|
+
keyHint: null,
|
|
116
|
+
leftItem: null,
|
|
117
|
+
subMenu: {
|
|
118
|
+
items: playbackRateItems,
|
|
119
|
+
leaveLeftSpace: true,
|
|
120
|
+
preselectIndex: playbackRateItems.findIndex((item) => item.id === selectedPlaybackRate),
|
|
121
|
+
},
|
|
122
|
+
quickSwitcherLabel: null,
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
if (showLoop) {
|
|
126
|
+
items.push({
|
|
127
|
+
type: 'item',
|
|
128
|
+
id: 'loop',
|
|
129
|
+
label: 'Loop',
|
|
130
|
+
value: 'loop',
|
|
131
|
+
onClick: () => (0, LoopToggle_1.toggleLoop)(setLoop),
|
|
132
|
+
keyHint: null,
|
|
133
|
+
leftItem: loop ? jsx_runtime_1.jsx(Checkmark_1.Checkmark, {}) : null,
|
|
134
|
+
subMenu: null,
|
|
135
|
+
quickSwitcherLabel: null,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
if (showCompositionControls) {
|
|
139
|
+
items.push({
|
|
140
|
+
type: 'item',
|
|
141
|
+
id: 'checkerboard',
|
|
142
|
+
label: 'Transparency as checkerboard',
|
|
143
|
+
value: 'checkerboard',
|
|
144
|
+
onClick: () => setCheckerboard((current) => !current),
|
|
145
|
+
keyHint: (0, use_keybinding_1.areKeyboardShortcutsDisabled)() ? null : 'T',
|
|
146
|
+
leftItem: checkerboard ? jsx_runtime_1.jsx(Checkmark_1.Checkmark, {}) : null,
|
|
147
|
+
subMenu: null,
|
|
148
|
+
quickSwitcherLabel: null,
|
|
149
|
+
});
|
|
150
|
+
items.push({
|
|
151
|
+
type: 'item',
|
|
152
|
+
id: 'outlines',
|
|
153
|
+
label: 'Outlines',
|
|
154
|
+
value: 'outlines',
|
|
155
|
+
onClick: () => setEditorShowOutlines((current) => !current),
|
|
156
|
+
keyHint: null,
|
|
157
|
+
leftItem: editorShowOutlines ? jsx_runtime_1.jsx(Checkmark_1.Checkmark, {}) : null,
|
|
158
|
+
subMenu: null,
|
|
159
|
+
quickSwitcherLabel: null,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
if (showFullscreen) {
|
|
163
|
+
items.push({
|
|
164
|
+
type: 'item',
|
|
165
|
+
id: 'fullscreen',
|
|
166
|
+
label: 'Fullscreen',
|
|
167
|
+
value: 'fullscreen',
|
|
168
|
+
onClick: () => clickButton('fullscreen-toggle'),
|
|
169
|
+
keyHint: (0, use_keybinding_1.areKeyboardShortcutsDisabled)() ? null : 'F',
|
|
170
|
+
leftItem: null,
|
|
171
|
+
subMenu: null,
|
|
172
|
+
quickSwitcherLabel: null,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
if (video) {
|
|
176
|
+
items.push({
|
|
177
|
+
type: 'item',
|
|
178
|
+
id: 'render',
|
|
179
|
+
label: 'Render',
|
|
180
|
+
value: 'render',
|
|
181
|
+
onClick: () => undefined,
|
|
182
|
+
keyHint: null,
|
|
183
|
+
leftItem: null,
|
|
184
|
+
subMenu: {
|
|
185
|
+
items: renderItems,
|
|
186
|
+
leaveLeftSpace: false,
|
|
187
|
+
preselectIndex: 0,
|
|
188
|
+
},
|
|
189
|
+
quickSwitcherLabel: null,
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
return items;
|
|
193
|
+
}, [
|
|
194
|
+
previewSizeItems,
|
|
195
|
+
playbackRateItems,
|
|
196
|
+
renderItems,
|
|
197
|
+
selectedPlaybackRate,
|
|
198
|
+
selectedPreviewSize,
|
|
199
|
+
showFullscreen,
|
|
200
|
+
showLoop,
|
|
201
|
+
showPlaybackRate,
|
|
202
|
+
showCompositionControls,
|
|
203
|
+
loop,
|
|
204
|
+
checkerboard,
|
|
205
|
+
editorShowOutlines,
|
|
206
|
+
setCheckerboard,
|
|
207
|
+
setEditorShowOutlines,
|
|
208
|
+
setLoop,
|
|
209
|
+
video,
|
|
210
|
+
zoomable,
|
|
211
|
+
]);
|
|
212
|
+
if (values.length === 0) {
|
|
213
|
+
return null;
|
|
214
|
+
}
|
|
215
|
+
return (jsx_runtime_1.jsx(InlineDropdown_1.InlineDropdown, { renderAction: renderAction, values: values, title: "More actions", unhoveredColor: colors_1.WHITE }));
|
|
216
|
+
};
|
|
217
|
+
exports.PreviewToolbarOverflowButton = PreviewToolbarOverflowButton;
|
|
@@ -37,6 +37,7 @@ const ExplorerQuickSwitcherTrigger = ({ mode, showShortcut, tabIndex }) => {
|
|
|
37
37
|
mode,
|
|
38
38
|
invocationTimestamp: Date.now(),
|
|
39
39
|
assetSelection: null,
|
|
40
|
+
compositionSelection: null,
|
|
40
41
|
});
|
|
41
42
|
}, [mode, setSelectedModal]);
|
|
42
43
|
return (jsx_runtime_1.jsx("div", { style: quickSwitcherArea, children: jsx_runtime_1.jsxs("button", { type: "button", style: quickSwitcherTrigger, onClick: openQuickSwitcher, tabIndex: tabIndex, children: ["Search...", showShortcut && !(0, use_keybinding_1.areKeyboardShortcutsDisabled)() ? (jsx_runtime_1.jsxs("span", { style: shortcutLabel, children: [ShortcutHint_1.cmdOrCtrlCharacter, "+K"] })) : null] }) }));
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import type { _InternalTypes } from 'remotion';
|
|
2
3
|
import type { StaticFile } from '../../api/get-static-files';
|
|
3
4
|
import type { QuickSwitcherMode } from './NoResults';
|
|
4
5
|
declare const QuickSwitcher: React.FC<{
|
|
@@ -7,7 +8,12 @@ declare const QuickSwitcher: React.FC<{
|
|
|
7
8
|
readonly readOnlyStudio: boolean;
|
|
8
9
|
readonly assetSelection: {
|
|
9
10
|
readonly initialQuery: string;
|
|
11
|
+
readonly onSelectFile: () => void;
|
|
10
12
|
readonly onSelected: (asset: StaticFile) => void;
|
|
11
13
|
} | null;
|
|
14
|
+
readonly compositionSelection: {
|
|
15
|
+
readonly excludeCompositionId: string;
|
|
16
|
+
readonly onSelected: (composition: _InternalTypes['AnyComposition']) => void;
|
|
17
|
+
} | null;
|
|
12
18
|
}>;
|
|
13
19
|
export default QuickSwitcher;
|
|
@@ -7,7 +7,7 @@ const panelStyle = {
|
|
|
7
7
|
borderRadius: 6,
|
|
8
8
|
overflow: 'hidden',
|
|
9
9
|
};
|
|
10
|
-
const QuickSwitcher = ({ initialMode, invocationTimestamp, readOnlyStudio, assetSelection }) => {
|
|
11
|
-
return (jsx_runtime_1.jsx(DismissableModal_1.DismissableModal, { panelStyle: panelStyle, children: jsx_runtime_1.jsx(QuickSwitcherContent_1.QuickSwitcherContent, { readOnlyStudio: readOnlyStudio, invocationTimestamp: invocationTimestamp, initialMode: initialMode, assetSelection: assetSelection }) }));
|
|
10
|
+
const QuickSwitcher = ({ initialMode, invocationTimestamp, readOnlyStudio, assetSelection, compositionSelection, }) => {
|
|
11
|
+
return (jsx_runtime_1.jsx(DismissableModal_1.DismissableModal, { panelStyle: panelStyle, children: jsx_runtime_1.jsx(QuickSwitcherContent_1.QuickSwitcherContent, { readOnlyStudio: readOnlyStudio, invocationTimestamp: invocationTimestamp, initialMode: initialMode, assetSelection: assetSelection, compositionSelection: compositionSelection }) }));
|
|
12
12
|
};
|
|
13
13
|
exports.default = QuickSwitcher;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import type { _InternalTypes } from 'remotion';
|
|
2
3
|
import type { StaticFile } from '../../api/get-static-files';
|
|
3
4
|
import type { QuickSwitcherMode } from './NoResults';
|
|
4
5
|
export declare const QuickSwitcherContent: React.FC<{
|
|
@@ -7,6 +8,11 @@ export declare const QuickSwitcherContent: React.FC<{
|
|
|
7
8
|
readonly readOnlyStudio: boolean;
|
|
8
9
|
readonly assetSelection: {
|
|
9
10
|
readonly initialQuery: string;
|
|
11
|
+
readonly onSelectFile: () => void;
|
|
10
12
|
readonly onSelected: (asset: StaticFile) => void;
|
|
11
13
|
} | null;
|
|
14
|
+
readonly compositionSelection: {
|
|
15
|
+
readonly excludeCompositionId: string;
|
|
16
|
+
readonly onSelected: (composition: _InternalTypes['AnyComposition']) => void;
|
|
17
|
+
} | null;
|
|
12
18
|
}>;
|