@esri/calcite-components 1.9.0-next.1 → 1.9.0-next.11

package/dist/cjs/calcite-meter.cjs.entry.js

@@ -1,21 +1,21 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.9.0-next.1
+ * v1.9.0-next.11
  */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-abb409dc.js');
-const loadable = require('./loadable-8378250a.js');
-const form = require('./form-4dc1d591.js');
-const locale = require('./locale-f9101d69.js');
-const dom = require('./dom-fce6f26d.js');
-const observers = require('./observers-bb4a4274.js');
-require('./key-74a84e1b.js');
-require('./guid-80751135.js');
-require('./resources-503ede36.js');
+const index = require('./index-72a027fc.js');
+const loadable = require('./loadable-7b7762a4.js');
+const form = require('./form-9e380f56.js');
+const locale = require('./locale-d8030d1e.js');
+const dom = require('./dom-dc793198.js');
+const observers = require('./observers-2cf2bf90.js');
+require('./key-448c4d4a.js');
+require('./guid-a38b1f13.js');
+require('./resources-a40b1bd8.js');
 
 const CSS = {
   container: "container",

package/dist/cjs/calcite-modal.cjs.entry.js

@@ -1,24 +1,24 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.9.0-next.1
+ * v1.9.0-next.11
  */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-abb409dc.js');
-const conditionalSlot = require('./conditionalSlot-f5ae9f6f.js');
-const dom = require('./dom-fce6f26d.js');
-const focusTrapComponent = require('./focusTrapComponent-d713a3f6.js');
-const loadable = require('./loadable-8378250a.js');
-const observers = require('./observers-bb4a4274.js');
-const openCloseComponent = require('./openCloseComponent-3658831a.js');
-const locale = require('./locale-f9101d69.js');
-const t9n = require('./t9n-61867878.js');
-require('./guid-80751135.js');
-require('./resources-503ede36.js');
-require('./key-74a84e1b.js');
+const index = require('./index-72a027fc.js');
+const conditionalSlot = require('./conditionalSlot-b0c2feb4.js');
+const dom = require('./dom-dc793198.js');
+const focusTrapComponent = require('./focusTrapComponent-4c916b1a.js');
+const loadable = require('./loadable-7b7762a4.js');
+const observers = require('./observers-2cf2bf90.js');
+const openCloseComponent = require('./openCloseComponent-7a805643.js');
+const locale = require('./locale-d8030d1e.js');
+const t9n = require('./t9n-d4a029c0.js');
+require('./guid-a38b1f13.js');
+require('./resources-a40b1bd8.js');
+require('./key-448c4d4a.js');
 
 const CSS = {
   modal: "modal",

package/dist/cjs/calcite-navigation_3.cjs.entry.js

@@ -1,17 +1,17 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.9.0-next.1
+ * v1.9.0-next.11
  */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-abb409dc.js');
-const dom = require('./dom-fce6f26d.js');
-const loadable = require('./loadable-8378250a.js');
-require('./guid-80751135.js');
-require('./resources-503ede36.js');
+const index = require('./index-72a027fc.js');
+const dom = require('./dom-dc793198.js');
+const loadable = require('./loadable-7b7762a4.js');
+require('./guid-a38b1f13.js');
+require('./resources-a40b1bd8.js');
 
 const CSS$2 = {
   container: "container",

package/dist/cjs/calcite-notice.cjs.entry.js

@@ -1,23 +1,24 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.9.0-next.1
+ * v1.9.0-next.11
  */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-abb409dc.js');
-const conditionalSlot = require('./conditionalSlot-f5ae9f6f.js');
-const dom = require('./dom-fce6f26d.js');
-const loadable = require('./loadable-8378250a.js');
-const locale = require('./locale-f9101d69.js');
-const t9n = require('./t9n-61867878.js');
-const resources = require('./resources-f7e4ffe0.js');
-require('./observers-bb4a4274.js');
-require('./guid-80751135.js');
-require('./resources-503ede36.js');
-require('./key-74a84e1b.js');
+const index = require('./index-72a027fc.js');
+const conditionalSlot = require('./conditionalSlot-b0c2feb4.js');
+const dom = require('./dom-dc793198.js');
+const loadable = require('./loadable-7b7762a4.js');
+const locale = require('./locale-d8030d1e.js');
+const t9n = require('./t9n-d4a029c0.js');
+const resources = require('./resources-c63ba8ae.js');
+const openCloseComponent = require('./openCloseComponent-7a805643.js');
+require('./observers-2cf2bf90.js');
+require('./guid-a38b1f13.js');
+require('./resources-a40b1bd8.js');
+require('./key-448c4d4a.js');
 
 const SLOTS = {
   title: "title",
@@ -38,8 +39,13 @@ const noticeCss = ":host([scale=s]){--calcite-notice-spacing-token-small:0.5rem;
 const Notice = class {
   constructor(hostRef) {
     index.registerInstance(this, hostRef);
+    this.calciteNoticeBeforeClose = index.createEvent(this, "calciteNoticeBeforeClose", 6);
+    this.calciteNoticeBeforeOpen = index.createEvent(this, "calciteNoticeBeforeOpen", 6);
     this.calciteNoticeClose = index.createEvent(this, "calciteNoticeClose", 6);
     this.calciteNoticeOpen = index.createEvent(this, "calciteNoticeOpen", 6);
+    this.setTransitionEl = (el) => {
+      this.transitionEl = el;
+    };
     //--------------------------------------------------------------------------
     //
     //  Private Methods
@@ -47,8 +53,8 @@ const Notice = class {
     //--------------------------------------------------------------------------
     this.close = () => {
       this.open = false;
-      this.calciteNoticeClose.emit();
     };
+    this.openTransitionProp = "opacity";
     this.open = false;
     this.kind = "brand";
     this.closable = false;
@@ -61,6 +67,9 @@ const Notice = class {
     this.effectiveLocale = undefined;
     this.defaultMessages = undefined;
   }
+  openHandler() {
+    openCloseComponent.onToggleOpenCloseComponent(this);
+  }
   onMessagesChange() {
     /* wired up by t9n util */
   }
@@ -86,6 +95,9 @@ const Notice = class {
     loadable.setUpLoadableComponent(this);
     this.requestedIcon = dom.setRequestedIcon(resources.KindIcons, this.icon, this.kind);
     await t9n.setUpMessages(this);
+    if (this.open) {
+      openCloseComponent.onToggleOpenCloseComponent(this);
+    }
   }
   componentDidLoad() {
     loadable.setComponentLoaded(this);
@@ -96,7 +108,9 @@ const Notice = class {
       // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
       ref: (el) => (this.closeButton = el) }, index.h("calcite-icon", { icon: "x", scale: this.scale === "l" ? "m" : "s" })));
     const hasActionEnd = dom.getSlotted(el, SLOTS.actionsEnd);
-    return (index.h("div", { class: CSS.container }, this.requestedIcon ? (index.h("div", { class: CSS.icon }, index.h("calcite-icon", { flipRtl: this.iconFlipRtl, icon: this.requestedIcon, scale: this.scale === "l" ? "m" : "s" }))) : null, index.h("div", { class: CSS.content }, index.h("slot", { name: SLOTS.title }), index.h("slot", { name: SLOTS.message }), index.h("slot", { name: SLOTS.link })), hasActionEnd ? (index.h("div", { class: CSS.actionsEnd }, index.h("slot", { name: SLOTS.actionsEnd }))) : null, this.closable ? closeButton : null));
+    return (index.h("div", { class: CSS.container,
+      // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
+      ref: this.setTransitionEl }, this.requestedIcon ? (index.h("div", { class: CSS.icon }, index.h("calcite-icon", { flipRtl: this.iconFlipRtl, icon: this.requestedIcon, scale: this.scale === "l" ? "m" : "s" }))) : null, index.h("div", { class: CSS.content }, index.h("slot", { name: SLOTS.title }), index.h("slot", { name: SLOTS.message }), index.h("slot", { name: SLOTS.link })), hasActionEnd ? (index.h("div", { class: CSS.actionsEnd }, index.h("slot", { name: SLOTS.actionsEnd }))) : null, this.closable ? closeButton : null));
   }
   //--------------------------------------------------------------------------
   //
@@ -117,12 +131,25 @@ const Notice = class {
       this.closeButton.focus();
     }
   }
+  onBeforeClose() {
+    this.calciteNoticeBeforeClose.emit();
+  }
+  onBeforeOpen() {
+    this.calciteNoticeBeforeOpen.emit();
+  }
+  onClose() {
+    this.calciteNoticeClose.emit();
+  }
+  onOpen() {
+    this.calciteNoticeOpen.emit();
+  }
   effectiveLocaleChange() {
     t9n.updateMessages(this, this.effectiveLocale);
   }
   static get assetsDirs() { return ["assets"]; }
   get el() { return index.getElement(this); }
   static get watchers() { return {
+    "open": ["openHandler"],
     "messageOverrides": ["onMessagesChange"],
     "icon": ["updateRequestedIcon"],
     "kind": ["updateRequestedIcon"],

package/dist/cjs/calcite-option_3.cjs.entry.js

@@ -1,22 +1,22 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.9.0-next.1
+ * v1.9.0-next.11
  */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-abb409dc.js');
-const observers = require('./observers-bb4a4274.js');
-const dom = require('./dom-fce6f26d.js');
-const form = require('./form-4dc1d591.js');
-const interactive = require('./interactive-b871d34e.js');
-const label = require('./label-881e97c2.js');
-const loadable = require('./loadable-8378250a.js');
-require('./guid-80751135.js');
-require('./resources-503ede36.js');
-require('./browser-3067f24e.js');
+const index = require('./index-72a027fc.js');
+const observers = require('./observers-2cf2bf90.js');
+const dom = require('./dom-dc793198.js');
+const form = require('./form-9e380f56.js');
+const interactive = require('./interactive-907d7330.js');
+const label = require('./label-9f2f565f.js');
+const loadable = require('./loadable-7b7762a4.js');
+require('./guid-a38b1f13.js');
+require('./resources-a40b1bd8.js');
+require('./browser-7ca059f6.js');
 
 const optionCss = ":host{display:block}:host([hidden]){display:none}[hidden]{display:none}";
 
@@ -45,12 +45,13 @@ const Option = class {
   //
   //--------------------------------------------------------------------------
   ensureTextContentDependentProps() {
-    const { el: { textContent }, } = this;
-    if (!this.label || this.label === this.internallySetLabel) {
+    const { el: { textContent }, internallySetLabel, internallySetValue, label, value, } = this;
+    if (!label || label === internallySetLabel) {
       this.label = textContent;
       this.internallySetLabel = textContent;
     }
-    if (!this.value || this.value === this.internallySetValue) {
+    if (value == null /* intentional loose equals to handle both undefined & null */ ||
+      value === internallySetValue) {
       this.value = textContent;
       this.internallySetValue = textContent;
     }

package/dist/cjs/calcite-pagination.cjs.entry.js

@@ -1,21 +1,21 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.9.0-next.1
+ * v1.9.0-next.11
  */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-abb409dc.js');
-const loadable = require('./loadable-8378250a.js');
-const locale = require('./locale-f9101d69.js');
-const t9n = require('./t9n-61867878.js');
-require('./dom-fce6f26d.js');
-require('./guid-80751135.js');
-require('./resources-503ede36.js');
-require('./key-74a84e1b.js');
-require('./observers-bb4a4274.js');
+const index = require('./index-72a027fc.js');
+const loadable = require('./loadable-7b7762a4.js');
+const locale = require('./locale-d8030d1e.js');
+const t9n = require('./t9n-d4a029c0.js');
+const observers = require('./observers-2cf2bf90.js');
+require('./dom-dc793198.js');
+require('./guid-a38b1f13.js');
+require('./resources-a40b1bd8.js');
+require('./key-448c4d4a.js');
 
 const CSS = {
   page: "page",
@@ -27,36 +27,90 @@ const CSS = {
   ellipsisStart: "ellipsis--start",
   ellipsisEnd: "ellipsis--end",
 };
+const ICONS = {
+  next: "chevronRight",
+  previous: "chevronLeft",
+};
+
+let getBreakpointsPromise;
+function breakpointTokenToNumericalValue(style, tokenName) {
+  return parseInt(style.getPropertyValue(tokenName));
+}
+/**
+ * This util will return a breakpoints lookup object.
+ *
+ * Note that the breakpoints will be evaluated at the root and cached for reuse.
+ *
+ * @returns {Promise<Breakpoints>} The Breakpoints object.
+ */
+async function getBreakpoints() {
+  if (getBreakpointsPromise) {
+    return getBreakpointsPromise;
+  }
+  getBreakpointsPromise = new Promise((resolve) => {
+    requestAnimationFrame(() => {
+      const rootStyles = getComputedStyle(document.body);
+      resolve({
+        width: {
+          large: breakpointTokenToNumericalValue(rootStyles, "--calcite-app-breakpoint-width-lg"),
+          medium: breakpointTokenToNumericalValue(rootStyles, "--calcite-app-breakpoint-width-md"),
+          small: breakpointTokenToNumericalValue(rootStyles, "--calcite-app-breakpoint-width-sm"),
+          xsmall: breakpointTokenToNumericalValue(rootStyles, "--calcite-app-breakpoint-width-xs"),
+        },
+      });
+    });
+  });
+  return getBreakpointsPromise;
+}
 
-const paginationCss = ":host([scale=s]){--calcite-pagination-spacing-internal:0.25rem 0.5rem}:host([scale=s]) .previous,:host([scale=s]) .next,:host([scale=s]) .page{block-size:1.5rem;font-size:var(--calcite-font-size--2);line-height:1rem}:host([scale=s]) .previous,:host([scale=s]) .next{padding-inline:0.25rem}:host([scale=m]){--calcite-pagination-spacing-internal:0.5rem 0.75rem}:host([scale=m]) .previous,:host([scale=m]) .next,:host([scale=m]) .page{block-size:2rem;font-size:var(--calcite-font-size--1);line-height:1rem}:host([scale=m]) .previous,:host([scale=m]) .next{padding-inline:0.5rem}:host([scale=l]){--calcite-pagination-spacing-internal:0.75rem 1rem}:host([scale=l]) .previous,:host([scale=l]) .next,:host([scale=l]) .page{block-size:2.75rem;font-size:var(--calcite-font-size-0);line-height:1.25rem}:host([scale=l]) .previous,:host([scale=l]) .next{padding-inline:1rem}:host{display:flex;writing-mode:horizontal-tb}:host button{outline-color:transparent}:host button:focus{outline:2px solid var(--calcite-ui-focus-color, var(--calcite-ui-brand));outline-offset:calc(\n            -2px *\n            calc(\n              1 -\n              2 * clamp(\n                0,\n                var(--calcite-ui-focus-offset-invert),\n                1\n              )\n            )\n          )}.previous,.next,.page{box-sizing:border-box;display:flex;cursor:pointer;align-items:center;border-style:none;--tw-border-opacity:0;background-color:transparent;font-family:inherit;font-size:var(--calcite-font-size-0);line-height:1.25rem;color:var(--calcite-ui-text-3);border-block:2px solid transparent}.previous:hover,.next:hover,.page:hover{color:var(--calcite-ui-text-1);transition:all var(--calcite-animation-timing) ease-in-out 0s, outline 0s, outline-offset 0s}.page:hover{border-block-end-color:var(--calcite-ui-border-2)}.page.is-selected{font-weight:var(--calcite-font-weight-medium);color:var(--calcite-ui-text-1);border-block-end-color:var(--calcite-ui-brand)}.previous:hover,.next:hover{background-color:var(--calcite-ui-foreground-2);color:var(--calcite-ui-brand)}.previous:active,.next:active{background-color:var(--calcite-ui-foreground-3)}.previous.is-disabled,.next.is-disabled{pointer-events:none;background-color:transparent}.previous.is-disabled>calcite-icon,.next.is-disabled>calcite-icon{opacity:var(--calcite-ui-opacity-disabled)}.next{margin-inline-end:0px}.page,.ellipsis{padding:var(--calcite-pagination-spacing-internal)}.ellipsis{display:flex;align-items:flex-end;color:var(--calcite-ui-text-3)}:host([hidden]){display:none}[hidden]{display:none}";
+const paginationCss = ":host{display:flex;writing-mode:horizontal-tb}:host([scale=s]) .previous,:host([scale=s]) .next,:host([scale=s]) .page,:host([scale=s]) .ellipsis{block-size:1.5rem;padding-inline:0.25rem;font-size:var(--calcite-font-size--2);line-height:1rem;min-inline-size:1.5rem}:host([scale=m]) .previous,:host([scale=m]) .next,:host([scale=m]) .page,:host([scale=m]) .ellipsis{block-size:2rem;padding-inline:0.5rem;font-size:var(--calcite-font-size--1);line-height:1rem;min-inline-size:2rem}:host([scale=l]) .previous,:host([scale=l]) .next,:host([scale=l]) .page,:host([scale=l]) .ellipsis{block-size:2.75rem;font-size:var(--calcite-font-size-0);line-height:1.25rem;min-inline-size:2.75rem}:host([scale=l]) .previous,:host([scale=l]) .next{padding-inline:0.625rem}:host([scale=l]) .page,:host([scale=l]) .ellipsis{padding-inline:0.75rem}:host button{outline-color:transparent}:host button:focus{outline:2px solid var(--calcite-ui-focus-color, var(--calcite-ui-brand));outline-offset:calc(\n            -2px *\n            calc(\n              1 -\n              2 * clamp(\n                0,\n                var(--calcite-ui-focus-offset-invert),\n                1\n              )\n            )\n          )}.previous,.next,.page,.ellipsis{margin:0px;box-sizing:border-box;display:flex;align-items:center;justify-content:center;border-style:none;--tw-border-opacity:0;background-color:transparent;padding:0px;vertical-align:baseline;font-family:inherit;font-size:var(--calcite-font-size-0);line-height:1.25rem;color:var(--calcite-ui-text-3)}.previous,.next,.page{cursor:pointer;border-block:2px solid transparent}.previous:hover,.next:hover,.page:hover{color:var(--calcite-ui-text-1);transition:all var(--calcite-animation-timing) ease-in-out 0s, outline 0s, outline-offset 0s}.page:hover{border-block-end-color:var(--calcite-ui-border-2)}.page.is-selected{font-weight:var(--calcite-font-weight-medium);color:var(--calcite-ui-text-1);border-block-end-color:var(--calcite-ui-brand)}.previous:hover,.next:hover{background-color:var(--calcite-ui-foreground-2);color:var(--calcite-ui-brand)}.previous:active,.next:active{background-color:var(--calcite-ui-foreground-3)}.previous.is-disabled,.next.is-disabled{pointer-events:none;background-color:transparent}.previous.is-disabled>calcite-icon,.next.is-disabled>calcite-icon{opacity:var(--calcite-ui-opacity-disabled)}:host([hidden]){display:none}[hidden]{display:none}";
 
-const maxPagesDisplayed = 5;
+const firstAndLastPageCount = 2;
+const ellipsisCount = 2;
+const maxItemBreakpoints = {
+  large: 11,
+  medium: 9,
+  small: 7,
+  xsmall: 5,
+};
 const Pagination = class {
   constructor(hostRef) {
     index.registerInstance(this, hostRef);
     this.calcitePaginationChange = index.createEvent(this, "calcitePaginationChange", 6);
-    this.previousClicked = () => {
-      this.previousPage().then();
+    this.resizeObserver = observers.createObserver("resize", (entries) => entries.forEach(this.resizeHandler));
+    this.resizeHandler = ({ contentRect: { width } }) => this.setMaxItemsToBreakpoint(width);
+    this.previousClicked = async () => {
+      await this.previousPage();
+      this.emitUpdate();
+    };
+    this.nextClicked = async () => {
+      await this.nextPage();
       this.emitUpdate();
     };
-    this.nextClicked = () => {
-      this.nextPage();
+    this.handlePageClick = (event) => {
+      const target = event.target;
+      this.startItem = parseInt(target.value, 10);
       this.emitUpdate();
     };
     this.groupSeparator = false;
+    this.messages = undefined;
     this.messageOverrides = undefined;
-    this.pageSize = 20;
     this.numberingSystem = undefined;
+    this.pageSize = 20;
+    this.scale = "m";
     this.startItem = 1;
     this.totalItems = 0;
-    this.scale = "m";
     this.defaultMessages = undefined;
     this.effectiveLocale = "";
-    this.messages = undefined;
+    this.maxItems = maxItemBreakpoints.xsmall;
+    this.totalPages = undefined;
   }
   onMessagesChange() {
     /* wired up by t9n util */
   }
+  handleTotalPages() {
+    this.totalPages = this.totalItems / this.pageSize;
+  }
   effectiveLocaleChange() {
     t9n.updateMessages(this, this.effectiveLocale);
   }
@@ -75,17 +129,22 @@ const Pagination = class {
   connectedCallback() {
     locale.connectLocalized(this);
     t9n.connectMessages(this);
+    this.resizeObserver?.observe(this.el);
   }
   async componentWillLoad() {
-    await t9n.setUpMessages(this);
+    const [, breakpoints] = await Promise.all([t9n.setUpMessages(this), getBreakpoints()]);
+    this.breakpoints = breakpoints;
     loadable.setUpLoadableComponent(this);
+    this.handleTotalPages();
   }
   componentDidLoad() {
     loadable.setComponentLoaded(this);
+    this.setMaxItemsToBreakpoint(this.el.clientWidth);
   }
   disconnectedCallback() {
     locale.disconnectLocalized(this);
     t9n.disconnectMessages(this);
+    this.resizeObserver?.disconnect();
   }
   // --------------------------------------------------------------------------
   //
@@ -110,18 +169,39 @@ const Pagination = class {
   //  Private Methods
   //
   // --------------------------------------------------------------------------
+  setMaxItemsToBreakpoint(width) {
+    const { breakpoints } = this;
+    if (!breakpoints || !width) {
+      return;
+    }
+    if (width >= breakpoints.width.medium) {
+      this.maxItems = maxItemBreakpoints.large;
+      return;
+    }
+    if (width >= breakpoints.width.small) {
+      this.maxItems = maxItemBreakpoints.medium;
+      return;
+    }
+    if (width >= breakpoints.width.xsmall) {
+      this.maxItems = maxItemBreakpoints.small;
+      return;
+    }
+    this.maxItems = maxItemBreakpoints.xsmall;
+  }
   getLastStart() {
-    const { totalItems, pageSize } = this;
-    const lastStart = totalItems % pageSize === 0
-      ? totalItems - pageSize
-      : Math.floor(totalItems / pageSize) * pageSize;
+    const { totalItems, pageSize, totalPages } = this;
+    const lastStart = totalItems % pageSize === 0 ? totalItems - pageSize : Math.floor(totalPages) * pageSize;
     return lastStart + 1;
   }
-  showLeftEllipsis() {
-    return Math.floor(this.startItem / this.pageSize) > 3;
+  showStartEllipsis() {
+    return (this.totalPages > this.maxItems &&
+      Math.floor(this.startItem / this.pageSize) >
+        this.maxItems - firstAndLastPageCount - ellipsisCount);
   }
-  showRightEllipsis() {
-    return (this.totalItems - this.startItem) / this.pageSize > 3;
+  showEndEllipsis() {
+    return (this.totalPages > this.maxItems &&
+      (this.totalItems - this.startItem) / this.pageSize >
+        this.maxItems - firstAndLastPageCount - (ellipsisCount - 1));
   }
   emitUpdate() {
     this.calcitePaginationChange.emit();
@@ -131,42 +211,69 @@ const Pagination = class {
   //  Render Methods
   //
   //--------------------------------------------------------------------------
-  renderPages() {
+  renderEllipsis(type) {
+    return (index.h("span", { class: {
+        [CSS.ellipsis]: true,
+        [CSS.ellipsisStart]: type === "start",
+        [CSS.ellipsisEnd]: type === "end",
+      }, key: type }, "\u2026"));
+  }
+  renderItems() {
+    const { totalItems, pageSize, startItem, maxItems, totalPages } = this;
+    const items = [];
+    const renderFirstPage = totalItems > pageSize;
+    const renderStartEllipsis = this.showStartEllipsis();
+    const renderEndEllipsis = this.showEndEllipsis();
     const lastStart = this.getLastStart();
+    if (renderFirstPage) {
+      items.push(this.renderPage(1));
+    }
+    if (renderStartEllipsis) {
+      items.push(this.renderEllipsis("start"));
+    }
+    const remainingItems = maxItems -
+      firstAndLastPageCount -
+      (renderEndEllipsis ? 1 : 0) -
+      (renderStartEllipsis ? 1 : 0);
     let end;
     let nextStart;
     // if we don't need ellipses render the whole set
-    if (this.totalItems / this.pageSize <= maxPagesDisplayed) {
-      nextStart = 1 + this.pageSize;
-      end = lastStart - this.pageSize;
+    if (totalPages - 1 <= remainingItems) {
+      nextStart = 1 + pageSize;
+      end = lastStart - pageSize;
     }
     else {
       // if we're within max pages of page 1
-      if (this.startItem / this.pageSize < maxPagesDisplayed - 1) {
-        nextStart = 1 + this.pageSize;
-        end = 1 + 4 * this.pageSize;
+      if (startItem / pageSize < remainingItems) {
+        nextStart = 1 + pageSize;
+        end = 1 + remainingItems * pageSize;
       }
       else {
         // if we're within max pages of last page
-        if (this.startItem + 3 * this.pageSize >= this.totalItems) {
-          nextStart = lastStart - 4 * this.pageSize;
-          end = lastStart - this.pageSize;
+        if (startItem + remainingItems * pageSize >= totalItems) {
+          nextStart = lastStart - remainingItems * pageSize;
+          end = lastStart - pageSize;
         }
         else {
-          nextStart = this.startItem - this.pageSize;
-          end = this.startItem + this.pageSize;
+          // if we're within the center pages
+          nextStart = startItem - pageSize * ((remainingItems - 1) / 2);
+          end = startItem + pageSize * ((remainingItems - 1) / 2);
         }
       }
     }
-    const pages = [];
-    while (nextStart <= end) {
-      pages.push(nextStart);
-      nextStart = nextStart + this.pageSize;
+    for (let i = 0; i < remainingItems && nextStart <= end; i++) {
+      items.push(this.renderPage(nextStart));
+      nextStart = nextStart + pageSize;
+    }
+    if (renderEndEllipsis) {
+      items.push(this.renderEllipsis("end"));
     }
-    return pages.map((page) => this.renderPage(page));
+    items.push(this.renderPage(lastStart));
+    return items;
   }
   renderPage(start) {
-    const page = Math.floor(start / this.pageSize) + (this.pageSize === 1 ? 0 : 1);
+    const { pageSize } = this;
+    const page = Math.floor(start / pageSize) + (pageSize === 1 ? 0 : 1);
     locale.numberStringFormatter.numberFormatOptions = {
       locale: this.effectiveLocale,
       numberingSystem: this.numberingSystem,
@@ -177,38 +284,28 @@ const Pagination = class {
     return (index.h("button", { "aria-current": selected ? "page" : "false", class: {
         [CSS.page]: true,
         [CSS.selected]: selected,
-      }, onClick: () => {
-        this.startItem = start;
-        this.emitUpdate();
-      } }, displayedPage));
-  }
-  renderLeftEllipsis() {
-    if (this.totalItems / this.pageSize > maxPagesDisplayed && this.showLeftEllipsis()) {
-      return index.h("span", { class: `${CSS.ellipsis} ${CSS.ellipsisStart}` }, "\u2026");
-    }
-  }
-  renderRightEllipsis() {
-    if (this.totalItems / this.pageSize > maxPagesDisplayed && this.showRightEllipsis()) {
-      return index.h("span", { class: `${CSS.ellipsis} ${CSS.ellipsisEnd}` }, "\u2026");
-    }
+      }, onClick: this.handlePageClick, value: start }, displayedPage));
   }
   render() {
-    const { totalItems, pageSize, startItem } = this;
+    const { totalItems, pageSize, startItem, messages, scale } = this;
     const prevDisabled = pageSize === 1 ? startItem <= pageSize : startItem < pageSize;
     const nextDisabled = pageSize === 1 ? startItem + pageSize > totalItems : startItem + pageSize > totalItems;
-    return (index.h(index.Fragment, null, index.h("button", { "aria-label": this.messages.previous, class: {
+    const iconScale = scale === "l" ? "m" : "s";
+    return (index.h(index.Fragment, null, index.h("button", { "aria-label": messages.previous, class: {
         [CSS.previous]: true,
         [CSS.disabled]: prevDisabled,
-      }, disabled: prevDisabled, onClick: this.previousClicked }, index.h("calcite-icon", { flipRtl: true, icon: "chevronLeft", scale: this.scale === "l" ? "m" : "s" })), totalItems > pageSize ? this.renderPage(1) : null, this.renderLeftEllipsis(), this.renderPages(), this.renderRightEllipsis(), this.renderPage(this.getLastStart()), index.h("button", { "aria-label": this.messages.next, class: {
+      }, disabled: prevDisabled, onClick: this.previousClicked }, index.h("calcite-icon", { flipRtl: true, icon: ICONS.previous, scale: iconScale })), this.renderItems(), index.h("button", { "aria-label": messages.next, class: {
         [CSS.next]: true,
         [CSS.disabled]: nextDisabled,
-      }, disabled: nextDisabled, onClick: this.nextClicked }, index.h("calcite-icon", { flipRtl: true, icon: "chevronRight", scale: this.scale === "l" ? "m" : "s" }))));
+      }, disabled: nextDisabled, onClick: this.nextClicked }, index.h("calcite-icon", { flipRtl: true, icon: ICONS.next, scale: iconScale }))));
   }
   static get delegatesFocus() { return true; }
   static get assetsDirs() { return ["assets"]; }
   get el() { return index.getElement(this); }
   static get watchers() { return {
     "messageOverrides": ["onMessagesChange"],
+    "pageSize": ["handleTotalPages"],
+    "totalItems": ["handleTotalPages"],
     "effectiveLocale": ["effectiveLocaleChange", "effectiveLocaleWatcher"]
   }; }
 };