Merge branch 'master' into preview

elemanhillary · May 26, 2022 · fa10722 · fa10722
2 parents f7338de + 1b30229
commit fa10722
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/components-react/editor/elements/RecordingPreview.tsx b/app/components-react/editor/elements/RecordingPreview.tsx
@@ -1,12 +1,12 @@
 import React, { useRef } from 'react';
-import { useModule } from 'slap';
 import Display from 'components-react/shared/Display';
 import Util from 'services/utils';
 import { ERenderingMode } from '../../../../obs-api';
 import styles from './BaseElement.m.less';
 import { $t } from 'services/i18n';
 import { Services } from 'components-react/service-provider';
 import useBaseElement from './hooks';
+import { useVuex } from 'components-react/hooks';
 
 export default function RecordingPreview() {
   const { WindowsService, StreamingService } = Services;
@@ -15,7 +15,7 @@ export default function RecordingPreview() {
 
   const { renderElement } = useBaseElement(<RecPreview />, { x: 0, y: 0 }, containerRef.current);
 
-  const { hideStyleBlockers, selectiveRecording } = useModule(() => ({
+  const { hideStyleBlockers, selectiveRecording } = useVuex(() => ({
     hideStyleBlockers: WindowsService.state[Util.getCurrentUrlParams().windowId].hideStyleBlockers,
     selectiveRecording: StreamingService.state.selectiveRecording,
   }));

diff --git a/app/components-react/editor/elements/StreamPreview.tsx b/app/components-react/editor/elements/StreamPreview.tsx
@@ -1,12 +1,12 @@
 import React, { useRef } from 'react';
-import { useModule } from 'slap';
 import Display from 'components-react/shared/Display';
 import Util from 'services/utils';
 import { ERenderingMode } from '../../../../obs-api';
 import styles from './BaseElement.m.less';
 import { $t } from 'services/i18n';
 import { Services } from 'components-react/service-provider';
 import useBaseElement from './hooks';
+import { useVuex } from 'components-react/hooks';
 
 export default function StreamPreview() {
   const { WindowsService, StreamingService } = Services;
@@ -19,7 +19,7 @@ export default function StreamPreview() {
     containerRef.current,
   );
 
-  const { hideStyleBlockers, selectiveRecording } = useModule(() => ({
+  const { hideStyleBlockers, selectiveRecording } = useVuex(() => ({
     hideStyleBlockers: WindowsService.state[Util.getCurrentUrlParams().windowId].hideStyleBlockers,
     selectiveRecording: StreamingService.state.selectiveRecording,
   }));

diff --git a/app/components/shared/ReactComponentList.tsx b/app/components/shared/ReactComponentList.tsx
@@ -257,6 +257,7 @@ export class RecentEvents extends ReactComponent<{ isOverlay?: boolean }> {}
   props: {
     name: { default: 'RecordingPreview' },
     wrapperStyles: { default: () => ({ height: '100%' }) },
+    mins: { default: () => ({ x: 0, y: 0 }) },
   },
 })
 export class RecordingPreview extends ReactComponent {}
@@ -281,6 +282,7 @@ export class SafeMode extends ReactComponent {}
   props: {
     name: { default: 'StreamPreview' },
     wrapperStyles: { default: () => ({ height: '100%' }) },
+    mins: { default: () => ({ x: 0, y: 0 }) },
   },
 })
 export class StreamPreview extends ReactComponent {}