Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0a6d16b
rdf forms component
timea-solid Jun 16, 2026
7c5a7c3
rendered first rdf forms elements
timea-solid Jun 16, 2026
35c066f
preliminary work for rdf-input
timea-solid Jun 17, 2026
a20fa4f
Merge branch 'staging' into rdfComponets
timea-solid Jun 22, 2026
5cd82c0
merge staging and moved components
timea-solid Jun 22, 2026
344b904
added also data to forms and wired the rdf input
timea-solid Jun 22, 2026
9d5565a
fixed rdf input
timea-solid Jun 22, 2026
0656653
Refactor for better readability
timea-solid Jun 22, 2026
84345df
fix types
timea-solid Jun 23, 2026
372135f
reverted the sortBySequence code back to original
timea-solid Jun 23, 2026
638786e
Merge branch 'staging' into rdfComponets
timea-solid Jun 24, 2026
235b0d0
vite config for generating custom elements tag name map
timea-solid Jun 24, 2026
da5c6fa
Merge branch 'staging' into rdfComponets
timea-solid Jun 25, 2026
35f4445
a first FormsContext with a default store from SolidLogic
timea-solid Jun 29, 2026
0d99a1b
added placeholder property to input
timea-solid Jun 29, 2026
7b7f9a9
added readonly to Input and used it in RDFinput
timea-solid Jun 29, 2026
65735ae
improved store usage
timea-solid Jun 29, 2026
cfb0475
added readonly style to input
timea-solid Jun 29, 2026
c81b17e
added save features, copied over code
timea-solid Jun 29, 2026
082b9ee
added an updater to the storybook store
timea-solid Jun 30, 2026
2b53d6c
added data change capabilities, 1st version
timea-solid Jun 30, 2026
403a143
Update src/components/input/Input.styles.css
timea-solid Jun 30, 2026
0af9ce9
rename to NoopStore
timea-solid Jun 30, 2026
9d9f48a
renamed NoopStore
timea-solid Jun 30, 2026
3da4992
cleanup from feedback
timea-solid Jun 30, 2026
643dc5a
imporved component type declarations
timea-solid Jun 30, 2026
d40ac8b
merge staging
timea-solid Jun 30, 2026
b076703
Addeda URL lit converter
timea-solid Jul 2, 2026
242180a
simplify components properties
timea-solid Jul 2, 2026
c410374
merge staging
timea-solid Jul 2, 2026
5fdb7bc
random name attribute
timea-solid Jul 2, 2026
bfeed32
rework logic of readonly
timea-solid Jul 2, 2026
eba9a70
use document instead of uri with fragment
timea-solid Jul 2, 2026
c9c7cf3
fixed statement insert
timea-solid Jul 2, 2026
a0eaae5
decode defensively
timea-solid Jul 2, 2026
d8604c6
small copilot suggested improvments
timea-solid Jul 2, 2026
6280cb4
chnaged from readonly to disabled on select
timea-solid Jul 2, 2026
71a305f
Potential fix for pull request finding
timea-solid Jul 13, 2026
eb1fd4d
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 pane-reg…
github-actions[bot] Jul 13, 2026
0429495
merge staging
timea-solid Jul 13, 2026
74ca18e
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 pane-reg…
github-actions[bot] Jul 13, 2026
78cb2fc
merge staging
timea-solid Jul 21, 2026
4109abe
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 pane-reg…
github-actions[bot] Jul 21, 2026
089892d
implemeneted PR feedback
timea-solid Jul 21, 2026
b7946d4
improved null check
timea-solid Jul 21, 2026
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
node_modules
dist
src/versionInfo.ts
src/types/custom-elements.d.ts

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this was added to the gitignore (which I like!), we should remove the file from the repository as well.

.idea
.vscode
coverage
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

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

