@cntrl-site/sdk-nextjs 1.9.52 → 1.9.53

package/src/components/items/FileItem/useFileItem.ts

@@ -1,81 +1,81 @@
-import { ImageItem, KeyframeType, VideoItem } from '@cntrl-site/sdk';
-import { useKeyframeValue } from '../../../common/useKeyframeValue';
-import { useLayoutContext } from '../../useLayoutContext';
-
-const DEFAULT_FILL = [
-  {
-    id: 'default',
-    type: 'solid' as const,
-    value: 'rgba(0, 0, 0, 1)',
-    blendMode: 'normal'
-  }
-];
-
-export function useFileItem(item: ImageItem | VideoItem, sectionId: string) {
-  const layoutId = useLayoutContext();
-  const radius = useKeyframeValue(
-    item,
-    KeyframeType.BorderRadius,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'radius' in layoutParams ? layoutParams.radius : 0;
-    },
-    (animator, scroll, value) => value !== undefined ? animator.getRadius({ radius: value }, scroll).radius : undefined,
-    sectionId,
-    [layoutId]
-  );
-  const strokeWidth = useKeyframeValue(
-    item,
-    KeyframeType.BorderWidth,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'strokeWidth' in layoutParams ? layoutParams.strokeWidth : 0;
-    },
-    (animator, scroll, value) => value !== undefined ? animator.getBorderWidth({ borderWidth: value }, scroll).borderWidth : undefined,
-    sectionId,
-    [layoutId]
-  );
-
-  const opacity = useKeyframeValue(
-    item,
-    KeyframeType.Opacity,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'opacity' in layoutParams ? layoutParams.opacity : 1;
-    },
-    (animator, scroll, value) => value !== undefined ? animator.getOpacity({ opacity: value }, scroll).opacity : undefined,
-    sectionId,
-    [layoutId]
-  );
-
-  const strokeFill = useKeyframeValue(
-    item,
-    KeyframeType.BorderFill,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'strokeFill' in layoutParams ? layoutParams.strokeFill : DEFAULT_FILL;
-    },
-    (animator, scroll, value) => value ? animator.getBorderFill(value, scroll) : undefined,
-    sectionId,
-    [layoutId]
-  );
-
-  const blur = useKeyframeValue(
-    item,
-    KeyframeType.Blur,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'blur' in layoutParams ? layoutParams.blur : 0;
-    },
-    (animator, scroll, value) => value !== undefined ? animator.getBlur({ blur: value }, scroll).blur : undefined,
-    sectionId,
-    [layoutId]
-  );
-
-  return { radius, strokeWidth, opacity, strokeFill, blur };
-}
+import { ImageItem, KeyframeType, VideoItem } from '@cntrl-site/sdk';
+import { useKeyframeValue } from '../../../common/useKeyframeValue';
+import { useLayoutContext } from '../../useLayoutContext';
+
+const DEFAULT_FILL = [
+  {
+    id: 'default',
+    type: 'solid' as const,
+    value: 'rgba(0, 0, 0, 1)',
+    blendMode: 'normal'
+  }
+];
+
+export function useFileItem(item: ImageItem | VideoItem, sectionId: string) {
+  const layoutId = useLayoutContext();
+  const radius = useKeyframeValue(
+    item,
+    KeyframeType.BorderRadius,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'radius' in layoutParams ? layoutParams.radius : 0;
+    },
+    (animator, scroll, value) => value !== undefined ? animator.getRadius({ radius: value }, scroll).radius : undefined,
+    sectionId,
+    [layoutId]
+  );
+  const strokeWidth = useKeyframeValue(
+    item,
+    KeyframeType.BorderWidth,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'strokeWidth' in layoutParams ? layoutParams.strokeWidth : 0;
+    },
+    (animator, scroll, value) => value !== undefined ? animator.getBorderWidth({ borderWidth: value }, scroll).borderWidth : undefined,
+    sectionId,
+    [layoutId]
+  );
+
+  const opacity = useKeyframeValue(
+    item,
+    KeyframeType.Opacity,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'opacity' in layoutParams ? layoutParams.opacity : 1;
+    },
+    (animator, scroll, value) => value !== undefined ? animator.getOpacity({ opacity: value }, scroll).opacity : undefined,
+    sectionId,
+    [layoutId]
+  );
+
+  const strokeFill = useKeyframeValue(
+    item,
+    KeyframeType.BorderFill,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'strokeFill' in layoutParams ? layoutParams.strokeFill : DEFAULT_FILL;
+    },
+    (animator, scroll, value) => value ? animator.getBorderFill(value, scroll) : undefined,
+    sectionId,
+    [layoutId]
+  );
+
+  const blur = useKeyframeValue(
+    item,
+    KeyframeType.Blur,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'blur' in layoutParams ? layoutParams.blur : 0;
+    },
+    (animator, scroll, value) => value !== undefined ? animator.getBlur({ blur: value }, scroll).blur : undefined,
+    sectionId,
+    [layoutId]
+  );
+
+  return { radius, strokeWidth, opacity, strokeFill, blur };
+}

