From 19990a3edb29cb1a8ce09659db1a51cd36cbb4ad Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 15 May 2024 08:31:35 -0400
Subject: cleanup

---
 src/client/views/PropertiesView.tsx                | 15 +++++-----
 .../collectionFreeForm/CollectionFreeFormView.tsx  |  6 +---
 src/client/views/nodes/DocumentView.tsx            | 33 +++++++---------------
 src/client/views/nodes/trails/SlideEffect.tsx      |  4 +--
 4 files changed, 20 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index a95477749..6f9350ef2 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -107,10 +107,7 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
     @observable openFilters: boolean = false;
     @observable openStyling: boolean = true;
 
-    // GPT styling
-    // removed for now
-
-    //Pres Trails booleans:
+    // Pres Trails booleans:
     @observable openPresTransitions: boolean = true;
     @observable openPresProgressivize: boolean = false;
     @observable openPresVisibilityAndDuration: boolean = false;
@@ -750,7 +747,7 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
     upDownButtons = (dirs: string, field: string) => {
         const selDoc = this.selectedDoc;
         if (!selDoc) return;
-        //prettier-ignore
+        // prettier-ignore
         switch (field) {
             case 'Xps': selDoc.x = NumCast(this.selectedDoc?.x) + (dirs === 'up' ? 10 : -10); break;
             case 'Yps': selDoc.y = NumCast(this.selectedDoc?.y) + (dirs === 'up' ? 10 : -10); break;
@@ -1060,7 +1057,9 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
                 <NumberInput formLabel={label} formLabelPlacement={'left'} type={Type.SEC} unit={unit} fillWidth color={this.color} number={number} setNumber={setNumber} min={min} max={max} />
                 <Slider
                     key={label}
-                    onPointerDown={e => (this._sliderBatch = UndoManager.StartBatch('slider ' + label))}
+                    onPointerDown={() => {
+                        this._sliderBatch = UndoManager.StartBatch('slider ' + label);
+                    }}
                     multithumb={false}
                     color={this.color}
                     size={Size.XSMALL}
@@ -1259,12 +1258,12 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
                 // if the relationship is already in the list AND the new rel is different from the prev rel, update the rel sizes
             } else if (linkRelationshipList && value !== prevRelationship) {
                 const index = linkRelationshipList.indexOf(value);
-                //increment size of new relationship size
+                // increment size of new relationship size
                 if (index !== -1 && index < linkRelationshipSizes.length) {
                     const pvalue = linkRelationshipSizes[index];
                     linkRelationshipSizes[index] = pvalue === undefined || !Number.isFinite(pvalue) ? 1 : pvalue + 1;
                 }
-                //decrement the size of the previous relationship if it already exists (i.e. not default 'link' relationship upon link creation)
+                // decrement the size of the previous relationship if it already exists (i.e. not default 'link' relationship upon link creation)
                 if (linkRelationshipList.includes(prevRelationship)) {
                     const pindex = linkRelationshipList.indexOf(prevRelationship);
                     if (pindex !== -1 && pindex < linkRelationshipSizes.length) {
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 22448c25c..71b0557c1 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -319,11 +319,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
 
     focus = (anchor: Doc, options: FocusViewOptions) => {
         // incorporate the easefunc here
-        if (options.easeFunc) {
-            this.setPresEaseFunc(options.easeFunc);
-            console.log('Ease func', options.easeFunc);
-        }
-
+        if (options.easeFunc) this.setPresEaseFunc(options.easeFunc);
         if (this._lightboxDoc) return;
         if (anchor === this.Document) {
             // if (options.willZoomCentered && options.zoomScale) {
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 5897dc105..350f0db76 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -997,7 +997,8 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
      * @returns a function that will wrap a JSX animation element wrapping any JSX element
      */
     public static AnimationEffect(renderDoc: JSX.Element, presEffectDoc: Opt<Doc>, root: Doc) {
-        let dir = presEffectDoc?.presentation_effectDirection ?? presEffectDoc?.followLinkAnimDirection;
+        let dir = (presEffectDoc?.presentation_effectDirection ?? presEffectDoc?.followLinkAnimDirection) as PresEffectDirection;
+        const transitionTime = presEffectDoc?.presentation_transition ? NumCast(presEffectDoc?.presentation_transition) : 500;
         const effectProps = {
             left: dir === PresEffectDirection.Left,
             right: dir === PresEffectDirection.Right,
@@ -1025,33 +1026,19 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
             dir = PresEffectDirection.Center;
         }
 
-        const transitionTime = presEffectDoc?.presentation_transition ? NumCast(presEffectDoc?.presentation_transition) : 500;
-        //prettier-ignore
-
         switch (StrCast(presEffectDoc?.presentation_effect, StrCast(presEffectDoc?.followLinkAnimEffect))) {
             default:
             case PresEffect.None:       return renderDoc;
-            case PresEffect.Zoom:       return <SlideEffect doc={root} dir={dir as PresEffectDirection} presEffect={PresEffect.Zoom} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
-            case PresEffect.Fade:       return <SlideEffect  doc={root} dir={dir as PresEffectDirection} presEffect={PresEffect.Fade} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
-            case PresEffect.Flip:       return <SlideEffect doc={root} dir={dir as PresEffectDirection} presEffect={PresEffect.Flip} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
-            case PresEffect.Rotate:       return <SlideEffect  doc={root}  dir={dir as PresEffectDirection} presEffect={PresEffect.Rotate} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
-            case PresEffect.Bounce:     return <SlideEffect doc={root} dir={dir as PresEffectDirection} presEffect={PresEffect.Bounce} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
-            case PresEffect.Roll:       return <SlideEffect doc={root}  dir={dir as PresEffectDirection} presEffect={PresEffect.Roll} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
+            case PresEffect.Zoom:       return <SlideEffect doc={root} dir={dir} presEffect={PresEffect.Zoom} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
+            case PresEffect.Fade:       return <SlideEffect  doc={root} dir={dir} presEffect={PresEffect.Fade} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
+            case PresEffect.Flip:       return <SlideEffect doc={root} dir={dir} presEffect={PresEffect.Flip} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
+            case PresEffect.Rotate:     return <SlideEffect  doc={root}  dir={dir} presEffect={PresEffect.Rotate} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
+            case PresEffect.Bounce:     return <SlideEffect doc={root} dir={dir} presEffect={PresEffect.Bounce} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
+            case PresEffect.Roll:       return <SlideEffect doc={root}  dir={dir} presEffect={PresEffect.Roll} tension={timingConfig.stiffness} friction={timingConfig.damping} mass={timingConfig.mass}>{renderDoc}</SlideEffect>
             // keep as preset, doesn't really make sense with spring config
             case PresEffect.Lightspeed: return <JackInTheBox {...effectProps}>{renderDoc}</JackInTheBox>;
-        }
-        // switch (StrCast(presEffectDoc?.presentation_effect, StrCast(presEffectDoc?.followLinkAnimEffect))) {
-        //     default:
-        //     // package used: react-awesome-reveal
-        //     case PresEffect.None:       return renderDoc;
-        //     case PresEffect.Zoom:       return <Zoom {...effectProps}>{renderDoc}</Zoom>;
-        //     case PresEffect.Fade:       return <Fade {...effectProps}>{renderDoc}</Fade>;
-        //     case PresEffect.Flip:       return <Flip {...effectProps}>{renderDoc}</Flip>;
-        //     case PresEffect.Rotate:     return <Rotate {...effectProps}>{renderDoc}</Rotate>;
-        //     case PresEffect.Bounce:     return <Bounce {...effectProps}>{renderDoc}</Bounce>;
-        //     case PresEffect.Roll:       return <Roll {...effectProps}>{renderDoc}</Roll>;
-        //     case PresEffect.Lightspeed: return <JackInTheBox {...effectProps}>{renderDoc}</JackInTheBox>;
-        // }
+        } // prettier-ignore
+
     }
     public static recordAudioAnnotation(dataDoc: Doc, field: string, onRecording?: (stop: () => void) => void, onEnd?: () => void) {
         let gumStream: any;
diff --git a/src/client/views/nodes/trails/SlideEffect.tsx b/src/client/views/nodes/trails/SlideEffect.tsx
index db2ac1ea0..e1cf9b127 100644
--- a/src/client/views/nodes/trails/SlideEffect.tsx
+++ b/src/client/views/nodes/trails/SlideEffect.tsx
@@ -5,7 +5,7 @@ import './SlideEffect.scss';
 import { Doc } from '../../../../fields/Doc';
 import { NumCast } from '../../../../fields/Types';
 
-interface Props {
+interface SlideEffectProps {
     // pass in doc to extract width, height, bg
     doc?: Doc;
     dir: PresEffectDirection;
@@ -31,7 +31,7 @@ const infiniteOptions = {
  * This component wraps around the doc to create an effect animation, and also wraps the preview animations
  * for the effects as well.
  */
-export default function SpringAnimation({ doc, dir, friction, tension, mass, presEffect, children, infinite }: Props) {
+export default function SpringAnimation({ doc, dir, friction, tension, mass, presEffect, children, infinite }: SlideEffectProps) {
     const [springs, api] = useSpring(
         () => ({
             from: {
-- 
cgit v1.2.3-70-g09d2