Visualize Your Ideas With Code
feat(docs): fiddle editor (#542)
Jacob3c68fefdf7bf
diff --git a/.eslintrc.json b/.eslintrc.jsonindex ad1e9135..da96ffeb 100644--- a/.eslintrc.json+++ b/.eslintrc.json@@ -33,7 +33,7 @@"leadingUnderscore": "forbid","trailingUnderscore": "forbid","filter": {- "regex": "^__html$",+ "regex": "^(__html|_jsx)$","match": false}},diff --git a/package-lock.json b/package-lock.jsonindex 1d83e4c4..8de910e2 100644--- a/package-lock.json+++ b/package-lock.json@@ -1814,6 +1814,14 @@"node": ">=6.9.0"}},+ "node_modules/@babel/standalone": {+ "version": "7.21.3",+ "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.21.3.tgz",+ "integrity": "sha512-c8feJERTAHlBEvihQUWrnUMLg2GzrwSnE76WDyN3fRJWju10pHeRy8r3wniIq0q7zPLhHd71PQtFVsn1H+Qscw==",+ "engines": {+ "node": ">=6.9.0"+ }+ },"node_modules/@babel/template": {"version": "7.18.10","license": "MIT",@@ -1873,6 +1881,96 @@"version": "6.0.2","license": "MIT"},+ "node_modules/@codemirror/autocomplete": {+ "version": "6.4.2",+ "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz",+ "integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==",+ "dependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.6.0",+ "@lezer/common": "^1.0.0"+ },+ "peerDependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0"+ }+ },+ "node_modules/@codemirror/commands": {+ "version": "6.2.2",+ "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.2.tgz",+ "integrity": "sha512-s9lPVW7TxXrI/7voZ+HmD/yiAlwAYn9PH5SUVSUhsxXHhv4yl5eZ3KLntSoTynfdgVYM0oIpccQEWRBQgmNZyw==",+ "dependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.2.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0"+ }+ },+ "node_modules/@codemirror/lang-javascript": {+ "version": "6.1.4",+ "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz",+ "integrity": "sha512-OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A==",+ "dependencies": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/language": "^6.6.0",+ "@codemirror/lint": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0",+ "@lezer/javascript": "^1.0.0"+ }+ },+ "node_modules/@codemirror/language": {+ "version": "6.6.0",+ "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz",+ "integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==",+ "dependencies": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0",+ "@lezer/highlight": "^1.0.0",+ "@lezer/lr": "^1.0.0",+ "style-mod": "^4.0.0"+ }+ },+ "node_modules/@codemirror/lint": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz",+ "integrity": "sha512-KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg==",+ "dependencies": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "crelt": "^1.0.5"+ }+ },+ "node_modules/@codemirror/search": {+ "version": "6.2.3",+ "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.3.tgz",+ "integrity": "sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==",+ "dependencies": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "crelt": "^1.0.5"+ }+ },+ "node_modules/@codemirror/state": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz",+ "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="+ },+ "node_modules/@codemirror/view": {+ "version": "6.9.2",+ "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.2.tgz",+ "integrity": "sha512-ci0r/v6aKOSlzOs7/STMTYP3jX/+YMq2dAfAJcLIB6uom4ThtrUlzeuS7GTRGNqJJ+qAJR1vGWfXgu4CO/0myQ==",+ "dependencies": {+ "@codemirror/state": "^6.1.4",+ "style-mod": "^4.0.0",+ "w3c-keyname": "^2.2.4"+ }+ },"node_modules/@colors/colors": {"version": "1.5.0","license": "MIT",@@ -4865,6 +4963,36 @@"node": "^14.15.0 || >=16.0.0"}},+ "node_modules/@lezer/common": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz",+ "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="+ },+ "node_modules/@lezer/highlight": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz",+ "integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==",+ "dependencies": {+ "@lezer/common": "^1.0.0"+ }+ },+ "node_modules/@lezer/javascript": {+ "version": "1.4.1",+ "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz",+ "integrity": "sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==",+ "dependencies": {+ "@lezer/highlight": "^1.1.3",+ "@lezer/lr": "^1.3.0"+ }+ },+ "node_modules/@lezer/lr": {+ "version": "1.3.3",+ "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz",+ "integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==",+ "dependencies": {+ "@lezer/common": "^1.0.0"+ }+ },"node_modules/@mdx-js/mdx": {"version": "1.6.22","resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz",@@ -8824,6 +8952,20 @@"node": ">= 0.12.0"}},+ "node_modules/codemirror": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",+ "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",+ "dependencies": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/commands": "^6.0.0",+ "@codemirror/language": "^6.0.0",+ "@codemirror/lint": "^6.0.0",+ "@codemirror/search": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0"+ }+ },"node_modules/collapse-white-space": {"version": "1.0.6","resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",@@ -9396,6 +9538,11 @@"devOptional": true,"license": "MIT"},+ "node_modules/crelt": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz",+ "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="+ },"node_modules/cross-fetch": {"version": "3.1.5","license": "MIT",@@ -20261,6 +20408,11 @@"node": ">=4"}},+ "node_modules/style-mod": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz",+ "integrity": "sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ=="+ },"node_modules/style-to-object": {"version": "0.3.0","resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",@@ -21639,6 +21791,11 @@"dev": true,"license": "MIT"},+ "node_modules/w3c-keyname": {+ "version": "2.2.6",+ "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",+ "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="+ },"node_modules/w3c-xmlserializer": {"version": "4.0.0","devOptional": true,@@ -22534,6 +22691,8 @@"name": "@motion-canvas/docs","version": "0.0.0","dependencies": {+ "@babel/standalone": "^7.21.3",+ "@codemirror/lang-javascript": "^6.1.4","@docusaurus/core": "^2.3.1","@docusaurus/preset-classic": "^2.3.1","@docusaurus/theme-mermaid": "^2.3.1",@@ -22542,6 +22701,7 @@"@motion-canvas/examples": "*","@motion-canvas/player": "*","clsx": "^1.2.0",+ "codemirror": "^6.0.1","prism-react-renderer": "^1.3.5","raw-loader": "^4.0.2","react": "^17.0.2",@@ -23737,6 +23897,11 @@"regenerator-runtime": "^0.13.4"}},+ "@babel/standalone": {+ "version": "7.21.3",+ "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.21.3.tgz",+ "integrity": "sha512-c8feJERTAHlBEvihQUWrnUMLg2GzrwSnE76WDyN3fRJWju10pHeRy8r3wniIq0q7zPLhHd71PQtFVsn1H+Qscw=="+ },"@babel/template": {"version": "7.18.10","requires": {@@ -23780,6 +23945,90 @@"@braintree/sanitize-url": {"version": "6.0.2"},+ "@codemirror/autocomplete": {+ "version": "6.4.2",+ "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz",+ "integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==",+ "requires": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.6.0",+ "@lezer/common": "^1.0.0"+ }+ },+ "@codemirror/commands": {+ "version": "6.2.2",+ "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.2.tgz",+ "integrity": "sha512-s9lPVW7TxXrI/7voZ+HmD/yiAlwAYn9PH5SUVSUhsxXHhv4yl5eZ3KLntSoTynfdgVYM0oIpccQEWRBQgmNZyw==",+ "requires": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.2.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0"+ }+ },+ "@codemirror/lang-javascript": {+ "version": "6.1.4",+ "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz",+ "integrity": "sha512-OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A==",+ "requires": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/language": "^6.6.0",+ "@codemirror/lint": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0",+ "@lezer/javascript": "^1.0.0"+ }+ },+ "@codemirror/language": {+ "version": "6.6.0",+ "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz",+ "integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==",+ "requires": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0",+ "@lezer/highlight": "^1.0.0",+ "@lezer/lr": "^1.0.0",+ "style-mod": "^4.0.0"+ }+ },+ "@codemirror/lint": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz",+ "integrity": "sha512-KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg==",+ "requires": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "crelt": "^1.0.5"+ }+ },+ "@codemirror/search": {+ "version": "6.2.3",+ "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.3.tgz",+ "integrity": "sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==",+ "requires": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "crelt": "^1.0.5"+ }+ },+ "@codemirror/state": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz",+ "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="+ },+ "@codemirror/view": {+ "version": "6.9.2",+ "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.2.tgz",+ "integrity": "sha512-ci0r/v6aKOSlzOs7/STMTYP3jX/+YMq2dAfAJcLIB6uom4ThtrUlzeuS7GTRGNqJJ+qAJR1vGWfXgu4CO/0myQ==",+ "requires": {+ "@codemirror/state": "^6.1.4",+ "style-mod": "^4.0.0",+ "w3c-keyname": "^2.2.4"+ }+ },"@colors/colors": {"version": "1.5.0","optional": true@@ -25983,6 +26232,36 @@"write-file-atomic": "^4.0.1"}},+ "@lezer/common": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz",+ "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="+ },+ "@lezer/highlight": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz",+ "integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==",+ "requires": {+ "@lezer/common": "^1.0.0"+ }+ },+ "@lezer/javascript": {+ "version": "1.4.1",+ "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz",+ "integrity": "sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==",+ "requires": {+ "@lezer/highlight": "^1.1.3",+ "@lezer/lr": "^1.3.0"+ }+ },+ "@lezer/lr": {+ "version": "1.3.3",+ "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz",+ "integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==",+ "requires": {+ "@lezer/common": "^1.0.0"+ }+ },"@mdx-js/mdx": {"version": "1.6.22","resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz",@@ -26171,6 +26450,8 @@"@motion-canvas/docs": {"version": "file:packages/docs","requires": {+ "@babel/standalone": "^7.21.3",+ "@codemirror/lang-javascript": "^6.1.4","@docusaurus/core": "^2.3.1","@docusaurus/module-type-aliases": "^2.3.1","@docusaurus/preset-classic": "^2.3.1",@@ -26181,6 +26462,7 @@"@motion-canvas/player": "*","@tsconfig/docusaurus": "^1.0.5","clsx": "^1.2.0",+ "codemirror": "^6.0.1","mdn-links": "^0.1.0","prism-react-renderer": "^1.3.5","raw-loader": "^4.0.2",@@ -28770,6 +29052,20 @@"version": "4.6.0","peer": true},+ "codemirror": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",+ "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",+ "requires": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/commands": "^6.0.0",+ "@codemirror/language": "^6.0.0",+ "@codemirror/lint": "^6.0.0",+ "@codemirror/search": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0"+ }+ },"collapse-white-space": {"version": "1.0.6","resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",@@ -29150,6 +29446,11 @@"version": "1.1.1","devOptional": true},+ "crelt": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz",+ "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="+ },"cross-fetch": {"version": "3.1.5","requires": {@@ -36355,6 +36656,11 @@"through": "^2.3.4"}},+ "style-mod": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz",+ "integrity": "sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ=="+ },"style-to-object": {"version": "0.3.0","resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",@@ -37185,6 +37491,11 @@"version": "6.0.0","dev": true},+ "w3c-keyname": {+ "version": "2.2.6",+ "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",+ "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="+ },"w3c-xmlserializer": {"version": "4.0.0","devOptional": true,diff --git a/packages/2d/package.json b/packages/2d/package.jsonindex ecf056fb..7d449276 100644--- a/packages/2d/package.json+++ b/packages/2d/package.json@@ -6,7 +6,6 @@"homepage": "https://motioncanvas.io/","bugs": "https://github.com/motion-canvas/motion-canvas/issues","license": "MIT",- "type": "module","main": "lib/scenes/index.js","types": "./lib/scenes/index.d.ts","scripts": {diff --git a/packages/2d/src/components/index.ts b/packages/2d/src/components/index.tsindex 23011c61..115b45ea 100644--- a/packages/2d/src/components/index.ts+++ b/packages/2d/src/components/index.ts@@ -1,5 +1,4 @@export * from './Circle';-export * from './CodeBlock';export * from './Icon';export * from './Img';export * from './Grid';diff --git a/packages/core/src/utils/useThread.ts b/packages/core/src/utils/useThread.tsindex 242b4820..1977c94b 100644--- a/packages/core/src/utils/useThread.ts+++ b/packages/core/src/utils/useThread.ts@@ -1,5 +1,5 @@import type {Thread} from '../threading';-import {DetailedError} from '../utils';+import {DetailedError} from './DetailedError';const ThreadStack: Thread[] = [];diff --git a/packages/docs/config/codeTheme.js b/packages/docs/config/codeTheme.jsnew file mode 100644index 00000000..84f6e80f--- /dev/null+++ b/packages/docs/config/codeTheme.js@@ -0,0 +1,83 @@+const codeTheme = require('prism-react-renderer/themes/github');++module.exports = {+ plain: {+ color: 'var(--hl-color)',+ backgroundColor: 'var(--hl-background)',+ },+ styles: [+ {+ types: ['comment', 'prolog', 'doctype', 'cdata'],+ style: {+ color: 'var(--hl-comment)',+ fontStyle: 'var(--hl-comment-style)',+ },+ },+ {+ types: ['builtin', 'changed', 'keyword', 'interpolation-punctuation'],+ style: {+ color: 'var(--hl-keyword)',+ },+ },+ {+ types: ['number', 'inserted'],+ style: {+ color: 'var(--hl-number)',+ },+ },+ {+ types: ['constant'],+ style: {+ color: 'var(--hl-constant)',+ },+ },+ {+ types: ['attr-name', 'variable'],+ style: {+ color: 'var(--hl-variable)',+ },+ },+ {+ types: ['deleted', 'string', 'attr-value', 'template-punctuation'],+ style: {+ color: 'var(--hl-string)',+ },+ },+ {+ types: ['selector'],+ style: {+ color: 'var(--hl-selector)',+ },+ },+ {+ types: ['tag'],+ style: {+ color: 'var(--hl-tag)',+ },+ },+ {+ types: ['punctuation', 'operator'],+ style: {+ color: 'var(--hl-punctuation)',+ },+ },+ {+ types: ['function'],+ style: {+ color: 'var(--hl-function)',+ },+ },+ {+ types: ['class-name'],+ style: {+ color: 'var(--hl-class)',+ },+ },+ {+ types: ['char'],+ style: {+ color: 'var(--hl-char)',+ },+ },+ ],+};diff --git a/packages/docs/config/darkCodeTheme.js b/packages/docs/config/darkCodeTheme.jsdeleted file mode 100644index 13425d2a..00000000--- a/packages/docs/config/darkCodeTheme.js+++ /dev/null@@ -1,18 +0,0 @@-const darkCodeTheme = require('prism-react-renderer/themes/vsDark');--module.exports = {- ...darkCodeTheme,- plain: {- color: '#f8f8f8',- backgroundColor: 'var(--code-background-color)',- },- styles: [- ...darkCodeTheme.styles,- {- types: ['constant'],- style: {- color: 'rgb(184,165,232)',- },- },- ],-};diff --git a/packages/docs/config/lightCodeTheme.js b/packages/docs/config/lightCodeTheme.jsdeleted file mode 100644index 0bf59a4d..00000000--- a/packages/docs/config/lightCodeTheme.js+++ /dev/null@@ -1,9 +0,0 @@-const lightCodeTheme = require('prism-react-renderer/themes/github');--module.exports = {- ...lightCodeTheme,- plain: {- color: 'rgb(57, 58, 52)',- backgroundColor: 'var(--code-background-color)',- },-};diff --git a/packages/docs/docs/getting-started/quickstart.mdx b/packages/docs/docs/getting-started/quickstart.mdxindex 1b452723..644e330c 100644--- a/packages/docs/docs/getting-started/quickstart.mdx+++ b/packages/docs/docs/getting-started/quickstart.mdx@@ -65,25 +65,43 @@ going to focus on `src/scenes/example.tsx`, which is where we can add ouranimations. Open `example.tsx` in a text editor, and replace all code in thefile with the following snippet.-<CodeBlock language="tsx" title="src/scenes/example.tsx">- {source}-</CodeBlock>+```tsx editor+import {makeScene2D} from '@motion-canvas/2d/lib/scenes';+import {Circle} from '@motion-canvas/2d/lib/components';+import {createRef} from '@motion-canvas/core/lib/utils';+import {all} from '@motion-canvas/core/lib/flow';++export default makeScene2D(function* (view) {+ const myCircle = createRef<Circle>();++ view.add(+ <Circle+ ref={myCircle}+ // try changing these properties:+ x={-300}+ width={140}+ height={140}+ fill="#e13238"+ />,+ );++ yield* all(+ myCircle().position.x(300, 1).to(-300, 1),+ myCircle().fill('#e6a700', 1).to('#e13238', 1),+ );+});+```Now save the file. Any changes you make are automatically picked up andreflected in the preview.-You should see a gray circle in the preview pane at the top right of the web+You should see a red circle in the preview pane at the top right of the webapplication. Press the play button to see the circle animate across the screen.-<AnimationPlayer small name="quickstart" />--Depending on the size of your browser, you may want to zoom the preview out by-scrolling down on your mouse wheel while hovering over the preview panel.-### Explanation-Each video in Motion Canvas is represented by an instance of the `Project`-class. In our example, the project is declared in `src/project.ts`:+Each video in Motion Canvas is represented by a project configuration object. In+our example, this configuration is declared in `src/project.ts`:```ts title="src/project.ts"import {makeProject} from '@motion-canvas/core';@@ -118,7 +136,7 @@ scene.You can learn more about scenes, nodes, and this XML-like syntax in the[scene hierarchy](/docs/hierarchy) section. For now, what's important is that,in our example, we add an individual [`<Circle/>`](/api/2d/components/Circle)-node to our scene. We make it red, set its width and height as `240` pixels and+node to our scene. We make it red, set its width and height as `140` pixels andposition it `300` pixels left from the center:```tsx@@ -127,8 +145,8 @@ view.add(// highlight-startref={myCircle}x={-300}- width={240}- height={240}+ width={140}+ height={140}fill="#e13238"/>,);@@ -149,8 +167,8 @@ view.add(// highlight-next-lineref={myCircle}x={-300}- width={240}- height={240}+ width={140}+ height={140}fill="#e13238"/>,);@@ -175,8 +193,8 @@ example, in the circle above we defined its `fill` property as `'#e13238'`:<Circleref={myCircle}x={-300}- width={240}- height={240}+ width={140}+ height={140}// highlight-next-linefill="#e13238"/>diff --git a/packages/docs/docs/getting-started/rendering.mdx b/packages/docs/docs/getting-started/rendering.mdxindex d4af15f0..d747291c 100644--- a/packages/docs/docs/getting-started/rendering.mdx+++ b/packages/docs/docs/getting-started/rendering.mdx@@ -58,7 +58,8 @@ adjustments to resolution.This option is only available if you've [set up audio](/docs/media#audio) forthe current project. It allows you to offset the start of the audio in relationto your animation. The value is stored in seconds. You can also adjust the-offset by holding `SHIFT` over the audio track and dragging it left or right.+offset by holding <kbd>SHIFT</kbd> over the audio track and dragging it left or+right.### Frame ratediff --git a/packages/docs/docs/getting-started/time-events.mdx b/packages/docs/docs/getting-started/time-events.mdxindex b4f35a9a..f539779b 100644--- a/packages/docs/docs/getting-started/time-events.mdx+++ b/packages/docs/docs/getting-started/time-events.mdx@@ -46,8 +46,8 @@ resume when the playhead reaches the event pill.By default, adjusting a time event will also adjust all events that happen afterit. This is useful when you want to extend or shorten a pause in your voiceoverbecause correcting the first time event after the pause will also fix all events-after it. You can hold `SHIFT` when editing an event to prevent this from-happening.+after it. You can hold <kbd>SHIFT</kbd> when editing an event to prevent this+from happening.## Controlling animation durationdiff --git a/packages/docs/docusaurus.config.js b/packages/docs/docusaurus.config.jsindex d9a006af..83e34c85 100644--- a/packages/docs/docusaurus.config.js+++ b/packages/docs/docusaurus.config.js@@ -105,8 +105,8 @@ const config = {indexName: 'motion-canvasio',},prism: {- theme: require('./config/lightCodeTheme'),- darkTheme: require('./config/darkCodeTheme'),+ theme: require('./config/codeTheme'),+ darkTheme: require('./config/codeTheme'),},}),themes: [diff --git a/packages/docs/package.json b/packages/docs/package.jsonindex 0692072d..72dddb68 100644--- a/packages/docs/package.json+++ b/packages/docs/package.json@@ -16,6 +16,8 @@"typecheck": "tsc"},"dependencies": {+ "@babel/standalone": "^7.21.3",+ "@codemirror/lang-javascript": "^6.1.4","@docusaurus/core": "^2.3.1","@docusaurus/preset-classic": "^2.3.1","@docusaurus/theme-mermaid": "^2.3.1",@@ -24,6 +26,7 @@"@motion-canvas/examples": "*","@motion-canvas/player": "*","clsx": "^1.2.0",+ "codemirror": "^6.0.1","prism-react-renderer": "^1.3.5","raw-loader": "^4.0.2","react": "^17.0.2",diff --git a/packages/docs/src/Icon/Pause/index.tsx b/packages/docs/src/Icon/Pause/index.tsxnew file mode 100644index 00000000..4e2a1a7e--- /dev/null+++ b/packages/docs/src/Icon/Pause/index.tsx@@ -0,0 +1,9 @@+import React from 'react';++export function Pause() {+ return (+ <svg width={24} height={24} viewBox="0 0 24 24" fill="currentColor">+ <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />+ </svg>+ );+}diff --git a/packages/docs/src/Icon/PlayArrow/index.tsx b/packages/docs/src/Icon/PlayArrow/index.tsxnew file mode 100644index 00000000..9117c20f--- /dev/null+++ b/packages/docs/src/Icon/PlayArrow/index.tsx@@ -0,0 +1,9 @@+import React from 'react';++export function PlayArrow() {+ return (+ <svg width={24} height={24} viewBox="0 0 24 24" fill="currentColor">+ <path d="M8 5v14l11-7z" />+ </svg>+ );+}diff --git a/packages/docs/src/Icon/SkipNext/index.tsx b/packages/docs/src/Icon/SkipNext/index.tsxnew file mode 100644index 00000000..7190c6cd--- /dev/null+++ b/packages/docs/src/Icon/SkipNext/index.tsx@@ -0,0 +1,9 @@+import React from 'react';++export function SkipNext() {+ return (+ <svg width={24} height={24} viewBox="0 0 24 24" fill="currentColor">+ <path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" />+ </svg>+ );+}diff --git a/packages/docs/src/Icon/SkipPrevious/index.tsx b/packages/docs/src/Icon/SkipPrevious/index.tsxnew file mode 100644index 00000000..8a723526--- /dev/null+++ b/packages/docs/src/Icon/SkipPrevious/index.tsx@@ -0,0 +1,9 @@+import React from 'react';++export function SkipPrevious() {+ return (+ <svg width={24} height={24} viewBox="0 0 24 24" fill="currentColor">+ <path d="M6 6h2v12H6zm3.5 6l8.5 6V6z" />+ </svg>+ );+}diff --git a/packages/docs/src/components/Fiddle/FiddleCodeBlock.tsx b/packages/docs/src/components/Fiddle/FiddleCodeBlock.tsxnew file mode 100644index 00000000..6688a774--- /dev/null+++ b/packages/docs/src/components/Fiddle/FiddleCodeBlock.tsx@@ -0,0 +1,24 @@+import Fiddle from '@site/src/components/Fiddle/index';+import {Props} from '@theme/MDXComponents/Pre';+import React, {isValidElement} from 'react';+import CodeBlock from '@theme/CodeBlock';++export default function FiddleCodeBlock(props: Props) {+ if (+ isValidElement(props.children) &&+ (props.children.props as {editor: boolean} | null)?.editor+ ) {+ return <Fiddle>{props.children.props.children}</Fiddle>;+ }++ return (+ <CodeBlock+ // If this pre is created by a ``` fenced codeblock, unwrap the children+ {...(isValidElement(props.children) &&+ (props.children.props as {originalType: string} | null)?.originalType ===+ 'code'+ ? props.children.props+ : {...props})}+ />+ );+}diff --git a/packages/docs/src/components/Fiddle/SharedPlayer.ts b/packages/docs/src/components/Fiddle/SharedPlayer.tsnew file mode 100644index 00000000..97e05aa6--- /dev/null+++ b/packages/docs/src/components/Fiddle/SharedPlayer.ts@@ -0,0 +1,108 @@+import {+ Logger,+ Player,+ Project,+ ProjectMetadata,+ Stage,+} from '@motion-canvas/core';+import type {+ FullSceneDescription,+ ThreadGeneratorFactory,+} from '@motion-canvas/core/lib/scenes';+import type {View2D} from '@motion-canvas/2d/lib/components';+import {makeScene2D} from '@motion-canvas/2d';+import {ValueDispatcher} from '@motion-canvas/core/lib/events';+import runtime from '@site/src/components/Fiddle/runtime';++declare global {+ interface Window {+ mc: typeof runtime & {+ makeScene2D: unknown;+ };+ }+}++let ProjectInstance: Project = null;+let Description: FullSceneDescription<ThreadGeneratorFactory<View2D>> = null;+let PlayerInstance: Player = null;+let StageInstance: Stage = null;+let CurrentSetter: (value: Player) => void = null;+let CurrentParent: HTMLElement = null;++export function disposePlayer(setter: (value: Player) => void) {+ if (CurrentSetter !== setter || !ProjectInstance) return;+ PlayerInstance.deactivate();+ CurrentSetter = null;+ CurrentParent = null;+ StageInstance.finalBuffer.remove();+}++export function borrowPlayer(+ setter: (value: Player) => void,+ parent: HTMLDivElement,+): Player {+ if (setter === CurrentSetter) return;++ if (!ProjectInstance) {+ window.mc = {+ ...runtime,+ makeScene2D: config => {+ Description.config = config;+ Description.onReplaced.current = Description;+ return Description;+ },+ };++ Description = makeScene2D(function* () {+ yield;+ }) as FullSceneDescription<ThreadGeneratorFactory<View2D>>;+ Description.onReplaced = new ValueDispatcher(Description);++ ProjectInstance = {+ name: 'fiddle',+ logger: new Logger(),+ meta: new ProjectMetadata(),+ scenes: [Description],+ } as Project;+ ProjectInstance.meta.shared.size.set([960, 960 / 4]);++ PlayerInstance = new Player(ProjectInstance, {+ size: ProjectInstance.meta.shared.size.get(),+ });+ StageInstance = new Stage();+ StageInstance.configure({+ size: ProjectInstance.meta.shared.size.get(),+ });+ PlayerInstance.onRender.subscribe(async () => {+ await StageInstance.render(+ PlayerInstance.playback.currentScene,+ PlayerInstance.playback.previousScene,+ );+ });+ PlayerInstance.onRecalculated.subscribe(() => {+ if (StageInstance.finalBuffer.parentElement !== CurrentParent) {+ CurrentParent?.append(StageInstance.finalBuffer);+ CurrentSetter(PlayerInstance);+ }+ });++ // TODO Find a way to attach the logger only for DEV:+ // ProjectInstance.logger.onLogged.subscribe(console.log);+ }++ CurrentParent?.removeChild(StageInstance.finalBuffer);+ CurrentSetter?.(null);+ CurrentSetter = setter;+ CurrentParent = parent;++ PlayerInstance.activate();+ PlayerInstance.requestReset();+ return PlayerInstance;+}++export function tryBorrowPlayer(+ setter: (value: Player) => void,+ parent: HTMLDivElement,+): Player | null {+ return CurrentSetter ? null : borrowPlayer(setter, parent);+}diff --git a/packages/docs/src/components/Fiddle/autocomplete.ts b/packages/docs/src/components/Fiddle/autocomplete.tsnew file mode 100644index 00000000..eba51a0e--- /dev/null+++ b/packages/docs/src/components/Fiddle/autocomplete.ts@@ -0,0 +1,36 @@+import {javascriptLanguage} from '@codemirror/lang-javascript';+import {syntaxTree} from '@codemirror/language';+import runtime from '@site/src/components/Fiddle/runtime';++function isConstructor(obj) {+ return !!obj.prototype && !!obj.prototype.constructor.name;+}++const Options = Object.entries(runtime).map(([name, value]) => ({+ label: name,+ type:+ typeof value === 'function'+ ? isConstructor(value)+ ? 'class'+ : 'function'+ : 'variable',+}));++export function autocomplete() {+ return javascriptLanguage.data.of({+ autocomplete: context => {+ const nodeBefore = syntaxTree(context.state).resolveInner(+ context.pos,+ -1,+ );+ if (nodeBefore.name === 'String') return;++ const word = context.matchBefore(/\w*/);+ if (word.from == word.to && !context.explicit) return null;+ return {+ from: word.from,+ options: Options,+ };+ },+ });+}diff --git a/packages/docs/src/components/Fiddle/index.tsx b/packages/docs/src/components/Fiddle/index.tsxnew file mode 100644index 00000000..c1c9eee1--- /dev/null+++ b/packages/docs/src/components/Fiddle/index.tsx@@ -0,0 +1,199 @@+import React, {useEffect, useRef, useState} from 'react';+import {basicSetup} from 'codemirror';+import {EditorView, keymap} from '@codemirror/view';+import {Text, EditorState} from '@codemirror/state';+import {javascript} from '@codemirror/lang-javascript';+import {syntaxHighlighting} from '@codemirror/language';+import {indentWithTab} from '@codemirror/commands';+import {Player} from '@motion-canvas/core';+import {+ EditorTheme,+ SyntaxHighlightStyle,+} from '@site/src/components/Fiddle/themes';+import CodeBlock from '@theme/CodeBlock';+import {useSubscribableValue} from '@site/src/utils/useSubscribable';+import {SkipPrevious} from '@site/src/Icon/SkipPrevious';+import {SkipNext} from '@site/src/Icon/SkipNext';+import {PlayArrow} from '@site/src/Icon/PlayArrow';+import {Pause} from '@site/src/Icon/Pause';+import {autocomplete} from '@site/src/components/Fiddle/autocomplete';+import {+ borrowPlayer,+ disposePlayer,+ tryBorrowPlayer,+} from '@site/src/components/Fiddle/SharedPlayer';+import styles from './styles.module.css';+import {+ transform,+ TransformError,+} from '@site/src/components/Fiddle/transformer';++export interface FiddleProps {+ children: string;+}++function highlight(sizePixels = 4) {+ return [+ {+ boxShadow: '0 0 0px 0 #ccc inset',+ easing: 'cubic-bezier(0.33, 1, 0.68, 1)',+ },+ {+ boxShadow: `0 0 0px ${sizePixels}px #ccc inset`,+ easing: 'cubic-bezier(0.32, 0, 0.67, 0)',+ },+ {boxShadow: '0 0 0px 0 #ccc inset'},+ ];+}++export default function Fiddle({children}: FiddleProps) {+ const [player, setPlayer] = useState<Player>(null);+ const editorView = useRef<EditorView>(null);+ const editorRef = useRef<HTMLDivElement>();+ const previewRef = useRef<HTMLDivElement>();++ const [error, setError] = useState<TransformError>(null);+ const duration = useSubscribableValue(player?.onDurationChanged);+ const frame = useSubscribableValue(player?.onFrameChanged);+ const state = useSubscribableValue(player?.onStateChanged);++ const [doc, setDoc] = useState<Text | null>(null);+ const [lastDoc, setLastDoc] = useState<Text | null>(null);+ const [initialState, setInitialState] = useState<EditorState>(null);++ const update = (newDoc: Text, animate = true) => {+ if (lastDoc?.eq(newDoc)) {+ return;+ }++ borrowPlayer(setPlayer, previewRef.current);+ const newError = transform(newDoc.sliceString(0));+ setError(newError);+ if (!newError) {+ setLastDoc(newDoc);+ if (animate) {+ previewRef.current.animate(highlight(), {duration: 300});+ }+ }+ };++ useEffect(() => {+ editorView.current = new EditorView({+ extensions: [+ basicSetup,+ keymap.of([+ indentWithTab,+ {+ key: 'Mod-s',+ preventDefault: true,+ run: view => {+ update(view.state.doc);+ return true;+ },+ },+ ]),+ EditorView.updateListener.of(update => {+ setDoc(update.state.doc);+ setError(null);+ }),+ autocomplete(),+ javascript({+ jsx: true,+ typescript: true,+ }),+ syntaxHighlighting(SyntaxHighlightStyle),+ EditorTheme,+ ],+ parent: editorRef.current,+ doc: children,+ });+ setInitialState(editorView.current.state);+ const borrowed = tryBorrowPlayer(setPlayer, previewRef.current);+ if (borrowed) {+ update(editorView.current.state.doc, false);+ }++ return () => {+ disposePlayer(setPlayer);+ editorView.current.destroy();+ };+ }, []);++ return (+ <div className={styles.root}>+ <div className={styles.preview} ref={previewRef}>+ {!player && <div>Press play to preview the animation</div>}+ </div>+ <div+ className={styles.progress}+ style={{width: player ? `${(frame / duration) * 100}%` : 0}}+ />+ <div className={styles.controls}>+ <div className={styles.section}>+ {lastDoc && !doc?.eq(lastDoc) && (+ <button+ onClick={() => update(editorView.current.state.doc)}+ className={styles.button}+ >+ <kbd>CTRL</kbd>+ <kbd>S</kbd>+ <small>Update preview</small>+ </button>+ )}+ </div>+ <div className={styles.section}>+ <button+ className={styles.icon}+ onClick={() => player?.requestPreviousFrame()}+ >+ <SkipPrevious />+ </button>+ <button+ className={styles.icon}+ onClick={() => {+ if (!player) {+ const borrowed = borrowPlayer(setPlayer, previewRef.current);+ update(editorView.current.state.doc);+ borrowed.togglePlayback(true);+ } else {+ if (!lastDoc) {+ update(editorView.current.state.doc);+ }+ player.togglePlayback();+ }+ }}+ >+ {!player || (state?.paused ?? true) ? <PlayArrow /> : <Pause />}+ </button>+ <button+ className={styles.icon}+ onClick={() => player?.requestNextFrame()}+ >+ <SkipNext />+ </button>+ </div>+ <div className={styles.section}>+ {((initialState && !doc?.eq(initialState.doc)) ||+ (lastDoc && !doc?.eq(lastDoc))) && (+ <button+ className={styles.button}+ onClick={() => {+ editorView.current.setState(initialState);+ update(initialState.doc);+ setDoc(initialState.doc);+ }}+ >+ <small>Reset example</small>+ </button>+ )}+ </div>+ </div>+ {error && <pre className={styles.error}>{error.message}</pre>}+ <div className={styles.editor} ref={editorRef}>+ <CodeBlock className={styles.source} language="tsx">+ {children + '\n'}+ </CodeBlock>+ </div>+ </div>+ );+}diff --git a/packages/docs/src/components/Fiddle/runtime.ts b/packages/docs/src/components/Fiddle/runtime.tsnew file mode 100644index 00000000..1e373145--- /dev/null+++ b/packages/docs/src/components/Fiddle/runtime.ts@@ -0,0 +1,21 @@+import {makeScene2D} from '@motion-canvas/2d';+import {jsx} from '@motion-canvas/2d/lib/jsx-runtime';+import * as components from '@motion-canvas/2d/lib/components';+import * as flow from '@motion-canvas/core/lib/flow';+import * as utils from '@motion-canvas/core/lib/utils';+import * as signals from '@motion-canvas/core/lib/signals';+import * as types from '@motion-canvas/core/lib/types';+import * as tweening from '@motion-canvas/core/lib/tweening';+import * as threading from '@motion-canvas/core/lib/threading';++export default {+ ...components,+ ...flow,+ ...utils,+ ...signals,+ ...types,+ ...tweening,+ ...threading,+ _jsx: jsx,+ makeScene2D,+};diff --git a/packages/docs/src/components/Fiddle/styles.module.css b/packages/docs/src/components/Fiddle/styles.module.cssnew file mode 100644index 00000000..cbd6ac62--- /dev/null+++ b/packages/docs/src/components/Fiddle/styles.module.css@@ -0,0 +1,105 @@+.root {+ border-radius: var(--ifm-code-border-radius);+ overflow: hidden;+ box-shadow: var(--ifm-global-shadow-lw);+ margin-bottom: var(--ifm-leading);+}++.progress {+ height: 1px;+ margin-bottom: -1px;+ position: relative;+ z-index: 1;+ background-color: var(--ifm-color-primary-lightest);+}++.controls {+ background-color: var(--ifm-background-surface-color);+ display: flex;+ border-bottom: 1px solid var(--ifm-color-emphasis-300);+ border-top: 1px solid var(--ifm-color-emphasis-300);+}++.section {+ width: 33.333%;+ display: flex;+ justify-content: center;+ gap: 8px;+ padding: 8px;+}++.section:first-child {+ justify-content: start;+}++.section:last-child {+ justify-content: end;+}++.icon {+ cursor: pointer;+ width: 2rem;+ height: 2rem;+ padding: 0;+ display: flex;+ align-items: center;+ justify-content: center;+ border-radius: 50%;+ color: var(--ifm-font-color-base);+ transition: background var(--ifm-transition-fast);+}++.icon:hover {+ background-color: var(--ifm-color-emphasis-200);+ color: var(--ifm-font-color-base);+}++.controls button {+ appearance: none;+ background-color: unset;+ border: none;+}++.error {+ border-radius: 0;+ margin: 0;+ border-top: 1px solid var(--ifm-color-danger-dark);+ border-bottom: 1px solid var(--ifm-color-danger-dark);+}++.editor {+}++.root .editor .source {+ display: none;+ margin-bottom: 0;+ padding-left: 38px;+}++.root .editor .source:first-child:last-child {+ display: block;+}++.preview {+ aspect-ratio: 4;+ background-color: var(--ifm-background-surface-color);+ overflow: hidden;+ display: flex;+ align-items: center;+ justify-content: center;+}++.preview canvas {+ max-width: 100%;+ max-height: 100%;+}++.button {+ cursor: pointer;+ height: 2rem;+ padding: var(--ifm-button-padding-vertical);+ color: var(--ifm-font-color-base);+ gap: 0.5rem;+ display: flex;+ align-items: center;+}diff --git a/packages/docs/src/components/Fiddle/themes.ts b/packages/docs/src/components/Fiddle/themes.tsnew file mode 100644index 00000000..d267428d--- /dev/null+++ b/packages/docs/src/components/Fiddle/themes.ts@@ -0,0 +1,84 @@+/* eslint-disable @typescript-eslint/naming-convention */+import {HighlightStyle} from '@codemirror/language';+import {tags} from '@lezer/highlight';+import {EditorView} from '@codemirror/view';++export const SyntaxHighlightStyle = HighlightStyle.define([+ {tag: tags.comment, color: 'var(--hl-comment)'},+ {tag: tags.docComment, color: 'var(--hl-comment)'},+ {tag: tags.blockComment, color: 'var(--hl-comment)'},+ {tag: tags.keyword, color: 'var(--hl-keyword)'},+ {tag: tags.number, color: 'var(--hl-number)'},+ {tag: tags.inserted, color: 'var(--hl-number)'},+ {tag: tags.constant(tags.propertyName), color: 'var(--hl-constant)'},+ {tag: tags.attributeName, color: 'var(--hl-variable)'},+ {tag: tags.variableName, color: 'var(--hl-variable)'},+ {tag: tags.propertyName, color: 'var(--hl-variable)'},+ {tag: tags.deleted, color: 'var(--hl-string)'},+ {tag: tags.string, color: 'var(--hl-string)'},+ {tag: tags.attributeValue, color: 'var(--hl-string)'},+ {tag: tags.tagName, color: 'var(--hl-tag)'},+ {tag: tags.typeName, color: 'var(--hl-tag)'},+ {tag: tags.punctuation, color: 'var(--hl-punctuation)'},+ {tag: tags.operator, color: 'var(--hl-punctuation)'},+ {tag: tags.function(tags.variableName), color: 'var(--hl-function)'},+ {tag: tags.function(tags.propertyName), color: 'var(--hl-function)'},+ {tag: tags.className, color: 'var(--hl-class)'},+ {tag: tags.character, color: 'var(--hl-char)'},+]);++export const EditorTheme = EditorView.theme({+ '&': {+ fontSize: `var(--ifm-code-font-size)`,+ lineHeight: `21.04px`,+ fontFamily: 'var(--ifm-font-family-monospace)',+ color: 'var(--hl-color)',+ backgroundColor: 'var(--hl-background)',+ },+ '&.cm-focused .cm-cursor': {+ borderLeftColor: 'var(--hl-color)',+ },+ '&.cm-focused': {+ outline: 'none',+ },+ '.cm-gutters': {+ backgroundColor: 'var(--hl-background)',+ color: 'var(--ifm-color-secondary-darkest)',+ borderRight: '1px solid var(--ifm-background-color)',+ },+ '& .cm-lineNumbers .cm-gutterElement': {+ paddingLeft: 'var(--ifm-pre-padding)',+ },+ '.cm-activeLineGutter': {+ backgroundColor: 'var(--ifm-code-active-color)',+ },+ '.cm-scroller': {+ fontFamily: 'var(--ifm-font-family-monospace)',+ lineHeight: 'var(--ifm-pre-line-height)',+ paddingTop: 'var(--ifm-pre-padding)',+ paddingBottom: 'var(--ifm-pre-padding)',+ },+ '.cm-content': {+ padding: '0',+ },+ '& .cm-line': {+ paddingRight: 'var(--ifm-pre-padding)',+ },+ '& .cm-selectionBackground, &.cm-focused .cm-selectionBackground, ::selection':+ {+ backgroundColor: 'var(--ifm-code-selection-color)',+ },+ '.cm-activeLine': {+ backgroundColor: 'var(--ifm-code-active-color)',+ },+ '.cm-selectionMatch': {+ backgroundColor: 'var(--ifm-code-selection-color)',+ },+ '.cm-foldPlaceholder': {+ backgroundColor: 'var(--ifm-code-selection-color)',+ borderColor: 'var(--ifm-color-emphasis-300)',+ },+ '.cm-tooltip': {+ backgroundColor: 'var(--ifm-background-surface-color)',+ },+});diff --git a/packages/docs/src/components/Fiddle/transformer.ts b/packages/docs/src/components/Fiddle/transformer.tsnew file mode 100644index 00000000..abad4ad4--- /dev/null+++ b/packages/docs/src/components/Fiddle/transformer.ts@@ -0,0 +1,65 @@+/* eslint-disable @typescript-eslint/naming-convention */+import * as Babel from '@babel/standalone';+import runtime from '@site/src/components/Fiddle/runtime';++Babel.registerPlugin('mc', ({types}) => ({+ visitor: {+ Program(path) {+ path.node.body.unshift(+ types.variableDeclaration('const', [+ types.variableDeclarator(+ types.objectPattern(+ Object.keys(runtime).map(key =>+ types.objectProperty(+ types.identifier(key),+ types.identifier(key),+ false,+ true,+ ),+ ),+ ),+ types.memberExpression(+ types.identifier('window'),+ types.identifier('mc'),+ ),+ ),+ ]),+ );+ },+ ImportDeclaration(path) {+ path.remove();+ },+ ExportDefaultDeclaration(path) {+ path.replaceWith(path.node.declaration);+ },+ },+}));++export interface TransformError {+ message: string;+ loc: {line: number; column: number; index: number};+}++export function transform(code: string): TransformError | null {+ try {+ const result = Babel.transform(code, {+ filename: 'fiddle.tsx',+ presets: [+ 'typescript',+ [+ 'react',+ {+ runtime: 'automatic',+ importSource: '@motion-canvas/2d/lib',+ },+ ],+ ],+ plugins: ['mc'],+ });+ eval(result.code);+ } catch (e) {+ return e as TransformError;+ }++ return null;+}diff --git a/packages/docs/src/css/custom.css b/packages/docs/src/css/custom.cssindex a61768fb..0e39124f 100644--- a/packages/docs/src/css/custom.css+++ b/packages/docs/src/css/custom.css@@ -56,6 +56,25 @@--ifm-pre-line-height: 1.6;--ifm-h3-font-size: 1.5rem;++ --ifm-code-selection-color: #dde8e1;+ --ifm-code-active-color: rgba(0, 0, 0, 0.04);+ --hl-color: rgb(57, 58, 52);+ --hl-background: var(--code-background-color);+ --hl-comment: #999988;+ --hl-comment-style: italic;+ --hl-keyword: #00009f;+ --hl-number: #36acaa;+ --hl-namespace: #f0f;+ --hl-string: #e3116c;+ --hl-punctuation: #393a34;+ --hl-constant: #36acaa;+ --hl-variable: var(--hl-color);+ --hl-selector: #00a4db;+ --hl-tag: #00009f;+ --hl-function: #d73a49;+ --hl-class: #00009f;+ --hl-char: rgb(209, 105, 105);}/* For readability concerns, you should choose a lighter palette in dark mode. */@@ -89,6 +108,24 @@ html[data-theme='dark'] {--ifm-color-emphasis-300: rgba(84, 84, 84, 0.48);--ifm-toc-border-color: var(--ifm-color-emphasis-300);++ --ifm-code-selection-color: #2b332f;+ --ifm-code-active-color: rgba(255, 255, 255, 0.04);+ --hl-color: #f8f8f8;+ --hl-comment: rgb(106, 153, 85);+ --hl-comment-style: italic;+ --hl-keyword: rgb(86, 156, 214);+ --hl-number: rgb(181, 206, 168);+ --hl-namespace: #f0f;+ --hl-string: rgb(206, 145, 120);+ --hl-punctuation: rgb(212, 212, 212);+ --hl-constant: rgb(100, 102, 149);+ --hl-variable: rgb(156, 220, 254);+ --hl-selector: rgb(215, 186, 125);+ --hl-tag: rgb(78, 201, 176);+ --hl-function: rgb(220, 220, 170);+ --hl-class: rgb(78, 201, 176);+ --hl-char: rgb(209, 105, 105);}.alert {@@ -196,3 +233,16 @@ a.button:hover {.DocSearch-Logo svg {filter: saturate(0) brightness(2);}++kbd {+ background-color: var(--ifm-background-color);+ border: 1px solid var(--ifm-color-emphasis-500);+ border-radius: var(--ifm-global-radius);+ box-shadow: none;+ color: var(--ifm-color-emphasis-800);+ font: 80% var(--ifm-font-family-monospace);+}++[data-theme='dark'] kbd {+ border: 1px solid var(--ifm-color-emphasis-300);+}diff --git a/packages/docs/src/theme/MDXComponents.js b/packages/docs/src/theme/MDXComponents.jsnew file mode 100644index 00000000..54861bfb--- /dev/null+++ b/packages/docs/src/theme/MDXComponents.js@@ -0,0 +1,8 @@+import React from 'react';+import MDXComponents from '@theme-original/MDXComponents';+import FiddleCodeBlock from '@site/src/components/Fiddle/FiddleCodeBlock';++export default {+ ...MDXComponents,+ pre: FiddleCodeBlock,+};diff --git a/packages/docs/src/utils/useSubscribable.ts b/packages/docs/src/utils/useSubscribable.tsnew file mode 100644index 00000000..b85eb9e2--- /dev/null+++ b/packages/docs/src/utils/useSubscribable.ts@@ -0,0 +1,22 @@+import type {+ EventHandler,+ Subscribable,+ SubscribableValueEvent,+} from '@motion-canvas/core/lib/events';+import {DependencyList, useEffect, useState} from 'react';++export function useSubscribable<TValue, THandler extends EventHandler<TValue>>(+ event: Subscribable<TValue, THandler>,+ handler: THandler,+ inputs: DependencyList,+) {+ useEffect(() => event?.subscribe(handler), [event, ...inputs]);+}++export function useSubscribableValue<TValue>(+ value: SubscribableValueEvent<TValue>,+) {+ const [state, setState] = useState(value?.current);+ useEffect(() => value && value.subscribe(setState), [value]);+ return state;+}diff --git a/packages/examples/src/scenes/quickstart.tsx b/packages/examples/src/scenes/quickstart.tsxindex ea0bf250..6dbf7311 100644--- a/packages/examples/src/scenes/quickstart.tsx+++ b/packages/examples/src/scenes/quickstart.tsx@@ -11,8 +11,8 @@ export default makeScene2D(function* (view) {//highlight-startref={myCircle}x={-300}- width={240}- height={240}+ width={140}+ height={140}fill="#e13238"/>,);