@internetarchive/ia-topnav 1.3.10-webdev-7394.2 → 1.3.10-webdev-7394.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-topnav",
-  "version": "1.3.10-webdev-7394.2",
+  "version": "1.3.10-webdev-7394.4",
   "description": "Top nav for Internet Archive",
   "license": "AGPL-3.0-only",
   "main": "dist/index.js",

package/src/data/menus.ts

@@ -201,7 +201,7 @@ export function buildTopNavMenus(
       featuredLinks: [],
       mobileAppsLinks: [],
       browserExtensionsLinks: [],
-      archiveItLinks: []
+      archiveItLinks: [],
     },
     software: {
       heading: 'Software',

package/src/desktop-subnav.ts

@@ -4,7 +4,7 @@ import { customElement, property } from 'lit/decorators.js';
 import TrackedElement from './tracked-element';
 import desktopSubnavCSS from './styles/desktop-subnav';
 import icons from './assets/img/icons';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import { IATopNavLink } from './models';
 
 @customElement('desktop-subnav')

package/src/dropdown-menu.ts

@@ -3,8 +3,8 @@ import { property } from 'lit/decorators.js';
 
 import icons from './assets/img/icons';
 import { defaultTopNavConfig } from './data/menus';
-import formatUrl from './lib/formatUrl';
-import { makeBooleanString } from './lib/makeBooleanString';
+import formatUrl from './lib/format-url';
+import { makeBooleanString } from './lib/make-boolean-string';
 import { IATopNavConfig, IATopNavLink } from './models';
 import dropdownMenuCSS from './styles/dropdown-menu';
 import TrackedElement from './tracked-element';

package/src/ia-topnav.ts

@@ -17,7 +17,7 @@ import iaTopNavCSS from './styles/ia-topnav';
 import './user-menu';
 
 @customElement('ia-topnav')
-export default class IATopNav extends LitElement {
+export class IATopNav extends LitElement {
   @property({ type: Boolean }) localLinks = false;
 
   @property({ type: String }) waybackPagesArchived = '';
@@ -286,6 +286,11 @@ export default class IATopNav extends LitElement {
         >
           ${this.secondLogoSlot}
         </primary-nav>
+        <desktop-subnav
+          .baseHost=${this.normalizedBaseHost}
+          .menuItems=${this.menus.more.links}
+          @focus=${this.closeMenus}
+        ></desktop-subnav>
         <media-slider
           .baseHost=${this.normalizedBaseHost}
           .config=${this.config}
@@ -308,11 +313,6 @@ export default class IATopNav extends LitElement {
         @trackClick=${this.trackClick}
         @trackSubmit=${this.trackSubmit}
       ></search-menu>
-      <desktop-subnav
-        .baseHost=${this.normalizedBaseHost}
-        .menuItems=${this.menus.more.links}
-        @focus=${this.closeMenus}
-      ></desktop-subnav>
       <div
         id="close-layer"
         class="${this.closeLayerClass}"

package/src/login-button.ts

@@ -2,7 +2,7 @@ import { html } from 'lit';
 import TrackedElement from './tracked-element';
 import icons from './assets/img/icons';
 import loginButtonCSS from './styles/login-button';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import { customElement, property, state } from 'lit/decorators.js';
 import { IATopNavConfig } from './models';
 import { defaultTopNavConfig } from './data/menus';

package/src/media-button.ts

@@ -1,7 +1,7 @@
 import { html, TemplateResult } from 'lit';
 import TrackedElement from './tracked-element';
 import icons from './assets/img/icons';
-import toSentenceCase from './lib/toSentenceCase';
+import toSentenceCase from './lib/t-sentence-case';
 import mediaButtonCSS from './styles/media-button';
 import { customElement, property } from 'lit/decorators.js';
 import { IATopNavConfig } from './models';

package/src/media-menu.ts

@@ -2,7 +2,7 @@ import { LitElement, PropertyValues, html } from 'lit';
 import { customElement, property, queryAll } from 'lit/decorators.js';
 
 import { defaultTopNavConfig } from './data/menus';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import './media-button';
 import { MediaButton } from './media-button';
 import { IATopNavConfig } from './models';

package/src/media-subnav.ts

@@ -5,8 +5,8 @@ import TrackedElement from './tracked-element';
 import './wayback-slider';
 import './more-slider';
 import mediaSubnavCSS from './styles/media-subnav';
-import toSentenceCase from './lib/toSentenceCase';
-import formatUrl from './lib/formatUrl';
+import toSentenceCase from './lib/t-sentence-case';
+import formatUrl from './lib/format-url';
 import { customElement, property } from 'lit/decorators.js';
 import { IATopNavConfig, IATopNavLink, IATopNavMediaMenu } from './models';
 import { defaultTopNavConfig } from './data/menus';

package/src/more-slider.ts

@@ -2,9 +2,9 @@ import { html } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
 import TrackedElement from './tracked-element';
-import toSentenceCase from './lib/toSentenceCase';
+import toSentenceCase from './lib/t-sentence-case';
 import moreSliderCSS from './styles/more-slider';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import { IATopNavConfig, IATopNavLink } from './models';
 import { defaultTopNavConfig } from './data/menus';
 

package/src/nav-search.ts

@@ -3,7 +3,7 @@ import { nothing, html } from 'lit';
 import TrackedElement from './tracked-element';
 import navSearchCSS from './styles/nav-search';
 import icons from './assets/img/icons';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import { customElement, property, query } from 'lit/decorators.js';
 import { defaultTopNavConfig } from './data/menus';
 import { IATopNavConfig } from './models';

package/src/primary-nav.ts

@@ -8,7 +8,7 @@ import './media-menu';
 import logoWordmarkStacked from './assets/img/wordmark-stacked';
 import primaryNavCSS from './styles/primary-nav';
 import locationHandler from './lib/location-handler';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import { customElement, property } from 'lit/decorators.js';
 import { IATopNavConfig, IATopNavSecondIdentitySlotMode } from './models';
 import { defaultTopNavConfig } from './data/menus';

package/src/search-menu.ts

@@ -3,9 +3,9 @@ import { customElement, property } from 'lit/decorators.js';
 
 import TrackedElement from './tracked-element';
 import searchMenuCSS from './styles/search-menu';
-import formatUrl from './lib/formatUrl';
+import formatUrl from './lib/format-url';
 import { IATopNavConfig } from './models';
-import { makeBooleanString } from './lib/makeBooleanString';
+import { makeBooleanString } from './lib/make-boolean-string';
 import { defaultTopNavConfig } from './data/menus';
 
 @customElement('search-menu')

package/src/styles/media-slider.ts

@@ -8,7 +8,7 @@ export default css`
   .overflow-clip {
     display: none;
     position: absolute;
-    top: 3rem;
+    top: 0;
     right: 0;
     left: 0;
     height: 0;

package/src/user-menu.ts

@@ -4,7 +4,7 @@ import userMenuCSS from './styles/user-menu';
 import dropdownStyles from './styles/dropdown-menu';
 import KeyboardNavigation from './lib/keyboard-navigation';
 import { customElement, property } from 'lit/decorators.js';
-import { makeBooleanFromString } from './lib/makeBooleanString';
+import { makeBooleanFromString } from './lib/make-boolean-string';
 
 @customElement('user-menu')
 export default class UserMenu extends DropdownMenu {

package/src/wayback-slider.ts

@@ -4,8 +4,8 @@ import TrackedElement from './tracked-element';
 import './save-page-form';
 import queryHandler from './lib/query-handler';
 import waybackSliderCSS from './styles/wayback-slider';
-import toSentenceCase from './lib/toSentenceCase';
-import formatUrl from './lib/formatUrl';
+import toSentenceCase from './lib/t-sentence-case';
+import formatUrl from './lib/format-url';
 import { customElement, property } from 'lit/decorators.js';
 import { IATopNavConfig, IATopNavLink } from './models';
 import { defaultTopNavConfig } from './data/menus';

package/test/ia-topnav.test.ts

@@ -8,11 +8,10 @@ import {
 } from '@open-wc/testing';
 
 import '../src/ia-topnav';
-import IATopNav from '../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';
-import { IATopNavConfig, IATopNavSecondIdentitySlotMode } from '../src/models';
 
 // const container = (
 //   {

package/test/more-slider.test.ts

@@ -10,7 +10,7 @@ describe('<more-slider>', () => {
       html`<more-slider
         .baseHost=${baseHost}
         .config=${{}}
-        .menuItems=${menus.more}
+        .menuItems=${menus.more.links}
       ></more-slider>`,
     );
 

package/dist/src/lib/formatUrl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatUrl.js","sourceRoot":"","sources":["../../../src/lib/formatUrl.ts"],"names":[],"mappings":"AAAA,eAAe,CAAC,MAAc,EAAE,EAAE,QAAgB,EAAU,EAAE,CAC5D,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAE,GAAG,QAAQ,GAAG,GAAG,EAAwB,CAAC","sourcesContent":["export default (url: string = '', baseHost: string): string =>\n  /^https?:/.test(url) ? url : (`${baseHost}${url}` as string & Location);\n"]}

package/dist/src/lib/makeBooleanString.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"makeBooleanString.js","sourceRoot":"","sources":["../../../src/lib/makeBooleanString.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IACvC,IAAI,YAAY,GAAY,KAAK,CAAC;IAClC,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QAChD,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,OAAO,iBAAiB,CAAC,YAAY,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAClC,CAAC","sourcesContent":["export function makeBooleanFromString(value: string): 'true' | 'false' {\n  const lowerValue = value.toLowerCase();\n  let booleanValue: boolean = false;\n  if (lowerValue === 'true' || lowerValue === '1') {\n    booleanValue = true;\n  }\n  return makeBooleanString(booleanValue);\n}\n\nexport function makeBooleanString(value: boolean): 'true' | 'false' {\n  return value ? 'true' : 'false';\n}\n"]}

package/dist/src/lib/toSentenceCase.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"toSentenceCase.js","sourceRoot":"","sources":["../../../src/lib/toSentenceCase.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,CAAC,MAAc,EAAU,EAAE;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,eAAe,GAAG,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACxF,OAAO,KAAK,CAAC,MAAM;QACjB,CAAC,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,CAAC;QACxD,CAAC,CAAC,eAAe,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC","sourcesContent":["const toSentenceCase = (phrase: string): string => {\n  const words = phrase.split(' ');\n  const lastWord = words.pop();\n  const capitalizedWord = `${lastWord?.substr(0, 1).toUpperCase()}${lastWord?.substr(1)}`;\n  return words.length\n    ? toSentenceCase(`${words.join(' ')}${capitalizedWord}`)\n    : capitalizedWord;\n};\n\nexport default toSentenceCase;\n"]}