Skip to content

Commit

Permalink
Merge branch 'main' into feature/combobox
Browse files Browse the repository at this point in the history
  • Loading branch information
jpzwarte committed Sep 20, 2024
2 parents ff87679 + a11f679 commit 7d42d1a
Show file tree
Hide file tree
Showing 11 changed files with 5,986 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .changeset/wild-peas-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sl-design-system/tabs': major
---

Stable version release
2 changes: 1 addition & 1 deletion packages/components/tabs/src/tab-group.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type Story = StoryObj<Props>;

export default {
title: 'Navigation/Tab group',
tags: ['preview'],
tags: ['stable'],
args: {
alignTabs: 'start',
vertical: false
Expand Down
5,967 changes: 5,967 additions & 0 deletions website/src/_data/custom-elements/custom-elements.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion website/src/_data/tokens/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2484,4 +2484,4 @@
}
}
}
}
}
11 changes: 8 additions & 3 deletions website/src/_data/tokens/core.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"width": {
"none": {
"value": "0",
"value": "0px",
"type": "borderWidth",
"description": "border.width.none"
},
Expand Down Expand Up @@ -1093,6 +1093,11 @@
"value": "{space.sm}",
"type": "spacing",
"description": "{space.button.gap.lg}"
},
"none": {
"value": "{space.none}",
"type": "spacing",
"description": "{space.button.gap.lg}"
}
},
"icon": {
Expand All @@ -1114,7 +1119,7 @@
"description": "{space.button.gap.md}"
},
"md": {
"value": "{space.sm}",
"value": "{space.xs}",
"type": "spacing",
"description": "{space.button.gap.md}"
},
Expand Down Expand Up @@ -2057,7 +2062,7 @@
},
"focus": {
"gap": {
"value": "{border.width.focusring.default}+{border.width.focusring.offset}",
"value": "{border.width.focusring.default} + {border.width.focusring.offset}",
"type": "spacing"
}
}
Expand Down
1 change: 0 additions & 1 deletion website/src/categories/components/button-bar/button-bar.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ storybookCategory: actions
eleventyNavigation:
parent: Components
key: Button bar
status: new
---
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ storybookCategory: feedback-status
eleventyNavigation:
parent: Components
key: Progress bar
status: new
---

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ storybookCategory: form
eleventyNavigation:
parent: Components
key: Search field
status: new
---

2 changes: 1 addition & 1 deletion website/src/categories/components/tabs/tabs.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"layout": "categories/components/components.njk",
"tags": "tab-group",
"componentStatus": "preview",
"componentStatus": "stable",
"componentTagName": [
{
"name": "Tab",
Expand Down
1 change: 0 additions & 1 deletion website/src/categories/components/tabs/tabs.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ storybookComponentName: tab-group
eleventyNavigation:
parent: Components
key: Tabs
status: ready
---

6 changes: 3 additions & 3 deletions website/src/ts/components/vertical-tabs/vertical-tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class VerticalTabs extends LitElement {
entries => {
let updated = false;
const sections = Array.from(this.parentElement?.querySelectorAll('section[id], [link-in-navigation][id]') || []),
links = Array.from(this.renderRoot.querySelectorAll('.ds-tab--vertical'));
links = Array.from<HTMLElement>(this.renderRoot.querySelectorAll('.ds-tab--vertical'));

if (
links.length === entries.filter(entry => entry.intersectionRatio === 1).length ||
Expand Down Expand Up @@ -86,7 +86,7 @@ export class VerticalTabs extends LitElement {
} else if (window.location.hash) {
setTimeout(() => {
const targetElement = document.querySelector(window.location.hash),
links = Array.from(this.renderRoot.querySelectorAll('.ds-tab--vertical'));
links = Array.from<HTMLElement>(this.renderRoot.querySelectorAll('.ds-tab--vertical'));
const index = links.findIndex(link => {
return (link as HTMLAnchorElement).hash == window.location.hash;
});
Expand All @@ -105,7 +105,7 @@ export class VerticalTabs extends LitElement {
window.addEventListener(
'hashchange',
() => {
const links = Array.from(this.renderRoot.querySelectorAll('.ds-tab--vertical'));
const links = Array.from<HTMLElement>(this.renderRoot.querySelectorAll('.ds-tab--vertical'));
const index = links.findIndex(link => {
return (link as HTMLAnchorElement).hash == window.location.hash;
});
Expand Down

0 comments on commit 7d42d1a

Please sign in to comment.