Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 6 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "solid-ui",
"version": "3.1.3-7",
"version": "3.1.3-8",
"description": "UI library for Solid applications",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
Expand All @@ -26,6 +26,12 @@
"types": "./dist/theme.css.d.ts",
"import": "./dist/theme.css",
"require": "./dist/theme.css"
},
"./breakpoints.css": {
"style": "./dist/breakpoints.css",
"types": "./dist/breakpoints.css.d.ts",
"import": "./dist/breakpoints.css",
"require": "./dist/breakpoints.css"
}
},
"files": [
Expand Down Expand Up @@ -115,7 +121,6 @@
"@storybook/addon-docs": "10.4.2",
"@storybook/addon-links": "10.4.2",
"@storybook/web-components-vite": "10.4.2",
"@tailwindcss/postcss": "^4.3.0",
"@tailwindcss/vite": "^4.3.0",
"@testing-library/dom": "^10.4.1",
"@testing-library/user-event": "^13.5.0",
Expand Down
1 change: 1 addition & 0 deletions src/assets/icons/solid-emblem.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/account/Account.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const meta = {
}
} as const

const render = defineAuthStoryRender<typeof meta.argTypes>(() => html`<solid-ui-account></solid-ui-account>`)
const render = defineAuthStoryRender(() => html`<solid-ui-account></solid-ui-account>`)

export default meta

Expand Down
17 changes: 16 additions & 1 deletion src/components/account/Account.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { consume } from '@lit/context'
import { html } from 'lit'
import { html, nothing, TemplateResult } from 'lit'
import { property } from 'lit/decorators.js'
import { customElement, WebComponent } from '@/lib/components'
import { authContext, AuthContext, DEFAULT_AUTH_CONTEXT } from '@/lib/auth'

Expand All @@ -17,13 +18,22 @@ import '~icons/lucide/user'

import styles from './Account.styles.css'

export interface AccountMenuItem {
label: string | TemplateResult
href?: string
onSelected?(): void
}

@customElement('solid-ui-account')
export default class Account extends WebComponent {
static styles = styles
static states = {
loggedIn: (component: Account) => !!component.auth.account,
}

@property({ type: Array })
accessor menuItems: AccountMenuItem[] = []

@consume({ context: authContext, subscribe: true })
private accessor auth: AuthContext = DEFAULT_AUTH_CONTEXT

Expand Down Expand Up @@ -66,6 +76,11 @@ export default class Account extends WebComponent {
<icon-lucide-chevron-down slot="right-icon"></icon-lucide-chevron-down>
</button>

${this.menuItems.map(menuItem => html`
<solid-ui-menu-item .href=${menuItem.href ?? nothing} @solid-ui-select=${() => menuItem.onSelected?.()}>
${menuItem.label}
</solid-ui-menu-item>
`)}
<solid-ui-logout-button>
<solid-ui-menu-item slot="trigger">
<icon-lucide-log-out slot="left-icon"></icon-lucide-log-out>
Expand Down
4 changes: 2 additions & 2 deletions src/components/account/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Account from './Account'
import Account, { type AccountMenuItem } from './Account'

export { Account }
export { Account, type AccountMenuItem }
export default Account
1 change: 0 additions & 1 deletion src/components/header/index.ts

This file was deleted.

25 changes: 14 additions & 11 deletions src/components/menu-item/MenuItem.styles.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
:host {
width: 100%;
display: flex;
position: relative;
justify-content: flex-start;
align-items: center;
gap: 5px;
padding: 10px;
border-radius: 5px;
color: var(--solid-ui-color-gray-600);
font-weight: 500;
font-size: var(--solid-ui-font-size-md);
& > a,
& > div {
width: 100%;
display: flex;
position: relative;
justify-content: flex-start;
align-items: center;
gap: 5px;
padding: 10px;
border-radius: 5px;
color: var(--solid-ui-color-gray-600);
font-weight: 500;
font-size: var(--solid-ui-font-size-md);
}

&:hover {
background-color: var(--solid-ui-color-slate-200);
Expand Down
8 changes: 5 additions & 3 deletions src/components/menu-item/MenuItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ export default class MenuItem extends WebComponent {
}

return html`
<slot name="left-icon"></slot>
<slot></slot>
<slot name="right-icon"></slot>
<div>
<slot name="left-icon"></slot>
<slot></slot>
<slot name="right-icon"></slot>
</div>
`
}

Expand Down
3 changes: 3 additions & 0 deletions src/components/solid-emblem/SolidEmblem.styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:host {
display: inline-flex;
}
15 changes: 15 additions & 0 deletions src/components/solid-emblem/SolidEmblem.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { customElement, WebComponent } from '@/lib/components'
import { html } from 'lit'

import '~icons/app/solid-emblem'

import styles from './SolidEmblem.styles.css'

@customElement('solid-ui-solid-emblem')
export default class SolidEmblem extends WebComponent {
static styles = styles

protected render () {
return html`<icon-app-solid-emblem></icon-app-solid-emblem>`
}
}
4 changes: 4 additions & 0 deletions src/components/solid-emblem/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import SolidEmblem from './SolidEmblem'

export { SolidEmblem }
export default SolidEmblem
9 changes: 0 additions & 9 deletions src/lib/features.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/styles/breakpoints.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@custom-media --solid-ui-mobile (max-width: 48rem); /* 768px */
1 change: 1 addition & 0 deletions src/styles/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
--solid-ui-color-slate-50: #f8fafc;
--solid-ui-color-slate-200: #e2e8f0;
--solid-ui-color-slate-400: #90a1b9;
--solid-ui-color-slate-800: #1d293d;

--solid-ui-color-red-500: #fb2c36;

Expand Down
Loading
Loading