@cntrl-site/sdk-nextjs 1.9.14-4 → 1.9.14-6

package/lib/ItemGeometry/RichTextGeometryController.js

@@ -83,9 +83,9 @@ class RichTextGeometryController {
     setAngle(angle) {
         this.angle = angle;
     }
-    getContentBoundary(isRotatedBoundary) {
+    getContentBoundary() {
         if (this.getAngle() !== 0) {
-            return this.getBoundary(isRotatedBoundary);
+            return this.getBoundary(true);
         }
         const [boundary, xs, ys] = this.getContentGuides();
         const left = Math.min(...xs);

package/lib/ItemGeometry/useItemGeometry.js

@@ -19,16 +19,6 @@ controllerCtor = GenericGeometryController_1.GenericGeometryController, options)
         controller.setOptions(options);
         return itemGeometryService.register(itemId, controller);
     }, [itemGeometryService, itemId, controller]);
-    (0, react_1.useEffect)(() => {
-        return () => {
-            console.log('element unmount');
-        };
-    }, [element]);
-    (0, react_1.useEffect)(() => {
-        return () => {
-            console.log('controllerCtor unmount');
-        };
-    }, [controllerCtor]);
     // @ts-ignore
     return controller;
 }

package/lib/interactions/InteractionsRegistry.js

@@ -110,7 +110,7 @@ class InteractionsRegistry {
     getTriggerPositionForItemScrollTrigger(trigger) {
         const itemRect = this.itemGeometryService.getItemBoundary(trigger.itemId);
         let triggerPosition = 0;
-        switch (trigger.itemPosition) {
+        switch (trigger.screenPosition) {
             case 'top':
                 triggerPosition = itemRect.top;
                 break;
@@ -124,7 +124,7 @@ class InteractionsRegistry {
                 triggerPosition = itemRect.top;
                 break;
         }
-        switch (trigger.screenPosition) {
+        switch (trigger.itemPosition) {
             case 'top':
                 triggerPosition += 0;
                 break;
@@ -143,7 +143,6 @@ class InteractionsRegistry {
     }
     isItemScrollTriggerOnStartScreen(trigger) {
         const triggerPosition = this.getTriggerPositionForItemScrollTrigger(trigger);
-        console.log(triggerPosition, triggerPosition < 0);
         return triggerPosition < 0;
     }
     notifyLoad() {
@@ -202,7 +201,7 @@ class InteractionsRegistry {
         const itemRect = this.itemGeometryService.getItemBoundary(trigger.itemId);
         if (!itemRect)
             return false;
-        switch (trigger.itemPosition) {
+        switch (trigger.screenPosition) {
             case 'top':
                 triggerPosition = 0;
                 break;
@@ -217,7 +216,7 @@ class InteractionsRegistry {
                 break;
         }
         triggerPosition -= trigger.offset;
-        switch (trigger.screenPosition) {
+        switch (trigger.itemPosition) {
             case 'top':
                 isScrolledPastTrigger = itemRect.y < triggerPosition;
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntrl-site/sdk-nextjs",
-  "version": "1.9.14-4",
+  "version": "1.9.14-6",
   "description": "SDK for Next.js",
   "author": "arsen@momdesign.nyc",
   "license": "MIT",

package/src/ItemGeometry/RichTextGeometryController.ts

@@ -111,9 +111,9 @@ export class RichTextGeometryController implements ItemGeometryController {
     this.angle = angle;
   }
 
-  getContentBoundary(isRotatedBoundary?: boolean): Rect {
+  getContentBoundary(): Rect {
     if (this.getAngle() !== 0) {
-      return this.getBoundary(isRotatedBoundary);
+      return this.getBoundary(true);
     }
     const [boundary, xs, ys] = this.getContentGuides();
     const left = Math.min(...xs);
@@ -170,7 +170,7 @@ export class RichTextGeometryController implements ItemGeometryController {
   }
 
   setOptions(options?: RichTextGeometryOptions) {
-    if(!options) return;
+    if (!options) return;
     this.options = options;
   }
 

package/src/ItemGeometry/useItemGeometry.ts

@@ -1,7 +1,7 @@
-import { useContext, useEffect, useMemo } from "react";
-import { GenericGeometryController } from "./GenericGeometryController";
-import { GeometryControllerCtor } from "./ItemGeometryController";
-import { ItemGeometryContext } from "./ItemGeometryContext";
+import { useContext, useEffect, useMemo } from 'react';
+import { GenericGeometryController } from './GenericGeometryController';
+import { GeometryControllerCtor } from './ItemGeometryController';
+import { ItemGeometryContext } from './ItemGeometryContext';
 
 export function useItemGeometry<T extends GeometryControllerCtor = typeof GenericGeometryController>(
   itemId: string,
@@ -20,19 +20,6 @@ export function useItemGeometry<T extends GeometryControllerCtor = typeof Generi
     controller.setOptions(options);
     return itemGeometryService.register(itemId, controller);
   }, [itemGeometryService, itemId, controller]);
-
-  useEffect(() => {
-    return () => {
-      console.log('element unmount');
-    };
-  }, [element]);
-
-  useEffect(() => {
-    return () => {
-      console.log('controllerCtor unmount');
-    };
-  }, [controllerCtor]);
-
   // @ts-ignore
   return controller;
 }

package/src/interactions/InteractionsRegistry.ts

@@ -121,7 +121,7 @@ export class InteractionsRegistry implements InteractionsRegistryPort {
   getTriggerPositionForItemScrollTrigger(trigger: InteractionItemScrollTrigger): number {
     const itemRect = this.itemGeometryService.getItemBoundary(trigger.itemId);
     let triggerPosition = 0;
-    switch (trigger.itemPosition) {
+    switch (trigger.screenPosition) {
       case 'top':
         triggerPosition = itemRect.top;
         break;
@@ -135,7 +135,7 @@ export class InteractionsRegistry implements InteractionsRegistryPort {
         triggerPosition = itemRect.top;
         break;
     }
-    switch (trigger.screenPosition) {
+    switch (trigger.itemPosition) {
       case 'top':
         triggerPosition += 0;
         break;
@@ -155,7 +155,6 @@ export class InteractionsRegistry implements InteractionsRegistryPort {
 
   isItemScrollTriggerOnStartScreen(trigger: InteractionItemScrollTrigger): boolean {
     const triggerPosition = this.getTriggerPositionForItemScrollTrigger(trigger);
-    console.log(triggerPosition, triggerPosition < 0);
     return triggerPosition < 0;
   }
 
@@ -214,7 +213,7 @@ export class InteractionsRegistry implements InteractionsRegistryPort {
     let isScrolledPastTrigger = false;
     const itemRect = this.itemGeometryService.getItemBoundary(trigger.itemId);
     if (!itemRect) return false;
-    switch (trigger.itemPosition) {
+    switch (trigger.screenPosition) {
       case 'top':
         triggerPosition = 0;
         break;
@@ -229,7 +228,7 @@ export class InteractionsRegistry implements InteractionsRegistryPort {
         break;
     }
     triggerPosition -= trigger.offset;
-    switch (trigger.screenPosition) {
+    switch (trigger.itemPosition) {
       case 'top':
         isScrolledPastTrigger = itemRect.y < triggerPosition;
         break;