package/src/components/items/GroupItem/GroupItem.tsx

@@ -1,98 +1,98 @@
-import React, { FC, useContext, useEffect, useId, useState } from 'react';
-import { Item, ItemProps } from '../Item';
-import JSXStyle from 'styled-jsx/style';
-import { getLayoutStyles, GroupItem as TGroupItem } from '@cntrl-site/sdk';
-import { LinkWrapper } from '../LinkWrapper';
-import { useRegisterResize } from '../../../common/useRegisterResize';
-import { useCntrlContext } from '../../../provider/useCntrlContext';
-import { useItemAngle } from '../useItemAngle';
-import { useGroupItem } from './useGroupItem';
-import { getStyleFromItemStateAndParams } from '../../../utils/getStyleFromItemStateAndParams';
-import { CompoundChild } from '../CompoundItem/CompoundChild';
-import { useItemGeometry } from '../../../ItemGeometry/useItemGeometry';
-import { ItemGeometryContext } from '../../../ItemGeometry/ItemGeometryContext';
-
-export const GroupItem: FC<ItemProps<TGroupItem>> = ({ item, sectionId, onResize, interactionCtrl, onVisibilityChange, isInCompound }) => {
-  const id = useId();
-  const { items } = item;
-  const itemIds = items ? items.map(item => item.id) : [];
-  const itemAngle = useItemAngle(item, sectionId);
-  const { layouts } = useCntrlContext();
-  const { opacity: itemOpacity, blur: itemBlur } = useGroupItem(item, sectionId);
-  const layoutValues: Record<string, any>[] = [item.area, item.layoutParams];
-  const [ref, setRef] = useState<HTMLDivElement | null>(null);
-  useRegisterResize(ref, onResize);
-  useItemGeometry(item.id, ref);
-  const itemGeometryService = useContext(ItemGeometryContext);
-  const stateParams = interactionCtrl?.getState<number>(['opacity', 'angle', 'blur']);
-  const angle = getStyleFromItemStateAndParams(stateParams?.styles?.angle, itemAngle);
-  const opacity = getStyleFromItemStateAndParams(stateParams?.styles?.opacity, itemOpacity);
-  const blur = getStyleFromItemStateAndParams(stateParams?.styles?.blur, itemBlur);
-  const isInteractive = opacity !== 0 && opacity !== undefined;
-  useEffect(() => {
-    onVisibilityChange?.(isInteractive);
-  }, [isInteractive, onVisibilityChange]);
-  useEffect(() => {
-    // because on first render controllers not yet initialized
-    setTimeout(() => {
-      for (const id of itemIds) {
-        const hasItem = itemGeometryService.hasItem(id);
-        if (hasItem) {
-          const cntrl = itemGeometryService.getControllerById(id);
-          cntrl.setParentId(item.id);
-        }
-      }
-    }, 0);
-  }, [itemIds, item.id]);
-  return (
-    <LinkWrapper url={item.link?.url} target={item.link?.target}>
-      <>
-        <div
-          className={`group-${item.id}`}
-          ref={setRef}
-          style={{
-            ...(opacity !== undefined ? { opacity } : {}),
-            ...(angle !== undefined ? { transform: `rotate(${angle}deg)` } : {}),
-            ...(blur !== undefined ? { filter: `blur(${blur * 100}vw)` } : {}),
-            transition: stateParams?.transition ?? 'none',
-            willChange: blur !== 0 && blur !== undefined ? 'transform' : 'unset',
-          }}
-        >
-          {items && items.map(item => isInCompound ? (
-            <CompoundChild
-              item={item}
-              key={item.id}
-              sectionId={sectionId}
-              isParentVisible={isInteractive}
-            />
-          ) : (
-            <Item
-              item={item}
-              key={item.id}
-              sectionId={sectionId}
-              isParentVisible={isInteractive}
-              isInGroup
-            />
-          ))}
-        </div>
-        <JSXStyle id={id}>{`
-        .group-${item.id} {
-          position: absolute;
-          width: 100%;
-          height: 100%;
-          box-sizing: border-box;
-        }
-        ${getLayoutStyles(layouts, layoutValues, ([area, layoutParams]) => {
-      return (`
-            .group-${item.id} {
-              opacity: ${layoutParams.opacity};
-              filter: ${layoutParams.blur !== 0 ? `blur(${layoutParams.blur * 100}vw)` : 'unset'};
-              transform: rotate(${area.angle}deg);
-            }
-          `);
-    })}
-      `}</JSXStyle>
-      </>
-    </LinkWrapper>
-  );
-};
+import React, { FC, useContext, useEffect, useId, useState } from 'react';
+import { Item, ItemProps } from '../Item';
+import JSXStyle from 'styled-jsx/style';
+import { getLayoutStyles, GroupItem as TGroupItem } from '@cntrl-site/sdk';
+import { LinkWrapper } from '../LinkWrapper';
+import { useRegisterResize } from '../../../common/useRegisterResize';
+import { useCntrlContext } from '../../../provider/useCntrlContext';
+import { useItemAngle } from '../useItemAngle';
+import { useGroupItem } from './useGroupItem';
+import { getStyleFromItemStateAndParams } from '../../../utils/getStyleFromItemStateAndParams';
+import { CompoundChild } from '../CompoundItem/CompoundChild';
+import { useItemGeometry } from '../../../ItemGeometry/useItemGeometry';
+import { ItemGeometryContext } from '../../../ItemGeometry/ItemGeometryContext';
+
+export const GroupItem: FC<ItemProps<TGroupItem>> = ({ item, sectionId, onResize, interactionCtrl, onVisibilityChange, isInCompound }) => {
+  const id = useId();
+  const { items } = item;
+  const itemIds = items ? items.map(item => item.id) : [];
+  const itemAngle = useItemAngle(item, sectionId);
+  const { layouts } = useCntrlContext();
+  const { opacity: itemOpacity, blur: itemBlur } = useGroupItem(item, sectionId);
+  const layoutValues: Record<string, any>[] = [item.area, item.layoutParams];
+  const [ref, setRef] = useState<HTMLDivElement | null>(null);
+  useRegisterResize(ref, onResize);
+  useItemGeometry(item.id, ref);
+  const itemGeometryService = useContext(ItemGeometryContext);
+  const stateParams = interactionCtrl?.getState<number>(['opacity', 'angle', 'blur']);
+  const angle = getStyleFromItemStateAndParams(stateParams?.styles?.angle, itemAngle);
+  const opacity = getStyleFromItemStateAndParams(stateParams?.styles?.opacity, itemOpacity);
+  const blur = getStyleFromItemStateAndParams(stateParams?.styles?.blur, itemBlur);
+  const isInteractive = opacity !== 0 && opacity !== undefined;
+  useEffect(() => {
+    onVisibilityChange?.(isInteractive);
+  }, [isInteractive, onVisibilityChange]);
+  useEffect(() => {
+    // because on first render controllers not yet initialized
+    setTimeout(() => {
+      for (const id of itemIds) {
+        const hasItem = itemGeometryService.hasItem(id);
+        if (hasItem) {
+          const cntrl = itemGeometryService.getControllerById(id);
+          cntrl.setParentId(item.id);
+        }
+      }
+    }, 0);
+  }, [itemIds, item.id]);
+  return (
+    <LinkWrapper url={item.link?.url} target={item.link?.target}>
+      <>
+        <div
+          className={`group-${item.id}`}
+          ref={setRef}
+          style={{
+            ...(opacity !== undefined ? { opacity } : {}),
+            ...(angle !== undefined ? { transform: `rotate(${angle}deg)` } : {}),
+            ...(blur !== undefined ? { filter: `blur(${blur * 100}vw)` } : {}),
+            transition: stateParams?.transition ?? 'none',
+            willChange: blur !== 0 && blur !== undefined ? 'transform' : 'unset',
+          }}
+        >
+          {items && items.map(item => isInCompound ? (
+            <CompoundChild
+              item={item}
+              key={item.id}
+              sectionId={sectionId}
+              isParentVisible={isInteractive}
+            />
+          ) : (
+            <Item
+              item={item}
+              key={item.id}
+              sectionId={sectionId}
+              isParentVisible={isInteractive}
+              isInGroup
+            />
+          ))}
+        </div>
+        <JSXStyle id={id}>{`
+        .group-${item.id} {
+          position: absolute;
+          width: 100%;
+          height: 100%;
+          box-sizing: border-box;
+        }
+        ${getLayoutStyles(layouts, layoutValues, ([area, layoutParams]) => {
+      return (`
+            .group-${item.id} {
+              opacity: ${layoutParams.opacity};
+              filter: ${layoutParams.blur !== 0 ? `blur(${layoutParams.blur * 100}vw)` : 'unset'};
+              transform: rotate(${area.angle}deg);
+            }
+          `);
+    })}
+      `}</JSXStyle>
+      </>
+    </LinkWrapper>
+  );
+};

