From eb80eb0f0487c87d568f7c03320a91789cd0dcb9 Mon Sep 17 00:00:00 2001
From: Michael Main <deusprogrammer@gmail.com>
Date: Sat, 4 Nov 2023 21:19:15 -0500
Subject: [PATCH] Keyboard issues still not fixed

---
 src/renderer/App.css                          |  4 ++--
 src/renderer/components/ClipTable.jsx         |  3 ++-
 src/renderer/routes/CollectionManager.jsx     |  2 ++
 src/renderer/routes/VideoList.jsx             |  3 ++-
 src/renderer/routes/editor/AdvancedEditor.jsx |  1 -
 src/renderer/routes/editor/ClipCutter.jsx     | 15 ---------------
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 555f0fe..9a1378a 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -223,13 +223,13 @@ button.selected {
     opacity: 0.5;
 }
 
-.removable,
+.removeable,
 .addable,
 .openable {
     position: relative;
 }
 
-.removable:hover::after {
+.removeable:hover::after {
     position: absolute;
     top: 50%;
     left: 50%;
diff --git a/src/renderer/components/ClipTable.jsx b/src/renderer/components/ClipTable.jsx
index 336f3fb..7ee37d4 100644
--- a/src/renderer/components/ClipTable.jsx
+++ b/src/renderer/components/ClipTable.jsx
@@ -7,6 +7,7 @@ export default ({
     videos,
     collections,
     collectionId,
+    allowCollectionFilter,
     op,
     opFn,
     includeDelete,
@@ -65,7 +66,7 @@ export default ({
                         setSearchValue(value);
                     }}
                 />
-                {!collectionId ? (
+                {allowCollectionFilter ? (
                     <>
                         <label>Clip Pack:</label>
                         <select
diff --git a/src/renderer/routes/CollectionManager.jsx b/src/renderer/routes/CollectionManager.jsx
index b9e88e2..ee9e3a9 100644
--- a/src/renderer/routes/CollectionManager.jsx
+++ b/src/renderer/routes/CollectionManager.jsx
@@ -297,6 +297,8 @@ export default () => {
                                         ) && video._id.startsWith('_')
                                 )}
                                 collections={filteredCollections}
+                                collectionId={collectionId}
+                                allowCollectionFilter
                                 op="add"
                                 opFn={(collectionId, videoId) => {
                                     addToCollection(collectionId, videoId);
diff --git a/src/renderer/routes/VideoList.jsx b/src/renderer/routes/VideoList.jsx
index 671958f..cd278b9 100644
--- a/src/renderer/routes/VideoList.jsx
+++ b/src/renderer/routes/VideoList.jsx
@@ -117,7 +117,8 @@ let VideoList = () => {
                 onDelete={(id, game) => {
                     deleteFile(id, game);
                 }}
-                includeDelete={true}
+                includeDelete
+                allowCollectionFilter
             />
         </div>
     );
diff --git a/src/renderer/routes/editor/AdvancedEditor.jsx b/src/renderer/routes/editor/AdvancedEditor.jsx
index 0fa1ad1..c91cbd8 100644
--- a/src/renderer/routes/editor/AdvancedEditor.jsx
+++ b/src/renderer/routes/editor/AdvancedEditor.jsx
@@ -568,7 +568,6 @@ let AdvancedEditor = () => {
                                         currentSliderPosition <=
                                             batchClip.clip.endTime))
                             }
-                            controls={true}
                             videoPosition={currentPosition}
                             subs={subs}
                             offset={offset}
diff --git a/src/renderer/routes/editor/ClipCutter.jsx b/src/renderer/routes/editor/ClipCutter.jsx
index 9278ef9..8bb3157 100644
--- a/src/renderer/routes/editor/ClipCutter.jsx
+++ b/src/renderer/routes/editor/ClipCutter.jsx
@@ -93,15 +93,6 @@ let ClipCutter = () => {
                 if (stateRef.current.currentClip === null) {
                     return;
                 }
-                // let nextClip =
-                //     stateRef.current.clips[
-                //         Math.min(
-                //             stateRef.current.clips.length - 1,
-                //             stateRef.current.currentClip + 1
-                //         )
-                //     ];
-                // setCurrentSliderPosition(nextClip.startTime);
-                // setCurrentPosition(nextClip.startTime / 1000);
                 setCurrentClip((currentClip) =>
                     Math.min(stateRef.current.clips.length - 1, currentClip + 1)
                 );
@@ -111,12 +102,6 @@ let ClipCutter = () => {
                 if (stateRef.current.currentClip === null) {
                     return;
                 }
-                // let nextClip =
-                //     stateRef.current.clips[
-                //         Math.max(0, stateRef.current.currentClip - 1)
-                //     ];
-                // setCurrentSliderPosition(nextClip.startTime);
-                // setCurrentPosition(nextClip.startTime / 1000);
                 setCurrentClip((currentClip) => Math.max(0, currentClip - 1));
                 break;
             }