@cntrl-site/sdk-nextjs 1.8.40 → 1.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (134) hide show
  1. package/LICENSE +21 -21
  2. package/README.md +4 -4
  3. package/TODO.md +1 -1
  4. package/cntrl-site-sdk-nextjs-1.8.40.tgz +0 -0
  5. package/eslint.config.mjs +35 -35
  6. package/jest.config.js +6 -6
  7. package/lib/common/useItemFXData.js +7 -7
  8. package/lib/components/Article.js +5 -5
  9. package/lib/components/LayoutStyle.js +4 -4
  10. package/lib/components/Section/Section.js +27 -27
  11. package/lib/components/items/CodeEmbedItem/CodeEmbedItem.js +36 -36
  12. package/lib/components/items/ComponentItem/ComponentItem.js +13 -13
  13. package/lib/components/items/CompoundItem/CompoundChild.js +20 -20
  14. package/lib/components/items/CompoundItem/CompoundItem.js +14 -14
  15. package/lib/components/items/CustomItem/CustomItem.js +9 -9
  16. package/lib/components/items/EmbedVideoItem/VimeoEmbed.js +24 -24
  17. package/lib/components/items/EmbedVideoItem/YoutubeEmbed.js +27 -27
  18. package/lib/components/items/FileItem/ImageItem.js +85 -58
  19. package/lib/components/items/FileItem/VideoItem.js +107 -80
  20. package/lib/components/items/FileItem/useFileItem.js +12 -5
  21. package/lib/components/items/GroupItem/GroupItem.js +14 -14
  22. package/lib/components/items/Item.js +30 -30
  23. package/lib/components/items/RectangleItem/RectangleItem.js +92 -36
  24. package/lib/components/items/RectangleItem/useRectangleItem.js +15 -8
  25. package/lib/components/items/RichTextItem/RichTextItem.js +22 -22
  26. package/lib/interactions/CSSPropertyNameMap.js +18 -18
  27. package/lib/utils/Animator/Animator.js +171 -19
  28. package/lib/utils/RichTextConverter/RichTextConverter.js +21 -21
  29. package/lib/utils/areFillsVisible/areFillsVisible.js +23 -0
  30. package/lib/utils/getFill.js +43 -0
  31. package/package.json +58 -57
  32. package/src/common/useCurrentLayout.ts +52 -52
  33. package/src/common/useExemplary.ts +9 -9
  34. package/src/common/useItemFXData.ts +47 -47
  35. package/src/common/useKeyframeValue.ts +85 -85
  36. package/src/common/useRegisterResize.ts +16 -16
  37. package/src/components/Article.tsx +73 -73
  38. package/src/components/ArticleWrapper.tsx +21 -21
  39. package/src/components/Head.tsx +56 -56
  40. package/src/components/LayoutStyle.tsx +21 -21
  41. package/src/components/Page.tsx +33 -33
  42. package/src/components/ScrollPlaybackVideo.tsx +56 -56
  43. package/src/components/Section/Section.tsx +127 -127
  44. package/src/components/Section/SectionImage.tsx +48 -48
  45. package/src/components/Section/SectionVideo.tsx +144 -144
  46. package/src/components/Section/useSectionColor.ts +19 -19
  47. package/src/components/Section/useSectionHeightMap.ts +19 -19
  48. package/src/components/items/CodeEmbedItem/CodeEmbedItem.tsx +145 -145
  49. package/src/components/items/CodeEmbedItem/useCodeEmbedItem.ts +36 -36
  50. package/src/components/items/ComponentItem/ComponentItem.tsx +67 -67
  51. package/src/components/items/ComponentItem/useComponentItem.ts +35 -35
  52. package/src/components/items/CompoundItem/CompoundChild.tsx +150 -150
  53. package/src/components/items/CompoundItem/CompoundItem.tsx +70 -70
  54. package/src/components/items/CompoundItem/useCompoundItem.ts +21 -21
  55. package/src/components/items/CustomItem/CustomItem.tsx +48 -48
  56. package/src/components/items/EmbedVideoItem/VimeoEmbed.tsx +206 -206
  57. package/src/components/items/EmbedVideoItem/YoutubeEmbed.tsx +193 -193
  58. package/src/components/items/EmbedVideoItem/useEmbedVideoItem.ts +46 -46
  59. package/src/components/items/FileItem/ImageItem.tsx +211 -158
  60. package/src/components/items/FileItem/VideoItem.tsx +328 -275
  61. package/src/components/items/FileItem/useFileItem.ts +81 -73
  62. package/src/components/items/GroupItem/GroupItem.tsx +81 -81
  63. package/src/components/items/GroupItem/useGroupItem.ts +34 -34
  64. package/src/components/items/Item.tsx +251 -251
  65. package/src/components/items/LinkWrapper.tsx +39 -39
  66. package/src/components/items/RectangleItem/RectangleItem.tsx +199 -97
  67. package/src/components/items/RectangleItem/useRectangleItem.ts +89 -82
  68. package/src/components/items/RichTextItem/RichTextItem.tsx +107 -107
  69. package/src/components/items/RichTextItem/useRichTextItem.ts +12 -12
  70. package/src/components/items/RichTextWrapper.tsx +15 -15
  71. package/src/components/items/itemsMap.ts +28 -28
  72. package/src/components/items/useDraggable.ts +252 -252
  73. package/src/components/items/useItemAngle.ts +13 -13
  74. package/src/components/items/useItemArea.ts +35 -35
  75. package/src/components/items/useItemPointerEvents.ts +23 -23
  76. package/src/components/items/useItemScale.ts +17 -17
  77. package/src/components/items/useItemTriggers.ts +15 -15
  78. package/src/components/items/useRichTextItemValues.ts +65 -65
  79. package/src/components/items/useSizing.ts +25 -25
  80. package/src/components/items/useStickyItemTop.ts +21 -21
  81. package/src/components/useLayoutContext.ts +7 -7
  82. package/src/index.ts +24 -24
  83. package/src/interactions/CSSPropertyNameMap.ts +37 -38
  84. package/src/interactions/InteractionsRegistry.ts +380 -380
  85. package/src/interactions/ItemInteractionCtrl.ts +78 -78
  86. package/src/interactions/getTransition.ts +27 -27
  87. package/src/interactions/types.ts +36 -36
  88. package/src/interactions/useItemInteractionCtrl.ts +18 -18
  89. package/src/provider/ArticleRectContext.ts +4 -4
  90. package/src/provider/CntrlContext.ts +5 -5
  91. package/src/provider/CntrlProvider.tsx +11 -11
  92. package/src/provider/CntrlSdkContext.ts +83 -83
  93. package/src/provider/CustomItemRegistry.ts +14 -14
  94. package/src/provider/CustomItemTypes.ts +3 -3
  95. package/src/provider/CustomSectionRegistry.ts +25 -25
  96. package/src/provider/InteractionsContext.tsx +59 -59
  97. package/src/provider/Keyframes.ts +11 -11
  98. package/src/provider/KeyframesContext.ts +5 -5
  99. package/src/provider/LayoutContext.ts +3 -3
  100. package/src/provider/WebGLContextManagerContext.tsx +4 -4
  101. package/src/provider/defaultContext.ts +8 -8
  102. package/src/provider/useCntrlContext.ts +8 -8
  103. package/src/styled-jsx.d.ts +1 -1
  104. package/src/utils/Animator/Animator.ts +571 -371
  105. package/src/utils/ArticleRectManager/ArticleRectObserver.ts +93 -93
  106. package/src/utils/ArticleRectManager/useArticleRectObserver.ts +17 -17
  107. package/src/utils/ArticleRectManager/useSectionRegistry.ts +11 -11
  108. package/src/utils/EventEmitter.ts +41 -41
  109. package/src/utils/RichTextConverter/RichTextConverter.tsx +326 -326
  110. package/src/utils/ScaleAnchorMap.ts +13 -13
  111. package/src/utils/StickyManager/StickyManager.ts +23 -23
  112. package/src/utils/Youtube/YouTubeIframeApiLoader.ts +58 -58
  113. package/src/utils/Youtube/YoutubeIframeApi.ts +101 -101
  114. package/src/utils/Youtube/useYouTubeIframeApi.ts +12 -12
  115. package/src/utils/areFillsVisible/areFillsVisible.test.ts +63 -0
  116. package/src/utils/areFillsVisible/areFillsVisible.ts +37 -0
  117. package/src/utils/binSearchInsertAt.ts +33 -33
  118. package/src/utils/castObject.ts +10 -10
  119. package/src/utils/checkOverflowClipSupport.ts +13 -13
  120. package/src/utils/effects/useImageFx.ts +156 -156
  121. package/src/utils/effects/useVideoFx.ts +158 -158
  122. package/src/utils/getAnchoredItemTop.ts +12 -12
  123. package/src/utils/getCompoundBoundaryStyles.ts +60 -60
  124. package/src/utils/getFill.ts +46 -0
  125. package/src/utils/getFontFamilyValue.ts +3 -3
  126. package/src/utils/getInvertedRanges.ts +43 -43
  127. package/src/utils/getItemTopStyle.ts +14 -14
  128. package/src/utils/getStyleFromItemStateAndParams.ts +8 -8
  129. package/src/utils/getValidYoutubeUrl.ts +29 -29
  130. package/src/utils/isItemType.ts +5 -5
  131. package/src/utils/rangeMap.ts +13 -13
  132. package/src/utils/useElementRect.ts +23 -23
  133. package/src/provider/InteractionsContext.old.tsx +0 -66
  134. package/src/provider/InteractionsContext.test.tsx +0 -97
