merge conflicts

.changeset/clever-lemons-fetch.md

@@ -0,0 +1,5 @@
+---
+"@salt-ds/lab": patch
+---
+
+Fixed date picker shown behind dialog. Fixed #3471

.changeset/mean-paws-relax.md

@@ -0,0 +1,6 @@
+---
+"@salt-ds/theme": minor
+---
+
+- Added `--salt-opacity-45: 0.45`.
+- Updated `--salt-palette-opacity-primary-border` from `var(--salt-opacity-40)` to `var(--salt-opacity-45)`.

.changeset/perfect-pugs-fix.md

@@ -0,0 +1,10 @@
+---
+"@salt-ds/lab": minor
+---
+
+Added Divider component—`Divider` provides a thin, unobtrusive line for grouping elements to reinforce visual hierarchy.
+
+```tsx
+<Divider />
+<Divider variant={variant} orientation={orientation} />
+```

.changeset/sharp-files-unite.md

@@ -0,0 +1,45 @@
+---
+"@salt-ds/theme": minor
+---
+
+Updated foundation color palette used in theme next due to color contrast concerns, below colors are impacted.
+
+```
+--salt-color-blue-200
+--salt-color-blue-300
+--salt-color-blue-400
+--salt-color-blue-600
+--salt-color-blue-700
+--salt-color-blue-800
+--salt-color-blue-900
+--salt-color-green-200
+--salt-color-green-300
+--salt-color-green-400
+--salt-color-green-600
+--salt-color-green-700
+--salt-color-green-800
+--salt-color-green-900
+--salt-color-teal-200
+--salt-color-teal-300
+--salt-color-teal-400
+--salt-color-teal-600
+--salt-color-teal-700
+--salt-color-teal-800
+--salt-color-teal-900
+--salt-color-orange-200
+--salt-color-orange-300
+--salt-color-orange-400
+--salt-color-orange-500
+--salt-color-orange-600
+--salt-color-orange-700
+--salt-color-orange-800
+--salt-color-red-300
+--salt-color-red-400
+--salt-color-red-600
+--salt-color-red-700
+--salt-color-red-800
+--salt-color-red-900
+--salt-color-purple-200
+--salt-color-purple-300
+--salt-color-purple-400
+```

.changeset/switch-no-label-span.md

@@ -0,0 +1,5 @@
+---
+"@salt-ds/core": patch
+---
+
+Fixed empty Switch label span being rendered. Closes #3505.

.github/workflows/build-storybook.yml

@@ -5,6 +5,11 @@ on:
       - main
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-storybook:
     runs-on: ubuntu-latest

.github/workflows/chromatic.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   chromatic-deployment:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -60,7 +61,7 @@ jobs:
           run-id: ${{ github.event.workflow_run.id }}
       - name: Publish to Chromatic
         if: ${{ steps.chromatic_branch.outputs.draft != 'true' }}
-        uses: chromaui/action@v11
+        uses: chromaui/action@v11.3.5
         # Chromatic GitHub Action options
         with:
           # 👇 Chromatic projectToken, refer to the manage page to obtain it.

.github/workflows/publish-storybook.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   deploy:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
 
     permissions:

.yarn/patches/@changesets-assemble-release-plan-npm-6.0.2-d74b7b2762.patch

