Merge branch 'dbajpeyi/fix/supported-paths' of github.com:duckduckgo/…

…content-scope-scripts into dbajpeyi/fix/supported-paths

eslint.config.js

@@ -22,6 +22,7 @@ export default tseslint.config(
             "playwright-report",
             "test-results",
             "injected/src/types",
+            ".idea"
         ],
     },
     {

injected/package.json

@@ -42,15 +42,15 @@
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-replace": "^6.0.1",
-    "@types/chrome": "^0.0.279",
+    "@types/chrome": "^0.0.280",
     "@types/jasmine": "^5.1.4",
-    "@types/node": "^22.8.6",
+    "@types/node": "^22.8.7",
     "@typescript-eslint/eslint-plugin": "^6.9.1",
     "config-builder": "github:duckduckgo/privacy-configuration#1729260354597",
-    "fast-check": "^3.22.0",
+    "fast-check": "^3.23.1",
     "jasmine": "^5.4.0",
     "minimist": "^1.2.8",
-    "rollup": "^4.24.3",
+    "rollup": "^4.24.4",
     "rollup-plugin-import-css": "^3.5.6",
     "rollup-plugin-svg-import": "^3.0.0"
   }

injected/src/features/autofill-password-import.js

@@ -257,12 +257,12 @@ export default class AutofillPasswordImport extends ContentFeature {
      * @param {string} path
      */
     async handleElementForPath (path) {
+        this.removeOverlayIfNeeded()
         const supportedPaths = [
             this.#exportButtonSettings?.path,
             this.#settingsButtonSettings?.path,
             this.#signInButtonSettings?.path
         ]
-        this.removeOverlayIfNeeded()
         if (supportedPaths.includes(path)) {
             try {
                 const { element, style, shouldTap, shouldWatchForRemoval } = await this.getElementAndStyleFromPath(path) ?? {}

package.json

@@ -40,7 +40,7 @@
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-csstree-validator": "^3.0.0",
-    "typedoc": "^0.26.10",
+    "typedoc": "^0.26.11",
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.12.2",
     "@playwright/test": "^1.48.2"

special-pages/messages/new-tab/examples/stats.js

@@ -14,7 +14,8 @@ const privacyStatsData = {
  * @type {import("../../../types/new-tab").StatsConfig}
  */
 const minimumConfig = {
-    expansion: "expanded"
+    expansion: "expanded",
+    animation: { kind: "none" }
 }
 
 /**

special-pages/messages/new-tab/favorites_add.notify.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#"
+}

special-pages/messages/new-tab/favorites_getConfig.request.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#"
+}

special-pages/messages/new-tab/favorites_getConfig.response.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "allOf": [
+    {
+      "$ref": "./types/favorites-config.json"
+    }
+  ]
+}

special-pages/messages/new-tab/favorites_getData.request.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#"
+}

special-pages/messages/new-tab/favorites_getData.response.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "allOf": [
+    {
+      "$ref": "types/favorites-data.json"
+    }
+  ]
+}

special-pages/messages/new-tab/favorites_move.notify.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Favorites Move Action",
+  "type": "object",
+  "required": [
+    "id",
+    "targetIndex"
+  ],
+  "properties": {
+    "id": {
+      "description": "Entity ID",
+      "type": "string"
+    },
+    "targetIndex": {
+      "description": "zero-indexed target",
+      "type": "number"
+    }
+  }
+}

special-pages/messages/new-tab/favorites_onConfigUpdate.subscribe.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "allOf": [
+    {
+      "$ref": "./types/favorites-config.json"
+    }
+  ]
+}

special-pages/messages/new-tab/favorites_onDataUpdate.subscribe.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "allOf": [
+    {
+      "$ref": "types/favorites-data.json"
+    }
+  ]
+}

special-pages/messages/new-tab/favorites_open.notify.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Favorites Open Action",
+  "type": "object",
+  "required": [
+    "id",
+    "target"
+  ],
+  "properties": {
+    "id": {
+      "description": "Entity ID",
+      "type": "string"
+    },
+    "target": {
+      "type": "string",
+      "enum": ["same-tab", "new-tab", "new-window"]
+    }
+  }
+}

special-pages/messages/new-tab/favorites_openContextMenu.notify.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Favorites Open Context Menu Action",
+  "type": "object",
+  "required": [
+    "id"
+  ],
+  "properties": {
+    "id": {
+      "description": "Entity ID",
+      "type": "string"
+    }
+  }
+}

special-pages/messages/new-tab/favorites_setConfig.notify.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "allOf": [
+    {
+      "$ref": "./types/favorites-config.json"
+    }
+  ]
+}

special-pages/messages/new-tab/types/favorites-config.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "FavoritesConfig",
+  "type": "object",
+  "required": ["expansion"],
+  "properties": {
+    "expansion": { "$ref":  "./expansion.json" },
+    "animation": { "$ref":  "./animation.json" }
+  }
+}

special-pages/messages/new-tab/types/favorites-data.json

@@ -0,0 +1,47 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Favorites Data",
+  "type": "object",
+  "required": ["favorites"],
+  "properties": {
+    "favorites": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "title": "Favorite",
+        "required": ["url", "id", "title", "favicon"],
+        "properties": {
+          "url": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "favicon": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "type": "object",
+                "title": "Favorite Favicon",
+                "required": ["src", "maxAvailableSize"],
+                "properties": {
+                  "src": {
+                    "type": "string"
+                  },
+                  "maxAvailableSize": {
+                    "type": "number"
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  }
+}

special-pages/package.json

@@ -28,7 +28,7 @@
     "esbuild": "^0.24.0",
     "http-server": "^14.1.1",
     "web-resource-inliner": "^6.0.1",
-    "fast-check": "^3.22.0"
+    "fast-check": "^3.23.1"
   },
   "dependencies": {
     "preact": "^10.24.3",

special-pages/pages/new-tab/app/components/App.module.css

@@ -17,7 +17,17 @@ body {
     margin-right: auto;
 }
 
+body:has([data-reset-layout="true"]) .layout {
+    padding-top: 0;
+}
+
 :global(.layout-centered) {
     margin-inline: auto;
+    width: 100%;
     max-width: calc(504 * var(--px-in-rem));
 }
+
+/** Don't affect layout if empty (eg: if a widget was toggled) **/
+:global(.layout-centered:empty) {
+    display: contents;
+}

special-pages/pages/new-tab/app/components/Components.jsx

@@ -1,19 +1,27 @@
 import { Fragment, h } from "preact";
 import styles from "./Components.module.css";
 import { mainExamples, otherExamples } from "./Examples.jsx";
+import { updateNotificationExamples } from "../update-notification/UpdateNotification.examples.js";
 const url = new URL(window.location.href);
 
+const list = {
+    ...mainExamples,
+    ...otherExamples,
+    ...updateNotificationExamples
+}
+
+const entries = Object.entries(list);
+
 export function Components() {
     const ids = url.searchParams.getAll("id");
     const isolated = url.searchParams.has("isolate");
     const e2e = url.searchParams.has("e2e");
-    const entries = Object.entries(mainExamples).concat(Object.entries(otherExamples));
     const entryIds = entries.map(([id]) => id);
 
     const validIds = ids.filter(id => entryIds.includes(id));
 
     const filtered = validIds.length
-        ? validIds.map((id) => /** @type {const} */([id, mainExamples[id] || otherExamples[id]]))
+        ? validIds.map((id) => /** @type {const} */([id, list[id]]))
         : entries
 
     if (isolated) {

special-pages/pages/new-tab/app/components/Components.module.css

@@ -1,9 +1,4 @@
 /* nested styles to avoid global side-effects */
-[data-display="components"] {
-    a {
-        color: var(--ntp-text-normal);
-    }
-}
 
 body[data-display="components"] {
     padding-left: 0;
@@ -35,7 +30,9 @@ body[data-display="components"] {
     align-items: center;
     gap: 1em;
 }
+
 .itemLink {
+    color: var(--ntp-text-normal);
     padding: 0.2em 0.3em;
     border: 1px solid var(--color-gray-60);
     border-radius: 4px;

special-pages/pages/new-tab/app/components/Layout.js

@@ -0,0 +1,9 @@
+import { h } from 'preact'
+
+export function Centered ({ children }) {
+    return (
+        <div class="layout-centered">
+            {children}
+        </div>
+    )
+}

special-pages/pages/new-tab/app/components/ShowHide.module.css

@@ -9,7 +9,6 @@
     justify-content: center;
     align-items: center;
     color: var(--ntp-text-normal);
-    background: var(--ntp-background-color);
     height: 32px;
     width: 32px;
     line-height: 32px;

special-pages/pages/new-tab/app/customizer/Customizer.js

@@ -91,12 +91,14 @@ export function useContextMenu () {
             e.stopImmediatePropagation()
             const items = getItems()
             /** @type {VisibilityMenuItem[]} */
-            const simplified = items.map(item => {
-                return {
-                    id: item.id,
-                    title: item.title
-                }
-            })
+            const simplified = items
+                .filter(x => x.id !== 'debug')
+                .map(item => {
+                    return {
+                        id: item.id,
+                        title: item.title
+                    }
+                })
             messaging.contextMenu({ visibilityMenuItems: simplified })
         }
         document.body.addEventListener('contextmenu', handler)