From df9c2f25e99c8f0ebbe959d8f923612ff75130af Mon Sep 17 00:00:00 2001 From: Trevor Lemeron Date: Tue, 7 Jun 2022 13:20:26 -0400 Subject: [PATCH 1/4] add offset to onMouseUp event (#4173) --- app/components-react/highlighter/ClipTrimmer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components-react/highlighter/ClipTrimmer.tsx b/app/components-react/highlighter/ClipTrimmer.tsx index 9be039ceadad..d4b7af978327 100644 --- a/app/components-react/highlighter/ClipTrimmer.tsx +++ b/app/components-react/highlighter/ClipTrimmer.tsx @@ -110,7 +110,7 @@ export default function ClipTrimmer(props: { clip: IClip }) { } else { isScrubbing.current = false; const timelineWidth = timelineRef.current!.offsetWidth - 40; - const timelineOffset = timelineRef.current!.getBoundingClientRect().left; + const timelineOffset = timelineRef.current!.getBoundingClientRect().left + 20; playAt(((e.clientX - timelineOffset) / timelineWidth) * props.clip.duration!); } } From ebf3efead18e9ab420cfed7e6fcdc5008ef94071 Mon Sep 17 00:00:00 2001 From: Trevor Lemeron Date: Tue, 7 Jun 2022 13:20:39 -0400 Subject: [PATCH 2/4] style adjustments for AddTabModal (#4174) --- app/components-react/pages/layout-editor/AddTabModal.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components-react/pages/layout-editor/AddTabModal.tsx b/app/components-react/pages/layout-editor/AddTabModal.tsx index 55fe6fba6556..e1dc414370c9 100644 --- a/app/components-react/pages/layout-editor/AddTabModal.tsx +++ b/app/components-react/pages/layout-editor/AddTabModal.tsx @@ -53,7 +53,7 @@ export default function AddTabModal() { } return ( - } wrapperStyle={{ width: '410px', height: '350px' }}> + } wrapperStyle={{ width: '390px', height: '270px' }}>
From 9ec1fc2c73cffba6e4d72b392ee532e851d18068 Mon Sep 17 00:00:00 2001 From: Trevor Lemeron Date: Tue, 7 Jun 2022 13:20:59 -0400 Subject: [PATCH 3/4] match progress bar styles (#4175) --- app/components-react/pages/onboarding/ThemeSelector.m.less | 7 ------- app/components-react/pages/onboarding/ThemeSelector.tsx | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/components-react/pages/onboarding/ThemeSelector.m.less b/app/components-react/pages/onboarding/ThemeSelector.m.less index 9f8459ca86fd..00f73b6b4d8a 100644 --- a/app/components-react/pages/onboarding/ThemeSelector.m.less +++ b/app/components-react/pages/onboarding/ThemeSelector.m.less @@ -103,10 +103,3 @@ .preview.active { border: 1px solid var(--teal); } - -.progress-bar { - position: relative; - display: block !important; - width: 80% !important; - margin: 20% auto; -} diff --git a/app/components-react/pages/onboarding/ThemeSelector.tsx b/app/components-react/pages/onboarding/ThemeSelector.tsx index 7805b8d7b14e..a961c2adca5a 100644 --- a/app/components-react/pages/onboarding/ThemeSelector.tsx +++ b/app/components-react/pages/onboarding/ThemeSelector.tsx @@ -120,9 +120,9 @@ export function ThemeSelector() { )} ) : ( -
-

{$t('Installing theme...')}

+
+

{$t('Installing theme...')}

)}
From af300d76c69fdb4b65171975488a08ecaf52bf68 Mon Sep 17 00:00:00 2001 From: gettinToasty Date: Tue, 7 Jun 2022 12:47:02 -0700 Subject: [PATCH 4/4] Remove Prime from Onboarding (#4181) * Remove Prime from Onboarding * Fix test * Fix other test --- app/components-react/pages/onboarding/Onboarding.tsx | 6 ++---- app/services/onboarding.ts | 6 +++--- test/regular/obs-importer.ts | 2 +- test/regular/onboarding.ts | 10 +++++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/components-react/pages/onboarding/Onboarding.tsx b/app/components-react/pages/onboarding/Onboarding.tsx index 2673969917a9..de6d97d96041 100644 --- a/app/components-react/pages/onboarding/Onboarding.tsx +++ b/app/components-react/pages/onboarding/Onboarding.tsx @@ -7,7 +7,7 @@ import cx from 'classnames'; import { $t } from 'services/i18n'; import * as stepComponents from './steps'; import Utils from 'services/utils'; -import {IOnboardingStep, ONBOARDING_STEPS} from 'services/onboarding'; +import { IOnboardingStep, ONBOARDING_STEPS } from 'services/onboarding'; import Scrollable from 'components-react/shared/Scrollable'; export default function Onboarding() { @@ -51,9 +51,7 @@ export default function Onboarding() { } function TopBar() { - const { stepIndex, preboardingOffset, singletonStep, steps } = useModule( - OnboardingModule, - ); + const { stepIndex, preboardingOffset, singletonStep, steps } = useModule(OnboardingModule); if (stepIndex < preboardingOffset || singletonStep) { return
; diff --git a/app/services/onboarding.ts b/app/services/onboarding.ts index 87ceb5fd4917..0bb7788ec970 100644 --- a/app/services/onboarding.ts +++ b/app/services/onboarding.ts @@ -177,9 +177,9 @@ class OnboardingViews extends ViewHandler { steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Optimize]); } - if (userViews.isLoggedIn && !userViews.isPrime) { - steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]); - } + // if (userViews.isLoggedIn && !userViews.isPrime) { + // steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]); + // } return steps; } diff --git a/test/regular/obs-importer.ts b/test/regular/obs-importer.ts index 4523f619003f..84e0f8664a47 100644 --- a/test/regular/obs-importer.ts +++ b/test/regular/obs-importer.ts @@ -59,7 +59,7 @@ test('OBS Importer', async t => { await waitForDisplayed('h1=Optimize'); await (await t.context.app.client.$('button=Skip')).click(); - await (await t.context.app.client.$('div=Choose Free')).click(); + // await (await t.context.app.client.$('div=Choose Free')).click(); await waitForDisplayed('[data-name=SceneSelector]'); diff --git a/test/regular/onboarding.ts b/test/regular/onboarding.ts index 157f94c0bcc6..df86b516726f 100644 --- a/test/regular/onboarding.ts +++ b/test/regular/onboarding.ts @@ -46,12 +46,12 @@ test('Go through the onboarding and autoconfig', async t => { t.true(await (await app.client.$('button=Start')).isExisting()); await (await app.client.$('button=Start')).click(); - await (await t.context.app.client.$('div=Choose Free')).waitForDisplayed({ timeout: 60000 }); + // await (await t.context.app.client.$('div=Choose Free')).waitForDisplayed({ timeout: 60000 }); // Skip purchasing prime - if (await (await t.context.app.client.$('div=Choose Free')).isExisting()) { - await (await t.context.app.client.$('div=Choose Free')).click(); - await sleep(1000); - } + // if (await (await t.context.app.client.$('div=Choose Free')).isExisting()) { + // await (await t.context.app.client.$('div=Choose Free')).click(); + // await sleep(1000); + // } await (await app.client.$('h2=Sources')).waitForDisplayed({ timeout: 60000 }); // success?