@aquera/nile-elements 0.1.50-beta-1.0 → 0.1.50

package/src/nile-pagination/nile-pagination.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the BSD-3-Clause license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 import { LitElement, html, CSSResultArray, TemplateResult } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
 import { styles } from './nile-pagination.css';
@@ -21,33 +22,51 @@ export class NilePagination extends NileElement {
     return [styles];
   }
 
-  
-  @property({attribute: 'totalitems',reflect: true, converter: { fromAttribute: (v: string) => {const n = Number(v);
-        return Number.isFinite(n) && n >= 0 ? Math.floor(n) : 0; }}})totalItems: number = 0;
-
-  @property({ attribute: 'currentpage',reflect: true,converter: { fromAttribute: (v: string) => { const n = Number(v);
-        return Number.isFinite(n) && n >= 1 ? Math.floor(n) : 1;}}}) currentPage : number = 1;
-
+  @property({attribute: 'totalitems',reflect: true,converter: {
+      fromAttribute: (v: string) => {
+        const n = Number(v);
+        return Number.isFinite(n) && n >= 0 ? Math.floor(n) : 0;
+      },
+    },
+  })totalItems: number = 0;
 
-  @property({attribute: 'pagesize',reflect: true, converter: { fromAttribute: (v: string) => {
+  @property({attribute: 'currentpage', reflect: true, converter: {
+      fromAttribute: (v: string) => {
         const n = Number(v);
-        return Number.isFinite(n) && n >= 1 ? Math.floor(n) : 50;}}}) pageSize: number = 50;
+        return Number.isFinite(n) && n >= 1 ? Math.floor(n) : 1;
+      },
+    },
+  })currentPage: number = 1;
 
+  @property({attribute: 'pagesize',reflect: true,converter: {
+      fromAttribute: (v: string) => {
+        const n = Number(v);
+        return Number.isFinite(n) && n >= 1 ? Math.floor(n) : 50;
+      },
+    },
+  })pageSize: number = 50;
 
-  @property({ attribute: 'pagesizeoptions', reflect: false,converter: { fromAttribute: (v: string) => { try { const arr = JSON.parse(v);
+  @property({ attribute: 'pagesizeoptions', reflect: false, converter: { fromAttribute: (v: string) => {
+        try {
+          const arr = JSON.parse(v);
           if (Array.isArray(arr) && arr.every(x => typeof x === 'number')) {
             return arr as number[];
           }
-        } catch {}return [10, 25, 50, 100];}}}) pageSizeOptions: number[] = [10, 25, 50, 100];
+        } catch {}
+        return [10, 25, 50, 100];
+  }}})
+ pageSizeOptions: number[] = [10, 25, 50, 100];
 
-  @property({ type: String }) variant: 'fluid' | 'compact' = 'fluid';
+  @property({ type: String })variant: 'fluid' | 'compact' = 'fluid';
   @property({ type: Boolean }) disabled = false;
   @property({ type: Boolean }) showTitle = true;
 
   @state() private _pageSizeOpen = false;
+  @state() private _pageOpen = false;
   @query('.page-size-dropdown') private _pageSizeDropdown!: HTMLElement;
 
   firstUpdated() {
+    if (this._pageSizeDropdown) { 
     this._pageSizeDropdown.addEventListener('nile-show', () => {
       this._pageSizeOpen = true;
     });
@@ -55,31 +74,49 @@ export class NilePagination extends NileElement {
       this._pageSizeOpen = false;
     });
   }
- 
+  }
+
   private get totalPages(): number {
     return Math.max(1, calculateTotalPages(this.totalItems, this.pageSize));
   }
 
