@primer/view-components 0.15.1-rc.6d3176b2 → 0.15.2-rc.ab78bcfc

package/app/components/primer/alpha/action_bar.css

@@ -1 +1 @@
-.ActionBar{display:flex!important;flex-grow:1;flex-shrink:1;justify-content:flex-end;min-width:calc(var(--control-medium-size,2rem)*3);overflow:hidden;position:relative}.ActionBar,.ActionBar-item-container{align-items:center;box-sizing:initial}.ActionBar-item-container{display:flex;flex-grow:0;flex-shrink:0}.ActionBar-item{flex-shrink:0;position:relative}.ActionBar-more-menu{flex-shrink:0}.ActionBar--small{min-width:calc(var(--control-small-size,1.75rem)*3)}.ActionBar--large{min-width:calc(var(--control-large-size,2.5rem)*3)}.ActionBar-divider{border-left:var(--borderWidth-thin,max(1px,.0625rem)) solid var(--borderColor-muted,var(--color-border-muted));height:calc(var(--control-medium-size,2rem)/2);margin:0 var(--controlStack-medium-gap-condensed,.5rem)}.ActionBar--small .ActionBar-divider{margin:0 var(--controlStack-small-gap-condensed,.5rem)}.ActionBar--large .ActionBar-divider{margin:0 var(--controlStack-large-gap-condensed,.5rem)}
+.ActionBar{align-items:center;box-sizing:initial;display:flex!important;flex-grow:1;flex-shrink:1;justify-content:flex-end;min-width:calc(var(--control-medium-size,2rem)*3);overflow:hidden;position:relative}.ActionBar-item-container{box-sizing:initial;height:var(--control-medium-size,2rem);overflow:hidden}.ActionBar-item{float:left;position:relative}.ActionBar-more-menu{float:left}.ActionBar--small{min-width:calc(var(--control-small-size,1.75rem)*3)}.ActionBar--large{min-width:calc(var(--control-large-size,2.5rem)*3)}.ActionBar-divider{border-left:var(--borderWidth-thin,max(1px,.0625rem)) solid var(--borderColor-muted,var(--color-border-muted));bottom:50%;float:left;height:calc(var(--control-medium-size,2rem)/2);margin:0 var(--controlStack-medium-gap-condensed,.5rem);top:50%;transform:translateY(-50%)}.ActionBar--small .ActionBar-divider{margin:0 var(--controlStack-small-gap-condensed,.5rem)}.ActionBar--large .ActionBar-divider{margin:0 var(--controlStack-large-gap-condensed,.5rem)}

package/app/components/primer/alpha/action_bar_element.d.ts

