From 8b51f0fbd29dba3b17d49dec88228a413f565f4a Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 28 Feb 2023 21:57:03 +0100 Subject: [PATCH 1/7] Update @strudel.cycles/react to 0.6.1 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 445910f8..f823e6b7 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@strudel.cycles/react", - "version": "0.6.0", + "version": "0.6.1", "description": "React components for strudel", "main": "src/index.js", "publishConfig": { From 032acbd27cb96e5772beb9d0cf22c876087c59b5 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 28 Feb 2023 22:11:17 +0100 Subject: [PATCH 2/7] comment out autocomplete --- packages/react/src/components/CodeMirror6.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/components/CodeMirror6.jsx b/packages/react/src/components/CodeMirror6.jsx index 319fb7f7..f33436c6 100644 --- a/packages/react/src/components/CodeMirror6.jsx +++ b/packages/react/src/components/CodeMirror6.jsx @@ -7,7 +7,7 @@ import strudelTheme from '../themes/strudel-theme'; import './style.css'; import { useCallback } from 'react'; import { autocompletion } from '@codemirror/autocomplete'; -import { strudelAutocomplete } from './Autocomplete'; +//import { strudelAutocomplete } from './Autocomplete'; import { vim } from '@replit/codemirror-vim'; import { emacs } from '@replit/codemirror-emacs'; From 7e1351507acfb75f46e820342c8e01cc8f7370c3 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 28 Feb 2023 22:17:24 +0100 Subject: [PATCH 3/7] add variables to react tailwind config --- packages/react/src/components/style.css | 12 ++++++++++++ packages/react/tailwind.config.js | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/react/src/components/style.css b/packages/react/src/components/style.css index ae33a5d2..150c9837 100644 --- a/packages/react/src/components/style.css +++ b/packages/react/src/components/style.css @@ -1,3 +1,15 @@ +:root { + --background: #222; + --lineBackground: #22222250; + --foreground: #fff; + --caret: #ffcc00; + --selection: rgba(128, 203, 196, 0.5); + --selectionMatch: #036dd626; + --lineHighlight: #00000050; + --gutterBackground: transparent; + --gutterForeground: #8a919966; +} + .cm-editor { background-color: transparent !important; height: 100%; diff --git a/packages/react/tailwind.config.js b/packages/react/tailwind.config.js index f6cae19b..c5a940fc 100644 --- a/packages/react/tailwind.config.js +++ b/packages/react/tailwind.config.js @@ -1,7 +1,21 @@ module.exports = { content: ['./src/**/*.{js,jsx,ts,tsx}'], theme: { - extend: {}, + extend: { + colors: { + // codemirror-theme settings + background: 'var(--background)', + lineBackground: 'var(--lineBackground)', + foreground: 'var(--foreground)', + caret: 'var(--caret)', + selection: 'var(--selection)', + selectionMatch: 'var(--selectionMatch)', + gutterBackground: 'var(--gutterBackground)', + gutterForeground: 'var(--gutterForeground)', + gutterBorder: 'var(--gutterBorder)', + lineHighlight: 'var(--lineHighlight)', + }, + }, }, plugins: [], corePlugins: { From 18c7e02609b9b3b88e5fc171eec91ccf67197678 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 28 Feb 2023 22:40:18 +0100 Subject: [PATCH 4/7] fix: minirepl styles for package --- packages/react/src/components/MiniRepl.jsx | 28 +++++++++++++------ .../react/src/components/MiniRepl.module.css | 27 ------------------ 2 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 packages/react/src/components/MiniRepl.module.css diff --git a/packages/react/src/components/MiniRepl.jsx b/packages/react/src/components/MiniRepl.jsx index ae91bbb0..bf151675 100644 --- a/packages/react/src/components/MiniRepl.jsx +++ b/packages/react/src/components/MiniRepl.jsx @@ -7,7 +7,6 @@ import useHighlighting from '../hooks/useHighlighting.mjs'; import useStrudel from '../hooks/useStrudel.mjs'; import CodeMirror6, { flash } from './CodeMirror6'; import { Icon } from './Icon'; -import styles from './MiniRepl.module.css'; import './style.css'; import { logger } from '@strudel.cycles/core'; import useEvent from '../hooks/useEvent.mjs'; @@ -129,19 +128,32 @@ export function MiniRepl({ ); return ( -
-
-
- -
- {error &&
{error.message}
} + {error &&
{error.message}
}
-
+
{show && }
{drawTime && ( diff --git a/packages/react/src/components/MiniRepl.module.css b/packages/react/src/components/MiniRepl.module.css deleted file mode 100644 index 257268a8..00000000 --- a/packages/react/src/components/MiniRepl.module.css +++ /dev/null @@ -1,27 +0,0 @@ -.container { - @apply overflow-hidden; -} - -.header { - @apply flex justify-between bg-lineHighlight border-t border-l border-r border-lineHighlight rounded-t-md overflow-hidden; -} - -.buttons { - @apply flex; -} - -.button { - @apply cursor-pointer w-16 flex items-center justify-center p-1 border-r border-lineHighlight text-foreground hover:bg-background; -} - -.buttonDisabled { - @apply w-16 flex items-center justify-center p-1 opacity-50 cursor-not-allowed border-r border-lineHighlight; -} - -.error { - @apply text-right p-1 text-sm text-red-200; -} - -.body { - @apply overflow-auto relative; -} From 66fba947acdacd4066b3414b41bbeff2234b7df7 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 28 Feb 2023 22:40:52 +0100 Subject: [PATCH 5/7] Update @strudel.cycles/react to 0.6.2 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index f823e6b7..39e5a984 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@strudel.cycles/react", - "version": "0.6.1", + "version": "0.6.2", "description": "React components for strudel", "main": "src/index.js", "publishConfig": { From e9d577496b7e9b63125317e0e5f2faf240e8c3ed Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 28 Feb 2023 22:48:06 +0100 Subject: [PATCH 6/7] fix disabled button --- packages/react/src/components/MiniRepl.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/src/components/MiniRepl.jsx b/packages/react/src/components/MiniRepl.jsx index bf151675..b6c79962 100644 --- a/packages/react/src/components/MiniRepl.jsx +++ b/packages/react/src/components/MiniRepl.jsx @@ -143,8 +143,8 @@ export function MiniRepl({