Skip to content
Open
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
18 changes: 18 additions & 0 deletions javascript/packages/client/src/actions/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,27 @@ export class Actions implements ElementObserverDelegate, InstructionsDelegate {
return null
}

if (kind === "seeded") {
return { value: this.seededLiteral(name, scope, raw) }
}

return { value: coerceState(raw, kind) }
}

private seededLiteral(name: string, scope: StateScope, raw: string): StateValue {
const current = this.state.getState(name, { scope })

if (typeof current === "number" && /^-?\d+$/.test(raw)) {
return Number(raw)
}

if (typeof current === "boolean" && (raw === "true" || raw === "false")) {
return raw === "true"
}

return raw
}

private toggle(element: Element, rest: string): void {
const groups: StateGroups = new Map()

Expand Down
14 changes: 14 additions & 0 deletions javascript/packages/client/test/actions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const PAGE =
`<input id="typer" data-herb-set="sort=$value">` +
`<input id="bound" value="name" data-herb-slot="5:attribute:value">` +
`<button id="setter" data-herb-set="sort=date">Date</button>` +
`<button id="page-reset" data-herb-set="page=1">First</button>` +
`<select id="chooser" data-herb-set="sort=$value"><option value="date">date</option></select>` +
`<div id="menu" data-herb-set="mouseenter->open=true mouseleave->open=false">hover</div>` +
`<div><!--herb-slot:0:conditional--><!--herb-branch:0:1-->closed<!--/herb-slot:0--></div>` +
Expand Down Expand Up @@ -55,6 +56,7 @@ const PAGE =
{ name: "failed", kind: "boolean", default: "false", scope: "region" },
{ name: "attempts", kind: "integer", default: "0", scope: "region" },
{ name: "sort", kind: "string", default: '"name"', scope: "region" },
{ name: "page", kind: "seeded", default: "params.fetch(:page, 1).to_i", scope: "region" },
{ name: "starred", kind: "boolean", default: "false", scope: 2 },
],
reads: { attempts: [1], sort: [5] },
Expand Down Expand Up @@ -102,6 +104,18 @@ describe("declarative actions", () => {
expect(state.getState("open")).toBe(false)
})

test("a literal assigned to a seeded state takes the type of the value it holds", () => {
state.setState({ page: 3 })
click("#page-reset")

expect(state.getState("page")).toBe(1)

state.setState({ page: "three" })
click("#page-reset")

expect(state.getState("page")).toBe("1")
})

test("two clauses on one attribute both write", () => {
const order: string[] = []
const handler = (event: Event): void => {
Expand Down
Loading