Skip to content

Commit 6637de6

Browse files
authored
Merge pull request #6419 from remix-project-org/joe-patch-014
Fix panel Enhancement on Focus
2 parents 9e55ef0 + c09d6d6 commit 6637de6

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

libs/remix-ui/remix-ai-assistant/src/components/prompt.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ export interface PromptAreaProps {
4040
maximizePanel: () => Promise<void>
4141
aiMode: 'ask' | 'edit'
4242
setAiMode: React.Dispatch<React.SetStateAction<'ask' | 'edit'>>
43+
isMaximized: boolean
44+
setIsMaximized: React.Dispatch<React.SetStateAction<boolean>>
4345
}
4446

4547
const _paq = (window._paq = window._paq || [])
@@ -77,7 +79,9 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
7779
textareaRef,
7880
maximizePanel,
7981
aiMode,
80-
setAiMode
82+
setAiMode,
83+
isMaximized,
84+
setIsMaximized
8185
}) => {
8286

8387
return (
@@ -155,7 +159,9 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
155159
value={input}
156160
disabled={isStreaming}
157161
onFocus={() => {
158-
maximizePanel()
162+
if (!isMaximized) {
163+
maximizePanel()
164+
}
159165
}}
160166
onChange={e => {
161167
setInput(e.target.value)

libs/remix-ui/remix-ai-assistant/src/components/remix-ui-remix-ai-assistant.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
5353
const [isOllamaFailureFallback, setIsOllamaFailureFallback] = useState(false)
5454
const [aiMode, setAiMode] = useState<'ask' | 'edit'>('ask')
5555
const [themeTracker, setThemeTracker] = useState(null)
56+
const [isMaximized, setIsMaximized] = useState(false)
5657

5758
const historyRef = useRef<HTMLDivElement | null>(null)
5859
const modelBtnRef = useRef(null)
@@ -666,6 +667,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
666667

667668
const maximizePanel = async () => {
668669
await props.plugin.call('layout', 'maximisePinnedPanel')
670+
setIsMaximized(true) // ensured that expansion of the panel is stateful
669671
}
670672

671673
return (
@@ -759,6 +761,8 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
759761
textareaRef={textareaRef}
760762
aiMode={aiMode}
761763
setAiMode={setAiMode}
764+
isMaximized={isMaximized}
765+
setIsMaximized={setIsMaximized}
762766
/>
763767
</section>
764768
</div>

0 commit comments

Comments
 (0)