@@ -1,12 +1,13 @@
+import { ActionMenuElement } from './action_menu/action_menu_element';
 declare class ActionBarElement extends HTMLElement {
     #private;
     items: HTMLElement[];
     itemContainer: HTMLElement;
-    moreMenu: HTMLElement;
+    moreMenu: ActionMenuElement;
     connectedCallback(): void;
     disconnectedCallback(): void;
     menuItemClick(event: Event): void;
-    update(rect?: DOMRect): void;
+    update(): void;
 }
 declare global {
     interface Window {

package/app/components/primer/alpha/action_bar_element.js

@@ -4,18 +4,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ActionBarElement_instances, _ActionBarElement_initialBarWidth, _ActionBarElement_previousBarWidth, _ActionBarElement_focusZoneAbortController, _ActionBarElement_isVisible, _ActionBarElement_itemGap, _ActionBarElement_availableSpace, _ActionBarElement_menuSpace, _ActionBarElement_shrink, _ActionBarElement_grow, _ActionBarElement_showItem, _ActionBarElement_hideItem, _ActionBarElement_menuItems_get;
+var _ActionBarElement_instances, _ActionBarElement_focusZoneAbortController, _ActionBarElement_firstItem_get, _ActionBarElement_showItem, _ActionBarElement_hideItem, _ActionBarElement_menuItems_get, _ActionBarElement_eachItem;
 import { controller, targets, target } from '@github/catalyst';
 import { focusZone, FocusKeys } from '@primer/behaviors';
 const instersectionObserver = new IntersectionObserver(entries => {
@@ -30,35 +30,37 @@ const resizeObserver = new ResizeObserver(entries => {
     for (const entry of entries) {
         const action = entry.target;
         if (action instanceof ActionBarElement) {
-            action.update(entry.contentRect);
+            action.update();
         }
     }
 });
+// These are definitely used, but eslint is dumb apparently
+// eslint-disable-next-line no-unused-vars
+var ItemType;
+(function (ItemType) {
+    // eslint-disable-next-line no-unused-vars
+    ItemType[ItemType["Item"] = 0] = "Item";
+    // eslint-disable-next-line no-unused-vars
+    ItemType[ItemType["Divider"] = 1] = "Divider";
+})(ItemType || (ItemType = {}));
 let ActionBarElement = class ActionBarElement extends HTMLElement {
     constructor() {
         super(...arguments);
         _ActionBarElement_instances.add(this);
-        _ActionBarElement_initialBarWidth.set(this, void 0);
-        _ActionBarElement_previousBarWidth.set(this, void 0);
         _ActionBarElement_focusZoneAbortController.set(this, null);
     }
     connectedCallback() {
-        var _a, _b, _c, _d;
-        __classPrivateFieldSet(this, _ActionBarElement_previousBarWidth, (_a = this.offsetWidth) !== null && _a !== void 0 ? _a : Infinity, "f");
-        __classPrivateFieldSet(this, _ActionBarElement_initialBarWidth, (_b = this.itemContainer.offsetWidth) !== null && _b !== void 0 ? _b : Infinity, "f");
+        var _a, _b;
         // Calculate the width of all the items before hiding anything
         for (const item of this.items) {
             const width = item.getBoundingClientRect().width;
-            const marginLeft = parseInt((_c = window.getComputedStyle(item)) === null || _c === void 0 ? void 0 : _c.marginLeft, 10);
-            const marginRight = parseInt((_d = window.getComputedStyle(item)) === null || _d === void 0 ? void 0 : _d.marginRight, 10);
+            const marginLeft = parseInt((_a = window.getComputedStyle(item)) === null || _a === void 0 ? void 0 : _a.marginLeft, 10);
+            const marginRight = parseInt((_b = window.getComputedStyle(item)) === null || _b === void 0 ? void 0 : _b.marginRight, 10);
             item.setAttribute('data-offset-width', `${width + marginLeft + marginRight}`);
         }
         resizeObserver.observe(this);
         instersectionObserver.observe(this);
-        setTimeout(() => {
-            this.style.overflow = 'visible';
-            this.update();
-        }, 20); // Wait for the items to be rendered, making this really short to avoid a flash of unstyled content
+        requestAnimationFrame(() => this.update());
     }
     disconnectedCallback() {
         resizeObserver.unobserve(this);
@@ -72,21 +74,37 @@ let ActionBarElement = class ActionBarElement extends HTMLElement {
             (_a = document.getElementById(id)) === null || _a === void 0 ? void 0 : _a.click();
         }
     }
-    update(rect = this.getBoundingClientRect()) {
-        // Only recalculate if the bar width changed
-        if (rect.width <= __classPrivateFieldGet(this, _ActionBarElement_previousBarWidth, "f") || __classPrivateFieldGet(this, _ActionBarElement_previousBarWidth, "f") === 0) {
-            __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_shrink).call(this);
-        }
-        else if (rect.width > __classPrivateFieldGet(this, _ActionBarElement_previousBarWidth, "f")) {
-            __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_grow).call(this);
-        }
-        __classPrivateFieldSet(this, _ActionBarElement_previousBarWidth, rect.width, "f");
-        if (rect.width <= __classPrivateFieldGet(this, _ActionBarElement_initialBarWidth, "f")) {
-            this.style.justifyContent = 'space-between';
-        }
-        else {
-            this.style.justifyContent = 'flex-end';
-        }
+    update() {
+        const firstItem = __classPrivateFieldGet(this, _ActionBarElement_instances, "a", _ActionBarElement_firstItem_get);
+        if (!firstItem)
+            return;
+        const firstItemTop = firstItem.getBoundingClientRect().top;
+        let previousItemType = null;
+        __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_eachItem).call(this, (item, index, type) => {
+            const itemTop = item.getBoundingClientRect().top;
+            if (type === ItemType.Item) {
+                if (itemTop > firstItemTop) {
+                    __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_hideItem).call(this, index);
+                    if (this.moreMenu.hidden) {
+                        this.moreMenu.hidden = false;
+                    }
+                    if (previousItemType === ItemType.Divider) {
+                        __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_hideItem).call(this, index - 1);
+                    }
+                }
+                else {
+                    __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_showItem).call(this, index);
+                    if (index === this.items.length - 1) {
+                        this.moreMenu.hidden = true;
+                    }
+                    if (previousItemType === ItemType.Divider) {
+                        __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_showItem).call(this, index - 1);
+                    }
+                }
+            }
+            previousItemType = type;
+            return true;
+        });
         if (__classPrivateFieldGet(this, _ActionBarElement_focusZoneAbortController, "f")) {
             __classPrivateFieldGet(this, _ActionBarElement_focusZoneAbortController, "f").abort();
         }
@@ -94,88 +112,47 @@ let ActionBarElement = class ActionBarElement extends HTMLElement {
             bindKeys: FocusKeys.ArrowHorizontal | FocusKeys.HomeAndEnd,
             focusOutBehavior: 'wrap',
             focusableElementFilter: element => {
-                return __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_isVisible).call(this, element);
-            }
+                const idx = this.items.indexOf(element.parentElement);
+                const elementIsVisibleItem = idx > -1 && this.items[idx].style.visibility === 'visible';
+                const elementIsVisibleActionMenuInvoker = element === this.moreMenu.invokerElement && !this.moreMenu.hidden;
+                return elementIsVisibleItem || elementIsVisibleActionMenuInvoker;
+            },
         }), "f");
     }
 };
