merge: pull in the PR #3207 conflict fix

This commit is contained in:
Vance Ingalls
2026-08-12 22:14:21 -07:00
11 changed files with 30 additions and 14 deletions
+16
View File
@@ -169,6 +169,22 @@
"withLane",
],
},
// automationShapes is part of the audio-automation stack: its consumer is
// the UI layer that uses shape generators one PR upstack, so a per-PR audit
// diffing against the merge base sees these as unused. Consumed for real once
// the stack merges; safe to drop this entry then.
{
"file": "packages/studio/src/player/components/automationShapes.ts",
"exports": ["AUTOMATION_SHAPES"],
},
// automationSimplify is part of the audio-automation stack: its consumer is
// the UI layer one PR upstack, so a per-PR audit diffing against the merge
// base sees these as unused. Consumed for real once the stack merges; safe
// to drop this entry then.
{
"file": "packages/studio/src/player/components/automationSimplify.ts",
"exports": ["simplifyPoints"],
},
// propertyPanelAutomation is the shared reader for both panel sections; the
// FX group that consumes these two lands one PR upstack, so a per-PR audit
// against the merge base sees them as unused.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
{"html":"<!doctype html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <meta name=\"viewport\" content=\"width=1920, height=1080\" />\n <title>Menu Morph - Demo</title>\n <script src=\"https://cdn.jsdelivr.net/npm/gsap@3.14.2/dist/gsap.min.js\"></script>\n <style>\n * {\n box-sizing: border-box;\n }\n html,\n body {\n margin: 0;\n width: 1920px;\n height: 1080px;\n overflow: hidden;\n }\n #demo {\n width: 1920px;\n height: 1080px;\n display: grid;\n place-items: center;\n background: #f4f4f5;\n font-family: Inter, system-ui, sans-serif;\n }\n .demo-frame {\n display: grid;\n place-items: center;\n min-width: 760px;\n min-height: 480px;\n padding: 56px;\n /* ponytail: zoom on the wrapper — GSAP animates children, not this element */\n zoom: 3.4;\n }\n .hf-transition-menu-morph {\n position: relative;\n display: grid;\n place-items: center;\n width: 360px;\n height: 280px;\n font-family: Inter, system-ui, sans-serif;\n }\n .hf-transition-menu-button {\n z-index: 2;\n display: grid;\n place-items: center;\n gap: 5px;\n width: 68px;\n height: 68px;\n border: 0;\n border-radius: 999px;\n background: #18181b;\n box-shadow: 0 22px 58px rgba(0, 0, 0, 0.22);\n }\n .hf-transition-menu-button span {\n width: 24px;\n height: 3px;\n border-radius: 999px;\n background: #ffffff;\n transform-origin: center;\n }\n .hf-transition-menu-actions {\n position: absolute;\n display: flex;\n gap: 10px;\n bottom: 20px;\n }\n .hf-transition-menu-actions div {\n padding: 10px 16px;\n border-radius: 999px;\n background: #ffffff;\n color: #18181b;\n font-size: 14px;\n font-weight: 700;\n box-shadow: 0 14px 34px rgba(0, 0, 0, 0.12);\n border: 1px solid #e4e4e7;\n }\n </style>\n </head>\n <body>\n <div\n id=\"demo\"\n data-composition-id=\"menu-morph-demo\"\n data-start=\"0\"\n data-width=\"1920\"\n data-height=\"1080\"\n data-duration=\"5\"\n >\n <div class=\"demo-frame\">\n <div class=\"hf-transition-menu-morph\">\n <button class=\"hf-transition-menu-button\" type=\"button\" aria-label=\"Menu\">\n <span></span><span></span><span></span>\n </button>\n <div class=\"hf-transition-menu-actions\">\n <div>Text</div>\n <div>Image</div>\n <div>Audio</div>\n </div>\n </div>\n </div>\n <script>\n const tl = gsap.timeline({ paused: true });\n tl.fromTo(\n \".hf-transition-menu-button\",\n { scale: 0.72, opacity: 0 },\n { scale: 1, opacity: 1, duration: 0.34, ease: \"back.out(1.8)\" },\n 0.3,\n );\n tl.to(\n \".hf-transition-menu-button span:nth-child(1)\",\n { y: 8, rotation: 45, duration: 0.24, ease: \"power2.inOut\" },\n 0.78,\n );\n tl.to(\n \".hf-transition-menu-button span:nth-child(2)\",\n { opacity: 0, duration: 0.18, ease: \"power1.out\" },\n 0.78,\n );\n tl.to(\n \".hf-transition-menu-button span:nth-child(3)\",\n { y: -8, rotation: -45, duration: 0.24, ease: \"power2.inOut\" },\n 0.78,\n );\n tl.fromTo(\n \".hf-transition-menu-actions div\",\n { y: 28, opacity: 0, scale: 0.86 },\n { y: 0, opacity: 1, scale: 1, duration: 0.26, stagger: 0.06, ease: \"back.out(1.6)\" },\n 0.96,\n );\n tl.set({}, {}, 5);\n window.__timelines = window.__timelines || {};\n window.__timelines[\"menu-morph-demo\"] = tl;\n </script>\n </div>\n </body>\n</html>\n"}
{"html":"<!doctype html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <meta name=\"viewport\" content=\"width=1920, height=1080\" />\n <title>Menu Morph - Demo</title>\n <script src=\"https://cdn.jsdelivr.net/npm/gsap@3.14.2/dist/gsap.min.js\"></script>\n <style>\n * {\n box-sizing: border-box;\n }\n html,\n body {\n margin: 0;\n width: 1920px;\n height: 1080px;\n overflow: hidden;\n }\n #demo {\n width: 1920px;\n height: 1080px;\n display: grid;\n place-items: center;\n background: #f4f4f5;\n font-family: Inter, system-ui, sans-serif;\n }\n .demo-frame {\n display: grid;\n place-items: center;\n min-width: 760px;\n min-height: 480px;\n padding: 56px;\n /* ponytail: scale the wrapper — GSAP animates children, not this element */\n transform: scale(3.4);\n }\n .hf-transition-menu-morph {\n position: relative;\n display: grid;\n place-items: center;\n width: 360px;\n height: 280px;\n font-family: Inter, system-ui, sans-serif;\n }\n .hf-transition-menu-button {\n z-index: 2;\n display: grid;\n place-items: center;\n gap: 5px;\n width: 68px;\n height: 68px;\n border: 0;\n border-radius: 999px;\n background: #18181b;\n box-shadow: 0 22px 58px rgba(0, 0, 0, 0.22);\n }\n .hf-transition-menu-button span {\n width: 24px;\n height: 3px;\n border-radius: 999px;\n background: #ffffff;\n transform-origin: center;\n }\n .hf-transition-menu-actions {\n position: absolute;\n display: flex;\n gap: 10px;\n bottom: 20px;\n }\n .hf-transition-menu-actions div {\n padding: 10px 16px;\n border-radius: 999px;\n background: #ffffff;\n color: #18181b;\n font-size: 14px;\n font-weight: 700;\n box-shadow: 0 14px 34px rgba(0, 0, 0, 0.12);\n border: 1px solid #e4e4e7;\n }\n </style>\n </head>\n <body>\n <div\n id=\"demo\"\n data-composition-id=\"menu-morph-demo\"\n data-start=\"0\"\n data-width=\"1920\"\n data-height=\"1080\"\n data-duration=\"5\"\n >\n <div class=\"demo-frame\">\n <div class=\"hf-transition-menu-morph\">\n <button class=\"hf-transition-menu-button\" type=\"button\" aria-label=\"Menu\">\n <span></span><span></span><span></span>\n </button>\n <div class=\"hf-transition-menu-actions\">\n <div>Text</div>\n <div>Image</div>\n <div>Audio</div>\n </div>\n </div>\n </div>\n <script>\n const tl = gsap.timeline({ paused: true });\n tl.fromTo(\n \".hf-transition-menu-button\",\n { scale: 0.72, opacity: 0 },\n { scale: 1, opacity: 1, duration: 0.34, ease: \"back.out(1.8)\" },\n 0.3,\n );\n tl.to(\n \".hf-transition-menu-button span:nth-child(1)\",\n { y: 8, rotation: 45, duration: 0.24, ease: \"power2.inOut\" },\n 0.78,\n );\n tl.to(\n \".hf-transition-menu-button span:nth-child(2)\",\n { opacity: 0, duration: 0.18, ease: \"power1.out\" },\n 0.78,\n );\n tl.to(\n \".hf-transition-menu-button span:nth-child(3)\",\n { y: -8, rotation: -45, duration: 0.24, ease: \"power2.inOut\" },\n 0.78,\n );\n tl.fromTo(\n \".hf-transition-menu-actions div\",\n { y: 28, opacity: 0, scale: 0.86 },\n { y: 0, opacity: 1, scale: 1, duration: 0.26, stagger: 0.06, ease: \"back.out(1.6)\" },\n 0.96,\n );\n tl.set({}, {}, 5);\n window.__timelines = window.__timelines || {};\n window.__timelines[\"menu-morph-demo\"] = tl;\n </script>\n </div>\n </body>\n</html>\n"}
@@ -1 +1 @@
{"html":"<!doctype html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <meta name=\"viewport\" content=\"width=1920, height=1080\" />\n <title>Text Stagger - Demo</title>\n <script src=\"https://cdn.jsdelivr.net/npm/gsap@3.14.2/dist/gsap.min.js\"></script>\n <style>\n * {\n box-sizing: border-box;\n }\n html,\n body {\n margin: 0;\n width: 1920px;\n height: 1080px;\n overflow: hidden;\n }\n #demo {\n width: 1920px;\n height: 1080px;\n display: grid;\n place-items: center;\n background: #fafafa;\n font-family: Inter, system-ui, sans-serif;\n }\n .demo-frame {\n display: grid;\n place-items: center;\n gap: 28px;\n /* ponytail: scale on non-GSAP wrapper; text was ~7% frame height, now fills ~55% */\n transform: scale(2.6);\n transform-origin: center center;\n }\n .demo-label {\n font-size: 11px;\n font-weight: 500;\n letter-spacing: 0.12em;\n text-transform: uppercase;\n color: #a1a1aa;\n }\n .hf-transition-text-stagger {\n display: flex;\n flex-wrap: wrap;\n gap: 0.24em;\n color: #18181b;\n font:\n 900 74px/0.95 Inter,\n system-ui,\n sans-serif;\n letter-spacing: -0.045em;\n }\n .hf-transition-text-stagger span {\n display: inline-block;\n background: linear-gradient(90deg, #18181b, #18181b, #71717a, #18181b);\n background-size: 240% 100%;\n -webkit-background-clip: text;\n background-clip: text;\n color: transparent;\n will-change: transform, opacity, filter, background-position;\n }\n </style>\n </head>\n <body>\n <div\n id=\"demo\"\n data-composition-id=\"text-stagger-demo\"\n data-start=\"0\"\n data-width=\"1920\"\n data-height=\"1080\"\n data-duration=\"5\"\n >\n <div class=\"demo-frame\">\n <div class=\"demo-label\">text-stagger</div>\n <div class=\"hf-transition-text-stagger\">\n <span>Build</span>\n <span>motion</span>\n <span>systems</span>\n <span>fast</span>\n </div>\n </div>\n <script>\n const tl = gsap.timeline({ paused: true });\n tl.fromTo(\n \".hf-transition-text-stagger span\",\n { opacity: 0, y: 48, filter: \"blur(14px)\" },\n {\n opacity: 1,\n y: 0,\n filter: \"blur(0px)\",\n duration: 0.54,\n stagger: 0.09,\n ease: \"power3.out\",\n },\n 0.35,\n );\n tl.to(\n \".hf-transition-text-stagger span\",\n { backgroundPosition: \"100% 0%\", duration: 0.72, stagger: 0.04, ease: \"power2.inOut\" },\n 1.05,\n );\n tl.set({}, {}, 5);\n window.__timelines = window.__timelines || {};\n window.__timelines[\"text-stagger-demo\"] = tl;\n </script>\n </div>\n </body>\n</html>\n"}
{"html":"<!doctype html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <meta name=\"viewport\" content=\"width=1920, height=1080\" />\n <title>Text Stagger - Demo</title>\n <script src=\"https://cdn.jsdelivr.net/npm/gsap@3.14.2/dist/gsap.min.js\"></script>\n <style>\n * {\n box-sizing: border-box;\n }\n html,\n body {\n margin: 0;\n width: 1920px;\n height: 1080px;\n overflow: hidden;\n }\n #demo {\n width: 1920px;\n height: 1080px;\n display: grid;\n place-items: center;\n background: #fafafa;\n font-family: Inter, system-ui, sans-serif;\n }\n .demo-frame {\n display: grid;\n place-items: center;\n gap: 28px;\n /* Scale the non-GSAP wrapper while keeping the full phrase inside the frame. */\n transform: scale(1.9);\n transform-origin: center center;\n }\n .demo-label {\n font-size: 11px;\n font-weight: 500;\n letter-spacing: 0.12em;\n text-transform: uppercase;\n color: #737379;\n }\n .hf-transition-text-stagger {\n display: flex;\n flex-wrap: wrap;\n gap: 0.24em;\n color: #18181b;\n font:\n 900 74px/0.95 Inter,\n system-ui,\n sans-serif;\n letter-spacing: -0.045em;\n }\n .hf-transition-text-stagger span {\n display: inline-block;\n background: linear-gradient(90deg, #18181b, #18181b, #71717a, #18181b);\n background-size: 240% 100%;\n -webkit-background-clip: text;\n background-clip: text;\n color: transparent;\n will-change: transform, opacity, filter, background-position;\n }\n </style>\n </head>\n <body>\n <div\n id=\"demo\"\n data-composition-id=\"text-stagger-demo\"\n data-start=\"0\"\n data-width=\"1920\"\n data-height=\"1080\"\n data-duration=\"5\"\n >\n <div class=\"demo-frame\">\n <div class=\"demo-label\">text-stagger</div>\n <div class=\"hf-transition-text-stagger\">\n <span>Build</span>\n <span>motion</span>\n <span>systems</span>\n <span>fast</span>\n </div>\n </div>\n <script>\n const tl = gsap.timeline({ paused: true });\n tl.fromTo(\n \".hf-transition-text-stagger span\",\n { opacity: 0, y: 48, filter: \"blur(14px)\" },\n {\n opacity: 1,\n y: 0,\n filter: \"blur(0px)\",\n duration: 0.54,\n stagger: 0.09,\n ease: \"power3.out\",\n },\n 0.35,\n );\n tl.to(\n \".hf-transition-text-stagger span\",\n { backgroundPosition: \"100% 0%\", duration: 0.72, stagger: 0.04, ease: \"power2.inOut\" },\n 1.05,\n );\n tl.set({}, {}, 5);\n window.__timelines = window.__timelines || {};\n window.__timelines[\"text-stagger-demo\"] = tl;\n </script>\n </div>\n </body>\n</html>\n"}
@@ -1 +1 @@
{"html":"<!doctype html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <meta name=\"viewport\" content=\"width=1920, height=1080\" />\n <title>Typewriter - Demo</title>\n <script src=\"https://cdn.jsdelivr.net/npm/gsap@3.14.2/dist/gsap.min.js\"></script>\n <style>\n * {\n box-sizing: border-box;\n }\n html,\n body {\n margin: 0;\n width: 1920px;\n height: 1080px;\n overflow: hidden;\n }\n #demo {\n width: 1920px;\n height: 1080px;\n display: grid;\n place-items: center;\n background: #f7f7f8;\n font-family: Inter, system-ui, sans-serif;\n }\n .demo-frame {\n display: grid;\n place-items: center;\n min-width: 900px;\n min-height: 500px;\n padding: 64px;\n /* ponytail: scale-up only; GSAP targets .hf-remocn-typewriter with CSS vars, not transforms */\n transform: scale(2.8);\n }\n .hf-remocn-typewriter {\n color: #18181b;\n font-family: Inter, system-ui, sans-serif;\n font-weight: 900;\n letter-spacing: -0.04em;\n }\n .hf-remocn-typewriter {\n display: inline-flex;\n align-items: center;\n gap: 6px;\n font:\n 800 52px/1 ui-monospace,\n SFMono-Regular,\n Menlo,\n monospace;\n }\n .hf-remocn-typewriter span {\n display: inline-block;\n max-width: calc(var(--hf-type-progress, 1) * 100%);\n overflow: hidden;\n white-space: nowrap;\n }\n .hf-remocn-typewriter i {\n width: 3px;\n height: 52px;\n border-radius: 999px;\n background: #18181b;\n opacity: var(--hf-caret-opacity, 1);\n }\n </style>\n </head>\n <body>\n <div\n id=\"demo\"\n data-composition-id=\"typewriter-demo\"\n data-start=\"0\"\n data-width=\"1920\"\n data-height=\"1080\"\n data-duration=\"5\"\n >\n <div class=\"demo-frame\">\n <div class=\"hf-remocn-typewriter\"><span>hyperframes add typewriter</span><i></i></div>\n </div>\n <script>\n const tl = gsap.timeline({ paused: true });\n const startTime = 0.5;\n tl.fromTo(\n \".hf-remocn-typewriter\",\n { \"--hf-type-progress\": 0 },\n { \"--hf-type-progress\": 1, duration: 1.2, ease: \"steps(28)\" },\n startTime,\n );\n tl.to(\n \".hf-remocn-typewriter i\",\n { \"--hf-caret-opacity\": 0.2, duration: 0.24, repeat: 7, yoyo: true, ease: \"none\" },\n startTime + 0.2,\n );\n tl.set({}, {}, 5);\n window.__timelines = window.__timelines || {};\n window.__timelines[\"typewriter-demo\"] = tl;\n </script>\n </div>\n </body>\n</html>\n"}
{"html":"<!doctype html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <meta name=\"viewport\" content=\"width=1920, height=1080\" />\n <title>Typewriter - Demo</title>\n <script src=\"https://cdn.jsdelivr.net/npm/gsap@3.14.2/dist/gsap.min.js\"></script>\n <style>\n * {\n box-sizing: border-box;\n }\n html,\n body {\n margin: 0;\n width: 1920px;\n height: 1080px;\n overflow: hidden;\n }\n #demo {\n width: 1920px;\n height: 1080px;\n display: grid;\n place-items: center;\n background: #f7f7f8;\n font-family: Inter, system-ui, sans-serif;\n }\n .demo-frame {\n display: grid;\n place-items: center;\n min-width: 900px;\n min-height: 500px;\n padding: 64px;\n /* ponytail: scale-up only; GSAP targets .hf-remocn-typewriter with CSS vars, not transforms */\n transform: scale(2);\n }\n .hf-remocn-typewriter {\n color: #18181b;\n font-family: Inter, system-ui, sans-serif;\n font-weight: 900;\n letter-spacing: -0.04em;\n }\n .hf-remocn-typewriter {\n display: inline-flex;\n align-items: center;\n gap: 6px;\n font:\n 800 52px/1.2 ui-monospace,\n SFMono-Regular,\n Menlo,\n monospace;\n }\n .hf-remocn-typewriter span {\n display: inline-block;\n max-width: calc(var(--hf-type-progress, 1) * 100%);\n overflow: hidden;\n white-space: nowrap;\n }\n .hf-remocn-typewriter i {\n width: 3px;\n height: 52px;\n border-radius: 999px;\n background: #18181b;\n opacity: var(--hf-caret-opacity, 1);\n }\n </style>\n </head>\n <body>\n <div\n id=\"demo\"\n data-composition-id=\"typewriter-demo\"\n data-start=\"0\"\n data-width=\"1920\"\n data-height=\"1080\"\n data-duration=\"5\"\n >\n <div class=\"demo-frame\">\n <div class=\"hf-remocn-typewriter\"><span>hyperframes add typewriter</span><i></i></div>\n </div>\n <script>\n const tl = gsap.timeline({ paused: true });\n const startTime = 0.5;\n tl.fromTo(\n \".hf-remocn-typewriter\",\n { \"--hf-type-progress\": 0 },\n { \"--hf-type-progress\": 1, duration: 1.2, ease: \"steps(28)\" },\n startTime,\n );\n tl.to(\n \".hf-remocn-typewriter i\",\n { \"--hf-caret-opacity\": 0.2, duration: 0.24, repeat: 7, yoyo: true, ease: \"none\" },\n startTime + 0.2,\n );\n tl.set({}, {}, 5);\n window.__timelines = window.__timelines || {};\n window.__timelines[\"typewriter-demo\"] = tl;\n </script>\n </div>\n </body>\n</html>\n"}
+1 -1
View File
@@ -28,7 +28,7 @@
display: grid;
place-items: center;
padding: 52px;
transform: scale(2.1);
transform: scale(1.6);
transform-origin: center center;
}
.hf-remocn-animated-bar-chart {
+1 -1
View File
@@ -109,7 +109,7 @@
? window.__hyperframes.getVariables()
: {};
var TEXTURE = vars.texture || "lava";
var TEXTURE_URL = "compositions/components/" + TEXTURE + ".png";
var TEXTURE_URL = TEXTURE + ".png";
var _fitCanvas = document.createElement("canvas");
var _fitCtx = _fitCanvas.getContext("2d");
+2 -2
View File
@@ -30,8 +30,8 @@
min-width: 760px;
min-height: 480px;
padding: 56px;
/* ponytail: zoom on the wrapper — GSAP animates children, not this element */
zoom: 3.4;
/* ponytail: scale the wrapper — GSAP animates children, not this element */
transform: scale(3.4);
}
.hf-transition-menu-morph {
position: relative;
+3 -3
View File
@@ -28,8 +28,8 @@
display: grid;
place-items: center;
gap: 28px;
/* ponytail: scale on non-GSAP wrapper; text was ~7% frame height, now fills ~55% */
transform: scale(2.6);
/* Scale the non-GSAP wrapper while keeping the full phrase inside the frame. */
transform: scale(1.9);
transform-origin: center center;
}
.demo-label {
@@ -37,7 +37,7 @@
font-weight: 500;
letter-spacing: 0.12em;
text-transform: uppercase;
color: #a1a1aa;
color: #737379;
}
.hf-transition-text-stagger {
display: flex;
+2 -2
View File
@@ -31,7 +31,7 @@
min-height: 500px;
padding: 64px;
/* ponytail: scale-up only; GSAP targets .hf-remocn-typewriter with CSS vars, not transforms */
transform: scale(2.8);
transform: scale(2);
}
.hf-remocn-typewriter {
color: #18181b;
@@ -44,7 +44,7 @@
align-items: center;
gap: 6px;
font:
800 52px/1 ui-monospace,
800 52px/1.2 ui-monospace,
SFMono-Regular,
Menlo,
monospace;