From 3ce7003f10cd409fd5db7a0426f9e34b86857474 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 1 Jul 2023 11:06:38 -0500
Subject: [PATCH 1/2] fix terminal not working

Fixes: https://github.com/pybricks/support/issues/1130
---
 CHANGELOG.md              | 5 +++++
 src/terminal/Terminal.tsx | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e84062f2..fa1497a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+### Fixed
+- Fixed terminal not working (regression in 2.2.0-beta.6, [support#1130]).
+
+[support#1130]: https://github.com/pybricks/support/issues/1130
+
 ## [2.2.0-beta.6] - 2023-06-30
 
 ### Changed
diff --git a/src/terminal/Terminal.tsx b/src/terminal/Terminal.tsx
index b082920e..6b2462cc 100644
--- a/src/terminal/Terminal.tsx
+++ b/src/terminal/Terminal.tsx
@@ -243,8 +243,8 @@ const Terminal: React.FunctionComponent = () => {
                 <source src={BELL_SOUND} />
             </audio>
             <div className="pb-terminal-bell-overlay" ref={bellOverlayRef} />
-            <ResizeSensor onResize={(): void => fitAddon.fit()}>
-                <div ref={terminalRef} className="h-100" />
+            <ResizeSensor targetRef={terminalRef} onResize={(): void => fitAddon.fit()}>
+                <div ref={terminalRef} className="h-100 pb-focus-managed" />
             </ResizeSensor>
         </ContextMenu>
     );

From a50f471e88bc7e8bf8d854e78cc74af3b891952a Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 1 Jul 2023 11:09:50 -0500
Subject: [PATCH 2/2] v2.2.0-beta.7

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa1497a9..c4750aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## [Unreleased]
 
+## [2.2.0-beta.7] - 2023-07-01
+
 ### Fixed
 - Fixed terminal not working (regression in 2.2.0-beta.6, [support#1130]).
 
diff --git a/package.json b/package.json
index 513f2530..71b6f33a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pybricks/pybricks-code",
-    "version": "2.2.0-beta.6",
+    "version": "2.2.0-beta.7",
     "license": "MIT",
     "author": "The Pybricks Authors",
     "repository": {