Commit ed1216c
authored
Fix feedback panel in scratch e2e tests (#1497)
issue:
[1489](RaspberryPiFoundation/digital-editor-issues#1489)
## Summary
Upgrade editor-ui to React 19 (matching editor-standalone) and bump
related dependencies so the Scratch classroom flow works again after
standalone’s React 19 upgrade.
## Why the Scratch e2e test was failing
The test failed at the final step: **teacher opens a student’s Scratch
remix** from Student work. The Scratch iframe never loaded because
**`editor-wc` crashed** with:
`Objects are not valid as a React child`
That only happens on this step because it is the first time
**`isViewingStudentWork`** is true, which registers the **feedback
sidebar plugin**.
## Feedback plugin + sidebar: the underlying issue
Classroom (`editor-standalone`) passes a sidebar plugin into the web
component (`editor-ui`) via `setSidebarPlugins`. That plugin includes
**React elements and components created by standalone’s React**
(`FeedbackIcon`, `panel()`, `buttons()`), which `Sidebar` then renders
inside **editor-ui’s React tree**.
Standalone and editor-ui are **separate bundles with separate React
instances**. Passing elements across that boundary is unsupported.
This was **latent for years** but broke when standalone moved to **React
19** (June 9, PR #932) while editor-ui stayed on React 18 — React 19
elements are rejected by React 18’s reconciler.
**Why it’s brittle:** even with both on React 19, this remains fragile.
Two bundled React copies can appear to work for simple JSX but can still
break (hooks, context, portaled UI). A robust long-term fix would avoid
passing React elements across the web component boundary (e.g. mount
callbacks / string icon names only).
## Fix
Bump **editor-ui to React 19.2.7** to align with **editor-standalone**.
Verified locally: teacher → student Scratch remix flow works again.
## Other dependency bumps
| Package | Change | Why |
|---------|--------|-----|
| **react / react-dom** | 18 → **19.2.7** | Match standalone; fixes
cross-version plugin crash |
| **react-toastify** | 8 → **11.1.0** | v8 uses removed `react-dom`
`render()` API; v11 supports React 18/19. Updated toast positions and
icon usage in `Notifications.js`; removed v8
`ToastContainer.defaultProps` workaround |
| **@react-three/fiber** | 8 → **9.6.1** | R3F v8 pairs with React 18
only; v9 required for React 19 (Astro Pi 3D simulator) |
| **@react-three/drei** | 9 → **10.0.0** | Companion to R3F v9 (helpers
used by Astro Pi `Simulator` / `FlightCase`) |
| **@react-three/test-renderer** | 8 → **9.0.0** | Test support for R3F
v9 |
## Scratch React 18 vendor aliases
```json
"scratchReactVendor": "npm:react@18.3.1",
"scratchReactDomVendor": "npm:react-dom@18.3.1"
```
The main app uses **React 19**, but the **Scratch iframe**
(`scratch.html`) loads **`scratch-gui` via `<script>` tags** and expects
**React 18 UMD** globals (`vendor/react.production.min.js`). React 19
**no longer ships UMD builds**, so we cannot copy from the main `react`
dependency. These aliases install React 18 solely so webpack can copy
UMD files into `build/vendor/` for the Scratch iframe.1 parent 550010c commit ed1216c
9 files changed
Lines changed: 430 additions & 326 deletions
File tree
- cypress
- e2e
- helpers
- support
- src
- containers
- utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
80 | 127 | | |
81 | 128 | | |
82 | 129 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
| 19 | + | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | | - | |
| 53 | + | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
| 72 | + | |
71 | 73 | | |
72 | 74 | | |
73 | 75 | | |
| |||
97 | 99 | | |
98 | 100 | | |
99 | 101 | | |
100 | | - | |
| 102 | + | |
101 | 103 | | |
102 | 104 | | |
103 | 105 | | |
| |||
114 | 116 | | |
115 | 117 | | |
116 | 118 | | |
| 119 | + | |
117 | 120 | | |
118 | 121 | | |
119 | 122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | 42 | | |
54 | 43 | | |
55 | 44 | | |
| |||
247 | 236 | | |
248 | 237 | | |
249 | 238 | | |
250 | | - | |
251 | 239 | | |
252 | 240 | | |
253 | 241 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | 66 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
303 | 303 | | |
304 | 304 | | |
305 | 305 | | |
306 | | - | |
| 306 | + | |
307 | 307 | | |
308 | 308 | | |
309 | 309 | | |
310 | | - | |
| 310 | + | |
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
| |||
0 commit comments