Skip to content

Conversation

@mejo-
Copy link
Member

@mejo- mejo- commented Apr 16, 2025

📝 Summary

  • fix: Make CollisionResolveDialog and DocumentStatus sticky
  • fix: Remove overflow property from editor wrapper
  • refactor(css): Use default-grid-baseline for menubar padding
  • fix(Editor): Add property lock to data
  • test(cy): Add regression test for sticky elements

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests

@mejo- mejo- added bug Something isn't working 3. to review regression labels Apr 16, 2025
@mejo- mejo- self-assigned this Apr 16, 2025
@mejo- mejo- requested a review from max-nextcloud as a code owner April 16, 2025 11:13
@github-project-automation github-project-automation bot moved this to 🧭 Planning evaluation (don't pick) in 📝 Office team Apr 16, 2025
@codecov
Copy link

codecov bot commented Apr 16, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.85%. Comparing base (95160cd) to head (87f2ddf).
Report is 11 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7130      +/-   ##
==========================================
+ Coverage   51.83%   51.85%   +0.02%     
==========================================
  Files         479      479              
  Lines       41488    41510      +22     
  Branches     1002     1002              
==========================================
+ Hits        21504    21526      +22     
  Misses      19879    19879              
  Partials      105      105              

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mejo- mejo- force-pushed the fix/refactor_document_status branch from 0ff0401 to 8d43fb1 Compare April 16, 2025 11:42
@mejo- mejo- requested a review from juliusknorr April 16, 2025 12:09
@mejo- mejo- moved this from 🧭 Planning evaluation (don't pick) to 👀 In review in 📝 Office team Apr 16, 2025
@mejo-
Copy link
Member Author

mejo- commented Apr 16, 2025

/backport to stable31

@mejo- mejo- force-pushed the fix/refactor_document_status branch from 8d43fb1 to cc5fef4 Compare April 29, 2025 12:47
mejo- added 2 commits April 29, 2025 14:48
Move DocumentStatus into parent container to do so.

Fixes stickyness of document status if editor does not have the full
app content height, e.g. in Collectives or Deck.

Signed-off-by: Jonas <[email protected]>
Fixes stickyness of menubar when editor does not have the full app
height, e.g. in Collectives and Deck.

Fixes: nextcloud/collectives#1704

Signed-off-by: Jonas <[email protected]>
@mejo- mejo- force-pushed the fix/refactor_document_status branch from cc5fef4 to e7d5527 Compare April 29, 2025 12:48
mejo- added 3 commits April 29, 2025 14:54
Fixes "[Vue warn]: Property or method "lock" is not defined on the
instance but referenced during render."

Signed-off-by: Jonas <[email protected]>
Make sure that document status and collision resolve dialog stay visible
when scrolling down long documents.

Signed-off-by: Jonas <[email protected]>
@mejo- mejo- force-pushed the fix/refactor_document_status branch from e7d5527 to e270905 Compare April 29, 2025 12:54
@juliusknorr juliusknorr changed the title Refactor document status and menbar padding Refactor document status and menubar padding Apr 29, 2025
@mejo-
Copy link
Member Author

mejo- commented Apr 29, 2025

I again did extensive testing to find possible regressions and added another fix concerning mobile view with menubar at the bottom.

This is the test matrix I went through:

✔️ = no problems
❌✅ = problem, but fixed now

app view content document status collision status
collectives desktop long no no ✔️
collectives desktop long yes no ✔️
collectives desktop long yes yes ✔️
collectives desktop short no no ✔️
collectives desktop short yes no ✔️
collectives desktop short yes yes ✔️
collectives mobile long no no ❌✅
collectives mobile long yes no ✔️
collectives mobile long yes yes ✔️
collectives mobile short no no ✔️
collectives mobile short yes no ✔️
collectives mobile short yes yes ✔️
collectives (landingpage) desktop long no no ✔️
collectives (landingpage) desktop short no no ✔️
collectives (landingpage) mobile long yes yes ❌✅
collectives (landingpage) mobile short yes yes ❌✅
standalone desktop long no no ✔️
standalone desktop long yes no ❌✅
standalone desktop long yes yes ❌✅
standalone desktop short no no ✔️
standalone desktop short yes no ✔️
standalone desktop short yes yes ✔️
standalone mobile long no no ✔️
standalone mobile long yes no ✔️
standalone mobile long yes yes ❌✅
standalone mobile short no no ✔️
standalone mobile short yes no ✔️
standalone mobile short yes yes ✔️

@max-nextcloud
Copy link
Collaborator

Scrollbar on mobile

I'm now seeing a scrollbar on short documents in chromium and if a message is displayed the scrollable area becomes higher:

Bildschirmaufzeichnung.vom.2025-04-30.08-56-34.mp4

Positioning on standalone (Chromium)

(Not sure this is an issue...)
With a short document the status now shows in the middle of the doc:

Bildschirmfoto vom 2025-04-30 08-48-30

mejo- added 4 commits April 30, 2025 11:03
Use flexbox layout instead of height `100%` to avoid issues where editor
is embedded into other apps and doesn't take full height.

Signed-off-by: Jonas <[email protected]>
We want the border to separate document content and menubar. So when we
display the menubar at the bottom on mobile, the menubar border should
be on top, not bottom of it.

Signed-off-by: Jonas <[email protected]>
I spent some time trying to figure out where the extra 8px came from
that created the scrollbar even with short content on mobile. In the end
this seems like an acceptable workaround for now.

Signed-off-by: Jonas <[email protected]>
@mejo- mejo- force-pushed the fix/refactor_document_status branch from a6c93ef to 87f2ddf Compare April 30, 2025 11:55
@mejo-
Copy link
Member Author

mejo- commented Apr 30, 2025

With a short document the status now shows in the middle of the doc:

Fixed this by using flexbox layout and flex-grow: 1.

I'm now seeing a scrollbar on short documents in chromium and if a message is displayed the scrollable area becomes higher:

Both also fixed now.

@mejo- mejo- merged commit 7392881 into main Apr 30, 2025
66 checks passed
@mejo- mejo- deleted the fix/refactor_document_status branch April 30, 2025 15:59
@github-project-automation github-project-automation bot moved this from 👀 In review to ☑️ Done in 📝 Office team Apr 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug Something isn't working regression

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants