Skip to content

Commit

Permalink
Merge branch 'main' into adjust-elevation
Browse files Browse the repository at this point in the history
  • Loading branch information
sebald committed May 8, 2024
2 parents 7133dac + 0a70a2f commit de1f8ae
Show file tree
Hide file tree
Showing 116 changed files with 2,231 additions and 2,053 deletions.
5 changes: 0 additions & 5 deletions .changeset/late-items-pretend.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/lazy-carrots-argue.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/light-zebras-develop.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/pretty-zoos-move.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/shy-clouds-joke.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-brooms-suffer.md

This file was deleted.

11 changes: 0 additions & 11 deletions .changeset/small-ducks-grin.md

This file was deleted.

6 changes: 6 additions & 0 deletions config/eslint/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @marigold/eslint-config

## 0.4.15

### Patch Changes

- [#3880](https://github.com/marigold-ui/marigold/pull/3880) [`4a59427`](https://github.com/marigold-ui/marigold/commit/4a59427fc1d4c14b1971c07778de1977cdde5dda) Thanks [@sebald](https://github.com/sebald)! - chore: cleanup peerdeeps

## 0.4.14

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions config/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/eslint-config",
"description": "marigold's eslint configuration",
"version": "0.4.14",
"version": "0.4.15",
"license": "MIT",
"keywords": [
"marigiold",
Expand All @@ -19,7 +19,7 @@
"directory": "config/eslint"
},
"dependencies": {
"@babel/core": "7.24.3",
"@babel/core": "7.24.4",
"@babel/eslint-parser": "^7.22.10",
"@babel/plugin-syntax-flow": "^7.16.7",
"@babel/plugin-transform-react-jsx": "^7.17.3",
Expand Down
6 changes: 6 additions & 0 deletions config/jest/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @marigold/jest-config

## 1.2.1

### Patch Changes

- [#3880](https://github.com/marigold-ui/marigold/pull/3880) [`4a59427`](https://github.com/marigold-ui/marigold/commit/4a59427fc1d4c14b1971c07778de1977cdde5dda) Thanks [@sebald](https://github.com/sebald)! - chore: cleanup peerdeeps

## 1.2.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions config/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/jest-config",
"description": "Marigold's jest configuration",
"version": "1.2.0",
"version": "1.2.1",
"license": "MIT",
"keywords": [
"marigold",
Expand All @@ -21,7 +21,7 @@
"directory": "config/jest"
},
"dependencies": {
"@babel/core": "7.24.3",
"@babel/core": "7.24.4",
"@swc/core": "1.4.11",
"@swc/jest": "0.2.36",
"@types/jest": "29.5.12",
Expand Down
15 changes: 12 additions & 3 deletions config/storybook/.storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ export const decorators: any = [
{Object.keys(THEME).map(key => (
<OverlayContainerProvider value={`portalContainer-${key}`}>
<Frame key={key} id={key} title={`Theme "${key}"`}>
<MarigoldProvider theme={THEME[key as ThemeNames]}>
<MarigoldProvider
theme={THEME[key as ThemeNames]}
className="bg-bg-surface"
>
<div className="p-4" data-theme={key}>
{Story()}
</div>
Expand All @@ -72,7 +75,10 @@ export const decorators: any = [
}
case 'core': {
return (
<MarigoldProvider theme={THEME[theme as ThemeNames]}>
<MarigoldProvider
theme={THEME[theme as ThemeNames]}
className="bg-bg-surface"
>
<div className="h-screen p-6">
<FieldGroup labelWidth="200px">{Story()}</FieldGroup>
</div>
Expand All @@ -81,7 +87,10 @@ export const decorators: any = [
}
default: {
return (
<MarigoldProvider theme={THEME[theme as ThemeNames]}>
<MarigoldProvider
theme={THEME[theme as ThemeNames]}
className="bg-bg-surface"
>
<div className="h-screen p-6">{Story()}</div>
</MarigoldProvider>
);
Expand Down
22 changes: 22 additions & 0 deletions config/storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# @marigold/storybook-config

## 1.1.39

### Patch Changes

- [#3893](https://github.com/marigold-ui/marigold/pull/3893) [`f57caec`](https://github.com/marigold-ui/marigold/commit/f57caecd8c964ba2012bf1fcab9b15a15a58080d) Thanks [@sarahgm](https://github.com/sarahgm)! - feat: add className to MarigoldProvider

- Updated dependencies [[`f57caec`](https://github.com/marigold-ui/marigold/commit/f57caecd8c964ba2012bf1fcab9b15a15a58080d), [`a54d186`](https://github.com/marigold-ui/marigold/commit/a54d186bf53da1a0afa6ee22a7711a803a155d6a), [`99d68a4`](https://github.com/marigold-ui/marigold/commit/99d68a42e1c4b9fbf70bf3a182270922bb042e0c)]:
- @marigold/components@7.7.1
- @marigold/theme-core@26.1.7
- @marigold/theme-b2b@27.1.7

## 1.1.38

### Patch Changes

- [#3880](https://github.com/marigold-ui/marigold/pull/3880) [`4a59427`](https://github.com/marigold-ui/marigold/commit/4a59427fc1d4c14b1971c07778de1977cdde5dda) Thanks [@sebald](https://github.com/sebald)! - chore: cleanup peerdeeps

- Updated dependencies [[`b62872d`](https://github.com/marigold-ui/marigold/commit/b62872dd557a8c35d56bc09d12b960752a466d46), [`72ece08`](https://github.com/marigold-ui/marigold/commit/72ece08fe8009ee19b05c2ad8796658dfa91ebb8), [`3f02ea1`](https://github.com/marigold-ui/marigold/commit/3f02ea15fab7b27907b0b478d479d6f2766e3ab2), [`5ea2604`](https://github.com/marigold-ui/marigold/commit/5ea26047d1b53f86a7a56f40e378172b69580593), [`78889c6`](https://github.com/marigold-ui/marigold/commit/78889c6a205085b355c3838792b8a9b3989a51f7), [`4a59427`](https://github.com/marigold-ui/marigold/commit/4a59427fc1d4c14b1971c07778de1977cdde5dda)]:
- @marigold/theme-core@26.1.6
- @marigold/components@7.7.0
- @marigold/theme-b2b@27.1.6

## 1.1.37

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion config/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/storybook-config",
"description": "Marigold's storybook configuration",
"version": "1.1.37",
"version": "1.1.39",
"license": "MIT",
"exports": "./main.js",
"keywords": [
Expand Down
41 changes: 41 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,46 @@
# @marigold/docs

## 7.7.1

### Patch Changes

- [#3893](https://github.com/marigold-ui/marigold/pull/3893) [`f57caec`](https://github.com/marigold-ui/marigold/commit/f57caecd8c964ba2012bf1fcab9b15a15a58080d) Thanks [@sarahgm](https://github.com/sarahgm)! - feat: add className to MarigoldProvider

- [#3898](https://github.com/marigold-ui/marigold/pull/3898) [`a54d186`](https://github.com/marigold-ui/marigold/commit/a54d186bf53da1a0afa6ee22a7711a803a155d6a) Thanks [@sebald](https://github.com/sebald)! - feat: Ensure datepicker shows only date by default

- Updated dependencies [[`f57caec`](https://github.com/marigold-ui/marigold/commit/f57caecd8c964ba2012bf1fcab9b15a15a58080d), [`a54d186`](https://github.com/marigold-ui/marigold/commit/a54d186bf53da1a0afa6ee22a7711a803a155d6a), [`99d68a4`](https://github.com/marigold-ui/marigold/commit/99d68a42e1c4b9fbf70bf3a182270922bb042e0c)]:
- @marigold/components@7.7.1
- @marigold/theme-core@26.1.7
- @marigold/theme-b2b@27.1.7
- @marigold/icons@1.2.47
- @marigold/theme-preset@1.3.12

## 7.7.0

### Minor Changes

- [#3892](https://github.com/marigold-ui/marigold/pull/3892) [`3f02ea1`](https://github.com/marigold-ui/marigold/commit/3f02ea15fab7b27907b0b478d479d6f2766e3ab2) Thanks [@sebald](https://github.com/sebald)! - feat: Allow to disable keyboard navigation on `Table`

### Patch Changes

- [#3891](https://github.com/marigold-ui/marigold/pull/3891) [`4ac7cc6`](https://github.com/marigold-ui/marigold/commit/4ac7cc684bfdda4a6eebb312712aec4711182ec1) Thanks [@sebald](https://github.com/sebald)! - docs: make `core` the default theme

- [#3871](https://github.com/marigold-ui/marigold/pull/3871) [`64f9892`](https://github.com/marigold-ui/marigold/commit/64f98925842753832cfe4321cfff4027021f6846) Thanks [@sarahgm](https://github.com/sarahgm)! - [DST-381]:docs: Reintroduce Table of Contents to docs

- [#3868](https://github.com/marigold-ui/marigold/pull/3868) [`3eac2f9`](https://github.com/marigold-ui/marigold/commit/3eac2f947935038653925c84a5fb1539d86cb59d) Thanks [@sarahgm](https://github.com/sarahgm)! - [DST-235]docs: add contact us page in docs

- [#3879](https://github.com/marigold-ui/marigold/pull/3879) [`78889c6`](https://github.com/marigold-ui/marigold/commit/78889c6a205085b355c3838792b8a9b3989a51f7) Thanks [@sarahgm](https://github.com/sarahgm)! - [DSTSUP-64]: add mastermark/adminmark as token in our system

- [#3881](https://github.com/marigold-ui/marigold/pull/3881) [`355eb6a`](https://github.com/marigold-ui/marigold/commit/355eb6a7864a0e01722d9db7596369c0ee9f79c1) Thanks [@sarahgm](https://github.com/sarahgm)! - [DST-405]:chore: adjust Command styles and menu

- Updated dependencies [[`b62872d`](https://github.com/marigold-ui/marigold/commit/b62872dd557a8c35d56bc09d12b960752a466d46), [`72ece08`](https://github.com/marigold-ui/marigold/commit/72ece08fe8009ee19b05c2ad8796658dfa91ebb8), [`3f02ea1`](https://github.com/marigold-ui/marigold/commit/3f02ea15fab7b27907b0b478d479d6f2766e3ab2), [`5ea2604`](https://github.com/marigold-ui/marigold/commit/5ea26047d1b53f86a7a56f40e378172b69580593), [`78889c6`](https://github.com/marigold-ui/marigold/commit/78889c6a205085b355c3838792b8a9b3989a51f7), [`4a59427`](https://github.com/marigold-ui/marigold/commit/4a59427fc1d4c14b1971c07778de1977cdde5dda)]:
- @marigold/theme-core@26.1.6
- @marigold/components@7.7.0
- @marigold/theme-b2b@27.1.6
- @marigold/eslint-config@0.4.15
- @marigold/icons@1.2.46
- @marigold/theme-preset@1.3.11

## 7.6.0

### Minor Changes
Expand Down
3 changes: 2 additions & 1 deletion docs/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use-client';

import { siteConfig } from '@/lib/config';
import { b2bTheme, coreTheme, theme } from '@/theme';
import { MarigoldProvider } from '@/ui';

Expand Down Expand Up @@ -46,7 +47,7 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
return (
<html lang="en">
<body className={`${fontSans.className} min-h-screen`}>
<MarigoldThemeSwitch themes={themes} initial="b2b">
<MarigoldThemeSwitch themes={themes} initial={siteConfig.defaultTheme}>
<MarigoldProvider theme={theme}>
<SiteHeader />
<aside
Expand Down
14 changes: 8 additions & 6 deletions docs/content/components/application/provider/provider.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ import { Button, MarigoldProvider } from '@marigold/components';
</MarigoldProvider>;
```

## Usage

### Import

To import the component you just have to use this code below.
## Import

```tsx
import { MarigoldProvider } from '@marigold/components';
```

### Props
## Props

<PropsTable
props={[
Expand All @@ -43,6 +39,12 @@ import { MarigoldProvider } from '@marigold/components';
default: 'none',
description: 'The use that should be used within the provider context.',
},
{
property: 'className',
type: 'string',
default: 'none',
description: 'Set a className to the outer div from your app.',
},

]}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@ caption: Provider for easier handling routing.
The [`<RouterProvider>`](https://react-spectrum.adobe.com/react-aria/routing.html) is a component from `react-aria-components` which we expose to give you something on the hand to handle your routes in your application.
It can be used to handle your routes if you use Next.js or the React Router.

## Usage

### Import

To import the component you just have to use this code below.
## Import

```tsx
import { RouterProvider } from '@marigold/components';
```

### Props
## Props

<PropsTable
props={[
Expand Down
15 changes: 7 additions & 8 deletions docs/content/components/collection/accordion/accordion.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,19 @@ An `<Accordion>` is a component that allows you to organizing content into colla
The `<Accordion.Item>` can be expanded by default using the `defaultExpandedKeys` property or collapsed.
You can also switch the `selectionMode` for `<Accordion>` by passing its property. The default behavior is set to single mode.

## Usage

### Import

To import the component you just have to use this code below.
## Import

```tsx onlyCode
import { Accordion } from '@marigold/components';
```

### Appearance
## Appearance

<AppearanceTable component={title} />

### Props Accordion
## Props

### Accordion

<PropsTable
props={[
Expand Down Expand Up @@ -54,7 +52,7 @@ import { Accordion } from '@marigold/components';
]}
/>

### Props Accordion.Item
### Accordion.Item

<PropsTable
props={[
Expand All @@ -80,6 +78,7 @@ import { Accordion } from '@marigold/components';
},
]}
/>

## Examples

### Singleselect Accordion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ A `SelectList` consists of a container element, with rows of data inside. The ro

`SelectList` can be used to select multiple items from a list simultaneously. It provides a familiar interface where users can select multiple items.

## Usage

### Import

To import the component you just have to use this code below.
## Import

```tsx
import { SelectList } from '@marigold/components';
```

### Props
## Props

### SelectList

<PropsTable
props={[
Expand Down Expand Up @@ -67,7 +65,7 @@ import { SelectList } from '@marigold/components';
]}
/>

### Item props
### SelectList.Item

<PropsTable
props={[
Expand Down
Loading

0 comments on commit de1f8ae

Please sign in to comment.