@@ -0,0 +1,46 @@
+diff --git a/dist/changesets-assemble-release-plan.cjs.js b/dist/changesets-assemble-release-plan.cjs.js
+index 60427457c887f2d72168fecec83d79088c68e3a4..b2f9655ac07d6adbc29b5c7e46c5d7af7ba1eba5 100644
+--- a/dist/changesets-assemble-release-plan.cjs.js
++++ b/dist/changesets-assemble-release-plan.cjs.js
+@@ -111,6 +111,9 @@ function incrementVersion(release, preInfo) {
+   }
+
+   let version = semverInc__default["default"](release.oldVersion, release.type);
++  if (release.name === "@salt-ds/lab" || release.name === "@salt-ds/data-grid") {
++    version = semverInc__default["default"](release.oldVersion, "prerelease")
++  }
+
+   if (preInfo !== undefined && preInfo.state.mode !== "exit") {
+     let preVersion = preInfo.preVersions.get(release.name);
+@@ -299,7 +302,7 @@ function shouldBumpMajor({
+   // we check if it is a peerDependency because if it is, our dependent bump type might need to be major.
+   return depType === "peerDependencies" && nextRelease.type !== "none" && nextRelease.type !== "patch" && ( // 1. If onlyUpdatePeerDependentsWhenOutOfRange set to true, bump major if the version is leaving the range.
+   // 2. If onlyUpdatePeerDependentsWhenOutOfRange set to false, bump major regardless whether or not the version is leaving the range.
+-  !onlyUpdatePeerDependentsWhenOutOfRange || !semverSatisfies__default["default"](incrementVersion(nextRelease, preInfo), versionRange)) && ( // bump major only if the dependent doesn't already has a major release.
++  !onlyUpdatePeerDependentsWhenOutOfRange) && ( // bump major only if the dependent doesn't already has a major release. (https://github.com/changesets/changesets/issues/1011)
+   !releases.has(dependent) || releases.has(dependent) && releases.get(dependent).type !== "major");
+ }
+
+diff --git a/dist/changesets-assemble-release-plan.esm.js b/dist/changesets-assemble-release-plan.esm.js
+index f6583cf3f639e1fe4df764a015689dea74127236..318ecb08e2c58e8d3ac4ef11f659a5cd09e9e66e 100644
+--- a/dist/changesets-assemble-release-plan.esm.js
++++ b/dist/changesets-assemble-release-plan.esm.js
+@@ -100,6 +100,9 @@ function incrementVersion(release, preInfo) {
+   }
+
+   let version = semverInc(release.oldVersion, release.type);
++  if (release.name === "@salt-ds/lab" || release.name === "@salt-ds/data-grid") {
++    version = semverInc(release.oldVersion, "prerelease");
++  }
+
+   if (preInfo !== undefined && preInfo.state.mode !== "exit") {
+     let preVersion = preInfo.preVersions.get(release.name);
+@@ -288,7 +291,7 @@ function shouldBumpMajor({
+   // we check if it is a peerDependency because if it is, our dependent bump type might need to be major.
+   return depType === "peerDependencies" && nextRelease.type !== "none" && nextRelease.type !== "patch" && ( // 1. If onlyUpdatePeerDependentsWhenOutOfRange set to true, bump major if the version is leaving the range.
+   // 2. If onlyUpdatePeerDependentsWhenOutOfRange set to false, bump major regardless whether or not the version is leaving the range.
+-  !onlyUpdatePeerDependentsWhenOutOfRange || !semverSatisfies(incrementVersion(nextRelease, preInfo), versionRange)) && ( // bump major only if the dependent doesn't already has a major release.
++  !onlyUpdatePeerDependentsWhenOutOfRange) && ( // bump major only if the dependent doesn't already has a major release. (https://github.com/changesets/changesets/issues/1011)
+   !releases.has(dependent) || releases.has(dependent) && releases.get(dependent).type !== "major");
+ }
+

docs/components/ColorBlock.css

@@ -6,7 +6,7 @@
   border-color: transparent;
   border-style: var(--salt-container-borderStyle);
   border-width: var(--salt-size-border);
-  border-radius: var(--salt-size-unit);
+  border-radius: var(--salt-palette-corner-weak, 0);
 
   background-size: 8px 8px;
   background-position: -4px 4px, 16px 16px;

docs/components/QAContainer.tsx

@@ -1,4 +1,10 @@
-import { makePrefixer, Mode, SaltProvider } from "@salt-ds/core";
+import {
+  makePrefixer,
+  Mode,
+  SaltProvider,
+  UNSTABLE_SaltProviderNext,
+  useTheme,
+} from "@salt-ds/core";
 import { clsx } from "clsx";
 import {
   Children,
@@ -52,15 +58,22 @@ const DensityBlock = ({
   children,
 }: DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
   mode: Mode;
-}) => (
-  <BackgroundBlock background={mode === "light" ? "white" : undefined}>
-    {DensityValues.map((d, i) => (
-      <SaltProvider mode={mode} density={d} key={i}>
-        <div className="background-item-wrapper">{children}</div>
-      </SaltProvider>
-    ))}
-  </BackgroundBlock>
-);
+}) => {
+  const { themeNext } = useTheme();
+  const ChosenSaltProvider = themeNext
+    ? UNSTABLE_SaltProviderNext
+    : SaltProvider;
+
+  return (
+    <BackgroundBlock background={mode === "light" ? "white" : undefined}>
+      {DensityValues.map((d, i) => (
+        <ChosenSaltProvider mode={mode} density={d} key={i}>
+          <div className="background-item-wrapper">{children}</div>
+        </ChosenSaltProvider>
+      ))}
+    </BackgroundBlock>
+  );
+};
 
 export const QAContainer = ({
   children,
@@ -85,6 +98,11 @@ export const QAContainer = ({
     "--qaContainer-item-width": itemWidthAuto ? "auto" : undefined,
   } as CSSProperties;
 
+  const { themeNext } = useTheme();
+  const ChosenSaltProvider = themeNext
+    ? UNSTABLE_SaltProviderNext
+    : SaltProvider;
+
   return (
     <div
       {...htmlAttributes}
@@ -109,20 +127,20 @@ export const QAContainer = ({
       ) : (
         DensityValues.map((d, i) => (
           <Fragment key={i}>
-            <SaltProvider
+            <ChosenSaltProvider
               mode="light"
               density={d}
               enableStyleInjection={enableStyleInjection}
             >
               <BackgroundBlock background="white">{children}</BackgroundBlock>
-            </SaltProvider>
-            <SaltProvider
+            </ChosenSaltProvider>
+            <ChosenSaltProvider
               mode="dark"
               density={d}
               enableStyleInjection={enableStyleInjection}
             >
               <BackgroundBlock>{children}</BackgroundBlock>
-            </SaltProvider>
+            </ChosenSaltProvider>
           </Fragment>
         ))
       )}

package.json

@@ -123,7 +123,7 @@
     "yup": "^1.0.2"
   },
   "resolutions": {
-    "@changesets/assemble-release-plan@^5.2.2": "patch:@changesets/assemble-release-plan@npm%3A5.2.2#./.yarn/patches/@changesets-assemble-release-plan-npm-5.2.2-11f5894b70.patch",
+    "@changesets/assemble-release-plan@npm:^6.0.2": "patch:@changesets/assemble-release-plan@npm%3A6.0.2#~/.yarn/patches/@changesets-assemble-release-plan-npm-6.0.2-d74b7b2762.patch",
     "@next/eslint-plugin-next": "^14.0.0",
     "@salt-ds/lab": "workspace:*",
     "modular-scripts/rollup": "2.79.1",

packages/ag-grid-theme/package.json

@@ -25,6 +25,6 @@
     "del": "^7.0.0"
   },
   "peerDependencies": {
-    "@salt-ds/theme": "^1.16.0"
+    "@salt-ds/theme": "^1.17.0"
   }
 }

packages/core/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @salt-ds/core
 
+## 1.28.1
+
+### Patch Changes
+
+- f8de151c: Fixed the chevron alignment for multi-line accordions.
+- a5556028: Fixed Text components not applying `className` correctly, including `Code`, `Display1`, `Display2`, `Display3`, `TextAction`, `TextNotation`.
+
 ## 1.28.0
 
 ### Minor Changes

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salt-ds/core",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

packages/core/src/__tests__/__e2e__/switch/Switch.cy.tsx

@@ -149,4 +149,11 @@ describe("GIVEN a Switch", () => {
       });
     });
   });
+
+  describe("WHEN used without label", () => {
+    it("THEN should NOT render label span", () => {
+      cy.mount(<Switch />);
+      cy.get(".saltSwitch-label").should("not.exist");
+    });
+  });
 });