Read-only editor

src-web/components/Editor/Editor.css

@@ -1,83 +1,85 @@
 .cm-wrapper {
     @apply h-full;
-}
 
-.cm-editor {
+    .cm-editor {
-    @apply w-full block text-base;
+        @apply w-full block text-base;
 
-    * {
+        * {
-        @apply cursor-text;
+            @apply cursor-text;
-    }
+        }
 
-    &.cm-focused {
+        &.cm-focused {
-        outline: none !important;
+            outline: none !important;
-    }
+        }
 
-    .cm-line {
+        .cm-selectionBackground {
-        @apply text-gray-900 pl-1 pr-1.5;
+            @apply bg-gray-300;
-    }
+        }
 
-    .cm-placeholder {
+        .cm-line {
-        @apply text-placeholder;
+            @apply text-gray-900 pl-1 pr-1.5;
-    }
+        }
 
-    .cm-gutters {
+        .cm-placeholder {
-        @apply border-0 text-gray-500 text-opacity-30;
+            @apply text-placeholder;
+        }
 
-        .cm-gutterElement {
+        .cm-gutters {
-            @apply cursor-default;
+            @apply border-0 text-gray-500 text-opacity-30;
+
+            .cm-gutterElement {
+                @apply cursor-default;
+            }
+        }
+
+        &.cm-focused .cm-gutters {
+            @apply text-opacity-60;
+        }
+
+        .placeholder-widget {
+            @apply text-[0.9em] text-gray-800 dark:text-gray-1000 px-1 rounded cursor-default dark:shadow;
+
+            /* NOTE: Background and border are translucent so we can see text selection through it */
+            @apply bg-gray-300/40 border border-gray-300 border-opacity-40 hover:border-opacity-80;
+
+            /* Bring above on hover */
+            @apply hover:z-10 relative;
         }
     }
 
-    &.cm-focused .cm-gutters,
+    &.cm-singleline {
-    .cm-gutters:hover {
+        .cm-editor {
-        @apply text-opacity-60;
+            @apply h-full w-full;
+        }
+
+        .cm-scroller {
+            @apply font-mono flex text-[0.8rem];
+            align-items: center !important;
+            overflow: hidden !important;
+        }
+
+        .cm-line {
+            @apply px-0;
+        }
     }
 
-    .placeholder-widget {
+    &.cm-multiline {
-        @apply text-[0.9em] text-gray-800 dark:text-gray-1000 px-1 rounded cursor-default dark:shadow;
+        &.cm-full-height {
+            @apply relative;
 
-        /* NOTE: Background and border are translucent so we can see text selection through it */
+            .cm-editor {
-        @apply bg-gray-300/40 border border-gray-300 border-opacity-40 hover:border-opacity-80;
+                @apply inset-0 absolute;
-
+                position: absolute !important;
-        /* Bring above on hover */
+            }
-        @apply hover:z-10 relative;
+        }
-    }
-}
-
-
-.cm-singleline {
-    .cm-editor {
-        @apply h-full w-full;
-    }
-
-    .cm-scroller {
-        @apply font-mono flex text-[0.8rem];
-        align-items: center !important;
-        overflow: hidden !important;
-    }
-
-    .cm-line {
-        @apply px-0;
-    }
-}
-
-.cm-multiline {
-    &.cm-full-height {
-        @apply relative;
 
         .cm-editor {
-            @apply inset-0 absolute;
+            @apply h-full;
-            position: absolute !important;
         }
-    }
 
-    .cm-editor {
+        .cm-scroller {
-        @apply h-full;
+            @apply font-mono text-[0.75rem];
-    }
+        }
-
-    .cm-scroller {
-        @apply font-mono text-[0.75rem];
     }
 }
 
@@ -115,20 +117,13 @@
     @apply bg-transparent;
 }
 
-.cm-editor.cm-focused .cm-activeLineGutter {
+.cm-wrapper:not(.cm-readonly) .cm-editor {
-    @apply text-gray-800;
+    &.cm-focused .cm-activeLineGutter {
-}
+        @apply text-gray-800;
-
+    }
-.cm-editor .cm-cursor {
+    .cm-cursor {
-    @apply border-l-2 border-gray-800;
+        @apply border-l-2 border-gray-800;
-}
+    }
-
-.cm-editor .cm-selectionBackground {
-    @apply bg-gray-200/70;
-}
-
-.cm-editor.cm-focused .cm-selectionBackground {
-    @apply bg-gray-200;
 }
 
 .cm-singleline .cm-editor {

src-web/components/Editor/Editor.tsx

@@ -10,6 +10,7 @@ import { baseExtensions, getLanguageExtension, multiLineExtensions } from './ext
 import { singleLineExt } from './singleLine';
 
 export interface EditorProps extends Omit<HTMLAttributes<HTMLDivElement>, 'onChange'> {
+  readOnly?: boolean;
   heightMode?: 'auto' | 'full';
   contentType?: string;
   autoFocus?: boolean;
@@ -23,6 +24,7 @@ export interface EditorProps extends Omit<HTMLAttributes<HTMLDivElement>, 'onCha
 }
 
 export default function Editor({
+  readOnly,
   heightMode,
   contentType,
   autoFocus,
@@ -41,6 +43,7 @@ export default function Editor({
     () =>
       getExtensions({
         container: ref.current,
+        readOnly,
         placeholder,
         singleLine,
         onChange,
@@ -116,6 +119,7 @@ export default function Editor({
         'cm-wrapper text-base bg-background',
         heightMode === 'auto' ? 'cm-auto-height' : 'cm-full-height',
         singleLine ? 'cm-singleline' : 'cm-multiline',
+        readOnly && 'cm-readonly',
       )}
       {...props}
     />
@@ -124,6 +128,7 @@ export default function Editor({
 
 function getExtensions({
   container,
+  readOnly,
   singleLine,
   placeholder,
   onChange,
@@ -131,7 +136,7 @@ function getExtensions({
   useTemplating,
 }: Pick<
   EditorProps,
-  'singleLine' | 'onChange' | 'contentType' | 'useTemplating' | 'placeholder'
+  'singleLine' | 'onChange' | 'contentType' | 'useTemplating' | 'placeholder' | 'readOnly'
 > & { container: HTMLDivElement | null }) {
   const ext = getLanguageExtension({ contentType, useTemplating });
 
@@ -148,6 +153,7 @@ function getExtensions({
     ...(singleLine ? [singleLineExt()] : []),
     ...(!singleLine ? [multiLineExtensions] : []),
     ...(ext ? [ext] : []),
+    ...(readOnly ? [EditorState.readOnly.of(true)] : []),
     ...(placeholder ? [placeholderExt(placeholder)] : []),
 
     ...(singleLine

src-web/components/Editor/extensions.ts

@@ -34,6 +34,7 @@ import {
 } from '@codemirror/view';
 import { tags as t } from '@lezer/highlight';
 import { debouncedAutocompletionDisplay } from './autocomplete';
+import { readOnlyTransactionFilter } from './readOnlyTransactionFilter';
 import { twig } from './twig/extension';
 import { url } from './url/extension';
 

src-web/components/ResponsePane.tsx

@@ -130,6 +130,7 @@ export function ResponsePane({ requestId, className }: Props) {
               </div>
             ) : response?.body ? (
               <Editor
+                readOnly
                 className="bg-gray-50 dark:!bg-gray-100"
                 valueKey={`${contentType}:${response.updatedAt}`}
                 defaultValue={response?.body}

src-web/lib/theme/theme.ts

@@ -146,7 +146,6 @@ export function generateColorVariant(
     lightnessMod > 0
       ? hsl[2] + (100 * whitePoint - hsl[2]) * lightnessMod
       : hsl[2] + hsl[2] * (1 - blackPoint) * lightnessMod;
-  console.log('NEWL', color, newL);
   return `hsl(${hsl[0]},${hsl[1]}%,${newL.toFixed(1)}%)`;
 }