Skip to content

Visualize Your Ideas With Code

feat(ui): scene graph (#909)

Jacobbf85c5b4a339
diff --git a/package-lock.json b/package-lock.json
index be04681d..802ecc80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9934,6 +9934,15 @@
"typedarray": "^0.0.6"
}
},
+ "node_modules/concat-with-sourcemaps": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+ "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+ "dev": true,
+ "dependencies": {
+ "source-map": "^0.6.1"
+ }
+ },
"node_modules/configstore": {
"version": "5.0.1",
"license": "BSD-2-Clause",
@@ -12885,6 +12894,24 @@
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
}
},
+ "node_modules/generic-names": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz",
+ "integrity": "sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==",
+ "dev": true,
+ "dependencies": {
+ "loader-utils": "^3.2.0"
+ }
+ },
+ "node_modules/generic-names/node_modules/loader-utils": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+ "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 12.13.0"
+ }
+ },
"node_modules/gensync": {
"version": "1.0.0-beta.2",
"license": "MIT",
@@ -13919,6 +13946,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/icss-replace-symbols": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+ "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==",
+ "dev": true
+ },
"node_modules/icss-utils": {
"version": "5.1.0",
"license": "ISC",
@@ -14015,6 +14048,18 @@
"devOptional": true,
"license": "MIT"
},
+ "node_modules/import-cwd": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+ "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
+ "dev": true,
+ "dependencies": {
+ "import-from": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/import-fresh": {
"version": "3.3.0",
"license": "MIT",
@@ -14036,6 +14081,18 @@
"node": ">=4"
}
},
+ "node_modules/import-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+ "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
+ "dev": true,
+ "dependencies": {
+ "resolve-from": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/import-lazy": {
"version": "2.1.0",
"license": "MIT",
@@ -19647,6 +19704,35 @@
"postcss": "^8.2.15"
}
},
+ "node_modules/postcss-load-config": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
+ "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+ "dev": true,
+ "dependencies": {
+ "lilconfig": "^2.0.5",
+ "yaml": "^1.10.2"
+ },
+ "engines": {
+ "node": ">= 10"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ "peerDependencies": {
+ "postcss": ">=8.0.9",
+ "ts-node": ">=9.0.0"
+ },
+ "peerDependenciesMeta": {
+ "postcss": {
+ "optional": true
+ },
+ "ts-node": {
+ "optional": true
+ }
+ }
+ },
"node_modules/postcss-loader": {
"version": "7.0.1",
"license": "MIT",
@@ -19769,6 +19855,25 @@
"postcss": "^8.2.15"
}
},
+ "node_modules/postcss-modules": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.3.1.tgz",
+ "integrity": "sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==",
+ "dev": true,
+ "dependencies": {
+ "generic-names": "^4.0.0",
+ "icss-replace-symbols": "^1.1.0",
+ "lodash.camelcase": "^4.3.0",
+ "postcss-modules-extract-imports": "^3.0.0",
+ "postcss-modules-local-by-default": "^4.0.0",
+ "postcss-modules-scope": "^3.0.0",
+ "postcss-modules-values": "^4.0.0",
+ "string-hash": "^1.1.1"
+ },
+ "peerDependencies": {
+ "postcss": "^8.0.0"
+ }
+ },
"node_modules/postcss-modules-extract-imports": {
"version": "3.0.0",
"license": "ISC",
@@ -20220,6 +20325,15 @@
"node": ">=10"
}
},
+ "node_modules/promise.series": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz",
+ "integrity": "sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
"node_modules/prompts": {
"version": "2.4.2",
"license": "MIT",
@@ -21717,6 +21831,48 @@
"fsevents": "~2.3.2"
}
},
+ "node_modules/rollup-plugin-postcss": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz",
+ "integrity": "sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==",
+ "dev": true,
+ "dependencies": {
+ "chalk": "^4.1.0",
+ "concat-with-sourcemaps": "^1.1.0",
+ "cssnano": "^5.0.1",
+ "import-cwd": "^3.0.0",
+ "p-queue": "^6.6.2",
+ "pify": "^5.0.0",
+ "postcss-load-config": "^3.0.0",
+ "postcss-modules": "^4.0.0",
+ "promise.series": "^0.2.0",
+ "resolve": "^1.19.0",
+ "rollup-pluginutils": "^2.8.2",
+ "safe-identifier": "^0.4.2",
+ "style-inject": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "postcss": "8.x"
+ }
+ },
+ "node_modules/rollup-pluginutils": {
+ "version": "2.8.2",
+ "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+ "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+ "dev": true,
+ "dependencies": {
+ "estree-walker": "^0.6.1"
+ }
+ },
+ "node_modules/rollup-pluginutils/node_modules/estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ },
"node_modules/rrweb-cssom": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
@@ -21786,6 +21942,12 @@
"version": "5.1.2",
"license": "MIT"
},
+ "node_modules/safe-identifier": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
+ "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
+ "dev": true
+ },
"node_modules/safer-buffer": {
"version": "2.1.2",
"license": "MIT"
@@ -22848,6 +23010,12 @@
"node": ">=0.6.19"
}
},
+ "node_modules/string-hash": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
+ "integrity": "sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==",
+ "dev": true
+ },
"node_modules/string-length": {
"version": "4.0.2",
"license": "MIT",
@@ -23004,6 +23172,12 @@
"node": ">=4"
}
},
+ "node_modules/style-inject": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz",
+ "integrity": "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==",
+ "dev": true
+ },
"node_modules/style-mod": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz",
@@ -25514,10 +25688,22 @@
"devDependencies": {
"@motion-canvas/internal": "0.0.0",
"@motion-canvas/ui": "^3.12.4",
+ "@preact/signals": "^1.2.1",
+ "clsx": "^2.0.0",
"jsdom": "^22.1.0",
+ "preact": "^10.19.2",
"vitest": "^0.34.6"
}
},
+ "packages/2d/node_modules/clsx": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz",
+ "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
"packages/2d/node_modules/code-fns": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/code-fns/-/code-fns-0.8.2.tgz",
@@ -25685,6 +25871,7 @@
"highlight.js": "^11.9.0",
"marked": "^10.0.0",
"marked-highlight": "^2.1.0",
+ "rollup-plugin-postcss": "^4.0.2",
"ts-patch": "^3.0.2"
}
},
@@ -29297,13 +29484,22 @@
"@motion-canvas/core": "^3.12.1",
"@motion-canvas/internal": "0.0.0",
"@motion-canvas/ui": "^3.12.4",
+ "@preact/signals": "^1.2.1",
+ "clsx": "^2.0.0",
"code-fns": "^0.8.2",
"jsdom": "^22.1.0",
"mathjax-full": "^3.2.2",
"parse-svg-path": "^0.1.2",
+ "preact": "^10.19.2",
"vitest": "^0.34.6"
},
"dependencies": {
+ "clsx": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz",
+ "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==",
+ "dev": true
+ },
"code-fns": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/code-fns/-/code-fns-0.8.2.tgz",
@@ -29429,6 +29625,7 @@
"highlight.js": "^11.9.0",
"marked": "^10.0.0",
"marked-highlight": "^2.1.0",
+ "rollup-plugin-postcss": "^4.0.2",
"ts-patch": "^3.0.2"
},
"dependencies": {
@@ -32867,6 +33064,15 @@
"typedarray": "^0.0.6"
}
},
+ "concat-with-sourcemaps": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+ "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+ "dev": true,
+ "requires": {
+ "source-map": "^0.6.1"
+ }
+ },
"configstore": {
"version": "5.0.1",
"requires": {
@@ -34800,6 +35006,23 @@
"wide-align": "^1.1.5"
}
},
+ "generic-names": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz",
+ "integrity": "sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==",
+ "dev": true,
+ "requires": {
+ "loader-utils": "^3.2.0"
+ },
+ "dependencies": {
+ "loader-utils": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+ "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+ "dev": true
+ }
+ }
+ },
"gensync": {
"version": "1.0.0-beta.2"
},
@@ -35535,6 +35758,12 @@
"safer-buffer": ">= 2.1.2 < 3"
}
},
+ "icss-replace-symbols": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+ "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==",
+ "dev": true
+ },
"icss-utils": {
"version": "5.1.0",
"requires": {}
@@ -35591,6 +35820,15 @@
"version": "4.1.0",
"devOptional": true
},
+ "import-cwd": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+ "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
+ "dev": true,
+ "requires": {
+ "import-from": "^3.0.0"
+ }
+ },
"import-fresh": {
"version": "3.3.0",
"requires": {
@@ -35603,6 +35841,15 @@
}
}
},
+ "import-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+ "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
+ "dev": true,
+ "requires": {
+ "resolve-from": "^5.0.0"
+ }
+ },
"import-lazy": {
"version": "2.1.0"
},
@@ -39512,6 +39759,16 @@
"postcss-selector-parser": "^6.0.5"
}
},
+ "postcss-load-config": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
+ "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+ "dev": true,
+ "requires": {
+ "lilconfig": "^2.0.5",
+ "yaml": "^1.10.2"
+ }
+ },
"postcss-loader": {
"version": "7.0.1",
"requires": {
@@ -39575,6 +39832,22 @@
"postcss-selector-parser": "^6.0.5"
}
},
+ "postcss-modules": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.3.1.tgz",
+ "integrity": "sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==",
+ "dev": true,
+ "requires": {
+ "generic-names": "^4.0.0",
+ "icss-replace-symbols": "^1.1.0",
+ "lodash.camelcase": "^4.3.0",
+ "postcss-modules-extract-imports": "^3.0.0",
+ "postcss-modules-local-by-default": "^4.0.0",
+ "postcss-modules-scope": "^3.0.0",
+ "postcss-modules-values": "^4.0.0",
+ "string-hash": "^1.1.1"
+ }
+ },
"postcss-modules-extract-imports": {
"version": "3.0.0",
"requires": {}
@@ -39819,6 +40092,12 @@
"retry": "^0.12.0"
}
},
+ "promise.series": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz",
+ "integrity": "sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==",
+ "dev": true
+ },
"prompts": {
"version": "2.4.2",
"requires": {
@@ -40910,6 +41189,44 @@
"fsevents": "~2.3.2"
}
},
+ "rollup-plugin-postcss": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz",
+ "integrity": "sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==",
+ "dev": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "concat-with-sourcemaps": "^1.1.0",
+ "cssnano": "^5.0.1",
+ "import-cwd": "^3.0.0",
+ "p-queue": "^6.6.2",
+ "pify": "^5.0.0",
+ "postcss-load-config": "^3.0.0",
+ "postcss-modules": "^4.0.0",
+ "promise.series": "^0.2.0",
+ "resolve": "^1.19.0",
+ "rollup-pluginutils": "^2.8.2",
+ "safe-identifier": "^0.4.2",
+ "style-inject": "^0.3.0"
+ }
+ },
+ "rollup-pluginutils": {
+ "version": "2.8.2",
+ "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+ "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+ "dev": true,
+ "requires": {
+ "estree-walker": "^0.6.1"
+ },
+ "dependencies": {
+ "estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ }
+ }
+ },
"rrweb-cssom": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
@@ -40954,6 +41271,12 @@
"safe-buffer": {
"version": "5.1.2"
},
+ "safe-identifier": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
+ "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
+ "dev": true
+ },
"safer-buffer": {
"version": "2.1.2"
},
@@ -41734,6 +42057,12 @@
"integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
"dev": true
},
+ "string-hash": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
+ "integrity": "sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==",
+ "dev": true
+ },
"string-length": {
"version": "4.0.2",
"optional": true,
@@ -41835,6 +42164,12 @@
"through": "^2.3.4"
}
},
+ "style-inject": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz",
+ "integrity": "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==",
+ "dev": true
+ },
"style-mod": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz",
diff --git a/packages/2d/package.json b/packages/2d/package.json
index c9a2bc3d..8775cfeb 100644
--- a/packages/2d/package.json
+++ b/packages/2d/package.json
@@ -9,8 +9,10 @@
"main": "lib/index.js",
"types": "./lib/index.d.ts",
"scripts": {
- "dev": "tspc -b src -w",
- "build": "tspc -b src/tsconfig.build.json",
+ "dev": "tspc -p src/lib -w",
+ "build": "npm run build-lib && npm run build-editor",
+ "build-lib": "tspc -p src/lib/tsconfig.build.json",
+ "build-editor": "rollup -c rollup.editor.mjs",
"bundle": "rollup -c rollup.config.mjs",
"test": "vitest"
},
@@ -28,7 +30,10 @@
"devDependencies": {
"@motion-canvas/internal": "0.0.0",
"@motion-canvas/ui": "^3.12.4",
+ "@preact/signals": "^1.2.1",
"jsdom": "^22.1.0",
+ "preact": "^10.19.2",
+ "clsx": "^2.0.0",
"vitest": "^0.34.6"
},
"dependencies": {
diff --git a/packages/2d/rollup.editor.mjs b/packages/2d/rollup.editor.mjs
new file mode 100644
index 00000000..c3219c17
--- /dev/null
+++ b/packages/2d/rollup.editor.mjs
@@ -0,0 +1,29 @@
+import typescript from '@motion-canvas/internal/rollup/typescript.mjs';
+import resolve from '@rollup/plugin-node-resolve';
+import postcss from 'rollup-plugin-postcss';
+
+export default [
+ {
+ input: './src/editor/index.ts',
+ output: {
+ format: 'es',
+ sourcemap: true,
+ dir: './editor',
+ },
+ external: [/^@motion-canvas/, /^@?preact/, './index.css'],
+ plugins: [
+ resolve(),
+ postcss({
+ modules: true,
+ extract: true,
+ }),
+ typescript({
+ tsconfig: './src/editor/tsconfig.build.json',
+ compilerOptions: {
+ outDir: './editor',
+ composite: false,
+ },
+ }),
+ ],
+ },
+];
diff --git a/packages/2d/src/editor/InspectorTabConfig.tsx b/packages/2d/src/editor/InspectorTabConfig.tsx
deleted file mode 100644
index f4313497..00000000
--- a/packages/2d/src/editor/InspectorTabConfig.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import {isInspectable} from '@motion-canvas/core';
-import {
- AccountTree,
- AutoField,
- Button,
- Group,
- Label,
- Pane,
- PluginTabConfig,
- PluginTabProps,
- Separator,
- Tab,
- emphasize,
- findAndOpenFirstUserFile,
- useApplication,
- useCurrentFrame,
- useCurrentScene,
- usePanels,
- useReducedMotion,
-} from '@motion-canvas/ui';
-import {useEffect, useMemo, useRef} from 'preact/hooks';
-import {useInspection} from './Provider';
-
-function TabComponent({tab}: PluginTabProps) {
- const {sidebar} = usePanels();
- const inspectorTab = useRef<HTMLButtonElement>(null);
- const reducedMotion = useReducedMotion();
- const {nodeKey} = useInspection();
- const {logger} = useApplication();
-
- useEffect(
- () =>
- logger.onInspected.subscribe(key => {
- nodeKey.value = key;
- sidebar.set(tab);
- }),
- [nodeKey, tab],
- );
-
- useEffect(() => {
- if (
- nodeKey.value &&
- sidebar.current.value !== tab &&
- !reducedMotion &&
- inspectorTab.current &&
- inspectorTab.current.getAnimations().length < 2
- ) {
- inspectorTab.current.animate(emphasize(), {duration: 400});
- inspectorTab.current.animate([{color: 'white'}, {color: ''}], {
- duration: 800,
- });
- }
- }, [nodeKey.value, reducedMotion]);
-
- return (
- <Tab
- forwardRef={inspectorTab}
- title="Inspector"
- id="inspector-tab"
- tab={tab}
- >
- <AccountTree />
- </Tab>
- );
-}
-
-function PaneComponent() {
- const {nodeKey} = useInspection();
- const scene = useCurrentScene();
- const frame = useCurrentFrame();
-
- const inspectable = useMemo(
- () => (isInspectable(scene) ? scene : null),
- [scene],
- );
-
- const [stack, attributes] = useMemo(() => {
- const attributes = inspectable?.inspectAttributes(nodeKey.value);
- if (attributes) {
- const {stack, ...rest} = attributes;
- return [stack, rest];
- }
- return [undefined, undefined];
- }, [nodeKey.value, inspectable, frame]);
-
- return (
- <Pane title="Inspector" id="inspector-pane">
- <Separator size={1} />
- {stack && (
- <Group>
- <Label />
- <Button onClick={() => findAndOpenFirstUserFile(stack)} main>
- GO TO SOURCE
- </Button>
- </Group>
- )}
- {attributes
- ? Object.entries(attributes).map(([key, value]) => (
- <Group>
- <Label>{key}</Label>
- <AutoField value={value} />
- </Group>
- ))
- : inspectable
- ? 'Click on a node to view its properties.'
- : "The current scene doesn't support inspecting."}
- </Pane>
- );
-}
-
-export const InspectorTabConfig: PluginTabConfig = {
- name: 'inspector',
- tabComponent: TabComponent,
- paneComponent: PaneComponent,
-};
diff --git a/packages/2d/src/editor/PreviewOverlayConfig.tsx b/packages/2d/src/editor/PreviewOverlayConfig.tsx
index d13b9aa2..e956a49c 100644
--- a/packages/2d/src/editor/PreviewOverlayConfig.tsx
+++ b/packages/2d/src/editor/PreviewOverlayConfig.tsx
@@ -13,7 +13,7 @@ import {useInspection} from './Provider';
function Component({children}: {children?: ComponentChildren}) {
const state = useViewportContext();
const scene = useCurrentScene();
- const {nodeKey} = useInspection();
+ const {selectedKey} = useInspection();
const matrix = useViewportMatrix();
return (
@@ -28,7 +28,10 @@ function Component({children}: {children?: ComponentChildren}) {
event.y - state.rect.y,
).transformAsPoint(matrix.inverse());
- nodeKey.value = scene.inspectPosition(position.x, position.y) as string;
+ selectedKey.value = scene.inspectPosition(
+ position.x,
+ position.y,
+ ) as string;
}}
>
{children}
@@ -37,18 +40,32 @@ function Component({children}: {children?: ComponentChildren}) {
}
function drawHook() {
- const {nodeKey} = useInspection();
- const scene = useCurrentScene();
- nodeKey.value;
+ const {selectedKey, hoveredKey, afterRender, scene} = useInspection();
+ selectedKey.value;
+ hoveredKey.value;
+ afterRender.value;
return (ctx: CanvasRenderingContext2D, matrix: DOMMatrix) => {
- if (!isInspectable(scene)) return;
- const element = scene.validateInspection(nodeKey.value);
- if (!element || element !== nodeKey.value) {
- nodeKey.value = element as string;
+ const currentScene = scene.peek();
+ if (!currentScene) return;
+
+ let node = currentScene.getNode(selectedKey.value);
+ if (!node || node.key !== selectedKey.value) {
+ selectedKey.value = node?.key ?? null;
+ } else {
+ currentScene.drawOverlay(selectedKey.value, matrix, ctx);
+ }
+
+ node = currentScene.getNode(hoveredKey.value);
+ if (!node || node.key !== hoveredKey.value) {
+ hoveredKey.value = node?.key ?? null;
return;
}
- scene.drawOverlay(element, matrix, ctx);
+
+ if (hoveredKey.value !== selectedKey.value) {
+ ctx.globalAlpha = 0.5;
+ currentScene.drawOverlay(hoveredKey.value, matrix, ctx);
+ }
};
}
diff --git a/packages/2d/src/editor/Provider.tsx b/packages/2d/src/editor/Provider.tsx
index a0a21bc3..e86fc440 100644
--- a/packages/2d/src/editor/Provider.tsx
+++ b/packages/2d/src/editor/Provider.tsx
@@ -1,9 +1,24 @@
-import {Signal, useSignal} from '@preact/signals';
+import {Scene2D} from '@motion-canvas/2d';
+import {SceneRenderEvent} from '@motion-canvas/core';
+import {useCurrentScene} from '@motion-canvas/ui';
+import {
+ ReadonlySignal,
+ Signal,
+ computed,
+ signal,
+ useSignal,
+ useSignalEffect,
+} from '@preact/signals';
import {ComponentChildren, createContext} from 'preact';
-import {useContext} from 'preact/hooks';
+import {useContext, useMemo} from 'preact/hooks';
export interface InspectionState {
- nodeKey: Signal<string | null>;
+ selectedKey: Signal<string | null>;
+ hoveredKey: Signal<string | null>;
+ openNodes: Map<string, boolean>;
+ scene: ReadonlySignal<Scene2D | null>;
+ selectedChain: ReadonlySignal<Set<string>>;
+ afterRender: ReadonlySignal<number>;
}
const InspectionContext = createContext<InspectionState | null>(null);
@@ -13,10 +28,51 @@ export function useInspection() {
}
export function Provider({children}: {children?: ComponentChildren}) {
- const nodeKey = useSignal<string | null>(null);
+ const currentScene = useCurrentScene();
+
+ const state = useMemo(() => {
+ const scene = useSignal(currentScene as Scene2D);
+ const selectedKey = signal<string | null>(null);
+ const afterRender = signal(0);
+ const hoveredKey = signal<string | null>(null);
+ const openNodes = new Map<string, boolean>();
+ const selectedChain = computed(() => {
+ const chain = new Set<string>();
+ const key = selectedKey.value;
+ const selectedNode = scene.value?.getNode(key);
+ if (selectedNode) {
+ let node = selectedNode.parent() ?? null;
+ while (node) {
+ chain.add(node.key);
+ node = node.parent();
+ }
+ }
+
+ return chain;
+ });
+
+ return {
+ selectedKey,
+ hoveredKey,
+ afterRender,
+ openNodes,
+ selectedChain,
+ scene,
+ } satisfies InspectionState;
+ }, []);
+
+ state.scene.value = currentScene as Scene2D;
+
+ useSignalEffect(() =>
+ state.scene.value.onRenderLifecycle.subscribe(([event]) => {
+ if (event === SceneRenderEvent.AfterRender) {
+ state.afterRender.value++;
+ }
+ }),
+ );
return (
- <InspectionContext.Provider value={{nodeKey}}>
+ <InspectionContext.Provider value={state}>
{children}
</InspectionContext.Provider>
);
diff --git a/packages/2d/src/editor/SceneGraphTabConfig.tsx b/packages/2d/src/editor/SceneGraphTabConfig.tsx
new file mode 100644
index 00000000..f8394ded
--- /dev/null
+++ b/packages/2d/src/editor/SceneGraphTabConfig.tsx
@@ -0,0 +1,82 @@
+import {
+ AccountTree,
+ emphasize,
+ Pane,
+ PluginTabConfig,
+ PluginTabProps,
+ Tab,
+ useApplication,
+ usePanels,
+ useReducedMotion,
+} from '@motion-canvas/ui';
+
+import {useSignalEffect} from '@preact/signals';
+import {useEffect, useRef} from 'preact/hooks';
+import {useInspection} from './Provider';
+import {DetachedRoot, ViewRoot} from './tree';
+
+function TabComponent({tab}: PluginTabProps) {
+ const {sidebar} = usePanels();
+ const inspectorTab = useRef<HTMLButtonElement>(null);
+ const reducedMotion = useReducedMotion();
+ const {selectedKey} = useInspection();
+ const {logger} = useApplication();
+
+ useEffect(
+ () =>
+ logger.onInspected.subscribe(key => {
+ selectedKey.value = key;
+ sidebar.set(tab);
+ }),
+ [tab],
+ );
+
+ useSignalEffect(() => {
+ if (
+ selectedKey.value &&
+ sidebar.current.peek() !== tab &&
+ !reducedMotion &&
+ inspectorTab.current &&
+ inspectorTab.current.getAnimations().length < 2
+ ) {
+ inspectorTab.current.animate(emphasize(), {duration: 400});
+ inspectorTab.current.animate([{color: 'white'}, {color: ''}], {
+ duration: 800,
+ });
+ }
+ });
+
+ return (
+ <Tab
+ forwardRef={inspectorTab}
+ title="Scene Graph"
+ id="scene-graph-tab"
+ tab={tab}
+ >
+ <AccountTree />
+ </Tab>
+ );
+}
+
+function PaneComponent() {
+ const {selectedKey} = useInspection();
+
+ return (
+ <Pane
+ title="Scene Graph"
+ id="scene-graph-pane"
+ onClick={() => {
+ selectedKey.value = null;
+ }}
+ >
+ <ViewRoot />
+ <DetachedRoot />
+ </Pane>
+ );
+}
+
+export const SceneGraphTabConfig: PluginTabConfig = {
+ name: 'scene-graph',
+ tabComponent: TabComponent,
+ paneComponent: PaneComponent,
+};
diff --git a/packages/2d/src/editor/index.css b/packages/2d/src/editor/index.css
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/2d/src/editor/index.ts b/packages/2d/src/editor/index.ts
index 71d6fe8d..8ab41ae5 100644
--- a/packages/2d/src/editor/index.ts
+++ b/packages/2d/src/editor/index.ts
@@ -1,11 +1,15 @@
+// import './index.css';
+
import {makeEditorPlugin} from '@motion-canvas/ui';
-import {InspectorTabConfig} from './InspectorTabConfig';
import {PreviewOverlayConfig} from './PreviewOverlayConfig';
import {Provider} from './Provider';
+import {SceneGraphTabConfig} from './SceneGraphTabConfig';
-export default makeEditorPlugin({
- name: '@motion-canvas/2d',
- provider: Provider,
- previewOverlay: PreviewOverlayConfig,
- tabs: [InspectorTabConfig],
+export default makeEditorPlugin(() => {
+ return {
+ name: '@motion-canvas/2d',
+ provider: Provider,
+ previewOverlay: PreviewOverlayConfig,
+ tabs: [SceneGraphTabConfig],
+ };
});
diff --git a/packages/2d/src/editor/tree/DetachedRoot.tsx b/packages/2d/src/editor/tree/DetachedRoot.tsx
new file mode 100644
index 00000000..3b4f0795
--- /dev/null
+++ b/packages/2d/src/editor/tree/DetachedRoot.tsx
@@ -0,0 +1,23 @@
+import {useSignal} from '@preact/signals';
+import {useInspection} from '../Provider';
+import {NodeElement} from './NodeElement';
+import {TreeElement} from './TreeElement';
+import {TreeRoot} from './TreeRoot';
+
+export function DetachedRoot() {
+ const {afterRender, scene} = useInspection();
+ const open = useSignal(false);
+ const currentScene = scene.value;
+ const children = currentScene ? [...currentScene.getDetachedNodes()] : [];
+ afterRender.value;
+
+ return children.length > 0 ? (
+ <TreeRoot>
+ <TreeElement open={open} label="Detached nodes">
+ {children.map(child => (
+ <NodeElement node={child} depth={1} />
+ ))}
+ </TreeElement>
+ </TreeRoot>
+ ) : null;
+}
diff --git a/packages/2d/src/editor/tree/NodeElement.tsx b/packages/2d/src/editor/tree/NodeElement.tsx
new file mode 100644
index 00000000..05779524
--- /dev/null
+++ b/packages/2d/src/editor/tree/NodeElement.tsx
@@ -0,0 +1,69 @@
+import {Node} from '@motion-canvas/2d';
+import {useComputed, useSignal, useSignalEffect} from '@preact/signals';
+import {useRef} from 'preact/hooks';
+import {useInspection} from '../Provider';
+import {TreeElement} from './TreeElement';
+
+interface NodeElementProps {
+ node: Node;
+ depth?: number;
+}
+
+export function NodeElement({node, depth = 0}: NodeElementProps) {
+ const {selectedKey, hoveredKey, openNodes, selectedChain, afterRender} =
+ useInspection();
+ const ref = useRef<HTMLDivElement>(null);
+ const open = useSignal(
+ selectedChain.peek().has(node.key) || (openNodes.get(node.key) ?? false),
+ );
+ const nodeSignal = useSignal(node);
+ nodeSignal.value = node;
+
+ const children = useComputed(() => {
+ afterRender.value;
+ return node.children();
+ });
+
+ useSignalEffect(() => {
+ open.value = openNodes.get(nodeSignal.value.key) ?? false;
+ });
+
+ useSignalEffect(() => {
+ const chain = selectedChain.value;
+ if (chain.has(nodeSignal.value.key)) {
+ open.value = true;
+ }
+ });
+
+ useSignalEffect(() => {
+ openNodes.set(nodeSignal.value.key, open.value);
+ });
+
+ useSignalEffect(() => {
+ const key = selectedKey.value;
+ if (node.key === key) {
+ ref.current?.scrollIntoView({block: 'nearest', behavior: 'instant'});
+ }
+ });
+
+ return (
+ <TreeElement
+ forwardRef={ref}
+ open={open}
+ depth={depth}
+ label={node.key}
+ selected={selectedKey.value === node.key}
+ onClick={event => {
+ selectedKey.value = node.key;
+ event.stopPropagation();
+ }}
+ onPointerEnter={() => (hoveredKey.value = node.key)}
+ onPointerLeave={() => (hoveredKey.value = null)}
+ >
+ {children.value.length > 0 &&
+ children.value.map(child => (
+ <NodeElement node={child} depth={depth + 1} />
+ ))}
+ </TreeElement>
+ );
+}
diff --git a/packages/2d/src/editor/tree/TreeElement.tsx b/packages/2d/src/editor/tree/TreeElement.tsx
new file mode 100644
index 00000000..b61bacc4
--- /dev/null
+++ b/packages/2d/src/editor/tree/TreeElement.tsx
@@ -0,0 +1,70 @@
+import {Collapse, Toggle} from '@motion-canvas/ui';
+import {Signal} from '@preact/signals';
+import clsx from 'clsx';
+import {ComponentChildren, JSX} from 'preact';
+import {Ref} from 'preact/hooks';
+import styles from './index.module.scss';
+
+const DEPTH_VAR = '--depth';
+
+interface TreeElementProps
+ extends Omit<JSX.HTMLAttributes<HTMLDivElement>, 'label'> {
+ label: ComponentChildren;
+ children?: ComponentChildren;
+ selected?: boolean;
+ open: Signal<boolean>;
+ depth?: number;
+ forwardRef?: Ref<HTMLDivElement>;
+}
+
+export function TreeElement({
+ label,
+ children,
+ selected,
+ depth = 0,
+ open,
+ forwardRef,
+ ...props
+}: TreeElementProps) {
+ const hasChildren = !!children;
+
+ return (
+ <>
+ <div
+ ref={forwardRef}
+ className={clsx(
+ styles.label,
+ selected && styles.active,
+ hasChildren && styles.parent,
+ )}
+ onDblClick={() => {
+ if (hasChildren) {
+ open.value = !open.value;
+ }
+ }}
+ {...props}
+ style={{[DEPTH_VAR]: `${depth}`}}
+ >
+ {hasChildren && (
+ <Toggle
+ animated={false}
+ open={open.value}
+ onToggle={value => {
+ open.value = value;
+ }}
+ onDblClick={e => {
+ e.stopPropagation();
+ }}
+ />
+ )}
+ <div className={styles.icon} />
+ {label}
+ </div>
+ {hasChildren && (
+ <Collapse open={open.value} animated={false}>
+ {children}
+ </Collapse>
+ )}
+ </>
+ );
+}
diff --git a/packages/2d/src/editor/tree/TreeRoot.tsx b/packages/2d/src/editor/tree/TreeRoot.tsx
new file mode 100644
index 00000000..0892a286
--- /dev/null
+++ b/packages/2d/src/editor/tree/TreeRoot.tsx
@@ -0,0 +1,10 @@
+import clsx from 'clsx';
+import {JSX} from 'preact';
+import styles from './index.module.scss';
+
+export function TreeRoot({
+ className,
+ ...props
+}: JSX.HTMLAttributes<HTMLDivElement>) {
+ return <div className={clsx(styles.root, className)} {...props} />;
+}
diff --git a/packages/2d/src/editor/tree/ViewRoot.tsx b/packages/2d/src/editor/tree/ViewRoot.tsx
new file mode 100644
index 00000000..3b4afbc2
--- /dev/null
+++ b/packages/2d/src/editor/tree/ViewRoot.tsx
@@ -0,0 +1,20 @@
+import {useSignal, useSignalEffect} from '@preact/signals';
+import {useInspection} from '../Provider';
+import {NodeElement} from './NodeElement';
+import {TreeRoot} from './TreeRoot';
+
+export function ViewRoot() {
+ const {scene} = useInspection();
+ const view = useSignal(scene.value?.getView());
+
+ useSignalEffect(() => {
+ view.value = scene.value?.getView();
+ return scene.value?.onReset.subscribe(() => {
+ view.value = scene.value?.getView();
+ });
+ });
+
+ return view.value ? (
+ <TreeRoot>{<NodeElement node={view.value} />}</TreeRoot>
+ ) : null;
+}
diff --git a/packages/2d/src/editor/tree/index.module.scss b/packages/2d/src/editor/tree/index.module.scss
new file mode 100644
index 00000000..d8b323ca
--- /dev/null
+++ b/packages/2d/src/editor/tree/index.module.scss
@@ -0,0 +1,38 @@
+.root {
+ margin-top: -1px;
+ padding: 3px 0 4px;
+ border-top: 2px solid var(--background-color);
+}
+
+.icon {
+ width: 20px;
+ height: 20px;
+ align-self: center;
+ background-color: var(--background-color);
+ border-radius: var(--radius);
+ margin-right: 8px;
+}
+
+.label {
+ --depth: 0;
+
+ padding: 4px 0 4px calc(var(--depth) * 22px + 24px);
+ border-radius: var(--radius);
+ user-select: none;
+ cursor: pointer;
+ display: flex;
+
+ &:hover {
+ background-color: var(--surface-color-hover);
+ }
+
+ &.active {
+ --surface-color-hover: none;
+ background-color: var(--theme-overlay);
+ color: var(--theme);
+ }
+
+ &.parent {
+ padding-left: calc(var(--depth) * 22px);
+ }
+}
diff --git a/packages/2d/src/editor/tree/index.ts b/packages/2d/src/editor/tree/index.ts
new file mode 100644
index 00000000..0621afd2
--- /dev/null
+++ b/packages/2d/src/editor/tree/index.ts
@@ -0,0 +1,3 @@
+export * from './DetachedRoot';
+export * from './NodeElement';
+export * from './ViewRoot';
diff --git a/packages/2d/src/editor/tsconfig.json b/packages/2d/src/editor/tsconfig.json
index 1b4e222b..ec7a46f2 100644
--- a/packages/2d/src/editor/tsconfig.json
+++ b/packages/2d/src/editor/tsconfig.json
@@ -1,10 +1,11 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
- "rootDir": ".",
- "outDir": "../../editor",
"jsx": "react-jsx",
- "jsxImportSource": "preact"
+ "jsxImportSource": "preact",
+ "paths": {
+ "@motion-canvas/2d": ["../lib"]
+ }
},
"references": [{"path": "../lib/tsconfig.json"}],
"include": ["**/*"]
diff --git a/packages/2d/src/editor/vite-env.d.ts b/packages/2d/src/editor/vite-env.d.ts
new file mode 100644
index 00000000..11f02fe2
--- /dev/null
+++ b/packages/2d/src/editor/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/2d/src/lib/components/Node.ts b/packages/2d/src/lib/components/Node.ts
index 88d0d0fb..436abae1 100644
--- a/packages/2d/src/lib/components/Node.ts
+++ b/packages/2d/src/lib/components/Node.ts
@@ -429,6 +429,7 @@ export class Node implements Promisable<Node> {
}
}
protected getChildren(): Node[] {
+ this.children.context.getter();
return this.spawnedChildren();
}
diff --git a/packages/2d/src/lib/scenes/Scene2D.ts b/packages/2d/src/lib/scenes/Scene2D.ts
index bfc2e619..d8182667 100644
--- a/packages/2d/src/lib/scenes/Scene2D.ts
+++ b/packages/2d/src/lib/scenes/Scene2D.ts
@@ -143,6 +143,12 @@ export class Scene2D extends GeneratorScene<View2D> implements Inspectable {
return this.registeredNodes.get(key) ?? null;
}
+ public *getDetachedNodes() {
+ for (const node of this.registeredNodes.values()) {
+ if (!node.parent() && node !== this.view) yield node;
+ }
+ }
+
protected recreateView() {
this.execute(() => {
const size = this.getSize();
diff --git a/packages/2d/src/lib/tsconfig.json b/packages/2d/src/lib/tsconfig.json
index c783c3d2..442aab96 100644
--- a/packages/2d/src/lib/tsconfig.json
+++ b/packages/2d/src/lib/tsconfig.json
@@ -1,8 +1,6 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
- "rootDir": ".",
- "outDir": "../../lib",
"types": ["node"],
"jsx": "react-jsx",
"jsxImportSource": "@motion-canvas/2d/src/lib",
diff --git a/packages/2d/src/tsconfig.base.json b/packages/2d/src/tsconfig.base.json
index 314e6f4d..254fc6a7 100644
--- a/packages/2d/src/tsconfig.base.json
+++ b/packages/2d/src/tsconfig.base.json
@@ -1,5 +1,7 @@
{
"compilerOptions": {
+ "rootDir": ".",
+ "outDir": "..",
"strict": true,
"noImplicitOverride": true,
"module": "esnext",
diff --git a/packages/internal/package.json b/packages/internal/package.json
index f94110ed..cd1dbde9 100644
--- a/packages/internal/package.json
+++ b/packages/internal/package.json
@@ -10,6 +10,7 @@
"highlight.js": "^11.9.0",
"marked": "^10.0.0",
"marked-highlight": "^2.1.0",
+ "rollup-plugin-postcss": "^4.0.2",
"ts-patch": "^3.0.2"
}
}
diff --git a/packages/internal/transformers/markdown-literals.js b/packages/internal/transformers/markdown-literals.js
index 9255eb9e..e0319e29 100644
--- a/packages/internal/transformers/markdown-literals.js
+++ b/packages/internal/transformers/markdown-literals.js
@@ -35,7 +35,7 @@ const transformerProgram = program => context => sourceFile => {
if (
ts.isImportDeclaration(node) &&
ts.isStringLiteral(node.moduleSpecifier) &&
- node.importClause.name !== undefined
+ node.importClause?.name !== undefined
) {
/**
* @type {ts.TypeChecker}
diff --git a/packages/ui/src/components/controls/Controls.module.scss b/packages/ui/src/components/controls/Controls.module.scss
index f6a5b708..7d10badb 100644
--- a/packages/ui/src/components/controls/Controls.module.scss
+++ b/packages/ui/src/components/controls/Controls.module.scss
@@ -255,7 +255,7 @@
background-color: var(--surface-color-hover);
}
- svg {
+ &.animated svg {
transition: rotate var(--duration-normal) var(--timing-ease-in-out);
}
diff --git a/packages/ui/src/components/controls/Toggle.tsx b/packages/ui/src/components/controls/Toggle.tsx
index 82cd3a0d..8f535510 100644
--- a/packages/ui/src/components/controls/Toggle.tsx
+++ b/packages/ui/src/components/controls/Toggle.tsx
@@ -1,17 +1,30 @@
import clsx from 'clsx';
+import {JSX} from 'preact';
import {ChevronRight} from '../icons/ChevronRight';
import styles from './Controls.module.scss';
-export interface ToggleProps {
+export interface ToggleProps
+ extends Omit<JSX.HTMLAttributes<HTMLButtonElement>, 'onToggle'> {
open?: boolean;
onToggle?: (value: boolean) => void;
+ animated?: boolean;
}
-export function Toggle({open, onToggle}: ToggleProps) {
+export function Toggle({
+ open,
+ onToggle,
+ animated = true,
+ ...props
+}: ToggleProps) {
return (
<button
- className={clsx(styles.toggle, open && styles.open)}
+ className={clsx(
+ styles.toggle,
+ open && styles.open,
+ animated && styles.animated,
+ )}
onClick={() => onToggle?.(!open)}
+ {...props}
>
<ChevronRight />
</button>
diff --git a/packages/ui/src/components/layout/Collapse.tsx b/packages/ui/src/components/layout/Collapse.tsx
index a7819b86..c2a64555 100644
--- a/packages/ui/src/components/layout/Collapse.tsx
+++ b/packages/ui/src/components/layout/Collapse.tsx
@@ -7,11 +7,13 @@ import styles from './Collapse.module.scss';
export interface CollapseProps extends JSX.HTMLAttributes<HTMLDivElement> {
open: boolean;
children: ComponentChildren;
+ animated?: boolean;
}
-export function Collapse(props: CollapseProps) {
+export function Collapse({animated = true, ...props}: CollapseProps) {
const reducedMotion = useReducedMotion();
- const Component = reducedMotion ? ReducedCollapse : AnimatedCollapse;
+ const Component =
+ !reducedMotion && animated ? AnimatedCollapse : ReducedCollapse;
return <Component {...props} />;
}
diff --git a/packages/ui/src/components/tabs/Pane.tsx b/packages/ui/src/components/tabs/Pane.tsx
index 1764271a..9959f5c2 100644
--- a/packages/ui/src/components/tabs/Pane.tsx
+++ b/packages/ui/src/components/tabs/Pane.tsx
@@ -1,17 +1,16 @@
-import styles from './Tabs.module.scss';
-
-import {ComponentChildren} from 'preact';
+import {ComponentChildren, JSX} from 'preact';
import {Header} from '../layout';
+import styles from './Tabs.module.scss';
-export interface PaneProps {
+export interface PaneProps extends JSX.HTMLAttributes<HTMLDivElement> {
title: string;
id?: string;
children: ComponentChildren;
}
-export function Pane({title, id, children}: PaneProps) {
+export function Pane({title, id, children, ...props}: PaneProps) {
return (
- <div className={styles.pane} id={id}>
+ <div className={styles.pane} id={id} {...props}>
<Header>{title}</Header>
{children}
</div>
diff --git a/packages/ui/vite.config.ts b/packages/ui/vite.config.ts
index 13230ccf..c7ffec4f 100644
--- a/packages/ui/vite.config.ts
+++ b/packages/ui/vite.config.ts
@@ -8,6 +8,8 @@ export default defineConfig({
alias: {
// eslint-disable-next-line @typescript-eslint/naming-convention
'@motion-canvas/ui': '/src/main.tsx',
+ // eslint-disable-next-line @typescript-eslint/naming-convention
+ '@motion-canvas/2d/editor': '@motion-canvas/2d/src/editor',
},
},
build: {