Refactor accordion component styles and markup, remove Bootstrap styles (#2139)

.changeset/unlucky-squids-burn.md

@@ -0,0 +1,6 @@
+---
+"@tabler/core": patch
+"preview": patch
+---
+
+Refactor accordion component styles and markup, remove Bootstrap styles

core/scss/_bootstrap-components.scss

@@ -14,7 +14,7 @@
 @import "bootstrap/scss/nav";
 @import "bootstrap/scss/navbar";
 @import "bootstrap/scss/card";
-@import "bootstrap/scss/accordion";
+// @import "bootstrap/scss/accordion";
 @import "bootstrap/scss/breadcrumb";
 @import "bootstrap/scss/pagination";
 @import "bootstrap/scss/alert";

core/scss/mixins/_functions.scss

@@ -6,6 +6,9 @@
   @return shade-color($color, 10%);
 }
 
+//
+// Replace all occurrences of a substring within a string.
+//
 @function str-replace($string, $search, $replace: "") {
   $index: str-index($string, $search);
 
@@ -42,6 +45,24 @@
   @return if($n > 1, nth($breakpoint-names, $n - 1), null);
 }
 
+//
+// Escape SVG strings.
+//
+@function escape-svg($string) {
+  @if str-index($string, "data:image/svg+xml") {
+    @each $char, $encoded in $escaped-characters {
+      // Do not escape the url brackets
+      @if str-index($string, "url(") == 1 {
+        $string: url("#{str-replace(str-slice($string, 6, -3), $char, $encoded)}");
+      } @else {
+        $string: str-replace($string, $char, $encoded);
+      }
+    }
+  }
+
+  @return $string;
+}
+
 /**
  * Converts a given value to a percentage string.
  *

core/scss/ui/_accordion.scss

@@ -1,24 +1,172 @@
 .accordion {
- --#{$prefix}accordion-color: #{$accordion-color};
+  --#{$prefix}accordion-color: var(--#{$prefix}body-color);
+  --#{$prefix}accordion-border-color: var(--#{$prefix}border-color);
+  --#{$prefix}accordion-border-radius: #{$accordion-border-radius};
+  --#{$prefix}accordion-inner-border-radius: #{$accordion-inner-border-radius};
+  --#{$prefix}accordion-btn-color: var(--#{$prefix}accordion-color);
+  --#{$prefix}accordion-btn-bg: #{$accordion-button-bg};
+  --#{$prefix}accordion-btn-toggle-width: 1.25rem;
+  --#{$prefix}accordion-padding-x: #{$accordion-body-padding-x};
+  --#{$prefix}accordion-btn-padding-x: var(--#{$prefix}accordion-padding-x);
+  --#{$prefix}accordion-btn-padding-y: #{$accordion-button-padding-y};
+  --#{$prefix}accordion-body-padding-x: var(--#{$prefix}accordion-padding-x);
+  --#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y};
+  --#{$prefix}accordion-active-color: #{$accordion-button-active-color};
+  --#{$prefix}accordion-gap: 0;
+
+  display: flex;
+  flex-direction: column;
+  gap: var(--#{$prefix}accordion-gap);
 }
 
-.accordion-button {
-  &:focus:not(:focus-visible) {
-    outline: none;
+.accordion-header {
+  position: relative;
+  display: flex;
+  gap: 1rem;
+  align-items: center;
+  width: 100%;
+  padding: var(--#{$prefix}accordion-btn-padding-y) var(--#{$prefix}accordion-padding-x);
+  color: var(--#{$prefix}accordion-btn-color);
+  text-align: left;
+  background-color: transparent;
+  border: 0;
+  overflow-anchor: none;
+  transition: transform $transition-time;
+
+  &:not(.collapsed) {
+    border-bottom-color: transparent;
     box-shadow: none;
+    color: var(--#{$prefix}accordion-active-color);
   }
 
-  &:after {
-    opacity: $text-secondary-opacity;
+  &:hover {
+    z-index: 2;
   }
 
-  &:not(.collapsed) {
-    font-weight: var(--#{$prefix}font-weight-bold);
-    border-bottom-color: transparent;
-    box-shadow: none;
+  &:focus {
+    z-index: 3;
+    outline: 0;
+    box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow);
+
+    &:not(:focus-visible) {
+      outline: none;
+      box-shadow: none;
+    }
+  }
+}
+
+.accordion-header-icon {
+  color: var(--#{$prefix}secondary);
+}
+
+.accordion-header-toggle {
+  display: flex;
+  line-height: 1;
+  transition: $transition-time transform;
+  margin-left: auto;
+  margin-right: 0;
+  color: var(--#{$prefix}secondary);
+  width: var(--#{$prefix}accordion-btn-toggle-width);
+  height: var(--#{$prefix}accordion-btn-toggle-width);
+
+  .accordion-header:not(.collapsed) & {
+    transform: rotate(-180deg);
+    color: var(--#{$prefix}accordion-active-color);
+  }
+
+  path {
+    transition: $transition-time opacity;
+  }
+}
+
+.accordion-header-toggle-plus {
+  .accordion-header:not(.collapsed) & {
+    path:first-child {
+      opacity: 0;
+    }
+  } 
+}
+
+.accordion-header-text {
+  margin-bottom: 0;
+
+  h1, h2, h3, h4, h5, h6,
+  .h1, .h2, .h3, .h4, .h5, .h6 {
+    margin-bottom: 0;
+  }
+}
+
+.accordion-item {
+  color: var(--#{$prefix}accordion-color);
+  border: var(--#{$prefix}border-width) solid var(--#{$prefix}accordion-border-color);
 
-    &:after {
-      opacity: 1;
+  &:first-of-type {
+    @include border-top-radius(var(--#{$prefix}accordion-border-radius));
+
+    > .accordion-header {
+      @include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
+    }
+  }
+
+  &:not(:first-of-type) {
+    border-top: 0;
+  }
+
+  &:last-of-type {
+    @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
+
+    > .accordion-header {
+      &.collapsed {
+        @include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
+      }
+    }
+
+    > .accordion-collapse {
+      @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
     }
   }
-}
+}
+
+.accordion-body {
+  color: var(--#{$prefix}secondary);
+  padding: 0 var(--#{$prefix}accordion-body-padding-x) var(--#{$prefix}accordion-body-padding-y);
+}
+
+.accordion-flush {
+  > .accordion-item {
+    border-right: 0;
+    border-left: 0;
+    @include border-radius(0);
+
+    &:first-child {
+      border-top: 0;
+    }
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    // stylelint-disable selector-max-class
+    > .accordion-collapse,
+    > .accordion-header .accordion-button,
+    > .accordion-header .accordion-button.collapsed {
+      @include border-radius(0);
+    }
+    // stylelint-enable selector-max-class
+  }
+}
+
+.accordion-tabs {
+  --#{$prefix}accordion-gap: 0.75rem;
+
+  > .accordion-item {
+    border: var(--#{$prefix}border-width) solid var(--#{$prefix}accordion-border-color);
+    border-radius: var(--#{$prefix}accordion-border-radius);
+  }
+}
+
+.accordion-inverted {
+  .accordion-header-toggle {
+    order: -1;
+    margin-left: 0;
+  }
+}

preview/pages/_data/menu.json

@@ -11,7 +11,8 @@
     "children": {
       "accordion": {
         "title": "Accordion",
-        "url": "accordion.html"
+        "url": "accordion.html",
+        "badge": "New"
       },
       "alerts": {
         "title": "Alerts",

preview/pages/_data/questions.json

@@ -0,0 +1,26 @@
+[
+  {
+    "question": "What makes Tabler different from other UI frameworks?",
+    "answer": "Tabler offers a modern, responsive design with a clean aesthetic, built on Bootstrap for ease of use and flexibility."
+  },
+  {
+    "question": "How can I customize Tabler components to fit my design needs?",
+    "answer": "You can customize Tabler components using CSS variables, SCSS, and utility classes to match your design preferences."
+  },
+  {
+    "question": "Is Tabler optimized for performance and fast loading times?",
+    "answer": "Yes, Tabler is lightweight, optimized for modern browsers, and follows best practices for fast loading and efficiency."
+  },
+  {
+    "question": "How accessible are Tabler components?",
+    "answer": "Tabler components follow WAI-ARIA standards and support keyboard navigation, screen readers, and accessibility best practices."
+  },
+  {
+    "question": "Do Tabler components follow WAI-ARIA standards?",
+    "answer": "Yes, all Tabler components include proper ARIA attributes to ensure accessibility compliance."
+  },
+  {
+    "question": "Does Tabler support keyboard navigation and screen readers?",
+    "answer": "Yes, Tabler components are designed to work seamlessly with keyboard navigation and popular screen readers like NVDA, VoiceOver, and JAWS."
+  }
+]

preview/pages/_includes/ui/accordion.html

@@ -0,0 +1,30 @@
+
+{% assign accordion-count = include.count | default: 4 %}
+{% assign accordion-id = include.id | default: "default" %}
+{% assign accordion-toggle-icon = include.toggle-icon | default: "chevron-down" %}
+{% assign accordion-types = include.type | default: "" | split: "," %}
+
+<div class="accordion{% for type in accordion-types %} accordion-{{ type }}{% endfor %}" id="accordion-{{ accordion-id }}">
+	{% for question in questions limit: accordion-count %}
+	<div class="accordion-item">
+		<button class="accordion-header {% unless forloop.index == 1 %}collapsed{% endunless %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-{{ forloop.index }}-{{ accordion-id }}" aria-expanded="{% if forloop.index == 1 %}true{% else %}false{% endif %}">
+			{% if include.show-icon %}
+			<div class="accordion-header-icon">
+				{% include "ui/icon.html" icon="link" %}
+			</div>
+			{% endif %}
+			<div class="accordion-header-text">
+				<h4>{{ question.question }}</h4>
+			</div>
+			<div class="accordion-header-toggle{% if include.toggle-icon %} accordion-header-toggle-plus{% endif %}">
+				{% include "ui/icon.html" icon=accordion-toggle-icon %}
+			</div>
+		</button>
+		<div id="collapse-{{ forloop.index }}-{{ accordion-id }}" class="accordion-collapse collapse{% if forloop.index == 1 %} show{% endif %}" data-bs-parent="#accordion-{{ accordion-id }}">
+			<div class="accordion-body">
+				{{ question.answer }}
+			</div>
+		</div>
+	</div>
+	{% endfor %}
+</div>

preview/pages/accordion.html

@@ -6,25 +6,45 @@ layout: default
 permalink: accordion.html
 ---
 
-<div class="card">
-	<div class="card-body">
-
-		<div class="accordion" id="accordion-example">
-			{% for i in (1..4) %}
-			<div class="accordion-item">
-				<h2 class="accordion-header" id="heading-{{ i }}">
-					<button class="accordion-button {% unless i == 1 %}collapsed{% endunless %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-{{ i }}" aria-expanded="{% if i == 1 %}true{% else %}false{% endif %}">
-						Accordion Item #{{ i }}
-					</button>
-				</h2>
-				<div id="collapse-{{ i }}" class="accordion-collapse collapse{% if i == 1 %} show{% endif %}" data-bs-parent="#accordion-example">
-					<div class="accordion-body pt-0">
-						<strong>This is the {% cycle 'first', 'second', 'third', 'fourth' %} item's accordion body.</strong> It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the <code>.accordion-body</code>, though the transition does limit overflow.
-					</div>
-				</div>
+<div class="row row-cards">
+	<div class="col-md-6">
+		<div class="card">
+			<div class="card-body">
+				{% include "ui/accordion.html" %}
+			</div>
+		</div>
+	</div>
+	<div class="col-md-6">
+		<div class="card">
+			{% include "ui/accordion.html" type="flush" id="flush" %}
+		</div>
+	</div>
+	<div class="col-md-6">
+		<div class="card">
+			<div class="card-body">
+				{% include "ui/accordion.html" type="tabs" id="tabs" %}
+			</div>
+		</div>
+	</div>
+	<div class="col-md-6">
+		<div class="card">
+			<div class="card-body">
+				{% include "ui/accordion.html" type="inverted" id="inverted" %}
+			</div>
+		</div>
+	</div>
+	<div class="col-md-6">
+		<div class="card">
+			<div class="card-body">
+				{% include "ui/accordion.html" id="inverted-plus" type="inverted,plus" toggle-icon="plus" %}
+			</div>
+		</div>
+	</div>
+	<div class="col-md-6">
+		<div class="card">
+			<div class="card-body">
+				{% include "ui/accordion.html" id="icons" show-icon %}
 			</div>
-			{% endfor %}
 		</div>
-
 	</div>
 </div>

preview/pages/faq.html

@@ -17,9 +17,9 @@ permalink: faq.html
 					{% for question in category.questions %}
 					{% assign questions-loop = forloop %}
 					<div class="accordion-item">
-						<div class="accordion-header" role="tab">
-							<button class="accordion-button{% unless questions-loop.index == 1 %} collapsed{% endunless %}" data-bs-toggle="collapse" data-bs-target="#faq-{{ categories-loop.index }}-{{ questions-loop.index }}">{{ question.question }}</button>
-						</div>
+						<button class="accordion-header{% unless questions-loop.index == 1 %} collapsed{% endunless %}" data-bs-toggle="collapse" data-bs-target="#faq-{{ categories-loop.index }}-{{ questions-loop.index }}" role="tab">
+							<h4 class="accordion-header-text">{{ question.question }}</h4>
+						</button>
 						<div id="faq-{{ categories-loop.index }}-{{ questions-loop.index }}" class="accordion-collapse collapse{% if questions-loop.index == 1 %} show{% endif %}" role="tabpanel" data-bs-parent="#faq-{{ categories-loop.index }}">
 							<div class="accordion-body pt-0">
 								<div>