From 1f7206a66fdf98b40067e9dd5ae10b76b5489732 Mon Sep 17 00:00:00 2001
From: vezwork <elliot@theatrejs.com>
Date: Mon, 16 May 2022 10:48:54 -0400
Subject: [PATCH] Replace few usages of useRefAndState with useState

---
 .../RightOverlay/HorizontalScrollbar.tsx      | 23 +++++++++----------
 .../uiComponents/form/BasicNumberInput.tsx    |  7 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx
index 6e2981f..828f662 100644
--- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx
+++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx
@@ -10,7 +10,6 @@ import styled from 'styled-components'
 import {zIndexes} from '@theatre/studio/panels/SequenceEditorPanel/SequenceEditorPanel'
 import {includeLockFrameStampAttrs} from '@theatre/studio/panels/SequenceEditorPanel/FrameStampPositionProvider'
 import {pointerEventsAutoInNormalMode} from '@theatre/studio/css'
-import useRefAndState from '@theatre/studio/utils/useRefAndState'
 import useDrag from '@theatre/studio/uiComponents/useDrag'
 
 const Container = styled.div`
@@ -258,26 +257,26 @@ const HorizontalScrollbar: React.FC<{
     return self
   }, [layoutP, relevantValuesD])
 
-  const [refRangeDrag, nodeRangeDrag] = useRefAndState<HTMLDivElement | null>(
+  const [rangeDragNode, setRangeDragNode] = useState<HTMLDivElement | null>(
     null,
   )
-  useDrag(nodeRangeDrag, {
+  useDrag(rangeDragNode, {
     debugName: 'HorizontalScrollbar/onRangeDrag',
     onDragStart: handles.onRangeDragStart,
     lockCSSCursorTo: 'ew-resize',
   })
 
-  const [refRangeStartDrag, nodeRangeStartDrag] =
-    useRefAndState<HTMLDivElement | null>(null)
-  useDrag(nodeRangeStartDrag, {
+  const [rangeStartDragNode, setRangeStartDragNode] =
+    useState<HTMLDivElement | null>(null)
+  useDrag(rangeStartDragNode, {
     debugName: 'HorizontalScrollbar/onRangeStartDrag',
     onDragStart: handles.onRangeStartDragStart,
     lockCSSCursorTo: 'w-resize',
   })
 
-  const [refRangeEndDrag, nodeRangeEndDrag] =
-    useRefAndState<HTMLDivElement | null>(null)
-  useDrag(nodeRangeEndDrag, {
+  const [rangeEndDragNode, setRangeEndDragNode] =
+    useState<HTMLDivElement | null>(null)
+  useDrag(rangeEndDragNode, {
     debugName: 'HorizontalScrollbar/onRangeEndDrag',
     onDragStart: handles.onRangeEndDragStart,
     lockCSSCursorTo: 'e-resize',
@@ -290,14 +289,14 @@ const HorizontalScrollbar: React.FC<{
     >
       <TimeThread>
         <RangeBar
-          ref={refRangeDrag}
+          ref={setRangeDragNode}
           style={{
             width: `${rangeEndX - rangeStartX}px`,
             transform: `translate3d(${rangeStartX}px, 0, 0)`,
           }}
         />
         <RangeStartHandle
-          ref={refRangeStartDrag}
+          ref={setRangeStartDragNode}
           style={{transform: `translate3d(${rangeStartX}px, 0, 0)`}}
         >
           <Tooltip active={beingDragged === 'both' || beingDragged === 'start'}>
@@ -305,7 +304,7 @@ const HorizontalScrollbar: React.FC<{
           </Tooltip>
         </RangeStartHandle>
         <RangeEndHandle
-          ref={refRangeEndDrag}
+          ref={setRangeEndDragNode}
           style={{transform: `translate3d(${rangeEndX}px, 0, 0)`}}
         >
           <Tooltip active={beingDragged === 'both' || beingDragged === 'end'}>
diff --git a/theatre/studio/src/uiComponents/form/BasicNumberInput.tsx b/theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
index a9eb32d..1ae4e10 100644
--- a/theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
+++ b/theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
@@ -1,5 +1,6 @@
 import {clamp, isInteger, round} from 'lodash-es'
 import type {MutableRefObject} from 'react'
+import {useState} from 'react'
 import React, {useMemo, useRef} from 'react'
 import styled from 'styled-components'
 import mergeRefs from 'react-merge-refs'
@@ -320,8 +321,8 @@ const BasicNumberInput: React.FC<{
     />
   ) : null
 
-  const [refDrag, nodeDrag] = useRefAndState<HTMLDivElement | null>(null)
-  useDrag(nodeDrag, {
+  const [dragNode, setDragNode] = useState<HTMLDivElement | null>(null)
+  useDrag(dragNode, {
     debugName: 'form/BasicNumberInput',
     onDragStart: callbacks.transitionToDraggingMode,
     lockCSSCursorTo: 'ew-resize',
@@ -331,7 +332,7 @@ const BasicNumberInput: React.FC<{
 
   return (
     <Container className={propsA.className + ' ' + stateRef.current.mode}>
-      <DragWrap ref={refDrag}>{theInput}</DragWrap>
+      <DragWrap ref={setDragNode}>{theInput}</DragWrap>
       {fillIndicator}
     </Container>
   )