diff --git a/src/apps/chat/components/composer/Composer.tsx b/src/apps/chat/components/composer/Composer.tsx index 2e71c1bd1..7a8c2f177 100644 --- a/src/apps/chat/components/composer/Composer.tsx +++ b/src/apps/chat/components/composer/Composer.tsx @@ -136,9 +136,7 @@ export function Composer(props: { // external state const { showPromisedOverlay } = useOverlayComponents(); const { newChat: appChatNewChatIntent } = useRouterQuery>(); - const { labsAttachScreenCapture, labsCameraDesktop, labsShowCost, labsShowShortcutBar } = useUXLabsStore(useShallow(state => ({ - labsAttachScreenCapture: state.labsAttachScreenCapture, - labsCameraDesktop: state.labsCameraDesktop, + const { labsShowCost, labsShowShortcutBar } = useUXLabsStore(useShallow(state => ({ labsShowCost: state.labsShowCost, labsShowShortcutBar: state.labsShowShortcutBar, }))); @@ -663,7 +661,7 @@ export function Composer(props: { if (supportsClipboardRead()) composerShortcuts.push({ key: 'v', ctrl: true, shift: true, action: attachAppendClipboardItems, description: 'Attach Clipboard' }); // Future: keep reactive state here to support Live Screen Capture and more - // if (labsAttachScreenCapture && supportsScreenCapture) + // if (supportsScreenCapture) // composerShortcuts.push({ key: 's', ctrl: true, shift: true, action: openScreenCaptureDialog, description: 'Attach Screen Capture' }); } if (recognitionState.isActive) { @@ -816,13 +814,13 @@ export function Composer(props: { {isDesktop && showChatAttachments && ( - {/* [desktop] Attachment Sources: inline buttons */} + {/* [desktop] Attachment Sources: dropdown menu or inline buttons */} - {!isMobile && Screen Capture} description={labsAttachScreenCapture ? 'Enabled' : 'Disabled'} - checked={labsAttachScreenCapture} onChange={setLabsAttachScreenCapture} - />} - - {!isMobile && Webcam Capture} description={/*'v1.8 · ' +*/ (labsCameraDesktop ? 'Enabled' : 'Disabled')} - checked={labsCameraDesktop} onChange={setLabsCameraDesktop} - />} - Cost of messages} description={labsShowCost ? 'Show when available' : 'Disabled'} checked={labsShowCost} onChange={setLabsShowCost} @@ -94,7 +80,7 @@ export function UxLabsSettings() { {' · '}Call AGI {' · '}Persona Creator {' · '}Auto Diagrams - {' · '}Imagine · Chat Search · Text Tools · LLM Overheat + {' · '}Imagine · Chat Search · Text Tools · LLM Overheat · Screen Capture · Webcam diff --git a/src/common/stores/store-ux-labs.ts b/src/common/stores/store-ux-labs.ts index 8ce638146..2c8582107 100644 --- a/src/common/stores/store-ux-labs.ts +++ b/src/common/stores/store-ux-labs.ts @@ -10,12 +10,6 @@ import { persist } from 'zustand/middleware'; // - Chat Mode: Follow-Ups; moved to Chat Advanced UI interface UXLabsStore { - labsAttachScreenCapture: boolean; - setLabsAttachScreenCapture: (labsAttachScreenCapture: boolean) => void; - - labsCameraDesktop: boolean; - setLabsCameraDesktop: (labsCameraDesktop: boolean) => void; - labsEnhanceCodeBlocks: boolean; setLabsEnhanceCodeBlocks: (labsEnhanceCodeBlocks: boolean) => void; @@ -40,12 +34,6 @@ export const useUXLabsStore = create()( persist( (set) => ({ - labsAttachScreenCapture: true, - setLabsAttachScreenCapture: (labsAttachScreenCapture: boolean) => set({ labsAttachScreenCapture }), - - labsCameraDesktop: false, - setLabsCameraDesktop: (labsCameraDesktop: boolean) => set({ labsCameraDesktop }), - labsEnhanceCodeBlocks: true, setLabsEnhanceCodeBlocks: (labsEnhanceCodeBlocks: boolean) => set({ labsEnhanceCodeBlocks }), @@ -69,14 +57,8 @@ export const useUXLabsStore = create()( name: 'app-ux-labs', // Migrations: - // - 1: turn on the screen capture by default + // - 1: turn on the screen capture by default (subsequently removed) version: 1, - migrate: (state: any, fromVersion: number): UXLabsStore => { - // 0 -> 1: turn on the screen capture by default - if (state && fromVersion < 1 && !state.labsAttachScreenCapture) - return { ...state, labsAttachScreenCapture: true }; - return state; - }, }, ),