@internetarchive/ia-topnav 1.4.0 → 1.4.1-alpha-webdev8259.1

package/test/ia-topnav.test.ts

@@ -9,35 +9,9 @@ import {
 
 import '../src/ia-topnav';
 import { IATopNav } from '../src/ia-topnav';
-import { SearchMenu } from '../src/search-menu';
 import { SignedOutDropdown } from '../src/signed-out-dropdown';
 import UserMenu from '../src/user-menu';
 
-// const container = (
-//   {
-//     username = '',
-//     screenName = '',
-//     config = {},
-//     localLinks = true,
-//     secondIdentitySlotMode = '',
-//   }: {
-//     username?: string;
-//     screenName?: string;
-//     config?: IATopNavConfig;
-//     localLinks: boolean;
-//     secondIdentitySlotMode?: IATopNavSecondIdentitySlotMode;
-//   } = {
-//     localLinks: true,
-//   },
-// ) =>
-//   html`<ia-topnav
-//     .screenName=${screenName}
-//     username=${username}
-//     ?localLinks=${localLinks}
-//     .config=${config}
-//     .secondIdentitySlotMode=${secondIdentitySlotMode}
-//   ></ia-topnav>`;
-
 const verifyClosed = (instance: IATopNav) => {
   expect(instance.mediaSliderOpen).to.be.false;
   expect(instance.selectedMenuOption).to.equal('');
@@ -53,25 +27,6 @@ afterEach(() => {
 });
 
 describe('<ia-topnav>', () => {
-  it('assigns a value to "search in" from outside event', async () => {
-    const el = await fixture<IATopNav>(html` <ia-topnav></ia-topnav>`);
-    const query = 'atari';
-    const searchMenu = el.shadowRoot?.querySelector(
-      'search-menu',
-    ) as SearchMenu;
-
-    const inputEvent = new InputEvent('input');
-    Object.defineProperty(inputEvent, 'target', {
-      value: { value: query },
-      writable: false,
-    });
-
-    searchMenu?.searchInChanged(inputEvent);
-    await el.updateComplete;
-
-    expect(el.searchIn).to.equal(query);
-  });
-
   it('dispatches an analyticsClick event when trackClick event fired', async () => {
     const el = await fixture<IATopNav>(html` <ia-topnav></ia-topnav>`);
     const clickEvent = new MouseEvent('click');
@@ -87,22 +42,6 @@ describe('<ia-topnav>', () => {
     expect(response).to.exist;
   });
 
-  it('dispatches an analyticsSubmit event when trackSubmit event fired', async () => {
-    const el = await fixture<IATopNav>(html` <ia-topnav></ia-topnav>`);
-    const submitEvent = new Event('submit');
-    const form = el.shadowRoot
-      ?.querySelector('primary-nav')
-      ?.shadowRoot?.querySelector('nav-search')
-      ?.shadowRoot?.querySelector('form');
-
-    form?.addEventListener('submit', (e) => e.preventDefault());
-    (form?.querySelector('[name=query]') as HTMLInputElement).value = 'atari';
-    setTimeout(() => form?.dispatchEvent(submitEvent));
-    const response = await oneEvent(el, 'trackSubmit');
-
-    expect(response).to.exist;
-  });
-
   it('closes all menus when close-layer clicked', async () => {
     const el = await fixture<IATopNav>(html` <ia-topnav></ia-topnav>`);
 
@@ -190,17 +129,6 @@ describe('<ia-topnav>', () => {
     expect(el.selectedMenuOption).to.equal('');
   });
 
-  it('toggles search menu tabindex when dropdown open', async () => {
-    const el = await fixture<IATopNav>(html` <ia-topnav></ia-topnav>`);
-
-    el.openMenu = 'search';
-    await el.updateComplete;
-
-    expect(
-      el.shadowRoot?.querySelector('search-menu')?.getAttribute('tabindex'),
-    ).to.equal('');
-  });
-
   it('toggles user menu tabindex when dropdown open', async () => {
     const el = await fixture<IATopNav>(
       html` <ia-topnav username="shaneriley" ?localLinks=${false}></ia-topnav>`,
@@ -246,11 +174,6 @@ describe('<ia-topnav>', () => {
         screenName="shaneriley"
         ?localLinks=${false}
       ></ia-topnav>`,
-      // container({
-      //   username: 'shaneriley',
-      //   screenName: 'shaneriley',
-      //   localLinks: false,
-      // }),
     );
 
     (
@@ -282,7 +205,6 @@ describe('<ia-topnav>', () => {
         'primary-nav',
         'media-slider',
         'desktop-subnav',
-        'search-menu',
       ];
       componentSelectors.forEach((selector) => {
         const component = el.shadowRoot?.querySelector(selector) as unknown as {
@@ -313,6 +235,24 @@ describe('<ia-topnav>', () => {
     });
   });
 
+  describe('search slot', () => {
+    it('forwards custom-search slot to primary-nav', async () => {
+      const el = await fixture<IATopNav>(html`<ia-topnav></ia-topnav>`);
+      await el.updateComplete;
+
+      const primaryNav = el.shadowRoot?.querySelector('primary-nav');
+      const slot = primaryNav?.querySelector('slot[name="custom-search"]');
+      expect(slot).to.exist;
+    });
+
+    it('does not render search-menu', async () => {
+      const el = await fixture<IATopNav>(html`<ia-topnav></ia-topnav>`);
+      await el.updateComplete;
+
+      expect(el.shadowRoot?.querySelector('search-menu')).to.not.exist;
+    });
+  });
+
   describe('slot pass throughs', () => {
     describe('slot for <primary-nav>', () => {
       it('opens a slot with `secondIdentitySlotMode`', async () => {
@@ -327,15 +267,14 @@ describe('<ia-topnav>', () => {
 
         const slot = el.shadowRoot
           ?.querySelector('primary-nav')
-          ?.querySelector('slot');
+          ?.querySelector('slot[name="opt-sec-logo"]');
         expect(slot).to.exist;
-        expect(slot?.getAttribute('name')).to.equal('opt-sec-logo');
 
         el.secondIdentitySlotMode = '';
         await elementUpdated(el);
         const noSlot = el.shadowRoot
           ?.querySelector('primary-nav')
-          ?.querySelector('slot');
+          ?.querySelector('slot[name="opt-sec-logo"]');
         expect(noSlot).to.not.exist;
       });
     });

package/test/primary-nav.test.ts

@@ -50,7 +50,7 @@ describe('<primary-nav>', () => {
     expect(el.shadowRoot?.querySelector('login-button')).to.not.be.undefined;
   });
 
-  it('does not render search menu toggle and search form if hideSearch true', async () => {
+  it('does not render search trigger or search slot if hideSearch true', async () => {
     const el = await fixture<PrimaryNav>(
       component({
         baseHost: 'archive.org',
@@ -61,7 +61,49 @@ describe('<primary-nav>', () => {
     );
 
     expect(el.shadowRoot?.querySelector('.search-trigger')).to.equal(null);
-    expect(el.shadowRoot?.querySelector('nav-search')).to.equal(null);
+    expect(el.shadowRoot?.querySelector('.custom-search-container')).to.not
+      .exist;
+  });
+
+  it('renders custom-search slot container', async () => {
+    const el = await fixture<PrimaryNav>(
+      component({
+        baseHost: 'archive.org',
+        username: 'testuser',
+        screenName: 'testuser',
+      }),
+    );
+
+    expect(el.shadowRoot?.querySelector('.custom-search-container')).to.exist;
+
+    const slot = el.shadowRoot?.querySelector<HTMLSlotElement>(
+      'slot[name="custom-search"]',
+    );
+    expect(slot).to.exist;
+  });
+
+  it('renders search trigger button for mobile toggle', async () => {
+    const el = await fixture<PrimaryNav>(
+      component({
+        baseHost: 'archive.org',
+        username: 'testuser',
+        screenName: 'testuser',
+      }),
+    );
+
+    expect(el.shadowRoot?.querySelector('.search-trigger')).to.exist;
+  });
+
+  it('does not render nav-search', async () => {
+    const el = await fixture<PrimaryNav>(
+      component({
+        baseHost: 'archive.org',
+        username: 'testuser',
+        screenName: 'testuser',
+      }),
+    );
+
+    expect(el.shadowRoot?.querySelector('nav-search')).to.not.exist;
   });
 
   it('opens a slot with `secondIdentitySlotMode`', async () => {

package/tsconfig.json

@@ -1,31 +1,31 @@
-{
-  "compilerOptions": {
-    "target": "es2018",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "lib": ["es2017", "dom"],
-    "strict": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "outDir": "dist",
-    "sourceMap": true,
-    "inlineSources": true,
-    "rootDir": "./",
-    "declaration": true,
-    "plugins": [
-      {
-        "name": "ts-lit-plugin"
-      }
-    ],
-    "paths": {
-      // workaround for: https://github.com/vitest-dev/vitest/issues/4567
-      "rollup/parseAst": [
-        "./node_modules/rollup/dist/parseAst"
-    ]
-}
-  },
-  "include": ["**/*.ts"]
-}
+{
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "lib": ["es2017", "dom"],
+    "strict": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "outDir": "dist",
+    "sourceMap": true,
+    "inlineSources": true,
+    "rootDir": "./",
+    "declaration": true,
+    "plugins": [
+      {
+        "name": "ts-lit-plugin"
+      }
+    ],
+    "paths": {
+      // workaround for: https://github.com/vitest-dev/vitest/issues/4567
+      "rollup/parseAst": [
+        "./node_modules/rollup/dist/parseAst"
+    ]
+}
+  },
+  "include": ["**/*.ts"]
+}

package/web-dev-server.config.mjs

@@ -1,32 +1,32 @@
-// import { hmrPlugin, presets } from '@open-wc/dev-server-hmr';
-
-/** Use Hot Module replacement by adding --hmr to the start command */
-const hmr = process.argv.includes('--hmr');
-
-export default /** @type {import('@web/dev-server').DevServerConfig} */ ({
-  nodeResolve: true,
-  open: '/demo',
-  watch: !hmr,
-  sslCert: './ssl/server.crt',
-  sslKey: './ssl/server.key',
-  hostname: 'local.archive.org',
-  http2: true,
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto'
-
-  /** Set appIndex to enable SPA routing */
-  // appIndex: 'demo/index.html',
-
-  /** Configure bare import resolve plugin */
-  // nodeResolve: {
-  //   exportConditions: ['browser', 'development']
-  // },
-
-  plugins: [
-    /** Use Hot Module Replacement by uncommenting. Requires @open-wc/dev-server-hmr plugin */
-    // hmr && hmrPlugin({ exclude: ['**/*/node_modules/**/*'], presets: [presets.litElement] }),
-  ],
-
-  // See documentation for all available options
-});
+// import { hmrPlugin, presets } from '@open-wc/dev-server-hmr';
+
+/** Use Hot Module replacement by adding --hmr to the start command */
+const hmr = process.argv.includes('--hmr');
+
+export default /** @type {import('@web/dev-server').DevServerConfig} */ ({
+  nodeResolve: true,
+  open: '/demo',
+  watch: !hmr,
+  sslCert: './ssl/server.crt',
+  sslKey: './ssl/server.key',
+  hostname: 'local.archive.org',
+  http2: true,
+
+  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
+  // esbuildTarget: 'auto'
+
+  /** Set appIndex to enable SPA routing */
+  // appIndex: 'demo/index.html',
+
+  /** Configure bare import resolve plugin */
+  // nodeResolve: {
+  //   exportConditions: ['browser', 'development']
+  // },
+
+  plugins: [
+    /** Use Hot Module Replacement by uncommenting. Requires @open-wc/dev-server-hmr plugin */
+    // hmr && hmrPlugin({ exclude: ['**/*/node_modules/**/*'], presets: [presets.litElement] }),
+  ],
+
+  // See documentation for all available options
+});

package/web-test-runner.config.mjs

@@ -1,41 +1,41 @@
-// import { playwrightLauncher } from '@web/test-runner-playwright';
-
-const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
-
-export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
-  /** Test files to run */
-  files: 'dist/test/**/*.test.js',
-
-  /** Resolve bare module imports */
-  nodeResolve: {
-    exportConditions: ['browser', 'development'],
-  },
-
-  /** Filter out lit dev mode logs */
-  filterBrowserLogs(log) {
-    for (const arg of log.args) {
-      if (typeof arg === 'string' && filteredLogs.some(l => arg.includes(l))) {
-        return false;
-      }
-    }
-    return true;
-  },
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto',
-
-  /** Amount of browsers to run concurrently */
-  // concurrentBrowsers: 2,
-
-  /** Amount of test files per browser to test concurrently */
-  // concurrency: 1,
-
-  /** Browsers to run tests on */
-  // browsers: [
-  //   playwrightLauncher({ product: 'chromium' }),
-  //   playwrightLauncher({ product: 'firefox' }),
-  //   playwrightLauncher({ product: 'webkit' }),
-  // ],
-
-  // See documentation for all available options
-});
+// import { playwrightLauncher } from '@web/test-runner-playwright';
+
+const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
+
+export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
+  /** Test files to run */
+  files: 'dist/test/**/*.test.js',
+
+  /** Resolve bare module imports */
+  nodeResolve: {
+    exportConditions: ['browser', 'development'],
+  },
+
+  /** Filter out lit dev mode logs */
+  filterBrowserLogs(log) {
+    for (const arg of log.args) {
+      if (typeof arg === 'string' && filteredLogs.some(l => arg.includes(l))) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
+  // esbuildTarget: 'auto',
+
+  /** Amount of browsers to run concurrently */
+  // concurrentBrowsers: 2,
+
+  /** Amount of test files per browser to test concurrently */
+  // concurrency: 1,
+
+  /** Browsers to run tests on */
+  // browsers: [
+  //   playwrightLauncher({ product: 'chromium' }),
+  //   playwrightLauncher({ product: 'firefox' }),
+  //   playwrightLauncher({ product: 'webkit' }),
+  // ],
+
+  // See documentation for all available options
+});