@@ -61,13 +61,13 @@ class RichTextConverter {
61
61
  const kids = [];
62
62
  layouts.forEach(l => {
63
63
  const ta = richText.layoutParams[l.id].textAlign;
64
- styleRules[l.id].push(`
65
- .${blockClass} {
66
- display: ${group.some(g => g.layout === l.id) ? 'block' : 'none'};
67
- text-align: ${ta};
68
- white-space: pre-wrap;
69
- overflow-wrap: break-word;
70
- }
64
+ styleRules[l.id].push(`
65
+ .${blockClass} {
66
+ display: ${group.some(g => g.layout === l.id) ? 'block' : 'none'};
67
+ text-align: ${ta};
68
+ white-space: pre-wrap;
69
+ overflow-wrap: break-word;
70
+ }
71
71
  `);
72
72
  });
73
73
  const item = group[0];
@@ -111,18 +111,18 @@ class RichTextConverter {
111
111
  if (lineHeight === null || lineHeight === void 0 ? void 0 : lineHeight.value) {
112
112
  currentLineHeight[item.layout] = lineHeight.value;
113
113
  }
114
- styleRules[item.layout].push(`
115
- .${blockClass} .s-${styleGroup.start}-${styleGroup.end} {
116
- ${styleGroup.styles.map(s => RichTextConverter.fromRangeStylesToInline(s, exemplary)).join('\n')}
117
- }
114
+ styleRules[item.layout].push(`
115
+ .${blockClass} .s-${styleGroup.start}-${styleGroup.end} {
116
+ ${styleGroup.styles.map(s => RichTextConverter.fromRangeStylesToInline(s, exemplary)).join('\n')}
117
+ }
118
118
  `);
119
119
  if (color) {
120
- styleRules[item.layout].push(`
121
- @supports not (color: oklch(42% 0.3 90 / 1)) {
122
- .${blockClass} .s-${styleGroup.start}-${styleGroup.end} {
123
- color: ${color_1.CntrlColor.parse(getResolvedValue(color.value, 'COLOR')).fmt('rgba')};
124
- }
125
- }
120
+ styleRules[item.layout].push(`
121
+ @supports not (color: oklch(42% 0.3 90 / 1)) {
122
+ .${blockClass} .s-${styleGroup.start}-${styleGroup.end} {
123
+ color: ${color_1.CntrlColor.parse(getResolvedValue(color.value, 'COLOR')).fmt('rgba')};
124
+ }
125
+ }
126
126
  `);
127
127
  }
128
128
  }
@@ -131,10 +131,10 @@ class RichTextConverter {
131
131
  root.push((0, jsx_runtime_1.jsx)("div", { className: blockClass, children: kids }, blockClass));
132
132
  }
133
133
  }
134
- const styles = layouts.map(l => `
135
- ${(0, sdk_1.getLayoutMediaQuery)(l.id, layouts)} {
136
- ${styleRules[l.id].join('\n')}
137
- }
134
+ const styles = layouts.map(l => `
135
+ ${(0, sdk_1.getLayoutMediaQuery)(l.id, layouts)} {
136
+ ${styleRules[l.id].join('\n')}
137
+ }
138
138
  `).join('\n');
139
139
  return [
140
140
  root,
@@ -0,0 +1,23 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.areFillsVisible = void 0;
4
+ const color_1 = require("@cntrl-site/color");
5
+ function areFillsVisible(fills) {
6
+ return fills.some(fill => {
7
+ switch (fill.type) {
8
+ case 'solid':
9
+ return color_1.CntrlColor.parse(fill.value).getAlpha() !== 0;
10
+ case 'linear-gradient':
11
+ return fill.colors.some(color => color_1.CntrlColor.parse(color.value).getAlpha() !== 0);
12
+ case 'radial-gradient':
13
+ return fill.colors.some(color => color_1.CntrlColor.parse(color.value).getAlpha() !== 0);
14
+ case 'conic-gradient':
15
+ return fill.colors.some(color => color_1.CntrlColor.parse(color.value).getAlpha() !== 0);
16
+ case 'image':
17
+ return fill.opacity !== 0;
18
+ default:
19
+ return true;
20
+ }
21
+ });
22
+ }
23
+ exports.areFillsVisible = areFillsVisible;
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getFill = void 0;
4
+ function getFill(fill) {
5
+ var _a;
6
+ if (fill.type === 'linear-gradient' && Array.isArray(fill.colors)) {
7
+ return `linear-gradient(${fill.angle}deg, ${fill.colors
8
+ .map(c => `${c.value} ${c.position}%`)
9
+ .join(', ')})`;
10
+ }
11
+ if (fill.type === 'radial-gradient' && Array.isArray(fill.colors)) {
12
+ const center = fill.center
13
+ ? `${fill.center[0] * 100}% ${fill.center[1] * 100}%`
14
+ : '50% 50%';
15
+ const diameter = fill.diameter;
16
+ return `radial-gradient(circle ${diameter * 100} at ${center}, ${fill.colors
17
+ .map(c => `${c.value} ${c.position}%`)
18
+ .join(', ')})`;
19
+ }
20
+ if (fill.type === 'conic-gradient' && Array.isArray(fill.colors)) {
21
+ const center = fill.center
22
+ ? `${fill.center[0] * 100}% ${fill.center[1] * 100}%`
23
+ : '50% 50%';
24
+ const angle = ((_a = fill.angle) !== null && _a !== void 0 ? _a : 0);
25
+ const hasMultipleStops = fill.colors.length > 1;
26
+ const lastStop = fill.colors[fill.colors.length - 1];
27
+ const shouldAppendWrapStop = hasMultipleStops && typeof lastStop.position === 'number' && lastStop.position < 100;
28
+ const colorsWithWrap = shouldAppendWrapStop
29
+ ? [...fill.colors, { value: fill.colors[0].value, position: 100 }]
30
+ : fill.colors;
31
+ return `conic-gradient(from ${angle + 90}deg at ${center}, ${colorsWithWrap
32
+ .map(c => `${c.value} ${c.position}%`)
33
+ .join(', ')})`;
34
+ }
35
+ if (fill.type === 'image' && fill.src) {
36
+ return `url(${fill.src})`;
37
+ }
38
+ if (fill.type === 'solid') {
39
+ return fill.value;
40
+ }
41
+ return 'transparent';
42
+ }
43
+ exports.getFill = getFill;
package/package.json CHANGED
@@ -1,57 +1,58 @@
1
- {
2
- "name": "@cntrl-site/sdk-nextjs",
3
- "version": "1.8.40",
4
- "description": "SDK for Next.js",
5
- "author": "arsen@momdesign.nyc",
6
- "license": "MIT",
7
- "homepage": "https://github.com/cntrl-site/sdk-nextjs#readme",
8
- "repository": {
9
- "type": "git",
10
- "url": "git+https://github.com/cntrl-site/sdk-nextjs.git"
11
- },
12
- "bugs": {
13
- "url": "https://github.com/cntrl-site/sdk-nextjs/issues"
14
- },
15
- "main": "lib/index.js",
16
- "types": "src/index.ts",
17
- "scripts": {
18
- "test": "jest",
19
- "prebuild": "rm -rf ./lib",
20
- "build": "tsc --project tsconfig.build.json",
21
- "prepublishOnly": "NODE_ENV=production npm run build"
22
- },
23
- "peerDependencies": {
24
- "@types/lodash.isequal": "^4.5.6",
25
- "lodash.isequal": "^4.5.0",
26
- "next": "^14.2.3",
27
- "react": "^18.3.1",
28
- "react-dom": "^18.3.1"
29
- },
30
- "dependencies": {
31
- "@antfu/eslint-config": "^3.8.0",
32
- "@cntrl-site/color": "^1.0.0",
33
- "@cntrl-site/effects": "^1.4.0",
34
- "@cntrl-site/sdk": "^1.23.2",
35
- "@types/vimeo__player": "^2.18.0",
36
- "@vimeo/player": "^2.25.0",
37
- "html-react-parser": "^3.0.1",
38
- "resize-observer-polyfill": "^1.5.1",
39
- "styled-jsx": "^5.0.2"
40
- },
41
- "devDependencies": {
42
- "@testing-library/jest-dom": "^6.4.8",
43
- "@testing-library/react": "^16.0.0",
44
- "@tsconfig/node16": "^1.0.3",
45
- "@tsconfig/recommended": "^1.0.1",
46
- "@types/jest": "^29.5.12",
47
- "@types/node": "^18.11.7",
48
- "@types/react": "^18.0.15",
49
- "jest": "^29.7.0",
50
- "jest-environment-jsdom": "^29.7.0",
51
- "ts-jest": "^29.0.3",
52
- "typescript": "^5.2.2"
53
- },
54
- "directories": {
55
- "lib": "lib"
56
- }
57
- }
1
+ {
2
+ "name": "@cntrl-site/sdk-nextjs",
3
+ "version": "1.9.1",
4
+ "description": "SDK for Next.js",
5
+ "author": "arsen@momdesign.nyc",
6
+ "license": "MIT",
7
+ "homepage": "https://github.com/cntrl-site/sdk-nextjs#readme",
8
+ "repository": {
9
+ "type": "git",
10
+ "url": "git+https://github.com/cntrl-site/sdk-nextjs.git"
11
+ },
12
+ "bugs": {
13
+ "url": "https://github.com/cntrl-site/sdk-nextjs/issues"
14
+ },
15
+ "main": "lib/index.js",
16
+ "types": "src/index.ts",
17
+ "scripts": {
18
+ "test": "jest",
19
+ "prebuild": "rimraf ./lib",
20
+ "build": "tsc --project tsconfig.build.json",
21
+ "prepublishOnly": "set NODE_ENV=production && npm run build"
22
+ },
23
+ "peerDependencies": {
24
+ "@types/lodash.isequal": "^4.5.6",
25
+ "lodash.isequal": "^4.5.0",
26
+ "next": "^14.2.3",
27
+ "react": "^18.3.1",
28
+ "react-dom": "^18.3.1"
29
+ },
30
+ "dependencies": {
31
+ "@antfu/eslint-config": "^3.8.0",
32
+ "@cntrl-site/color": "^1.0.0",
33
+ "@cntrl-site/effects": "^1.4.0",
34
+ "@cntrl-site/sdk": "^1.24.1",
35
+ "@types/vimeo__player": "^2.18.0",
36
+ "@vimeo/player": "^2.25.0",
37
+ "html-react-parser": "^3.0.1",
38
+ "resize-observer-polyfill": "^1.5.1",
39
+ "styled-jsx": "^5.0.2"
40
+ },
41
+ "devDependencies": {
42
+ "@testing-library/jest-dom": "^6.4.8",
43
+ "@testing-library/react": "^16.0.0",
44
+ "@tsconfig/node16": "^1.0.3",
45
+ "@tsconfig/recommended": "^1.0.1",
46
+ "@types/jest": "^29.5.12",
47
+ "@types/node": "^18.11.7",
48
+ "@types/react": "^18.0.15",
49
+ "jest": "^29.7.0",
50
+ "jest-environment-jsdom": "^29.7.0",
51
+ "rimraf": "^6.0.1",
52
+ "ts-jest": "^29.0.3",
53
+ "typescript": "^5.2.2"
54
+ },
55
+ "directories": {
56
+ "lib": "lib"
57
+ }
58
+ }
@@ -1,52 +1,52 @@
1
- import { useCntrlContext } from '../provider/useCntrlContext';
2
- import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
3
- import { ArticleRectContext } from '../provider/ArticleRectContext';
4
-
5
- interface LayoutData {
6
- layoutId: string;
7
- exemplary: number;
8
- start: number;
9
- end: number;
10
- }
11
-
12
- type UseCurrentLayoutReturn = {
13
- layoutId: string | undefined;
14
- layoutDeviation: number;
15
- };
16
-
17
- export function useCurrentLayout(): UseCurrentLayoutReturn {
18
- const { layouts } = useCntrlContext();
19
- const articleRectObserver = useContext(ArticleRectContext);
20
- const layoutRanges = useMemo(() => {
21
- const sorted = layouts.slice().sort((la, lb) => la.startsWith - lb.startsWith);
22
- return sorted.reduce<LayoutData[]>((acc, layout, i, layouts) => {
23
- const next = layouts[i + 1];
24
- return [
25
- ...acc,
26
- {
27
- layoutId: layout.id,
28
- exemplary: layout.exemplary,
29
- start: layout.startsWith,
30
- end: next ? next.startsWith : Number.MAX_SAFE_INTEGER
31
- }
32
- ];
33
- }, []);
34
- }, [layouts]);
35
- const getCurrentLayout = useCallback((articleWidth: number) => {
36
- const range = layoutRanges.find(l => articleWidth >= l.start && articleWidth < l.end);
37
- return range;
38
- }, [layoutRanges]);
39
- const [layoutId, setLayoutId] = useState<string | undefined>(undefined);
40
- const [deviation, setDeviation] = useState(1);
41
- useEffect(() => {
42
- if (!articleRectObserver) return;
43
- return articleRectObserver.on('resize', () => {
44
- const articleWidth = articleRectObserver.width;
45
- const { layoutId, exemplary } = getCurrentLayout(articleWidth)!;
46
- setLayoutId(layoutId);
47
- setDeviation(articleWidth / exemplary);
48
- });
49
- }, [articleRectObserver, getCurrentLayout]);
50
-
51
- return { layoutId, layoutDeviation: deviation };
52
- }
1
+ import { useCntrlContext } from '../provider/useCntrlContext';
2
+ import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
3
+ import { ArticleRectContext } from '../provider/ArticleRectContext';
4
+
5
+ interface LayoutData {
6
+ layoutId: string;
7
+ exemplary: number;
8
+ start: number;
9
+ end: number;
10
+ }
11
+
12
+ type UseCurrentLayoutReturn = {
13
+ layoutId: string | undefined;
14
+ layoutDeviation: number;
15
+ };
16
+
17
+ export function useCurrentLayout(): UseCurrentLayoutReturn {
18
+ const { layouts } = useCntrlContext();
19
+ const articleRectObserver = useContext(ArticleRectContext);
20
+ const layoutRanges = useMemo(() => {
21
+ const sorted = layouts.slice().sort((la, lb) => la.startsWith - lb.startsWith);
22
+ return sorted.reduce<LayoutData[]>((acc, layout, i, layouts) => {
23
+ const next = layouts[i + 1];
24
+ return [
25
+ ...acc,
26
+ {
27
+ layoutId: layout.id,
28
+ exemplary: layout.exemplary,
29
+ start: layout.startsWith,
30
+ end: next ? next.startsWith : Number.MAX_SAFE_INTEGER
31
+ }
32
+ ];
33
+ }, []);
34
+ }, [layouts]);
35
+ const getCurrentLayout = useCallback((articleWidth: number) => {
36
+ const range = layoutRanges.find(l => articleWidth >= l.start && articleWidth < l.end);
37
+ return range;
38
+ }, [layoutRanges]);
39
+ const [layoutId, setLayoutId] = useState<string | undefined>(undefined);
40
+ const [deviation, setDeviation] = useState(1);
41
+ useEffect(() => {
42
+ if (!articleRectObserver) return;
43
+ return articleRectObserver.on('resize', () => {
44
+ const articleWidth = articleRectObserver.width;
45
+ const { layoutId, exemplary } = getCurrentLayout(articleWidth)!;
46
+ setLayoutId(layoutId);
47
+ setDeviation(articleWidth / exemplary);
48
+ });
49
+ }, [articleRectObserver, getCurrentLayout]);
50
+
51
+ return { layoutId, layoutDeviation: deviation };
52
+ }
@@ -1,9 +1,9 @@
1
- import { useCntrlContext } from "../provider/useCntrlContext";
2
- import { useLayoutContext } from "../components/useLayoutContext";
3
-
4
- export const useExemplary = () => {
5
- const { layouts } = useCntrlContext();
6
- const layout = useLayoutContext();
7
- const exemplary = layouts.find(l => l.id === layout)?.exemplary ?? 1;
8
- return exemplary;
9
- };
1
+ import { useCntrlContext } from "../provider/useCntrlContext";
2
+ import { useLayoutContext } from "../components/useLayoutContext";
3
+
4
+ export const useExemplary = () => {
5
+ const { layouts } = useCntrlContext();
6
+ const layout = useLayoutContext();
7
+ const exemplary = layouts.find(l => l.id === layout)?.exemplary ?? 1;
8
+ return exemplary;
9
+ };
@@ -1,47 +1,47 @@
1
- import { ImageItem, KeyframeType, VideoItem } from '@cntrl-site/sdk';
2
- import { useKeyframeValue } from './useKeyframeValue';
3
-
4
- const baseVariables = `precision mediump float;
5
- uniform sampler2D u_image;
6
- uniform sampler2D u_pattern;
7
- uniform vec2 u_imgDimensions;
8
- uniform vec2 u_patternDimensions;
9
- uniform float u_time;
10
- uniform vec2 u_cursor;
11
- varying vec2 v_texCoord;`;
12
-
13
- export function useItemFXData(item: ImageItem | VideoItem, sectionId: string): FXData {
14
- const { fragmentShader: shaderBody, FXControls } = item.commonParams;
15
- const controls = FXControls ?? [];
16
- const controlsVariables = controls.map((c) => `uniform ${c.type} ${c.shaderParam};`)
17
- .join('\n');
18
- const fragmentShader = `${baseVariables}\n${controlsVariables}\n${shaderBody}`;
19
- const controlsValues = useKeyframeValue(
20
- item,
21
- KeyframeType.FXParams,
22
- () => {
23
- const defaultValue = controls.reduce<Record<string, ControlValue>>((acc, control) => {
24
- if (Array.isArray(control.value)) {
25
- acc[control.shaderParam] = control.value[0];
26
- } else {
27
- acc[control.shaderParam] = control.value;
28
- }
29
- return acc;
30
- }, {});
31
- return defaultValue;
32
- },
33
- (animator, scroll, value) => animator.getFXParams(value, scroll),
34
- sectionId,
35
- );
36
- return {
37
- fragmentShader,
38
- controlsValues
39
- };
40
- }
41
-
42
- type FXData = {
43
- fragmentShader: string;
44
- controlsValues: Record<string, ControlValue>;
45
- }
46
-
47
- type ControlValue = number;
1
+ import { ImageItem, KeyframeType, VideoItem } from '@cntrl-site/sdk';
2
+ import { useKeyframeValue } from './useKeyframeValue';
3
+
4
+ const baseVariables = `precision mediump float;
5
+ uniform sampler2D u_image;
6
+ uniform sampler2D u_pattern;
7
+ uniform vec2 u_imgDimensions;
8
+ uniform vec2 u_patternDimensions;
9
+ uniform float u_time;
10
+ uniform vec2 u_cursor;
11
+ varying vec2 v_texCoord;`;
12
+
13
+ export function useItemFXData(item: ImageItem | VideoItem, sectionId: string): FXData {
14
+ const { fragmentShader: shaderBody, FXControls } = item.commonParams;
15
+ const controls = FXControls ?? [];
16
+ const controlsVariables = controls.map((c) => `uniform ${c.type} ${c.shaderParam};`)
17
+ .join('\n');
18
+ const fragmentShader = `${baseVariables}\n${controlsVariables}\n${shaderBody}`;
19
+ const controlsValues = useKeyframeValue(
20
+ item,
21
+ KeyframeType.FXParams,
22
+ () => {
23
+ const defaultValue = controls.reduce<Record<string, ControlValue>>((acc, control) => {
24
+ if (Array.isArray(control.value)) {
25
+ acc[control.shaderParam] = control.value[0];
26
+ } else {
27
+ acc[control.shaderParam] = control.value;
28
+ }
29
+ return acc;
30
+ }, {});
31
+ return defaultValue;
32
+ },
33
+ (animator, scroll, value) => animator.getFXParams(value, scroll),
34
+ sectionId,
35
+ );
36
+ return {
37
+ fragmentShader,
38
+ controlsValues
39
+ };
40
+ }
41
+
42
+ type FXData = {
43
+ fragmentShader: string;
44
+ controlsValues: Record<string, ControlValue>;
45
+ }
46
+
47
+ type ControlValue = number;
@@ -1,85 +1,85 @@
1
- import { KeyframeType, ItemAny } from '@cntrl-site/sdk';
2
- import isEqual from 'lodash.isequal';
3
- import { DependencyList, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
4
- import { ArticleRectContext } from '../provider/ArticleRectContext';
5
- import { KeyframesContext } from '../provider/KeyframesContext';
6
- import { AnimationData, Animator } from '../utils/Animator/Animator';
7
- import { useLayoutContext } from '../components/useLayoutContext';
8
-
9
- export type AnimatorGetter<T> = (animator: Animator, scroll: number, value: T) => T;
10
- type ItemParamGetter<T> = (item: ItemAny, layoutId: string | undefined) => T;
11
- const emptyDeps: DependencyList = [];
12
-
13
- export function useKeyframeValue<T>(
14
- item: ItemAny,
15
- type: KeyframeType,
16
- itemParamsGetter: ItemParamGetter<T>,
17
- animatorGetter: AnimatorGetter<T>,
18
- sectionId: string,
19
- deps: DependencyList = emptyDeps
20
- ): T {
21
- const animatorGetterRef = useRef(animatorGetter);
22
- const itemParamsGetterRef = useRef(itemParamsGetter);
23
-
24
- animatorGetterRef.current = animatorGetter;
25
- itemParamsGetterRef.current = itemParamsGetter;
26
-
27
- const articleRectObserver = useContext(ArticleRectContext);
28
- const layoutId = useLayoutContext();
29
- const keyframesRepo = useContext(KeyframesContext);
30
- const keyframes = useMemo(() => keyframesRepo.getItemKeyframes(item.id).filter(kf => kf.type === type), [item.id, keyframesRepo, type]);
31
- const paramValue = useMemo<T>(() => {
32
- return itemParamsGetterRef.current(item, layoutId);
33
- }, [item, layoutId, ...deps]);
34
-
35
- const [adjustedValue, setAdjustedValue] = useState<T>(paramValue);
36
- const adjustedValueRef = useRef<T>(adjustedValue);
37
- adjustedValueRef.current = adjustedValue;
38
-
39
- const animator = useMemo(() => {
40
- if (!layoutId || !keyframes.length) return;
41
- const animationData = keyframes
42
- .filter(k => k.layoutId === layoutId)
43
- .map<AnimationData<KeyframeType>>(({ position, type, value }) => ({
44
- position,
45
- type,
46
- value
47
- }));
48
- return new Animator(animationData);
49
- }, [keyframes, layoutId]);
50
-
51
- const handleKeyframeValue = useCallback((scroll: number) => {
52
- if (!animator) return;
53
- const newValue = animatorGetterRef.current(animator, scroll, paramValue);
54
- if (!isEqual(newValue, adjustedValueRef.current)) {
55
- setAdjustedValue(newValue);
56
- }
57
- }, [animator, paramValue]);
58
-
59
- useEffect(() => {
60
- setAdjustedValue(paramValue);
61
- }, [paramValue]);
62
-
63
- useEffect(() => {
64
- if (!articleRectObserver || !animator) return;
65
- const scroll = articleRectObserver.getSectionScroll(sectionId);
66
- handleKeyframeValue(scroll);
67
- }, [articleRectObserver, handleKeyframeValue, animator]);
68
-
69
- useEffect(() => {
70
- if (!articleRectObserver || !animator) return;
71
- return articleRectObserver.on('resize', () => {
72
- const scroll = articleRectObserver.getSectionScroll(sectionId);
73
- handleKeyframeValue(scroll);
74
- });
75
- }, [handleKeyframeValue, articleRectObserver, animator]);
76
-
77
- useEffect(() => {
78
- if (!articleRectObserver || !animator) return;
79
- return articleRectObserver.on('scroll', () => {
80
- const scroll = articleRectObserver.getSectionScroll(sectionId);
81
- handleKeyframeValue(scroll);
82
- });
83
- }, [handleKeyframeValue, articleRectObserver, animator]);
84
- return keyframes.length ? adjustedValue : paramValue;
85
- }
1
+ import { KeyframeType, ItemAny } from '@cntrl-site/sdk';
2
+ import isEqual from 'lodash.isequal';
3
+ import { DependencyList, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
4
+ import { ArticleRectContext } from '../provider/ArticleRectContext';
5
+ import { KeyframesContext } from '../provider/KeyframesContext';
6
+ import { AnimationData, Animator } from '../utils/Animator/Animator';
7
+ import { useLayoutContext } from '../components/useLayoutContext';
8
+
9
+ export type AnimatorGetter<T> = (animator: Animator, scroll: number, value: T) => T;
10
+ type ItemParamGetter<T> = (item: ItemAny, layoutId: string | undefined) => T;
11
+ const emptyDeps: DependencyList = [];
12
+
13
+ export function useKeyframeValue<T>(
14
+ item: ItemAny,
15
+ type: KeyframeType,
16
+ itemParamsGetter: ItemParamGetter<T>,
17
+ animatorGetter: AnimatorGetter<T>,
18
+ sectionId: string,
19
+ deps: DependencyList = emptyDeps
20
+ ): T {
21
+ const animatorGetterRef = useRef(animatorGetter);
22
+ const itemParamsGetterRef = useRef(itemParamsGetter);
23
+
24
+ animatorGetterRef.current = animatorGetter;
25
+ itemParamsGetterRef.current = itemParamsGetter;
26
+
27
+ const articleRectObserver = useContext(ArticleRectContext);
28
+ const layoutId = useLayoutContext();
29
+ const keyframesRepo = useContext(KeyframesContext);
30
+ const keyframes = useMemo(() => keyframesRepo.getItemKeyframes(item.id).filter(kf => kf.type === type), [item.id, keyframesRepo, type]);
31
+ const paramValue = useMemo<T>(() => {
32
+ return itemParamsGetterRef.current(item, layoutId);
33
+ }, [item, layoutId, ...deps]);
34
+
35
+ const [adjustedValue, setAdjustedValue] = useState<T>(paramValue);
36
+ const adjustedValueRef = useRef<T>(adjustedValue);
37
+ adjustedValueRef.current = adjustedValue;
38
+
39
+ const animator = useMemo(() => {
40
+ if (!layoutId || !keyframes.length) return;
41
+ const animationData = keyframes
42
+ .filter(k => k.layoutId === layoutId)
43
+ .map<AnimationData<KeyframeType>>(({ position, type, value }) => ({
44
+ position,
45
+ type,
46
+ value
47
+ }));
48
+ return new Animator(animationData);
49
+ }, [keyframes, layoutId]);
50
+
51
+ const handleKeyframeValue = useCallback((scroll: number) => {
52
+ if (!animator) return;
53
+ const newValue = animatorGetterRef.current(animator, scroll, paramValue);
54
+ if (!isEqual(newValue, adjustedValueRef.current)) {
55
+ setAdjustedValue(newValue);
56
+ }
57
+ }, [animator, paramValue]);
58
+
59
+ useEffect(() => {
60
+ setAdjustedValue(paramValue);
61
+ }, [paramValue]);
62
+
63
+ useEffect(() => {
64
+ if (!articleRectObserver || !animator) return;
65
+ const scroll = articleRectObserver.getSectionScroll(sectionId);
66
+ handleKeyframeValue(scroll);
67
+ }, [articleRectObserver, handleKeyframeValue, animator]);
68
+
69
+ useEffect(() => {
70
+ if (!articleRectObserver || !animator) return;
71
+ return articleRectObserver.on('resize', () => {
72
+ const scroll = articleRectObserver.getSectionScroll(sectionId);
73
+ handleKeyframeValue(scroll);
74
+ });
75
+ }, [handleKeyframeValue, articleRectObserver, animator]);
76
+
77
+ useEffect(() => {
78
+ if (!articleRectObserver || !animator) return;
79
+ return articleRectObserver.on('scroll', () => {
80
+ const scroll = articleRectObserver.getSectionScroll(sectionId);
81
+ handleKeyframeValue(scroll);
82
+ });
83
+ }, [handleKeyframeValue, articleRectObserver, animator]);
84
+ return keyframes.length ? adjustedValue : paramValue;
85
+ }