Merge pull request #16033 from Budibase/feat/ai-js-styling

AI JS styling fixes

Author: PClmnt

packages/builder/src/components/common/CodeEditor/AIGen.svelte

@@ -87,6 +87,8 @@
   function reset() {
     suggestedCode = null
     previousContents = null
+    promptText = ""
+    expanded = false
   }
 
   function calculateExpandedWidth() {
@@ -112,7 +114,6 @@
     placeholder="Generate with AI"
     onSubmit={generateJs}
     bind:expanded
-    on:collapse={rejectSuggestion}
     readonly={!!suggestedCode}
     {expandedOnly}
   />
@@ -130,21 +131,11 @@
     overflow: visible;
   }
 
-  @keyframes border-fade-in {
-    from {
-      opacity: 0;
-    }
-    to {
-      opacity: 1;
-    }
-  }
-
   .floating-actions {
     position: absolute;
     display: flex;
     gap: var(--spacing-s);
     bottom: calc(100% + 5px);
-    left: 5px;
     z-index: 2;
     animation: fade-in 0.2s ease-out forwards;
   }

packages/builder/src/components/common/CodeEditor/CodeEditor.svelte

@@ -88,6 +88,7 @@
   let isEditorInitialised = false
   let queuedRefresh = false
   let editorWidth: number | null = null
+  let isAIGeneratedContent = false
 
   // Theming!
   let currentTheme = $themeStore?.theme
@@ -429,6 +430,7 @@
     editor.dispatch({
       changes: { from: 0, to: editor.state.doc.length, insert: code },
     })
