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

package/lib/ItemGeometry/GenericGeometryController.js

@@ -32,25 +32,12 @@ class GenericGeometryController {
         this.angle = angle;
     }
     setOptions(options) {
-        // no options
     }
     getAngle() {
-        return this.angle + this.getParentAngle();
+        return 0;
     }
     getScale() {
-        return this.scale * this.getParentScale();
-    }
-    getParentAngle() {
-        if (!this.registry || !this.parentId)
-            return 0;
-        const parentController = this.registry.getControllerById(this.parentId);
-        return parentController.getAngle();
-    }
-    getParentScale() {
-        if (!this.registry || !this.parentId)
-            return 1;
-        const parentController = this.registry.getControllerById(this.parentId);
-        return parentController.getScale();
+        return 1;
     }
 }
 exports.GenericGeometryController = GenericGeometryController;

package/lib/ItemGeometry/RichTextGeometryController.js

@@ -95,32 +95,6 @@ class RichTextGeometryController {
         const content = new sdk_1.Rect(boundary.left + left, boundary.top + top, right - left, bottom - top);
         return content;
     }
-    getBaselines() {
-        const boundary = this.getBoundary();
-        const contentBoundary = this.getContentBoundary();
-        const offsetY = contentBoundary.top - boundary.top;
-        const baselines = [];
-        (0, domDfs_1.domDfs)(Array.from(this.container.children), (el) => {
-            var _a, _b;
-            if (el.children.length !== 0)
-                return;
-            const rects = el.getClientRects();
-            const styles = window.getComputedStyle(el);
-            const isTextCentered = styles.textAlign === 'center';
-            const ls = RichTextGeometryController.parseCssValue(styles.letterSpacing);
-            const metrics = (0, sdk_1.measureFont)(this.getFontStr(styles), (_b = (_a = el.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '');
-            const { baseline, fontBoxHeight, rightMargin } = metrics;
-            for (let i = 0; i <= rects.length - 1; i += 1) {
-                const rect = rects[i];
-                const halfLead = (rect.height - fontBoxHeight) / 2;
-                baselines.push({
-                    xEnd: isTextCentered ? boundary.width : rect.right - rightMargin - ls - boundary.left,
-                    y: rect.top + halfLead + baseline - boundary.top - offsetY
-                });
-            }
-        });
-        return baselines;
-    }
     getFontStr(styles) {
         const fontSize = (0, CSSNumeric_1.parseCSSNumber)(styles.fontSize);
         const lineHeight = (0, CSSNumeric_1.parseCSSNumber)(styles.lineHeight);

package/lib/components/items/RichTextItem/RichTextItem.js

@@ -27,12 +27,11 @@ const RichTextItem = ({ item, sectionId, onResize, interactionCtrl, onVisibility
     const { layouts } = (0, useCntrlContext_1.useCntrlContext)();
     const itemAngle = (0, useItemAngle_1.useItemAngle)(item, sectionId);
     const { blur: itemBlur, wordSpacing: itemWordSpacing, letterSpacing: itemLetterSpacing, color: itemColor, fontSize, lineHeight, xSizing } = (0, useRichTextItemValues_1.useRichTextItemValues)(item, sectionId);
-    const geometryOptions = (0, react_1.useMemo)(() => ({ xSizing }), [xSizing]);
     const layoutValues = [item.area, item.layoutParams];
     const exemplary = (0, useExemplary_1.useExemplary)();
     const { layoutId } = (0, useCurrentLayout_1.useCurrentLayout)();
     (0, useRegisterResize_1.useRegisterResize)(ref, onResize);
-    const geometry = (0, useItemGeometry_1.useItemGeometry)(item.id, ref, RichTextGeometryController_1.RichTextGeometryController, geometryOptions);
+    const geometry = (0, useItemGeometry_1.useItemGeometry)(item.id, ref, RichTextGeometryController_1.RichTextGeometryController, { xSizing });
     geometry === null || geometry === void 0 ? void 0 : geometry.setAngle(itemAngle);
     const stateParams = interactionCtrl === null || interactionCtrl === void 0 ? void 0 : interactionCtrl.getState(['angle', 'blur', 'letterSpacing', 'wordSpacing', 'color']);
     const stateStyles = (_a = stateParams === null || stateParams === void 0 ? void 0 : stateParams.styles) !== null && _a !== void 0 ? _a : {};

package/package.json

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

package/src/ItemGeometry/GenericGeometryController.ts

@@ -46,26 +46,14 @@ export class GenericGeometryController implements ItemGeometryController {
   }
 
   setOptions(options?: unknown) {
-    // no options
+
   }
 
   getAngle(): number {
-    return this.angle + this.getParentAngle();
+    return 0;
   }
 
   getScale() {
-    return this.scale * this.getParentScale();
-  }
-
-  private getParentAngle() {
-    if (!this.registry || !this.parentId) return 0;
-    const parentController = this.registry.getControllerById(this.parentId);
-    return parentController.getAngle();
-  }
-
-  getParentScale(): number {
-    if (!this.registry || !this.parentId) return 1;
-    const parentController = this.registry.getControllerById(this.parentId);
-    return parentController.getScale();
+    return 1;
   }
 }

package/src/ItemGeometry/RichTextGeometryController.ts

@@ -12,11 +12,6 @@ interface RichTextGeometryOptions {
   xSizing: SizingType;
 }
 
-interface Baseline {
-  y: number;
-  xEnd: number;
-}
-
 type GeomtryRegistry = {
   getControllerById: (itemId: string) => ItemGeometryController;
 };
@@ -130,31 +125,6 @@ export class RichTextGeometryController implements ItemGeometryController {
     return content;
   }
 
-  private getBaselines(): Baseline[] {
-    const boundary = this.getBoundary();
-    const contentBoundary = this.getContentBoundary();
-    const offsetY = contentBoundary.top - boundary.top;
-    const baselines: Baseline[] = [];
-    domDfs(Array.from(this.container.children), (el) => {
-      if (el.children.length !== 0) return;
-      const rects = el.getClientRects();
-      const styles = window.getComputedStyle(el);
-      const isTextCentered = styles.textAlign === 'center';
-      const ls = RichTextGeometryController.parseCssValue(styles.letterSpacing);
-      const metrics = measureFont(this.getFontStr(styles), el.textContent?.trim() ?? '');
-      const { baseline, fontBoxHeight, rightMargin } = metrics;
-      for (let i = 0; i <= rects.length - 1; i += 1) {
-        const rect = rects[i];
-        const halfLead = (rect.height - fontBoxHeight) / 2;
-        baselines.push({
-          xEnd: isTextCentered ? boundary.width : rect.right - rightMargin - ls - boundary.left,
-          y: rect.top + halfLead + baseline - boundary.top - offsetY
-        });
-      }
-    });
-    return baselines;
-  }
-
   private getFontStr(styles: CSSStyleDeclaration) {
     const fontSize = parseCSSNumber(styles.fontSize);
     const lineHeight = parseCSSNumber(styles.lineHeight);

package/src/components/items/RichTextItem/RichTextItem.tsx

@@ -29,12 +29,11 @@ export const RichTextItem: FC<ItemProps<TRichTextItem>> = ({ item, sectionId, on
     lineHeight,
     xSizing
   } = useRichTextItemValues(item, sectionId);
-  const geometryOptions = useMemo(() => ({ xSizing }), [xSizing]);
   const layoutValues: Record<string, any>[] = [item.area, item.layoutParams];
   const exemplary = useExemplary();
   const { layoutId } = useCurrentLayout();
   useRegisterResize(ref, onResize);
-  const geometry = useItemGeometry(item.id, ref, RichTextGeometryController, geometryOptions);
+  const geometry = useItemGeometry(item.id, ref, RichTextGeometryController, { xSizing });
   geometry?.setAngle(itemAngle!);
   const stateParams = interactionCtrl?.getState<number | string>(['angle', 'blur', 'letterSpacing', 'wordSpacing', 'color']);
   const stateStyles = stateParams?.styles ?? {};