mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-06 10:11:31 +00:00
Merge branch 'feature/mvp' into feature/comp/playbar-w-trim
This commit is contained in:
commit
a105bb3d5f
3 files changed
+10
-10
No files matched your search
@@ -118,18 +118,19 @@ export const VideoQuickTrim = memo(({
|
||||
]); //END videoRefCallback\
|
||||
|
||||
useEffect(()=>{
|
||||
if( compState.trimStartSeconds
|
||||
&& compState.trimEndSeconds
|
||||
if( compState.trimStartSeconds !== undefined
|
||||
&& compState.trimEndSeconds !== undefined
|
||||
&& (
|
||||
compState.trimStartSeconds !== propsTrimStartSeconds
|
||||
|| compState.trimEndSeconds !== propsTrimEndSeconds
|
||||
)
|
||||
){
|
||||
onSelect({
|
||||
trimStartSeconds: compState.trimStartSeconds,
|
||||
trimEndSeconds: compState.trimEndSeconds,
|
||||
});
|
||||
}
|
||||
console.log(`TRIM on useEFFECT: calling onSELECT`);
|
||||
onSelect({
|
||||
trimStartSeconds: compState.trimStartSeconds,
|
||||
trimEndSeconds: compState.trimEndSeconds,
|
||||
});
|
||||
}
|
||||
}, [onSelect, compState.trimStartSeconds, compState.trimEndSeconds, propsTrimStartSeconds, propsTrimEndSeconds])
|
||||
|
||||
const togglePlaypause = useCallback(()=>{
|
||||
|
||||
+2
-2
@@ -73,12 +73,12 @@ export default function PageVSTApp({
|
||||
trimStartSeconds={vstValues.trimStart}
|
||||
trimEndSeconds={vstValues.trimEnd}
|
||||
mediaToken={vstValues.fileToken}
|
||||
onSelect={(val: QuickTrimData) =>
|
||||
onSelect={(val: QuickTrimData) =>{
|
||||
handleOnChange({
|
||||
trimStart: val.trimStartSeconds,
|
||||
trimEnd: val.trimEndSeconds,
|
||||
})
|
||||
}
|
||||
}}
|
||||
onResponse={res => {
|
||||
dispatchPageState({
|
||||
type: "loadFileSuccess",
|
||||
|
||||
@@ -82,6 +82,5 @@ export function reducer (state: State, action: Action): State {
|
||||
case 'reset':
|
||||
default:
|
||||
return {status: states.NO_FILE};
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user