3 changes: 3 additions & 0 deletions src/components/combobox/Combobox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ export default class Combobox extends FormControlComponent {
@query('input')
protected accessor controlElement: HTMLInputElement | null = null

@property({ type: Boolean, reflect: true })
accessor readonly = false

@state()
private accessor filter = ''

Expand Down
7 changes: 7 additions & 0 deletions src/components/input/Input.styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,12 @@
color: var(--solid-ui-color-gray-700);
font-size: inherit;
}

input:read-only {
border: none;
padding: 0;
cursor: not-allowed;
}
}

}
10 changes: 10 additions & 0 deletions src/components/input/Input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ export default class Input extends FormControlComponent {
@property({ type: String, reflect: true })
accessor type = 'text';

@property({ type: String, reflect: true })
accessor placeholder = '';

@property({ type: Boolean, reflect: true })
accessor required = false;

@property({ type: Boolean, reflect: true })
accessor readonly = false;

@query('input')
protected accessor controlElement: HTMLInputElement | null = null;

Expand All @@ -26,6 +35,7 @@ export default class Input extends FormControlComponent {
placeholder=${this.placeholder}
?required=${this.required}
.value=${this.value}
?readonly=${this.readonly}
@input=${() => this.controlTrait.onInput()}
@keydown=${this.onKeyDown}
/>
Expand Down
171 changes: 171 additions & 0 deletions src/components/rdf-form/RDFForm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
import { property, state } from 'lit/decorators.js'
import { html } from 'lit/html.js'
import type { PropertyValues } from 'lit'
import { consume } from '@lit/context'
import { customElement, WebComponent } from '@/lib/components'
import ns from '../../lib/ns'
import { fetchData, findForm, sortBySequence } from '../../lib/forms/rdfFormsHelper'
import { sym, LiveStore } from 'rdflib'
import '@/components/rdf-input'
import { DEFAULT_STORE, storeContext, StoreContext } from '@/lib/forms/store/StoreContext'

const urlConverter = {
fromAttribute (value: string | null): URL | null {
if (!value) return null

try {
return new URL(value)
} catch {
return null
}
},
toAttribute (value: URL | null) {
if (!value) return null
return value
}
}

const hrefFromUrlValue = (value: URL | null): string =>
value?.href ?? ''

@customElement('solid-ui-rdf-form')
export default class RDFForm extends WebComponent {
@consume({ context: storeContext, subscribe: true })
private accessor storeContext: StoreContext = DEFAULT_STORE

@property({ attribute: false })
Comment thread
timea-solid marked this conversation as resolved.
accessor passedInStore: LiveStore | null = null

private get currentStore (): LiveStore {
return this.passedInStore ?? this.storeContext.store
}

@state()
private accessor entireDataIsReadonly: boolean = true // to protect data, we default to not editable

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be used only in the render() method, I think it'd be better to keep it as a function-scoped variable rather than component state.


@state()
private accessor _loadVersion = 0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this and the storeVersion proeprties are for, can you help me understand?


@state()
private accessor _documentsLoaded = false

@property({ converter: urlConverter })
accessor formUrl: URL | null = null

@property({ converter: urlConverter })
accessor subjectUrl: URL | null = null

render () {
if (!this._documentsLoaded) {
return html``
}

const store = this.currentStore

const subjectUrl = hrefFromUrlValue(this.subjectUrl)
if (subjectUrl && store.updater?.editable(subjectUrl) !== undefined && store.updater?.editable(subjectUrl) !== false) {
this.entireDataIsReadonly = false
}

const formRoot = findForm(this.currentStore, hrefFromUrlValue(this.formUrl)) // If there are more 'a ui:Form' elements in a form file
if (!formRoot) throw new Error('No ui:Form found in ' + hrefFromUrlValue(this.formUrl))

const formDocument = sym(hrefFromUrlValue(this.formUrl)) // rdflib NamedNode for the document
const parts = store.each(formRoot, ns.ui('parts'), null, formDocument)
const partsBySequence = sortBySequence(store, parts)
const partItems = (partsBySequence || []).flatMap(item => {
if (item && typeof item === 'object' && 'elements' in item && Array.isArray((item as any).elements)) {
return (item as any).elements
}
return [item]
})
const uiFields = partItems.map(item => {
const types = store.each(item as any, ns.rdf('type'), null, formDocument)
const typeNode = types[0]
const value = typeNode ? ((typeNode as any).value || String(typeNode)) : ((item as any).value || String(item))
const hashIndex = value.lastIndexOf('#')
return {
value: item,
fieldValue: hashIndex >= 0 ? value.slice(hashIndex + 1) : value
}
})

return html`
Comment thread
timea-solid marked this conversation as resolved.
<form>
${uiFields.map(part => {
switch (part.fieldValue) {
case 'PhoneField':
case 'EmailField':
case 'ColorField':
case 'DateField':
case 'DateTimeField':
case 'TimeField':
case 'NumericField':
case 'IntegerField':
case 'DecimalField':
case 'FloatField':
case 'TextField':
case 'SingleLineTextField':
case 'NamedNodeURIField': {
return html` <solid-ui-rdf-input
.formSubject=${sym(part.value)}
.dataSubject=${sym(subjectUrl)}
.storeVersion=${this._loadVersion}
.readonly=${this.entireDataIsReadonly}
Comment on lines +110 to +114
></solid-ui-rdf-input>
<br>`

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this <br> should be necessary, we should deal with these in CSS.

}
case 'MultiLineTextField':
return html`<input .rdf=${part}></input>`
case 'BooleanField':
return html`<input .rdf=${part}></input>`
case 'TristateField':
return html`<input .rdf=${part}></input>`
case 'Classifier':
return html`<input .rdf=${part}></input>`
case 'Choice':
return html`<input .rdf=${part}></input>`
case 'Multiple':
return html`<input .rdf=${part}></input>`
case 'Options':
return html`<input .rdf=${part}></input>`
case 'AutocompleteField':
return html`<input .rdf=${part}></input>`
case 'Comment':
case 'Heading':
return html`<input .rdf=${part}></input>`
default:
return html`<div>Unknown part type: ${part}</div>`
}
})}
</form>
`
}

protected override willUpdate (changedProperties: PropertyValues<this>) {
super.willUpdate(changedProperties)
if (changedProperties.has('formUrl') ||
changedProperties.has('subjectUrl') ||
changedProperties.has('passedInStore')
) {
this.loadDocumentsIfNeeded()
}
}

private async loadDocumentsIfNeeded () {
const store = this.currentStore
const formUrl = hrefFromUrlValue(this.formUrl)
const subjectUrl = hrefFromUrlValue(this.subjectUrl)

if (!formUrl || !subjectUrl) return

try {
await fetchData(store, formUrl)
await fetchData(store, subjectUrl)
this._loadVersion += 1
this._documentsLoaded = true
} catch (error) {
console.error('Failed to load RDF documents', error)
}
}
}
28 changes: 28 additions & 0 deletions src/components/rdf-form/RDForm.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { html } from 'lit'
import './RDFForm'
Comment thread
timea-solid marked this conversation as resolved.

const meta = {
title: 'Design System/RDF Form',
args: {
formUrl: 'https://solidos.solidcommunity.net/public/2021/solidUiFormTestData/dummyFormTestFile.ttl', // we need a working URL
subjectUrl: 'https://solidos.solidcommunity.net/public/2021/alice.ttl#me'
},

argTypes: {
formUrl: { control: 'text' },
subjectUrl: { control: 'text' }
},
} as const

const render = ({ formUrl, subjectUrl }: typeof meta.args) => {
return html`
<solid-ui-rdf-form
formUrl=${formUrl}
.subjectUrl=${new URL(subjectUrl)}>
</solid-ui-rdf-form>
`
}

export default meta

export const Primary = { render }
4 changes: 4 additions & 0 deletions src/components/rdf-form/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import RDFForm from './RDFForm'

export { RDFForm }
export default RDFForm
Loading
Loading