Skip to content

multi_workspace: Move up action handler and modal rendering from workspace to multi workspace - #49995

Merged
Anthony-Eid merged 6 commits into
mainfrom
multiworkspace-context
Feb 25, 2026
Merged

multi_workspace: Move up action handler and modal rendering from workspace to multi workspace#49995
Anthony-Eid merged 6 commits into
mainfrom
multiworkspace-context

Conversation

@Anthony-Eid

@Anthony-Eid Anthony-Eid commented Feb 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Now that MultiWorkspace is the root view, actions bound to the Workspace key context wouldn't be dispatched when Workspace is not in the key context stack (e.g. when the sidebar is focused). To fix this, the Workspace key context and action handlers are moved up to the MultiWorkspace rendering layer. This avoids introducing a new key context and the keymap migration that would require.

This PR also moves modal rendering up a layer so modals are centered within the window (MultiWorkspace element) instead of the Workspace element.

Before

image ### After image

Before you mark this PR as ready for review, make sure that you have:

  • Added a solid test coverage and/or screenshots from doing manual testing
  • Done a self-review taking into account security and performance aspects
  • Aligned any UI changes with the UI checklist

Release Notes:

  • N/A

Anthony-Eid and others added 2 commits February 24, 2026 16:39
@Anthony-Eid @cameron1024
Move up workspace actions handlers to multiworkspace
06cea7a 
Co-authored-by: cameron <cameron.studdstreet@gmail.com>
@Anthony-Eid @cameron1024
Move modal to center when sidebar is open
f9a761c 
Co-authored-by: cameron <cameron.studdstreet@gmail.com>
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Feb 24, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Feb 24, 2026
@Anthony-Eid
Anthony-Eid enabled auto-merge (squash) February 25, 2026 23:28
@Anthony-Eid
Anthony-Eid merged commit 72d69d1 into main Feb 25, 2026
27 checks passed
@Anthony-Eid
Anthony-Eid deleted the multiworkspace-context branch February 25, 2026 23:37
Anthony-Eid added a commit that referenced this pull request Feb 26, 2026
@Anthony-Eid
Fix modal not using UI font and text color
dbd7d85 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in #49995
@Anthony-Eid Anthony-Eid mentioned this pull request Feb 26, 2026
Merged
3 tasks
Anthony-Eid added a commit that referenced this pull request Feb 26, 2026
@Anthony-Eid
ui: Fix modals not using UI font and text color (#50208)
2434a77 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in #49995

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/eca71731-5009-4e47-a948-d80eb3f13938"
/>

### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/75d8c591-f539-413e-a171-71e4fc847f13"
/>


Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A
rtfeldman pushed a commit that referenced this pull request Feb 27, 2026
@Anthony-Eid @cameron1024
multi_workspace: Move up action handler and modal rendering from work…
39d3ceb 
…space to multi workspace (#49995)

Now that MultiWorkspace is the root view, actions bound to the
`Workspace` key context wouldn't be dispatched when `Workspace` is not
in the key context stack (e.g. when the sidebar is focused). To fix
this, the `Workspace` key context and action handlers are moved up to
the MultiWorkspace rendering layer. This avoids introducing a new key
context and the keymap migration that would require.

This PR also moves modal rendering up a layer so modals are centered
within the window (MultiWorkspace element) instead of the Workspace
element.

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/233a0b75-47a1-423a-8394-c6a1b50fb991"
/>
### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/9c51c839-e524-4ef8-afc9-9429b028def0"
/>


Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

---------

Co-authored-by: cameron <cameron.studdstreet@gmail.com>
rtfeldman pushed a commit that referenced this pull request Feb 27, 2026
@Anthony-Eid
ui: Fix modals not using UI font and text color (#50208)
23bdf89 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in #49995

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/eca71731-5009-4e47-a948-d80eb3f13938"
/>

### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/75d8c591-f539-413e-a171-71e4fc847f13"
/>


Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A
tahayvr pushed a commit to tahayvr/zed that referenced this pull request Mar 4, 2026
@Anthony-Eid @cameron1024 @tahayvr
multi_workspace: Move up action handler and modal rendering from work…
76cc80c 
…space to multi workspace (zed-industries#49995)

Now that MultiWorkspace is the root view, actions bound to the
`Workspace` key context wouldn't be dispatched when `Workspace` is not
in the key context stack (e.g. when the sidebar is focused). To fix
this, the `Workspace` key context and action handlers are moved up to
the MultiWorkspace rendering layer. This avoids introducing a new key
context and the keymap migration that would require.

This PR also moves modal rendering up a layer so modals are centered
within the window (MultiWorkspace element) instead of the Workspace
element.

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/233a0b75-47a1-423a-8394-c6a1b50fb991"
/>
### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/9c51c839-e524-4ef8-afc9-9429b028def0"
/>


Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

---------

Co-authored-by: cameron <cameron.studdstreet@gmail.com>
tahayvr pushed a commit to tahayvr/zed that referenced this pull request Mar 4, 2026
@Anthony-Eid @tahayvr
ui: Fix modals not using UI font and text color (zed-industries#50208)
16f56b1 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in zed-industries#49995

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/eca71731-5009-4e47-a948-d80eb3f13938"
/>

### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/75d8c591-f539-413e-a171-71e4fc847f13"
/>


Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A
naaiyy pushed a commit to Glass-HQ/Glass that referenced this pull request Mar 6, 2026
@Anthony-Eid @naaiyy
ui: Fix modals not using UI font and text color (zed-industries#50208)
1fea902 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in zed-industries#49995

<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/eca71731-5009-4e47-a948-d80eb3f13938"
/>

<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/75d8c591-f539-413e-a171-71e4fc847f13"
/>

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
@Anthony-Eid @cameron1024
multi_workspace: Move up action handler and modal rendering from work…
f390fc5 
…space to multi workspace (zed-industries#49995)

Now that MultiWorkspace is the root view, actions bound to the
`Workspace` key context wouldn't be dispatched when `Workspace` is not
in the key context stack (e.g. when the sidebar is focused). To fix
this, the `Workspace` key context and action handlers are moved up to
the MultiWorkspace rendering layer. This avoids introducing a new key
context and the keymap migration that would require.

This PR also moves modal rendering up a layer so modals are centered
within the window (MultiWorkspace element) instead of the Workspace
element.

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/233a0b75-47a1-423a-8394-c6a1b50fb991"
/>
### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/9c51c839-e524-4ef8-afc9-9429b028def0"
/>


Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

---------

Co-authored-by: cameron <cameron.studdstreet@gmail.com>
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
@Anthony-Eid
ui: Fix modals not using UI font and text color (zed-industries#50208)
211a012 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in zed-industries#49995

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/eca71731-5009-4e47-a948-d80eb3f13938"
/>

### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/75d8c591-f539-413e-a171-71e4fc847f13"
/>


Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
@Anthony-Eid @cameron1024
multi_workspace: Move up action handler and modal rendering from work…
de3eaf8 
…space to multi workspace (zed-industries#49995)

Now that MultiWorkspace is the root view, actions bound to the
`Workspace` key context wouldn't be dispatched when `Workspace` is not
in the key context stack (e.g. when the sidebar is focused). To fix
this, the `Workspace` key context and action handlers are moved up to
the MultiWorkspace rendering layer. This avoids introducing a new key
context and the keymap migration that would require.

This PR also moves modal rendering up a layer so modals are centered
within the window (MultiWorkspace element) instead of the Workspace
element.

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/233a0b75-47a1-423a-8394-c6a1b50fb991"
/>
### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/9c51c839-e524-4ef8-afc9-9429b028def0"
/>


Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

---------

Co-authored-by: cameron <cameron.studdstreet@gmail.com>
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
@Anthony-Eid
ui: Fix modals not using UI font and text color (zed-industries#50208)
c7c4d3d 
The bug occurred because we weren't setting the right text style on the
root div anymore (Multiworkspace), which was introduce in zed-industries#49995

### Before
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/eca71731-5009-4e47-a948-d80eb3f13938"
/>

### After
<img width="3248" height="2122" alt="image"
src="https://github.com/user-attachments/assets/75d8c591-f539-413e-a171-71e4fc847f13"
/>


Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Anthony-Eid