not re-rendering

Author: alsonleej

src/features/cseMachine/CseMachineUtils.ts

@@ -265,7 +265,7 @@ export function isMainReference(value: Value, reference: ReferenceType) {
 export function isDummyReference(reference: ReferenceType) {
   return (
     (reference instanceof Binding && reference.isDummyBinding) ||
-    (reference instanceof ArrayUnit && !reference.parent.isReferenced())
+    (reference instanceof ArrayUnit && !reference.parent.isReachable())
   );
 }
 

src/features/cseMachine/components/ArrayEmptyUnit.tsx

@@ -29,7 +29,7 @@ export class ArrayEmptyUnit extends Visible {
         y={this.y()}
         width={this.width()}
         height={this.height()}
-        stroke={this.parent.isReferenced() ? reachedStrokeColor() : defaultStrokeColor()}
+        stroke={this.parent.isReachable() ? reachedStrokeColor() : defaultStrokeColor()}
         ref={this.ref}
       />
     );

src/features/cseMachine/components/ArrayNullUnit.tsx

@@ -23,7 +23,7 @@ export class ArrayNullUnit extends Visible {
         {...ShapeDefaultProps}
         key={Layout.key++}
         points={[this.x(), this.y() + this.height(), this.x() + this.width(), this.y()]}
-        stroke={this.reference.parent.isReferenced() ? reachedStrokeColor() : defaultStrokeColor()}
+        stroke={this.reference.parent.isReachable() ? reachedStrokeColor() : defaultStrokeColor()}
         hitStrokeWidth={Config.DataHitStrokeWidth}
         ref={this.ref}
         listening={false}

src/features/cseMachine/components/Frame.tsx

@@ -178,9 +178,13 @@ export class Frame extends Visible implements IHoverable {
       CseAnimation.setCurrentFrame(this);
       this.setParentChainReachable();
     }
+
+    console.log('frame constructor');
+
+
   }
 
-  private setParentChainReachable(): void {
+  public setParentChainReachable(): void {
     this.setReachable(true);
     this.arrow?.setReachable(true);
 
@@ -194,6 +198,12 @@ export class Frame extends Visible implements IHoverable {
   onMouseLeave = () => {};
 
   draw(): React.ReactNode {
+
+    this.bindings.map(binding => binding.key.setReachable(this.isReachable()))
+    if (this.isReachable() && this.parentFrame) {
+      this.bindings.map(binding => binding.value.setReachable(true))
+    }
+
     return (
       <Group ref={this.ref} key={Layout.key++}>
         {this.name.draw()}
@@ -215,8 +225,8 @@ export class Frame extends Visible implements IHoverable {
           onMouseLeave={this.onMouseLeave}
           key={Layout.key++}
         />
-        {this.bindings.map(binding => binding.key.setReachable(this.isReachable()))}
-        {this.bindings.map(binding => binding.value.setReachable(this.isReachable()))}
+        {/* {this.bindings.map(binding => binding.key.setReachable(this.isReachable()))}
+        {this.isReachable() && this.parentFrame && this.bindings.map(binding => binding.value.setReachable(true))} */}
         {this.bindings.map(binding => binding.draw())}
         {this.arrow?.draw()}
       </Group>

src/features/cseMachine/components/StashItemComponent.tsx

@@ -79,7 +79,7 @@ export class StashItemComponent extends Visible implements IHoverable {
     this._x = ControlStashConfig.StashPosX + stackWidth;
     this._y = ControlStashConfig.StashPosY;
     if (arrowTo) {
-      arrowTo.markAsReferenced();
+      arrowTo.setReachable(true);
       this.arrow = new ArrowFromStashItemComponent(this).to(arrowTo) as ArrowFromStashItemComponent;
     }
   }

src/features/cseMachine/components/arrows/ArrowFromFn.tsx

@@ -19,6 +19,18 @@ export class ArrowFromFn extends GenericArrow<FnValue | GlobalFnValue | ContValu
 
     if (!to) return [];
 
+    if (this.isReachable() && !to.isReachable()) {
+      console.log('setting to reachable...');
+
+      to.setParentChainReachable();
+    }
+
+    to.draw();
+    console.log('to', to.isReachable());
+    console.log(to);
+    
+
+
     const steps: StepsArray = [
       (x, y) =>
         this.source instanceof ContValue

src/features/cseMachine/components/arrows/ArrowFromStashItemComponent.tsx

@@ -21,7 +21,7 @@ export class ArrowFromStashItemComponent extends GenericArrow<
     const from = this.source;
     const to = this.target;
 
-    to?.setReachable(true);
+    //to?.setReachable(true);
     console.log(to);
 
     if (!to) return [];

src/features/cseMachine/components/values/ArrayValue.tsx

@@ -27,6 +27,8 @@ export class ArrayValue extends Value implements IHoverable {
     super();
     Layout.memoizeValue(data, this);
     this.addReference(firstReference);
+    console.log('arrayvalue constructor...');
+    console.log(firstReference);
   }
 
   handleNewReference(newReference: ReferenceType): void {
@@ -77,11 +79,13 @@ export class ArrayValue extends Value implements IHoverable {
     }
   }
 
-  markAsReferenced() {
-    if (this.isReferenced()) return;
-    super.markAsReferenced();
+  setReachable(reachable: boolean = true) {
+    if (this.isReachable()) return;
+    super.setReachable(reachable);
+    // Propagate reachability to all array units
     for (const unit of this.units) {
-      unit.value.markAsReferenced();
+      unit.setReachable(reachable);
+      unit.value.setReachable(reachable);
     }
   }
 
@@ -101,6 +105,8 @@ export class ArrayValue extends Value implements IHoverable {
 
   draw(): React.ReactNode {
     if (this.isDrawn()) return null;
+    console.log('drawingarray...');
+    console.log(this);
     this._isDrawn = true;
     return (
       <Group
@@ -115,12 +121,4 @@ export class ArrayValue extends Value implements IHoverable {
       </Group>
     );
   }
-
-  setReachable(reachable: boolean) {
-    super.setReachable(reachable);
-    // Propagate reachability to all array units
-    this.units.forEach(unit => {
-      unit.setReachable(reachable);
-    });
-  }
 }

src/features/cseMachine/components/values/FnValue.tsx

@@ -126,11 +126,19 @@ export class FnValue extends Value implements IHoverable {
   };
 
   draw(): React.ReactNode {
+    if (this.isDrawn()) return;
+    this._isDrawn = true;
+    
     if (this.fnName === undefined) {
       throw new Error('Closure has no main reference and is not initialised!');
     }
     if (this.enclosingFrame) {
       this._arrow = new ArrowFromFn(this).to(this.enclosingFrame) as ArrowFromFn;
+
+      if (this.isReachable()) {
+        this._arrow.setReachable(true);
+      }
+
     }
     const textColor = this.isReachable() ? reachedTextColor() : defaultTextColor();
     const strokeColor = this.isReachable() ? reachedStrokeColor() : defaultStrokeColor();

src/features/cseMachine/components/values/PrimitiveValue.tsx

@@ -61,10 +61,10 @@ export class PrimitiveValue extends Value {
       throw new Error('Primitive values cannot have more than one reference!');
   }
 
-  markAsReferenced() {
-    if (this.isReferenced()) return;
-    super.markAsReferenced();
-    if (this.text instanceof Text) this.text.options.faded = false;
+  setReachable(reachable: boolean = true) {
+    if (this.isReachable()) return;
+    super.setReachable(reachable);
+    if (this.text instanceof Text) this.text.options.faded = !reachable;
   }
 
   draw(): React.ReactNode {