@primer/css 20.0.0-rc.8702fd9a → 20.0.0-rc.e6f567ec

package/actionlist/action-list-item.scss

@@ -1,9 +1,4 @@
-@mixin focusOutline {
-  position: relative;
-  z-index: 1;
-  outline: none;
-  box-shadow: 0 0 0 2px var(--color-accent-fg); // this color breaks convention
-}
+// stylelint-disable max-nesting-depth, selector-max-specificity, selector-max-compound-selectors
 
 @mixin activeIndicatorLine {
   position: absolute;
@@ -26,48 +21,72 @@
   &:hover,
   &:active {
     cursor: pointer;
-
-    // a href
-    .ActionList-content {
-      text-decoration: none;
-    }
   }
 
   // only hover li without list as children
-  &:not(.ActionList-item--hasSubItem) {
-    &:hover {
-      cursor: pointer;
-      background-color: var(--color-action-list-item-default-hover-bg);
+  &:not(.ActionList-item--hasSubItem),
+  // target contents of first child li if sub-item (li wraps item label + nested ul)
+  &.ActionList-item--hasSubItem > .ActionList-content {
+    @media (hover: hover) {
+      &:hover {
+        cursor: pointer;
+        background-color: var(--color-action-list-item-default-hover-bg);
+
+        &:not(.ActionList-item--navActive) {
+          // Support for "Windows high contrast mode"
+          outline: $border-style $border-width transparent;
+          outline-offset: -$border-width;
+          // stylelint-disable-next-line primer/box-shadow
+          box-shadow: inset 0 0 0 2px var(--color-action-list-item-default-active-border);
+        }
+      }
     }
 
     &:active {
       background: var(--color-action-list-item-default-active-bg);
 
+      &:not(.ActionList-item--navActive) {
+        // Support for "Windows high contrast mode" https://sarahmhigley.com/writing/whcm-quick-tips/
+        outline: $border-style $border-width transparent;
+        outline-offset: -$border-width;
+        // stylelint-disable-next-line primer/box-shadow
+        box-shadow: inset 0 0 0 2px var(--color-action-list-item-default-active-border);
+      }
+
       @media screen and (prefers-reduced-motion: no-preference) {
         animation: ActionList-item-active-bg 4s forwards cubic-bezier(0.33, 1, 0.68, 1);
       }
 
-      // stylelint-disable primer/box-shadow
       @keyframes ActionList-item-active-bg {
-        // stylelint-disable-next-line max-nesting-depth
         50% {
-          box-shadow: inset 0 0 0 rgba(#000, 0.04);
+          // stylelint-disable-next-line primer/box-shadow
+          box-shadow: inset 0 2px 12px 6px rgba(var(--color-canvas-default), 0.4);
           transform: scale(1);
         }
 
-        // stylelint-disable-next-line max-nesting-depth
         100% {
-          box-shadow: inset 0 3px 9px rgba(#000, 0.04);
           transform: scale(0.97);
         }
       }
-      // stylelint-enable primer/box-shadow
     }
 
-    &:hover,
+    // hide dividers
+
+    @media (hover: hover) {
+      &:hover {
+        .ActionList-item-label::before,
+        + .ActionList-item .ActionList-item-label::before {
+          visibility: hidden;
+        }
+
+        .ActionList-item-descriptionWrap--inline::before,
+        + .ActionList-item .ActionList-item-descriptionWrap--inline::before {
+          visibility: hidden;
+        }
+      }
+    }
+    // stylelint-disable-next-line no-duplicate-selectors
     &:active {
-      // hide dividers
-      // stylelint-disable-next-line selector-max-specificity
       .ActionList-item-label::before,
       + .ActionList-item .ActionList-item-label::before {
         visibility: hidden;
@@ -80,8 +99,16 @@
   &.ActionList-item--hasSubItem {
     // first child
     > .ActionList-content {
-      &:hover {
-        background-color: var(--color-action-list-item-default-hover-bg);
+      z-index: 1;
+
+      @media (hover: hover) {
+        &:hover {
+          background-color: var(--color-action-list-item-default-hover-bg);
+        }
+      }
+
+      &:active {
+        background-color: var(--color-action-list-item-default-active-bg);
       }
     }
   }
@@ -98,58 +125,12 @@
     &:not(.ActionList-item--danger) {
       background: var(--color-action-list-item-default-selected-bg);
 
-      // stylelint-disable-next-line selector-max-specificity
-      &::before,
-      + .ActionList-item::before {
-        visibility: hidden;
-      }
-
-      // blue accent line
-      &::after {
-        @include activeIndicatorLine;
-      }
-    }
-  }
-
-  // collapsible item [aria-expanded]
-
-  &[aria-expanded='true'] {
-    .ActionList-item-collapseIcon {
-      transition: transform 120ms linear;
-      transform: scaleY(-1);
-    }
-
-    .ActionList--subGroup {
-      display: block;
-    }
-
-    &.ActionList-item--hasActiveSubItem {
-      // stylelint-disable-next-line selector-max-specificity
-      > .ActionList-content > .ActionList-item-label {
-        font-weight: $font-weight-bold;
-      }
-    }
-  }
-
-  &[aria-expanded='false'] {
-    .ActionList-item-collapseIcon {
-      transition: transform 120ms linear;
-      transform: scaleY(1);
-    }
-
-    .ActionList--subGroup {
-      display: none;
-    }
-
-    // show active indicator on parent collapse if child is active
-    &.ActionList-item--hasActiveSubItem {
-      background: var(--color-action-list-item-default-selected-bg);
-
-      .ActionList-item-label {
-        font-weight: $font-weight-bold;
+      @media (hover: hover) {
+        &:hover {
+          background-color: var(--color-action-list-item-default-hover-bg);
+        }
       }
 
-      // stylelint-disable-next-line selector-max-specificity
       &::before,
       + .ActionList-item::before {
         visibility: hidden;
@@ -204,7 +185,7 @@
       visibility: hidden;
       opacity: 0;
       transition:
- visibility 0 linear $actionList-item-checkmark-transition-timing,
+        visibility 0 linear $actionList-item-checkmark-transition-timing,
         opacity $actionList-item-checkmark-transition-timing;
     }
 
@@ -266,37 +247,19 @@
       color: var(--color-danger-fg);
     }
 
-    @media (hover: hover) and (pointer: fine) {
+    @media (hover: hover) {
       &:hover {
         background: var(--color-action-list-item-danger-hover-bg);
 
-        // stylelint-disable-next-line max-nesting-depth
         .ActionList-item-label {
           color: var(--color-action-list-item-danger-hover-text);
         }
       }
     }
 
-    &:active {
-      background: var(--color-action-list-item-danger-active-bg);
-    }
-  }
-
-  // disabled
-  &[aria-disabled='true'] {
-    .ActionList-item-label,
-    .ActionList-item-description {
-      color: var(--color-primer-fg-disabled);
-    }
-
-    .ActionList-item-visual {
-      fill: var(--color-primer-fg-disabled);
-    }
-
-    @media (hover: hover) and (pointer: fine) {
-      &:hover {
-        cursor: not-allowed;
-        background-color: transparent;
+    .ActionList-content {
+      &:active {
+        background: var(--color-action-list-item-danger-active-bg);
       }
     }
   }
@@ -308,31 +271,167 @@
   }
 }
 
-// span or a href
+// button or a href
 .ActionList-content {
   position: relative;
   display: grid;
+  width: 100%;
   // stylelint-disable-next-line primer/spacing
   padding: $actionList-item-padding-vertical $actionList-item-padding-horizontal;
+  font-size: $body-font-size;
   font-weight: $font-weight-normal;
   color: var(--color-fg-default);
+  text-align: left;
   user-select: none;
+  background-color: transparent;
+  // stylelint-disable-next-line declaration-property-value-disallowed-list
+  border: none;
   border-radius: $border-radius;
   transition: $actionList-item-bg-transition;
+  touch-action: manipulation;
+  touch-action: manipulation;
+  -webkit-tap-highlight-color: transparent;
   grid-template-rows: min-content;
   grid-template-areas: 'leadingAction leadingVisual label trailingVisual trailingAction';
-  grid-template-columns: min-content min-content minmax(min-content, auto) min-content min-content;
-  align-items: center;
+  grid-template-columns: min-content min-content minmax(0, auto) min-content min-content;
+  align-items: start;
 
   // column-gap persists with empty grid-areas, margin applies only when children exist
   > :not(:last-child) {
     margin-right: $spacer-2;
   }
 
+  // state
+
+  &:hover {
+    text-decoration: none;
+  }
+
+  &:focus {
+    @include focusOutline;
+
+    // remove fallback :focus if :focus-visible is supported
+    &:not(:focus-visible) {
+      outline: solid 1px transparent;
+    }
+  }
+
+  // default focus state
   &:focus-visible {
     @include focusOutline;
   }
 
+  // disabled
+  &[aria-disabled='true'] {
+    .ActionList-item-label,
+    .ActionList-item-description {
+      color: var(--color-primer-fg-disabled);
+    }
+
+    .ActionList-item-visual {
+      fill: var(--color-primer-fg-disabled);
+    }
+
+    @media (hover: hover) {
+      &:hover {
+        cursor: not-allowed;
+        background-color: transparent;
+      }
+    }
+  }
+
+  // collapsible item [aria-expanded]
+
+  // nesting (single level)
+  // target items inside expanded subgroups
+  &[aria-expanded] {
+    + .ActionList--subGroup {
+      @media screen and (prefers-reduced-motion: no-preference) {
+        transition: opacity 160ms cubic-bezier(0.25, 1, 0.5, 1), transform 160ms cubic-bezier(0.25, 1, 0.5, 1);
+      }
+
+      .ActionList-content {
+        padding-left: $spacer-4;
+      }
+    }
+
+    // has 16px leading visual
+    &.ActionList-content--visual16 + .ActionList--subGroup {
+      .ActionList-content {
+        padding-left: $spacer-5;
+      }
+    }
+
+    // has 20px leading visual
+    &.ActionList-content--visual20 + .ActionList--subGroup {
+      .ActionList-content {
+        padding-left: $spacer-2 * 4.5; // 36px
+      }
+    }
+
+    // has 24px leading visual
+    &.ActionList-content--visual24 + .ActionList--subGroup {
+      .ActionList-content {
+        padding-left: $spacer-6;
+      }
+    }
+  }
+
+  &[aria-expanded='true'] {
+    .ActionList-item-collapseIcon {
+      transition: transform 120ms linear;
+      transform: scaleY(-1);
+    }
+
+    + .ActionList--subGroup {
+      height: auto;
+      overflow: visible;
+      visibility: visible;
+      opacity: 1;
+      transform: translateY(0);
+    }
+
+    &.ActionList-content--hasActiveSubItem {
+      > .ActionList-item-label {
+        font-weight: $font-weight-bold;
+      }
+    }
+  }
+
+  &[aria-expanded='false'] {
+    .ActionList-item-collapseIcon {
+      transition: transform 120ms linear;
+      transform: scaleY(1);
+    }
+
+    + .ActionList--subGroup {
+      height: 0;
+      overflow: hidden;
+      visibility: hidden;
+      opacity: 0;
+      transform: translateY(-$spacer-3);
+    }
+
+    // show active indicator on parent collapse if child is active
+    &.ActionList-content--hasActiveSubItem {
+      background: var(--color-action-list-item-default-selected-bg);
+
+      .ActionList-item-label {
+        font-weight: $font-weight-bold;
+      }
+
+      &::before,
+      + .ActionList-item::before {
+        visibility: hidden;
+      }
+
+      // blue accent line
+      &::after {
+        @include activeIndicatorLine;
+      }
+    }
+  }
+
   // sizes
 
   &.ActionList-content--sizeMedium {
@@ -347,6 +446,10 @@
     padding: $actionList-item-padding-vertical-lg $actionList-item-padding-horizontal;
   }
 
+  &.ActionList-content--fontSmall {
+    font-size: $font-size-small;
+  }
+
   // On pointer:coarse (mobile), all list items are large
   @media (pointer: coarse) {
     // stylelint-disable-next-line primer/spacing
@@ -401,6 +504,7 @@
 
 // inline
 .ActionList-item-descriptionWrap--inline {
+  position: relative;
   flex-direction: row;
   align-items: baseline;
 
@@ -425,6 +529,7 @@
   display: flex;
   min-height: $actionList-item-height-sm;
   color: var(--color-fg-muted); // if visual is text
+  pointer-events: none;
   fill: var(--color-fg-muted);
   align-items: center;
 }
@@ -440,37 +545,16 @@
   color: var(--color-fg-default);
 }
 
+.ActionList-item-label--truncate {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 // nested lists (only supports 1 level currently)
 // target ActionList-item--subItem for padding-left to maintain :active :after state
 
+// TODO: remove with PVC implementation
 .ActionList-item--subItem > .ActionList-content {
   font-size: $font-size-small;
 }
-
-// no leading visual
-.ActionList--subGroup {
-  .ActionList-item--subItem {
-    padding-left: $spacer-3;
-  }
-}
-
-// has 16px leading visual
-.ActionList-content--visual16 + .ActionList--subGroup {
-  .ActionList-item--subItem {
-    padding-left: $spacer-4;
-  }
-}
-
-// has 20px leading visual
-.ActionList-content--visual20 + .ActionList--subGroup {
-  .ActionList-item--subItem {
-    padding-left: $spacer-3 * 1.75;
-  }
-}
-
-// has 24px leading visual
-.ActionList-content--visual24 + .ActionList--subGroup {
-  .ActionList-item--subItem {
-    padding-left: $spacer-5;
-  }
-}

package/actionlist/action-list-tree.scss

@@ -0,0 +1,118 @@
+// stylelint-disable max-nesting-depth, selector-max-compound-selectors, selector-max-specificity, selector-max-type, primer/spacing
+// tree-view variant
+// renders ActionList with default styling for tree-view
+// collapse/expand icons presents as leadingActions, rotate 90deg
+// connecting vertical lines between collapse groups
+// consistent font-size between nested groups
+
+@mixin treeConnectingLine($left) {
+  position: absolute;
+  left: $left;
+  width: 1px;
+  height: 100%;
+  content: '';
+  background: var(--color-action-list-item-inline-divider);
+}
+
+.ActionList--tree {
+  --ActionList-tree-depth: 1;
+  // TODO: remove with PVC implementation
+  .ActionList-item--subItem > .ActionList-content {
+    font-size: $body-font-size;
+  }
+
+  .ActionList-item {
+    // class for single tree items not within a group
+    &.ActionList-item--singleton {
+      .ActionList-content {
+        padding-left: $spacer-5;
+      }
+    }
+
+    // normal font-weight for any active item
+    &.ActionList-item--navActive {
+      &:not(.ActionList-item--subItem) {
+        .ActionList-item-label {
+          font-weight: $font-weight-normal;
+        }
+      }
+    }
+  }
+
+  .ActionList-content {
+    // nesting (infinite levels)
+    // target items inside expanded subgroup
+    &[aria-expanded] {
+      + .ActionList--subGroup {
+        position: relative;
+
+        // --ActionList-tree-depth is defined as an inline style referencing the aria-level of each item ie: aria-level="2"
+        .ActionList-content {
+          padding-left: calc(#{$spacer-2} * var(--ActionList-tree-depth));
+        }
+      }
+    }
+
+    // tree-view specific collapse icon positioning/animation
+    &[aria-expanded='true'] {
+      .ActionList-item-collapseIcon {
+        transition: transform 120ms linear;
+        transform: rotate(0deg);
+      }
+
+      // normal weight for parent folder containing active child
+      &.ActionList-content--hasActiveSubItem {
+        > .ActionList-item-label {
+          font-weight: $font-weight-normal;
+        }
+      }
+    }
+
+    &[aria-expanded='false'] {
+      .ActionList-item-collapseIcon {
+        transition: transform 120ms linear;
+        transform: rotate(-90deg);
+      }
+
+      &.ActionList-content--hasActiveSubItem {
+        > .ActionList-item-label {
+          font-weight: $font-weight-normal;
+        }
+      }
+    }
+  }
+
+  // expand/collapse group
+  .ActionList-item--hasSubItem {
+    .ActionList-item--subItem:not(.ActionList-item--hasSubItem) {
+      .ActionList-content {
+        // increase child padding by targeting content first child span (add to ActionList-content padding, not replace)
+        // creates a slight indent of child items
+        > span:first-child {
+          padding-left: $spacer-4;
+        }
+      }
+    }
+  }
+
+  // first subitem
+  > [aria-level='1'].ActionList-item--hasSubItem {
+    > .ActionList--subGroup {
+      &::before {
+        @include treeConnectingLine($left: $spacer-3);
+      }
+    }
+  }
+
+  // all other subitems
+  // center connecting line with parent (line is 1px (8px - 1px)
+  .ActionList-item--hasSubItem:not([aria-level='1']) {
+    > .ActionList--subGroup {
+      &::before {
+        @include treeConnectingLine(
+          $left: calc(#{$spacer-2} * (var(--ActionList-tree-depth)) + #{$spacer-2 - $border-width})
+        );
+      }
+    }
+  }
+}

package/actionlist/action-list.scss

@@ -8,6 +8,11 @@
   padding: 0;
 }
 
+// nested list within main ActionList
+.ActionList--subGroup {
+  padding: 0;
+}
+
 // dividers
 
 .ActionList--divided {
@@ -21,6 +26,24 @@
     background: var(--color-action-list-item-inline-divider);
   }
 
+  // if descriptionWrap--inline exists, move pseudo divider to wrapper
+  .ActionList-item-descriptionWrap--inline {
+    &::before {
+      position: absolute;
+      top: -$actionList-item-padding-vertical;
+      display: block;
+      width: 100%;
+      height: $border-width;
+      content: '';
+      background: var(--color-action-list-item-inline-divider);
+    }
+
+    // unset the default label pseudo
+    .ActionList-item-label::before {
+      content: unset;
+    }
+  }
+
   // hide divider if item is active
   .ActionList-item--navActive {
     // stylelint-disable-next-line selector-max-specificity, selector-max-compound-selectors
@@ -36,3 +59,9 @@
 .ActionList-sectionDivider + .ActionList-item .ActionList-item-label::before {
   visibility: hidden;
 }
+
+// hide if item is first of type with label::before, or is the first item after a sectionDivider
+.ActionList-item:first-of-type .ActionList-item-descriptionWrap--inline::before,
+.ActionList-sectionDivider + .ActionList-item .ActionList-item-descriptionWrap--inline::before {
+  visibility: hidden;
+}

package/actionlist/index.scss

@@ -1,5 +1,6 @@
 @import '../support/index.scss';
 @import './action-list-variables.scss';
 @import './action-list.scss';
+@import './action-list-tree.scss';
 @import './action-list-item.scss';
 @import './action-list-item-divider.scss';

package/alerts/flash.scss

@@ -63,8 +63,12 @@
     color: var(--color-fg-muted);
   }
 
-  &.btn-primary .octicon {
-    color: inherit;
+  &.btn-primary {
+    background-clip: border-box;
+
+    .octicon {
+      color: inherit;
+    }
   }
 }