Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sheets-ui): should disable sheet menus on cell editing #3809

Merged
merged 21 commits into from
Oct 22, 2024

Conversation

weird94
Copy link
Contributor

@weird94 weird94 commented Oct 19, 2024

实现方案

  1. toolbar + context-menu在editing的状态时将sheet的菜单。
  2. 编辑时context处于doc中,无法匹配到sheet的shortcut - 无需改动。
  3. facade api 的调用不应该导致editing的退出,除非手动调用退出命令 - 无需改动。

close https://github.com/dream-num/univer-pro/issues/2918
close https://github.com/dream-num/univer-pro/issues/2500
close https://github.com/dream-num/univer-pro/issues/2870
close https://github.com/dream-num/univer-pro/issues/2919
close https://github.com/dream-num/univer-pro/issues/2899
close https://github.com/dream-num/univer-pro/issues/2904
close https://github.com/dream-num/univer-pro/issues/2639

close https://github.com/dream-num/univer-pro/issues/2917
close https://github.com/dream-num/univer-pro/issues/2926
close https://github.com/dream-num/univer-pro/issues/2924

These issues are not reproducible.
close https://github.com/dream-num/univer-pro/issues/2923
close https://github.com/dream-num/univer-pro/issues/2887
close https://github.com/dream-num/univer-pro/issues/2890
close https://github.com/dream-num/univer-pro/issues/2886
close https://github.com/dream-num/univer-pro/issues/2864
close https://github.com/dream-num/univer-pro/issues/2821

Pull Request Checklist

  • Related tickets or issues have been linked in the PR description (or missing issue).
  • Naming convention is followed (do please check it especially when you created new plugins, commands and resources).
  • Unit tests have been added for the changes (if applicable).
  • Breaking changes have been documented (or no breaking changes introduced in this PR).

@univer-bot univer-bot bot added the qa:untested This PR is ready to be tested label Oct 19, 2024
@univer-bot
Copy link

univer-bot bot commented Oct 19, 2024

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Origin Title: fix(sheets-ui): should disable sheet menus on cell editing

Title: fix(sheets-ui): should disable sheet menus on cell editing


Implementation plan

  1. toolbar + context-menu will be the menu of the sheet in the editing state.
  2. When editing, the context is in the doc and cannot match the shortcut of the sheet - no changes are required.
  3. The call to the facade api should not cause the exit of editing unless the exit command is manually called - no changes are required.

close https://github.com/dream-num/univer-pro/issues/2918
close https://github.com/dream-num/univer-pro/issues/2500
close https://github.com/dream-num/univer-pro/issues/2870
close https://github.com/dream-num/univer-pro/issues/2919
close https://github.com/dream-num/univer-pro/issues/2899
close https://github.com/dream-num/univer-pro/issues/2904
close https://github.com/dream-num/univer-pro/issues/2639

close https://github.com/dream-num/univer-pro/issues/2917
close https://github.com/dream-num/univer-pro/issues/2926
close https://github.com/dream-num/univer-pro/issues/2924

These issues are not reproducible.
close https://github.com/dream-num/univer-pro/issues/2923
close https://github.com/dream-num/univer-pro/issues/2887
close https://github.com/dream-num/univer-pro/issues/2890
close https://github.com/dream-num/univer-pro/issues/2886
close https://github.com/dream-num/univer-pro/issues/2864
close https://github.com/dream-num/univer-pro/issues/2821

Pull Request Checklist

  • Related tickets or issues have been linked in the PR description (or missing issue).
  • Naming convention is followed (do please check it especially when you created new plugins, commands and resources).
  • Unit tests have been added for the changes (if applicable).
  • Breaking changes have been documented (or no breaking changes introduced in this PR).

Copy link

github-actions bot commented Oct 19, 2024

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

Copy link

github-actions bot commented Oct 19, 2024

Playwright test results

passed  17 passed

Details

stats  17 tests across 8 suites
duration  4 minutes, 9 seconds
commit  7a4d892
info  For more information, see full report

Copy link

codecov bot commented Oct 21, 2024

Codecov Report

Attention: Patch coverage is 12.32877% with 64 lines in your changes missing coverage. Please review.

Project coverage is 32.04%. Comparing base (192da79) to head (7a4d892).
Report is 2 commits behind head on dev.

Files with missing lines Patch % Lines
...rc/controllers/editor/editing.render-controller.ts 0.00% 14 Missing ⚠️
...ts-ui/src/controllers/menu/permission-menu-util.ts 0.00% 14 Missing ⚠️
...ets-hyper-link-ui/src/views/CellLinkEdit/index.tsx 0.00% 9 Missing ⚠️
...-ui/src/commands/commands/inline-format.command.ts 12.50% 7 Missing ⚠️
...ckages/sheets-ui/src/controllers/menu/menu-util.ts 54.54% 5 Missing ⚠️
...-hyper-link-ui/src/controllers/popup.controller.ts 0.00% 3 Missing ⚠️
...on-ui/src/views/components/date-dropdown/index.tsx 0.00% 2 Missing ⚠️
...on-ui/src/views/components/list-dropdown/index.tsx 0.00% 2 Missing ⚠️
packages/sheets-hyper-link-ui/src/utils/index.ts 0.00% 2 Missing ⚠️
...rc/docs/data-model/text-x/build-utils/selection.ts 0.00% 1 Missing ⚠️
... and 5 more
Additional details and impacted files
@@            Coverage Diff             @@
##              dev    #3809      +/-   ##
==========================================
- Coverage   32.06%   32.04%   -0.03%     
==========================================
  Files        2322     2322              
  Lines      120245   120270      +25     
  Branches    26608    26622      +14     
==========================================
- Hits        38562    38537      -25     
- Misses      81683    81733      +50     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zhaolixin7
Copy link

zhaolixin7 commented Oct 21, 2024

@weird94 1、编辑态时链接入口预期不禁掉image

#2917 禅模式下是列表内容如截图,添加链接失败2024_10_21 19_11_17 video.webm
image

#2926 禅模式下选中内容添加链接后,选择完选区回到禅模式时1、显示内容会延迟一会 2、显示如截图时退出禅模式,弹出未消失
image
2024_10_21 19_30_13 video.webm

@univer-bot
Copy link

univer-bot bot commented Oct 21, 2024

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

@weird94 1. The link entry is expected to be lost when editing the state! image

#2917 In Zen mode, the list content is as shown in the screenshot, and the link fails to be added 2024_10_21 19_11_17 video.webm
image

#2926 After adding a link to the selected content in Zen mode, when returning to Zen mode after selecting the area 1. The displayed content will be delayed for a while 2. Exit Zen mode when the display is as shown in the screenshot, and the pop-up does not disappear
image
2024_10_21 19_30_13 video.webm

@zhaolixin7 zhaolixin7 added qa:verified This PR has already by verified by a QA and is considered good enough to be merge and removed qa:untested This PR is ready to be tested labels Oct 22, 2024
@weird94 weird94 merged commit e758013 into dev Oct 22, 2024
9 checks passed
@weird94 weird94 deleted the feat/quit-editor1 branch October 22, 2024 03:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
qa:verified This PR has already by verified by a QA and is considered good enough to be merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants