diff options
Diffstat (limited to 'extension/react-app/src/components')
| -rw-r--r-- | extension/react-app/src/components/DebugPanel.tsx | 15 | ||||
| -rw-r--r-- | extension/react-app/src/components/StepContainer.tsx | 52 | ||||
| -rw-r--r-- | extension/react-app/src/components/index.ts | 11 | 
3 files changed, 42 insertions, 36 deletions
| diff --git a/extension/react-app/src/components/DebugPanel.tsx b/extension/react-app/src/components/DebugPanel.tsx index 9dacc624..11ec2fe2 100644 --- a/extension/react-app/src/components/DebugPanel.tsx +++ b/extension/react-app/src/components/DebugPanel.tsx @@ -9,7 +9,7 @@ import {  } from "../redux/slices/configSlice";  import { setHighlightedCode } from "../redux/slices/miscSlice";  import { updateFileSystem } from "../redux/slices/debugContexSlice"; -import { buttonColor, defaultBorderRadius, vscBackground } from "."; +import { defaultBorderRadius, secondaryDark, vscBackground } from ".";  interface DebugPanelProps {    tabs: {      element: React.ReactElement; @@ -19,14 +19,15 @@ interface DebugPanelProps {  const GradientContainer = styled.div`    // Uncomment to get gradient border -  background: linear-gradient( +  /* background: linear-gradient(      101.79deg,      #12887a 0%,      #87245c 37.64%,      #e12637 65.98%,      #ffb215 110.45% -  ); +  ); */    /* padding: 10px; */ +  background-color: ${secondaryDark};    margin: 0;    height: 100%;    /* border: 1px solid white; */ @@ -36,11 +37,8 @@ const GradientContainer = styled.div`  const MainDiv = styled.div`    height: 100%;    border-radius: ${defaultBorderRadius}; -  overflow-y: scroll; -  scrollbar-gutter: stable both-edges;    scrollbar-base-color: transparent; -  /* background: ${vscBackground}; */ -  background-color: #1e1e1ede; +  background-color: ${vscBackground};  `;  const TabBar = styled.div<{ numTabs: number }>` @@ -105,9 +103,6 @@ function DebugPanel(props: DebugPanelProps) {                <div                  key={index}                  hidden={index !== currentTab} -                className={ -                  tab.title === "Chat" ? "overflow-hidden" : "overflow-scroll" -                }                  style={{ scrollbarGutter: "stable both-edges" }}                >                  {tab.element} diff --git a/extension/react-app/src/components/StepContainer.tsx b/extension/react-app/src/components/StepContainer.tsx index f54d4d75..dab5a752 100644 --- a/extension/react-app/src/components/StepContainer.tsx +++ b/extension/react-app/src/components/StepContainer.tsx @@ -2,13 +2,11 @@ import { useCallback, useEffect, useRef, useState } from "react";  import styled, { keyframes } from "styled-components";  import {    appear, -  buttonColor,    defaultBorderRadius, -  MainContainerWithBorder, -  MainTextInput,    secondaryDark,    vscBackground,    GradientBorder, +  vscBackgroundTransparent,  } from ".";  import { RangeInFile, FileEdit } from "../../../src/client";  import CodeBlock from "./CodeBlock"; @@ -32,6 +30,7 @@ interface StepContainerProps {    onRefinement: (input: string) => void;    onUserInput: (input: string) => void;    onRetry: () => void; +  open?: boolean;  }  const MainDiv = styled.div<{ stepDepth: number; inFuture: boolean }>` @@ -44,17 +43,25 @@ const MainDiv = styled.div<{ stepDepth: number; inFuture: boolean }>`  `;  const StepContainerDiv = styled.div<{ open: boolean }>` -  background-color: ${(props) => (props.open ? vscBackground : secondaryDark)}; -  border-radius: ${defaultBorderRadius}; -  padding: 8px; +  /* background-color: ${(props) => +    props.open ? vscBackground : secondaryDark}; */ +  /* border-radius: ${defaultBorderRadius}; */ +  /* padding: 8px; */  `;  const HeaderDiv = styled.div` +  background-color: ${vscBackgroundTransparent};    display: grid;    grid-template-columns: 1fr auto;    align-items: center;  `; +const ContentDiv = styled.div` +  padding: 8px; +  padding-left: 16px; +  background-color: ${vscBackground}; +`; +  const HeaderButton = styled.button`    background-color: transparent;    border: 1px solid white; @@ -75,12 +82,10 @@ const OnHoverDiv = styled.div`    animation: ${appear} 0.3s ease-in-out;  `; -const NaturalLanguageInput = styled(MainTextInput)` -  width: 80%; -`; -  function StepContainer(props: StepContainerProps) { -  const [open, setOpen] = useState(false); +  const [open, setOpen] = useState( +    typeof props.open === "undefined" ? true : props.open +  );    const [isHovered, setIsHovered] = useState(false);    const naturalLanguageInputRef = useRef<HTMLTextAreaElement>(null);    const userInputRef = useRef<HTMLInputElement>(null); @@ -116,11 +121,11 @@ function StepContainer(props: StepContainerProps) {        }}        hidden={props.historyNode.step.hide as any}      > -      <GradientBorder -        className="m-2 overflow-hidden cursor-pointer" -        onClick={() => setOpen((prev) => !prev)} -      > -        <StepContainerDiv open={open}> +      <StepContainerDiv open={open}> +        <GradientBorder +          className="overflow-hidden cursor-pointer" +          onClick={() => setOpen((prev) => !prev)} +        >            <HeaderDiv>              <h4 className="m-2">                {open ? ( @@ -128,7 +133,7 @@ function StepContainer(props: StepContainerProps) {                ) : (                  <ChevronRight size="1.4em" />                )} -              {props.historyNode.step.name as any}: +              {props.historyNode.step.name as any}              </h4>              {/* <HeaderButton                onClick={(e) => { @@ -152,8 +157,9 @@ function StepContainer(props: StepContainerProps) {                <></>              )}            </HeaderDiv> - -          {open && ( +        </GradientBorder> +        <ContentDiv hidden={!open}> +          {open && false && (              <>                <pre className="overflow-scroll">                  Step Details: @@ -177,7 +183,7 @@ function StepContainer(props: StepContainerProps) {              </ReactMarkdown>            )} -          {props.historyNode.step.name === "Waiting for user input" && ( +          {/* {props.historyNode.step.name === "Waiting for user input" && (              <InputAndButton                onUserInput={(value) => {                  props.onUserInput(value); @@ -202,9 +208,9 @@ function StepContainer(props: StepContainerProps) {                  value="Confirm"                />              </> -          )} -        </StepContainerDiv> -      </GradientBorder> +          )} */} +        </ContentDiv> +      </StepContainerDiv>        {/* <OnHoverDiv hidden={!open}>          <NaturalLanguageInput diff --git a/extension/react-app/src/components/index.ts b/extension/react-app/src/components/index.ts index 7ba60467..ac5faa41 100644 --- a/extension/react-app/src/components/index.ts +++ b/extension/react-app/src/components/index.ts @@ -3,6 +3,7 @@ import styled, { keyframes } from "styled-components";  export const defaultBorderRadius = "5px";  export const secondaryDark = "rgb(37 37 38)";  export const vscBackground = "rgb(30 30 30)"; +export const vscBackgroundTransparent = "#1e1e1ede";  export const buttonColor = "rgb(113 28 59)";  export const buttonColorHover = "rgb(113 28 59 0.67)"; @@ -94,9 +95,13 @@ export const Loader = styled.div`    margin: auto;  `; -export const GradientBorder = styled.div<{ borderWidth?: string }>` -  border-radius: ${defaultBorderRadius}; -  padding: ${(props) => props.borderWidth || "1px"}; +export const GradientBorder = styled.div<{ +  borderWidth?: string; +  borderRadius?: string; +}>` +  border-radius: ${(props) => props.borderRadius || "0"}; +  padding-top: ${(props) => props.borderWidth || "1px"}; +  padding-bottom: ${(props) => props.borderWidth || "1px"};    background: linear-gradient(      101.79deg,      #12887a 0%, | 
