Merge remote-tracking branch 'origin/master' into api-exec-await

haraldschilly · haraldschilly · commit a2d58e952405 · 2024-08-17T18:22:34.000+02:00
diff --git a/src/packages/frontend/account/settings/text-setting.tsx b/src/packages/frontend/account/settings/text-setting.tsx
@@ -19,6 +19,10 @@ interface Props {
   disabled?: boolean;
 }
 
+
+// Note -- we disable all password manager autocomplete, since this is a component
+// that's used internally in the app for configuration. See https://github.com/sagemathinc/cocalc/issues/6868
+
 export function TextSetting(props: Props): JSX.Element {
   return (
     <LabeledRow
@@ -33,6 +37,9 @@ export function TextSetting(props: Props): JSX.Element {
         onPressEnter={props.onPressEnter}
         maxLength={props.maxLength}
         disabled={props.disabled}
+        autoComplete={"off"}
+        data-lpignore="true"
+        data-1p-ignore
       />
     </LabeledRow>
   );
diff --git a/src/packages/frontend/jupyter/output-messages/mime-types/html.tsx b/src/packages/frontend/jupyter/output-messages/mime-types/html.tsx
@@ -13,8 +13,8 @@ const Html = ({
   index?: number;
   trust?: boolean;
 }) => {
-  if (!trust) {
-    <HTML value={value} />;
+  if (!trust || !requiresStableUnsafeHtml(value)) {
+    return <HTML value={value} />;
   }
   return (
     <div style={{ margin: "5px 0" }}>
@@ -34,3 +34,20 @@ export default Html;
 // that looks good and is meant to be rendered on the frontend.
 // See https://github.com/sagemathinc/cocalc/issues/5925
 register("text/html", 5, Html);
+
+// Heuristics to only use plain stateless html.
+function requiresStableUnsafeHtml(value: string) {
+  if (!value) {
+    return false;
+  }
+  if (value.includes(".bk-notebook-logo")) {
+    // bokeh -- needs state
+    return true;
+  }
+  if (value.includes(`class="dataframe"`)) {
+    // pandas
+    return false;
+  }
+  // default for now
+  return true;
+}
diff --git a/src/packages/frontend/jupyter/output-messages/stable-unsafe-html.tsx b/src/packages/frontend/jupyter/output-messages/stable-unsafe-html.tsx
@@ -64,17 +64,16 @@ const cache = new TTL<string, any>({
 });
 
 // make it really standout:
-// const PADDING = 5;
-// const STYLE = {
-//   border: "1px solid #ccc",
-//   borderRadius: "5px",
-//   padding: `${PADDING}px`,
-//   background: "#eee",
-// } as const;
-
-// make it blend in
-const PADDING = 0;
-const STYLE = {} as const;
+const PADDING = 5;
+const STYLE = {
+  border: "1px solid #ccc",
+  borderRadius: "5px",
+  padding: `${PADDING}px`,
+} as const;
+
+// // make it blend in
+// const PADDING = 0;
+// const STYLE = {} as const;
 
 interface Props {
   docId: string;
@@ -180,6 +179,22 @@ export default function StableUnsafeHtml({
           }
         }
       }
+
+      // This below sort of makes it so in some cases scrolling still works.
+      // It's flaky and not great, but perhaps the best we can do.
+      // It breaks clicking on the html for 1s after scrolling it.
+      let timer: any = 0;
+      //elt.addEventListener("wheel", () => {
+      elt.style.pointerEvents = "none";
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(() => {
+        timer = 0;
+        // Re-enable pointer events after the scroll
+        elt.style.pointerEvents = "auto";
+      }, 1000);
+      // });
     }
   }, []);
 
@@ -192,6 +207,20 @@ export default function StableUnsafeHtml({
       elt.process_smc_links();
       // @ts-ignore
       elt.katex({ preProcess: true });
+
+      let timer: any = 0;
+      const elt0 = elt[0];
+      elt0.addEventListener("wheel", () => {
+        elt0.style.pointerEvents = "none";
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = setTimeout(() => {
+          timer = 0;
+          elt0.style.pointerEvents = "auto";
+        }, 2000);
+      });
+
       cache.set(globalKey, elt);
       $("body").append(elt);
       return elt;
