From a38201a835f2dbd65d2469030718fe7bc54d0845 Mon Sep 17 00:00:00 2001
From: Aria Minaei <aria.minaei@gmail.com>
Date: Thu, 5 May 2022 15:17:35 +0200
Subject: [PATCH] Fix the visual glitches with FocusRangeCurtains

---
 .../DopeSheet/Right/FocusRangeCurtains.tsx    | 93 +++++++++++++------
 .../DopeSheet/Right/Right.tsx                 |  2 -
 .../RightOverlay/RightOverlay.tsx             |  2 +
 3 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/FocusRangeCurtains.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/FocusRangeCurtains.tsx
index 7e34579..bda733d 100644
--- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/FocusRangeCurtains.tsx
+++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/FocusRangeCurtains.tsx
@@ -11,12 +11,11 @@ const divWidth = 1000
 
 const Curtain = styled.div<{enabled: boolean}>`
   position: absolute;
+  top: ${topStripHeight}px;
   left: 0;
   opacity: 0.15;
-  top: ${topStripHeight}px;
   width: ${divWidth}px;
   transform-origin: top left;
-  z-index: 20;
   pointer-events: none;
   background-color: ${(props) => (props.enabled ? '#000000' : 'transparent')};
 `
@@ -44,36 +43,78 @@ const FocusRangeCurtains: React.FC<{
 
     const {range} = existingRange
 
-    const height = val(layoutP.rightDims.height)
+    const height = val(layoutP.rightDims.height) - topStripHeight
 
     const unitSpaceToClippedSpace = val(layoutP.clippedSpace.fromUnitSpace)
+    const clippedSpaceWidth = val(layoutP.clippedSpace.width)
 
-    const els = [
-      [-1000, range.start],
-      [range.end, val(layoutP.clippedSpace.range.end)],
-    ].map(([start, end], i) => {
-      const startPosInClippedSpace = unitSpaceToClippedSpace(start)
+    const els: Array<{translateX: number; scaleX: number}> = []
 
-      const endPosInClippedSpace = unitSpaceToClippedSpace(end)
-      const desiredWidth = endPosInClippedSpace - startPosInClippedSpace
+    {
+      // the left (start) curtain
+      // starts from 0px
+      let startX = 0
+      // ends in the start of the range
+      let endX = unitSpaceToClippedSpace(existingRange.range.start)
+      let scaleX: number, translateX: number
+      // hide the curtain if:
+      if (
+        // endX would be larger than startX, which means the curtain is to the left of the RightOverlay
+        startX > endX
+      ) {
+        // fully hide it then with scaleX = 0
+        translateX = 0
+        scaleX = 0
+      } else {
+        // clip the end of the curtain if it's going over the right side of RightOverlay
+        if (endX > clippedSpaceWidth) {
+          //
+          endX = clippedSpaceWidth
+        }
+        translateX = startX
+        scaleX = (endX - startX) / divWidth
+      }
 
-      return (
-        <Curtain
-          key={`curtain-${i}`}
-          enabled={true}
-          style={{
-            height: `${height}px`,
-            transform: `translateX(${
-              val(layoutP.scaledSpace.leftPadding) +
-              startPosInClippedSpace -
-              unitSpaceToClippedSpace(0)
-            }px) scaleX(${desiredWidth / divWidth})`,
-          }}
-        />
-      )
-    })
+      els.push({translateX, scaleX})
+    }
 
-    return <>{els}</>
+    {
+      // the right (end) curtain
+      // starts at the end of the range
+      let startX = unitSpaceToClippedSpace(existingRange.range.end)
+      // and ends at the right edge of RightOverlay (which is clippedSpaceWidth)
+      let endX = clippedSpaceWidth
+      let scaleX: number, translateX: number
+      // if the whole curtain falls to the right of RightOverlay, hide it
+      if (startX > endX) {
+        translateX = 0
+        scaleX = 0
+      } else {
+        // if the left of the curtain falls on the left of RightOverlay, clip it
+        if (startX < 0) {
+          startX = 0
+        }
+        translateX = startX
+        scaleX = (endX - startX) / divWidth
+      }
+
+      els.push({translateX, scaleX})
+    }
+
+    return (
+      <>
+        {els.map(({translateX, scaleX}, i) => (
+          <Curtain
+            key={`curtain-${i}`}
+            enabled={true}
+            style={{
+              height: `${height}px`,
+              transform: `translateX(${translateX}px) scaleX(${scaleX})`,
+            }}
+          />
+        ))}
+      </>
+    )
   }, [layoutP, existingRangeD])
 }
 
diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx
index dcd5063..f250588 100644
--- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx
+++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx
@@ -10,7 +10,6 @@ import {zIndexes} from '@theatre/studio/panels/SequenceEditorPanel/SequenceEdito
 import DopeSheetSelectionView from './DopeSheetSelectionView'
 import HorizontallyScrollableArea from './HorizontallyScrollableArea'
 import SheetRow from './SheetRow'
-import FocusRangeCurtains from './FocusRangeCurtains'
 
 export const contentWidth = 1000000
 
@@ -49,7 +48,6 @@ const Right: React.FC<{
     return (
       <>
         <HorizontallyScrollableArea layoutP={layoutP} height={height}>
-          <FocusRangeCurtains layoutP={layoutP} />
           <DopeSheetSelectionView layoutP={layoutP}>
             <ListContainer style={{top: tree.top + 'px'}}>
               <SheetRow leaf={tree} layoutP={layoutP} />
diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx
index fdc938f..3802607 100644
--- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx
+++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx
@@ -10,6 +10,7 @@ import FrameStamp from './FrameStamp'
 import HorizontalScrollbar from './HorizontalScrollbar'
 import Playhead from './Playhead'
 import TopStrip from './TopStrip'
+import FocusRangeCurtains from '@theatre/studio/panels/SequenceEditorPanel/DopeSheet/Right/FocusRangeCurtains'
 
 const Container = styled.div`
   position: absolute;
@@ -34,6 +35,7 @@ const RightOverlay: React.FC<{
         <FrameStamp layoutP={layoutP} />
         <TopStrip layoutP={layoutP} />
         <LengthIndicator layoutP={layoutP} />
+        <FocusRangeCurtains layoutP={layoutP} />
       </Container>
     )
   }, [layoutP])