-  private goToPage(page: number) {
+  private goToPage(newPage: number) {
+    
     if (this.disabled) return;
-    this.currentPage = page;  
-    this.emit('nile-change', { page: this.currentPage, pageSize: this.pageSize });
+    const previousPage = this.currentPage;
+    this.currentPage = newPage;
+    this.emit('nile-change', { page: newPage, previousPage, pageSize: this.pageSize });
   }
 
-  private onPageSizeSelect(size: number) {
-    if (this.disabled || this.pageSize === size) return;
-    this.pageSize = size;
-    this.currentPage = 1;
-    this.emit('nile-change', { page: 1, pageSize: size });
-  }
+ private onPageSizeSelect(newSize: number) {
+  if (this.disabled || this.pageSize === newSize) return;
+
+  const previousPage = this.currentPage;
+  this.pageSize = newSize;
+  this.currentPage = 1;
+  this.emit('nile-change', {
+    page: 1,
+    previousPage,
+    pageSize: newSize
+  });
+}
+
+private renderCompactRangeText(): TemplateResult {
+  const full = getRangeText(this.totalItems, this.pageSize, this.currentPage);
+  const trimmed = full.replace(/^Showing\s*/, ''); 
+  return html`<div class="range-text">${trimmed}</div>`;
+}
+
 
   private renderRangeText(): TemplateResult {
     if (this.totalItems === 0) {
       return html`<div class="range-text">Showing 0 of 0</div>`;
     }
-    return html`<div class="range-text">
-      ${getRangeText(this.totalItems, this.pageSize, this.currentPage)}
-    </div>`;
+    return html`
+      <div part="range-text" class="range-text">
+        ${getRangeText(this.totalItems, this.pageSize, this.currentPage)}
+      </div>
+    `;
   }
 
   private renderPageSizeSelect(): TemplateResult | null {
@@ -87,13 +124,65 @@ export class NilePagination extends NileElement {
     return html`
       <div class="page-size-select">
         <nile-dropdown class="page-size-dropdown" ?disabled=${this.disabled}>
-          <nile-button slot="trigger" variant="tertiary" class="down ${this._pageSizeOpen ? 'open' : ''}"
+          <nile-button
+            slot="trigger"
+            variant="tertiary"
+            class="down ${this._pageSizeOpen ? 'open' : ''}"
             ?disabled=${this.disabled}
           >
             ${this.pageSize}
-            <nile-icon name="chevrondown" size="14" color="var(--nile-colors-dark-500)" class="chevron"></nile-icon>
+            <nile-icon
+              name="chevrondown"
+              size="14"
+              color="var(--nile-colors-dark-500)"
+              class="chevron"
+            ></nile-icon>
           </nile-button>
-          <nile-menu class="page-size-menu">
+          <nile-menu>
+            <div class="down-scroll-wrapper">
+              ${this.pageSizeOptions.map(
+                size => html`
+                  <nile-menu-item
+                    ?disabled=${this.disabled}
+                    @click=${() => this.onPageSizeSelect(size)}
+                  >
+                    ${size}
+                  </nile-menu-item>
+                `
+              )}
+            </div>
+          </nile-menu>
+        </nile-dropdown>
+        <span part="pagesize-label" class="page-size-label">Items per page</span>
+      </div>
+    `;
+  }
+
+
+  private renderCompactPageSize(): TemplateResult {
+    return html`
+      <nile-dropdown
+        class="compact-dropdown"
+        ?disabled=${this.disabled}
+        @nile-show=${() => (this._pageSizeOpen = true)}
+        @nile-after-hide=${() => (this._pageSizeOpen = false)}
+      >
+        <nile-button
+          slot="trigger"
+          variant="tertiary"
+          class="down ${this._pageSizeOpen ? 'open' : ''}"
+          ?disabled=${this.disabled}
+        >
+          ${this.pageSize}
+          <nile-icon
+            name="chevrondown"
+            size="14"
+            color="var(--nile-colors-dark-500)"
+            class="chevron"
+          ></nile-icon>
+        </nile-button>
+        <nile-menu>
+          <div class="compact-scroll-wrapper">
             ${this.pageSizeOptions.map(
               size => html`
                 <nile-menu-item
@@ -101,14 +190,15 @@ export class NilePagination extends NileElement {
                   @click=${() => this.onPageSizeSelect(size)}
                 >
                   ${size}
-                </nile-menu-item>`
+                </nile-menu-item>
+              `
             )}
-          </nile-menu>
-        </nile-dropdown>
-        <span class="page-size-label">Items per page</span>
-      </div>
+          </div>
+        </nile-menu>
+      </nile-dropdown>
     `;
   }
+  
 
   private renderPrevButton(): TemplateResult {
     return html`
@@ -164,7 +254,8 @@ export class NilePagination extends NileElement {
                       @click=${() => this.goToPage(page)}
                     >
                       ${page}
-                    </nile-menu-item>`
+                    </nile-menu-item>
+                  `
                 )}
               </div>
             </nile-menu>
@@ -172,7 +263,6 @@ export class NilePagination extends NileElement {
         </li>
       `;
     }
-
     return html`
       <li>
         <nile-button
@@ -187,10 +277,56 @@ export class NilePagination extends NileElement {
   }
 
   private renderPageList(): TemplateResult {
+    if (this.variant === 'compact') {
+      return html`
+        <nav aria-label="Pagination">
+          <ul class="pagination compact-pagination">
+            ${this.renderPrevButton()}
+            <li>
+              <nile-dropdown
+                class="compact-dropdown1"
+                ?disabled=${this.disabled}
+                @nile-show=${() => (this._pageOpen = true)}
+                @nile-after-hide=${() => (this._pageOpen = false)}
+              >
+                <nile-button
+                  slot="trigger"
+                  variant="tertiary"
+                  class="current-page-btn ${this._pageOpen ? 'open' : ''}"
+                  ?disabled=${this.disabled}
+                >
+                  ${this.currentPage}
+                  <nile-icon
+                    name="chevrondown"
+                    size="14"
+                    class="chevron"
+                  ></nile-icon>
+                </nile-button>
+                <nile-menu>
+                  <div class="compact-scroll-wrapper1">
+                    ${Array.from({ length: this.totalPages }, (_, i) => i + 1).map(
+                      p => html`
+                        <nile-menu-item
+                          ?disabled=${this.disabled}
+                          @click=${() => this.goToPage(p)}
+                        >
+                          ${p}
+                        </nile-menu-item>
+                      `
+                    )}
+                  </div>
+                </nile-menu>
+              </nile-dropdown>
+            </li>
+            ${this.renderNextButton()}
+          </ul>
+        </nav>
+      `;
+    }
     const items = getPaginationItems(this.totalPages, this.currentPage);
     return html`
       <nav aria-label="Pagination">
-        <ul class="pagination">
+        <ul part="page-list" class="pagination">
           ${this.renderPrevButton()}
           ${items.map((item, idx) => this.renderPageItem(item, idx, items))}
           ${this.renderNextButton()}
@@ -199,17 +335,23 @@ export class NilePagination extends NileElement {
     `;
   }
 
-  public render(): TemplateResult {
-    return html`
-      <div class="pagination-wrapper ${this.variant}">
-        <div class="pager-container">
-          ${this.showTitle ? this.renderRangeText() : null}
-          ${this.renderPageSizeSelect()}
-        </div>
-        ${this.renderPageList()}
+ public render(): TemplateResult {
+  return html`
+    <div part="wrapper" class="pagination-wrapper ${this.variant}">
+      <div part="pager-container" class="pager-container">
+        ${this.variant === 'fluid' && this.showTitle
+            ? this.renderRangeText()
+          : this.variant === 'compact'
+            ? this.renderCompactRangeText()
+            : null}
+        ${this.variant === 'fluid'
+          ? this.renderPageSizeSelect()
+          : this.renderCompactPageSize()}
       </div>
-    `;
-  }
+      ${this.renderPageList()}
+    </div>
+  `;
+}
 }
 
 declare global {

package/src/nile-select/nile-select.ts

@@ -33,11 +33,8 @@ import type { CSSResultGroup, PropertyValues } from 'lit';
 import type { NileFormControl } from '../internal/nile-element';
 import type NileOption from '../nile-option/nile-option';
 import type NilePopup from '../nile-popup/nile-popup';
-import type { RenderItemConfig } from '../nile-virtual-select/types.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import '../nile-virtual-select/nile-virtual-select';
-import { VirtualScrollHelper } from './virtual-scroll-helper';
 
 type NileRemoveEvent = CustomEvent<Record<PropertyKey, never>>;
 
@@ -56,7 +53,6 @@ type NileRemoveEvent = CustomEvent<Record<PropertyKey, never>>;
  * @dependency nile-icon
  * @dependency nile-popup
  * @dependency nile-tag
- * @dependency nile-virtual-select
  *
  * @slot - The listbox options. Must be `<nile-option>` elements. You can use `<nile-divider>` to group items visually.
  * @slot label - The input's label. Alternatively, you can use the `label` attribute.
@@ -95,15 +91,14 @@ type NileRemoveEvent = CustomEvent<Record<PropertyKey, never>>;
  */
 
 @customElement('nile-select')
-export class NileSelect extends NileElement implements NileFormControl{
+export class NileSelect extends NileElement implements NileFormControl {
   static styles: CSSResultGroup = styles;
 
   // protected override BUBBLES=false;
 
-  private formControlController: FormControlController | null;
-  private virtualScrollHelper!: VirtualScrollHelper;
-
-
+  private readonly formControlController = new FormControlController(this, {
+    assumeInteractionOn: ['nile-blur', 'nile-input'],
+  });
   private readonly hasSlotController = new HasSlotController(
     this,
     'help-text',
@@ -237,13 +232,6 @@ export class NileSelect extends NileElement implements NileFormControl{
 
   @property({ type: String }) noResultsMessage: string = 'No results found';
 
-  /** Enhanced configuration for rendering items with support for display text, value, and search text */
-  @property({ attribute: false }) renderItemConfig?: RenderItemConfig;
-
-  @property({ type: Array }) data: any = [];
-
-  @property({ type: Boolean }) enableVirtualScroll = false;
-
   /** Gets the validity state object */
   get validity() {
     return this.valueInput?.validity;
@@ -254,18 +242,8 @@ export class NileSelect extends NileElement implements NileFormControl{
     return this.valueInput?.validationMessage;
   }
 
-  constructor() {
-    super();
-  }
-
   connectedCallback() {
     super.connectedCallback();
-    if(!this.enableVirtualScroll) {
-      this.formControlController = new FormControlController(this, {
-          assumeInteractionOn: ['nile-blur', 'nile-input'],
-      });
-    }
-    this.virtualScrollHelper = new VirtualScrollHelper(this);
     this.handleDocumentFocusIn = this.handleDocumentFocusIn.bind(this);
     this.handleDocumentKeyDown = this.handleDocumentKeyDown.bind(this);
     this.handleDocumentMouseDown = this.handleDocumentMouseDown.bind(this);
@@ -769,7 +747,7 @@ export class NileSelect extends NileElement implements NileFormControl{
 
     // Update validity
     this.updateComplete.then(() => {
-      this.formControlController?.updateValidity();
+      this.formControlController.updateValidity();
     });
 
     this.calculateTotalWidthOfTags();
@@ -820,8 +798,8 @@ export class NileSelect extends NileElement implements NileFormControl{
   }
 
   private handleInvalid(event: Event) {
-    this.formControlController?.setValidity(false);
-    this.formControlController?.emitInvalidEvent(event);
+    this.formControlController.setValidity(false);
+    this.formControlController.emitInvalidEvent(event);
   }
 
   @watch('disabled', { waitUntilFirstUpdate: true })
@@ -924,7 +902,7 @@ export class NileSelect extends NileElement implements NileFormControl{
 
   /** Gets the associated form, if one exists. */
   getForm(): HTMLFormElement | null {
-    return this.formControlController?.getForm() || null;
+    return this.formControlController.getForm();
   }
 
   /** Checks for validity and shows the browser's validation message if the control is invalid. */
@@ -935,7 +913,7 @@ export class NileSelect extends NileElement implements NileFormControl{
   /** Sets a custom validation message. Pass an empty string to restore validity. */
   setCustomValidity(message: string) {
     this.valueInput.setCustomValidity(message);
-    this.formControlController?.updateValidity();
+    this.formControlController.updateValidity();
   }
 
   /** Sets focus on the control. */
@@ -1008,10 +986,6 @@ export class NileSelect extends NileElement implements NileFormControl{
   }
 
   render() {
-    if(this.enableVirtualScroll) {
-      return this.virtualScrollHelper.renderVirtualizedContent();
-    }
-
     const hasLabelSlot = this.hasSlotController.test('label');
     const hasHelpTextSlot = this.hasSlotController.test('help-text');
     const hasLabelSuffixSlot = this.hasSlotController.test('label-suffix');