Unrolled build for rust-lang#119746

rust-timer · web-flow · commit ce78e5f82aa2 · 2024-01-22T08:07:30.000-05:00
Rollup merge of rust-lang#119746 - notriddle:notriddle/resize-close-modals, r=fmease rustdoc: hide modals when resizing the sidebar Follow-up for rust-lang#119477 (comment) CC `@lukas-code`
diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js
@@ -1721,6 +1721,7 @@ href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.htm
             }
             currentPointerId = e.pointerId;
         }
+        window.hideAllModals(false);
         e.preventDefault();
         window.addEventListener("pointermove", resize, false);
         window.addEventListener("pointercancel", stopResize, false);
diff --git a/tests/rustdoc-gui/sidebar-resize-close-popover.goml b/tests/rustdoc-gui/sidebar-resize-close-popover.goml
@@ -0,0 +1,20 @@
+// Checks sidebar resizing close the Settings popover
+go-to: "file://" + |DOC_PATH| + "/test_docs/index.html"
+assert-property: (".sidebar", {"clientWidth": "200"})
+show-text: true
+click: "#settings-menu"
+wait-for: "#settings"
+assert-css: ("#settings", {"display": "block"})
+// normal resizing
+drag-and-drop: ((205, 100), (185, 100))
+assert-property: (".sidebar", {"clientWidth": "182"})
+assert-css: ("#settings", {"display": "none"})
+
+// Now same thing, but for source code
+go-to: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
+click: "#settings-menu"
+wait-for: "#settings"
+assert-css: ("#settings", {"display": "block"})
+assert-property: (".sidebar", {"clientWidth": "49"})
+drag-and-drop: ((52, 100), (185, 100))
+assert-css: ("#settings", {"display": "none"})

Original file line number	Diff line number	Diff line change
`@@ -1721,6 +1721,7 @@ href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.htm`
`1721`	`1721`	`}`
`1722`	`1722`	`currentPointerId = e.pointerId;`
`1723`	`1723`	`}`
	`1724`	`+ window.hideAllModals(false);`
`1724`	`1725`	`e.preventDefault();`
`1725`	`1726`	`window.addEventListener("pointermove", resize, false);`
`1726`	`1727`	`window.addEventListener("pointercancel", stopResize, false);`