+    isAIGeneratedContent = true
   }
 
   onMount(() => {
@@ -462,7 +464,12 @@
   </div>
 {/if}
 
-<div class={`code-editor ${mode?.name || ""}`} bind:this={editorEle}>
+<div
+  class={`code-editor ${mode?.name || ""} ${
+    isAIGeneratedContent ? "ai-generated" : ""
+  }`}
+  bind:this={editorEle}
+>
   <div tabindex="-1" bind:this={textarea} />
 </div>
 
@@ -475,13 +482,15 @@
     on:accept={() => {
       dispatch("change", editor.state.doc.toString())
       dispatch("blur", editor.state.doc.toString())
+      isAIGeneratedContent = false
     }}
     on:reject={event => {
       const { code } = event.detail
       value = code || ""
       editor.dispatch({
         changes: { from: 0, to: editor.state.doc.length, insert: code || "" },
       })
+      isAIGeneratedContent = false
     }}
   />
 {/if}
@@ -691,4 +700,19 @@
     text-overflow: ellipsis !important;
     white-space: nowrap !important;
   }
+
+  .code-editor.ai-generated :global(.cm-editor) {
+    background: var(--spectrum-global-color-blue-50) !important;
+  }
+
+  .code-editor.ai-generated :global(.cm-content) {
+    background: transparent !important;
+  }
+
+  .code-editor.ai-generated :global(.cm-line) {
+    background: #765ffe1a !important;
+    display: inline-block;
+    min-width: fit-content;
+    padding-right: 2px !important;
+  }
 </style>

packages/builder/src/components/common/ai/AIInput.svelte

@@ -14,7 +14,6 @@
   export const submit = onPromptSubmit
 
   $: expanded = expandedOnly || expanded
-
   const dispatch = createEventDispatcher()
 
   let promptInput: HTMLInputElement
@@ -154,11 +153,11 @@
         </Modal>
       {:else}
         <Icon
-          color={promptLoading
+          color={promptInput
             ? "#6E56FF"
             : "var(--spectrum-global-color-gray-600)"}
           size="S"
-          disabled={!canSubmit}
+          disabled={!canSubmit || promptLoading}
           hoverable={!readonly}
           hoverColor="#6E56FF"
           name={promptLoading ? "StopCircle" : "PlayCircle"}
@@ -171,31 +170,43 @@
 
 <style>
   .spectrum-ActionButton {
-    --offset: 1px;
     position: relative;
     display: flex;
     align-items: center;
     justify-content: space-between;
     box-sizing: border-box;
     padding: var(--spacing-s);
-    border: 1px solid var(--spectrum-alias-border-color);
     border-radius: 30px;
     transition: width 0.8s cubic-bezier(0.4, 0, 0.2, 1);
     width: 100%;
     height: 40px;
     overflow: hidden;
     cursor: pointer;
     background-color: var(--spectrum-global-color-gray-75);
+    border: none;
   }
 
   .spectrum-ActionButton::before {
     content: "";
     position: absolute;
-    top: -1px;
-    left: -1px;
-    width: calc(100% + 2px);
-    height: calc(100% + 2px);
-    border-radius: inherit;
+    inset: 0;
+    border-radius: 30px;
+    padding: 1px;
+    background: var(--spectrum-alias-border-color);
+    -webkit-mask: linear-gradient(#fff 0 0) content-box,
+      linear-gradient(#fff 0 0);
+    mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
+    pointer-events: none;
+  }
+
+  .animate-border::after {
+    content: "";
+    position: absolute;
+    inset: 0;
+    border-radius: 30px;
+    padding: 1px;
     background: linear-gradient(
       125deg,
       transparent -10%,
@@ -205,38 +216,40 @@
       transparent 35%,
       transparent 110%
     );
+    -webkit-mask: linear-gradient(#fff 0 0) content-box,
+      linear-gradient(#fff 0 0);
+    mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
+    mask-composite: exclude;
     pointer-events: none;
-    z-index: 0;
-  }
-
-  .spectrum-ActionButton:not(.animate-border)::before {
-    content: none;
+    animation: border-flow 1.5s cubic-bezier(0.17, 0.67, 0.83, 0.67) forwards;
   }
 
-  .animate-border::before {
-    animation: border-fade-in 1s cubic-bezier(0.17, 0.67, 0.83, 0.67);
-    animation-fill-mode: forwards;
-  }
-
-  @keyframes border-fade-in {
-    from {
-      opacity: 0;
+  @keyframes border-flow {
+    0% {
+      clip-path: polygon(0% 0%, 10% 0%, 8% 100%, 0% 100%);
     }
-    to {
-      opacity: 1;
+    30% {
+      clip-path: polygon(0% 0%, 35% 0%, 26% 100%, 0% 100%);
+    }
+    50% {
+      clip-path: polygon(0% 0%, 55% 0%, 41% 100%, 0% 100%);
+    }
+    70% {
+      clip-path: polygon(0% 0%, 70% 0%, 53% 100%, 0% 100%);
+    }
+    85% {
+      clip-path: polygon(0% 0%, 80% 0%, 60% 100%, 0% 100%);
+    }
+    95% {
+      clip-path: polygon(0% 0%, 86% 0%, 65% 100%, 0% 100%);
+    }
+    100% {
+      clip-path: polygon(0% 0%, 90% 0%, 68% 100%, 0% 100%);
     }
   }
 
-  .spectrum-ActionButton::after {
-    content: "";
-    background: inherit;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    inset: var(--offset);
-    height: calc(100% - 2 * var(--offset));
-    width: calc(100% - 2 * var(--offset));
-    border-radius: inherit;
+  .spectrum-ActionButton:not(.animate-border)::after {
+    content: none;
   }
 
   @keyframes fade-in {
@@ -269,10 +282,12 @@
   .ai-icon {
     width: 18px;
     height: 18px;
-    margin-left: 4px;
-    margin-right: 8px;
+    margin-left: var(--spacing-xs);
+    margin-right: var(--spacing-s);
     flex-shrink: 0;
     cursor: var(--ai-icon-cursor, pointer);
+    position: relative;
+    z-index: 2;
   }
 
   .ai-gen-text {
@@ -281,10 +296,12 @@
     text-overflow: ellipsis;
     transition: opacity 0.2s ease-out;
     margin-right: var(--spacing-xs);
+    position: relative;
+    z-index: 2;
   }
 
   .prompt-input {
-    font-size: 14px;
+    font-size: inherit;
     flex: 1;
     border: none;
     background: transparent;
@@ -294,6 +311,8 @@
     min-width: 0;
     resize: none;
     overflow: hidden;
+    position: relative;
+    z-index: 2;
   }
 
   .prompt-input::placeholder {
@@ -304,14 +323,15 @@
   .action-buttons {
     display: flex;
     gap: var(--spacing-s);
-    z-index: 4;
+    z-index: 5;
     flex-shrink: 0;
     margin-right: var(--spacing-s);
+    position: relative;
   }
 
   .button-content-wrapper {
     position: relative;
-    z-index: 1;
+    z-index: 2;
     display: flex;
     align-items: center;
     overflow: hidden;