@startinblox/core 0.19.0-beta.4 → 0.19.0-beta.6

package/dist/index.js

@@ -11322,7 +11322,7 @@ class Store {
     var _a;
     let key = id2;
     if (serverPagination) {
-      key = id2 + "#p" + serverPagination.limit + "?o" + serverPagination.offset;
+      key = appendServerPaginationToIri(key, serverPagination);
     }
     if (serverSearch) {
       key = appendServerSearchToIri(key, serverSearch);
@@ -11432,7 +11432,7 @@ class Store {
         key = key + parentId;
       if (key === id2 && resource2["@type"] == this.getExpandedPredicate("ldp:Container", clientContext)) {
         if (serverPagination)
-          key = key + "#p" + serverPagination.limit + "?o" + serverPagination.offset;
+          key = appendServerPaginationToIri(key, serverPagination);
         if (serverSearch)
           key = appendServerSearchToIri(key, serverSearch);
       }
@@ -11568,7 +11568,10 @@ class Store {
    *
    * @returns Resource (Proxy) if in the cache, null otherwise
    */
-  get(id2, serverSearch) {
+  get(id2, serverPagination, serverSearch) {
+    if (serverPagination) {
+      id2 = appendServerPaginationToIri(id2, serverPagination);
+    }
     if (serverSearch) {
       id2 = appendServerSearchToIri(id2, serverSearch);
     }
@@ -11945,9 +11948,8 @@ const ServerPaginationMixin = {
     this.updateNavButtons(resourceId, index, 1);
     await this.fetchData(this.dataSrc);
   },
-  updateNavButtons(resourceId, index, variance) {
+  async updateNavButtons(resourceId, index, variance) {
     this.element.querySelector("[data-id='prev']").disabled = this.currentOffset[index] <= 0;
-    this.element.querySelector("[data-id='next']").disabled = this.currentOffset[index] * this.limit >= this.pageCount;
     this.element.querySelector("[data-id='current']").innerText = this.getCurrentServedPage(resourceId, variance);
   },
   getServerNavElement(div2) {
@@ -11959,6 +11961,7 @@ const ServerPaginationMixin = {
   },
   getCurrentServedPage(context2, variance) {
     this.currentPage[context2] = Number(this.currentPage[context2]) + variance;
+    this.pageNumber = this.currentPage[context2];
     return this.currentPage[context2];
   },
   /**
@@ -11989,18 +11992,15 @@ const ServerPaginationMixin = {
           ?disabled=${currentOffset <= 0}
           @click=${() => this.decreaseCurrentOffset(resourceId)}
         >←</button>
+        <span data-id="current">
+          ${currentPageNumber}
+        </span>
         <button
           data-id="next"
           ?disabled=${currentOffset >= (pageCount - 1) * this.limit}
           @click=${() => this.increaseCurrentOffset(resourceId)}
         >→</button>
         <span>
-          <span data-id="current">
-            ${currentPageNumber}
-          </span> / 
-          <span data-id="count">
-            ${this.pageCount}
-          </span>
         </span>
       `, div2);
     }
@@ -12068,15 +12068,13 @@ const StoreMixin = {
   get resource() {
     var _a;
     let id2 = this.resourceId;
-    if (this.limit) {
-      id2 = this.resourceId + "#p" + this.limit + "?o" + this.offset;
-    }
+    const serverPagination = formatAttributesToServerPaginationOptions(this.element.attributes);
     const serverSearch = mergeServerSearchOptions(
       formatAttributesToServerSearchOptions(this.element.attributes),
       (_a = this.getDynamicServerSearch) == null ? void 0 : _a.call(this)
       // from `filterMixin`
     );
-    return id2 ? store.get(id2, serverSearch) : null;
+    return id2 ? store.get(id2, serverPagination, serverSearch) : null;
   },
   get loader() {
     return this.loaderId ? document.getElementById(this.loaderId) : null;