-_ActionBarElement_initialBarWidth = new WeakMap();
-_ActionBarElement_previousBarWidth = new WeakMap();
 _ActionBarElement_focusZoneAbortController = new WeakMap();
 _ActionBarElement_instances = new WeakSet();
-_ActionBarElement_isVisible = function _ActionBarElement_isVisible(element) {
-    // Safari doesn't support `checkVisibility` yet.
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    if (typeof element.checkVisibility === 'function')
-        return element.checkVisibility();
-    return Boolean(element.offsetParent || element.offsetWidth || element.offsetHeight);
-};
-_ActionBarElement_itemGap = function _ActionBarElement_itemGap() {
-    var _a;
-    return parseInt((_a = window.getComputedStyle(this.itemContainer)) === null || _a === void 0 ? void 0 : _a.columnGap, 10) || 0;
-};
-_ActionBarElement_availableSpace = function _ActionBarElement_availableSpace() {
-    // Get the offset of the item container from the container edge
-    return this.offsetWidth - this.itemContainer.offsetWidth;
-};
-_ActionBarElement_menuSpace = function _ActionBarElement_menuSpace() {
-    if (this.moreMenu.hidden) {
-        return 0;
-    }
-    return this.moreMenu.offsetWidth + __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_itemGap).call(this);
-};
-_ActionBarElement_shrink = function _ActionBarElement_shrink() {
-    if (this.items[0].hidden) {
-        return;
-    }
-    let index = this.items.length - 1;
-    for (const item of this.items.reverse()) {
-        if (!item.hidden && __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_availableSpace).call(this) < __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_menuSpace).call(this)) {
-            __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_hideItem).call(this, index);
+_ActionBarElement_firstItem_get = function _ActionBarElement_firstItem_get() {
+    let foundItem = null;
+    __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_eachItem).call(this, (item, _index, type) => {
+        if (type === ItemType.Item) {
+            foundItem = item;
+            return false;
         }
-        else if (__classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_availableSpace).call(this) >= __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_menuSpace).call(this)) {
-            return;
-        }
-        index--;
-    }
-};
-_ActionBarElement_grow = function _ActionBarElement_grow() {
-    // If last item is visible, there is no need to grow
-    if (!this.items[this.items.length - 1].hidden) {
-        return;
-    }
-    let index = 0;
-    for (const item of this.items) {
-        if (item.hidden) {
-            const offsetWidth = Number(item.getAttribute('data-offset-width'));
-            if (__classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_availableSpace).call(this) >= __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_menuSpace).call(this) + offsetWidth || index === this.items.length - 1) {
-                __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_showItem).call(this, index);
-            }
-            else {
-                return;
-            }
-        }
-        index++;
-    }
-    if (!this.items[this.items.length - 1].hidden) {
-        this.moreMenu.hidden = true;
-    }
+        return true;
+    });
+    return foundItem;
 };
 _ActionBarElement_showItem = function _ActionBarElement_showItem(index) {
-    this.items[index].hidden = false;
+    this.items[index].style.setProperty('visibility', 'visible');
     __classPrivateFieldGet(this, _ActionBarElement_instances, "a", _ActionBarElement_menuItems_get)[index].hidden = true;
 };
 _ActionBarElement_hideItem = function _ActionBarElement_hideItem(index) {
-    this.items[index].hidden = true;
+    this.items[index].style.setProperty('visibility', 'hidden');
     __classPrivateFieldGet(this, _ActionBarElement_instances, "a", _ActionBarElement_menuItems_get)[index].hidden = false;
-    if (this.moreMenu.hidden) {
-        this.moreMenu.hidden = false;
-    }
 };
 _ActionBarElement_menuItems_get = function _ActionBarElement_menuItems_get() {
     return this.moreMenu.querySelectorAll('[role="menu"] > li');
 };
+_ActionBarElement_eachItem = function _ActionBarElement_eachItem(callback) {
+    for (let i = 0; i < this.items.length; i++) {
+        const item = this.items[i];
+        const type = item.classList.contains('ActionBar-divider') ? ItemType.Divider : ItemType.Item;
+        if (!callback(item, i, type)) {
+            break;
+        }
+    }
+};
 __decorate([
     targets
 ], ActionBarElement.prototype, "items", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/view-components",
-  "version": "0.15.1-rc.6d3176b2",
+  "version": "0.15.2-rc.ab78bcfc",
   "description": "ViewComponents for the Primer Design System",
   "main": "app/assets/javascripts/primer_view_components.js",
   "module": "app/components/primer/primer.js",