Skip to content

🎥 Make videos programmatically with React

Preserve property selection when committing number inputs

JonnyBurger27cd8d5c549b
diff --git a/packages/studio/src/components/NewComposition/InputDragger.tsx b/packages/studio/src/components/NewComposition/InputDragger.tsx
index c804032cff..d74490641c 100644
--- a/packages/studio/src/components/NewComposition/InputDragger.tsx
+++ b/packages/studio/src/components/NewComposition/InputDragger.tsx
@@ -9,6 +9,7 @@ import {BLUE, BLUE_HOVERED, TRANSPARENT} from '../../helpers/colors';
import {noop} from '../../helpers/noop';
import {
isPointerSessionRelease,
+ observePointerRelease,
startCapturedPointerSession,
} from '../../helpers/pointer-session';
import {getClickLock, setClickLock} from '../../state/input-dragger-click-lock';
@@ -856,6 +857,54 @@ const InputDraggerForwardRefFn: React.ForwardRefRenderFunction<
}
}, [inputFallback]);
+ useEffect(() => {
+ if (!inputFallback) {
+ return;
+ }
+
+ const commitWithoutClickThrough = (event: PointerEvent) => {
+ const input = fallbackRef.current;
+ if (
+ event.button !== 0 ||
+ input === null ||
+ document.activeElement !== input ||
+ input.contains(event.target as Node)
+ ) {
+ return;
+ }
+
+ // Commit before timeline selection handlers can hide the edited row.
+ event.preventDefault();
+ event.stopImmediatePropagation();
+
+ const stopClick = (clickEvent: MouseEvent) => {
+ clickEvent.preventDefault();
+ clickEvent.stopImmediatePropagation();
+ };
+
+ window.addEventListener('click', stopClick, {capture: true, once: true});
+ observePointerRelease({
+ event,
+ onEnd: () => {
+ // The click follows pointerup, even though blurring unmounts the input.
+ setTimeout(() => {
+ window.removeEventListener('click', stopClick, true);
+ }, 0);
+ },
+ });
+ input.blur();
+ };
+
+ window.addEventListener('pointerdown', commitWithoutClickThrough, true);
+ return () => {
+ window.removeEventListener(
+ 'pointerdown',
+ commitWithoutClickThrough,
+ true,
+ );
+ };
+ }, [inputFallback]);
+
if (inputFallback) {
return (
<HigherZIndex onEscape={onEscape} onOutsideClick={noop}>