package/src/components/items/GroupItem/useGroupItem.ts

@@ -1,34 +1,34 @@
-import { useKeyframeValue } from '../../../common/useKeyframeValue';
-import { GroupItem, KeyframeType } from '@cntrl-site/sdk';
-import { useLayoutContext } from '../../useLayoutContext';
-
-export function useGroupItem(item: GroupItem, sectionId: string) {
-  const layoutId = useLayoutContext();
-  const opacity = useKeyframeValue(
-    item,
-    KeyframeType.Opacity,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'opacity' in layoutParams ? layoutParams.opacity : 1;
-    },
-    (animator, scroll, value) => value !== undefined ? animator.getOpacity({ opacity: value }, scroll).opacity : undefined,
-    sectionId,
-    [layoutId]
-  );
-
-  const blur = useKeyframeValue(
-    item,
-    KeyframeType.Blur,
-    (item, layoutId) => {
-      if (!layoutId) return;
-      const layoutParams = item.layoutParams[layoutId];
-      return 'blur' in layoutParams ? layoutParams.blur : 0;
-    },
-    (animator, scroll, value) => value !== undefined ? animator.getBlur({ blur: value }, scroll).blur : undefined,
-    sectionId,
-    [layoutId]
-  );
-
-  return { opacity, blur };
-}
+import { useKeyframeValue } from '../../../common/useKeyframeValue';
+import { GroupItem, KeyframeType } from '@cntrl-site/sdk';
+import { useLayoutContext } from '../../useLayoutContext';
+
+export function useGroupItem(item: GroupItem, sectionId: string) {
+  const layoutId = useLayoutContext();
+  const opacity = useKeyframeValue(
+    item,
+    KeyframeType.Opacity,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'opacity' in layoutParams ? layoutParams.opacity : 1;
+    },
+    (animator, scroll, value) => value !== undefined ? animator.getOpacity({ opacity: value }, scroll).opacity : undefined,
+    sectionId,
+    [layoutId]
+  );
+
+  const blur = useKeyframeValue(
+    item,
+    KeyframeType.Blur,
+    (item, layoutId) => {
+      if (!layoutId) return;
+      const layoutParams = item.layoutParams[layoutId];
+      return 'blur' in layoutParams ? layoutParams.blur : 0;
+    },
+    (animator, scroll, value) => value !== undefined ? animator.getBlur({ blur: value }, scroll).blur : undefined,
+    sectionId,
+    [layoutId]
+  );
+
+  return { opacity, blur };
+}