-
Notifications
You must be signed in to change notification settings - Fork 739
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
Notebookbar: main-nav: Fix last child being glued to the edge #10896
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested, Working good. Thanks for the fix!
these tests seem to fail with or without this PR |
f12c2a4
to
498bcba
Compare
I have rebased and it passes the tests locally so, force pushed. |
Also this branch is missing the multi-use cypress fix: 188ca7a |
498bcba
to
09d0885
Compare
@pedropintosilva need to rebase this PR. I have merged the Navigator PR: #10936 |
09d0885
to
59527c7
Compare
now the test that sometimes fails is |
Ok so, I was able to reproduce this cypress fail manually with (private/pedro/fix-main-nav-width) or without (master) this commit by:
cy:command ✘ assert expected **Page 3 of 4** to be one of **[ Page 2 of 4 ]** cy:command ✔ cGet #zoom-dropdown
cy:command ✔ contains .ui-combobox-entry, 40
cy:command ✔ click {force: true}
cy:log ✱ >> shouldHaveZoomLevel - start
cy:command ✔ cGet #toolbar-down #zoom .unolabel
cy:command ✔ assert expected **<label.ui-content.unolabel>** to have text **'40'**
cy:log ✱ << shouldHaveZoomLevel - end
cy:log ✱ << selectZoomLevel - end
cy:log ✱ >> typeIntoDocument - start
cy:command ✔ cGet div.clipboard
cy:command ✔ type {ctrl}{home}, {force: true}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524795,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524806,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524807,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524818,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cy:log ✱ << typeIntoDocument - end
cy:command ✔ cGet #StatePageNumber
cy:command ✔ invoke .text()
cy:command ✔ assert expected **Page 1 of 4** to be one of **[ Page 1 of 4 ]**
cy:log ✱ >> pressKey - start
cy:log ✱ >> typeIntoDocument - start
cy:command ✔ cGet div.clipboard
cy:command ✔ type {pagedown}, {force: true}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524878,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524879,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cy:log ✱ << typeIntoDocument - end
cy:log ✱ >> typeIntoDocument - start
cy:command ✔ cGet div.clipboard
cy:command ✔ type {pagedown}, {force: true}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524946,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cons:log ✱ ==== debug.html receiveMessage: {"MessageId":"FollowUser_Changed","SendTime":1736970524947,"Values":{"FollowedViewId":4,"IsFollowUser":true,"IsFollowEditor":false}}
cy:log ✱ << typeIntoDocument - end
cy:log ✱ << pressKey - end
cy:command ✔ cGet #StatePageNumber
cy:command ✔ invoke .text()
cy:command ✘ assert expected **Page 3 of 4** to be one of **[ Page 2 of 4 ]**
Actual: "Page 3 of 4"
Expected: ["Page 2 of 4"] |
Before this commit the .main-nav's width had bigger width than the webview due to borders not being factored in. This was particular visible for integrators that have the close button toggled off and that have no "EnableShare" where the last sidebar icon was "glued" the right edge of the web view. Cases where this is possible to test: - Using the make run Edit mode urls in Tabbed view - Places where Collabora Online is integrated with close and share buttons. Example: Moddle Signed-off-by: Pedro Pinto Silva <[email protected]> Change-Id: Ie189ed780080cda69d3d41e425a047c45d0e69e9
59527c7
to
a4863e3
Compare
Before this commit the .main-nav's width had bigger width than the
webview due to borders not being factored in. This was particular
visible for integrators that have the close button toggled off and
that have no "EnableShare" where the last sidebar icon was "glued" the
right edge of the web view.
Cases where this is possible to test:
share buttons. Example: Moddle
Signed-off-by: Pedro Pinto Silva [email protected]
Change-Id: Ie189ed780080cda69d3d41e425a047c45d0e69e9