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
7 changes: 7 additions & 0 deletions gno.land/pkg/gnoweb/frontend/css/06-blocks.css
Original file line number Diff line number Diff line change
Expand Up @@ -2144,6 +2144,13 @@ pre.chroma-chroma {
margin-inline-start: var(--g-space-1);
}

.gno-form_required-badge {
font-size: var(--g-font-size-50);
color: var(--s-color-text-tertiary);
font-weight: var(--g-font-normal);
margin-inline-start: var(--g-space-1);
}

.gno-form_selectable {
display: flex;
column-gap: var(--g-space-2);
Expand Down
61 changes: 53 additions & 8 deletions gno.land/pkg/gnoweb/markdown/ext_forms.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ type FormInput struct {
Value string
Checked bool
Readonly bool
Required bool
Description string
Error error
}
Expand All @@ -91,6 +92,9 @@ func (e FormInput) String() string {
if e.Readonly {
s += " (readonly=true)"
}
if e.Required {
s += " (required=true)"
}
return s
}

Expand All @@ -101,6 +105,7 @@ type FormTextarea struct {
Rows int
Value string
Readonly bool
Required bool
Description string
Error error
}
Expand All @@ -118,6 +123,9 @@ func (e FormTextarea) String() string {
if e.Readonly {
s += " (readonly=true)"
}
if e.Required {
s += " (required=true)"
}
return s
}

Expand All @@ -127,6 +135,7 @@ type FormSelect struct {
Value string
Selected bool
Readonly bool
Required bool
Description string
Error error
}
Expand All @@ -144,6 +153,9 @@ func (e FormSelect) String() string {
if e.Readonly {
s += " (readonly=true)"
}
if e.Required {
s += " (required=true)"
}
return s
}

Expand Down Expand Up @@ -296,6 +308,7 @@ func (p *FormParser) parseInput(node *FormNode, tok html.Token) {
input.Value = attrs["value"]
input.Checked = attrs["checked"] == "true"
input.Readonly = attrs["readonly"] == "true"
input.Required = attrs["required"] == "true"

// Validate
if err := node.validateName(input.Name, input.Type); err != nil {
Expand Down Expand Up @@ -369,6 +382,8 @@ func (p *FormParser) parseTextarea(node *FormNode, tok html.Token) {
textarea.Description = strings.TrimSpace(attr.Val)
case "readonly":
textarea.Readonly = strings.TrimSpace(attr.Val) == "true"
case "required":
textarea.Required = strings.TrimSpace(attr.Val) == "true"
}
}

Expand Down Expand Up @@ -400,6 +415,8 @@ func (p *FormParser) parseSelect(node *FormNode, tok html.Token) {
sel.Description = strings.TrimSpace(attr.Val)
case "readonly":
sel.Readonly = strings.TrimSpace(attr.Val) == "true"
case "required":
sel.Required = strings.TrimSpace(attr.Val) == "true"
}
}

Expand Down Expand Up @@ -598,6 +615,9 @@ func (r *FormRenderer) renderInput(w util.BufWriter, e FormInput, idx int, lastD
if e.Readonly {
fmt.Fprint(w, ` disabled`)
}
if e.Required {
fmt.Fprint(w, ` required`)
}
if isExec {
fmt.Fprintf(w, ` data-action-function-target="param-input" data-action="change->action-function#updateAllArgs" data-action-function-param-value="%s"`, HTMLEscapeString(e.Name))
}
Expand All @@ -612,17 +632,25 @@ func (r *FormRenderer) renderInput(w util.BufWriter, e FormInput, idx int, lastD
if e.Readonly {
readonlyBadge = `<span class="gno-form_readonly-badge">(readonly)</span>`
}
fmt.Fprintf(w, `<label for="%s"> %s %s</label>
requiredBadge := ""
if e.Required {
requiredBadge = `<span class="gno-form_required-badge">*</span>`
}
fmt.Fprintf(w, `<label for="%s">%s %s %s</label>
</div>
`, HTMLEscapeString(uniqueID), HTMLEscapeString(label), readonlyBadge)
`, HTMLEscapeString(uniqueID), requiredBadge, HTMLEscapeString(label), readonlyBadge)
} else {
readonlyBadge := ""
if e.Readonly {
readonlyBadge = `<span class="gno-form_readonly-badge">(readonly)</span>`
}
fmt.Fprintf(w, `<div class="gno-form_input"><label for="%s"> %s %s</label>
requiredBadge := ""
if e.Required {
requiredBadge = `<span class="gno-form_required-badge">*</span>`
}
fmt.Fprintf(w, `<div class="gno-form_input"><label for="%s">%s %s %s</label>
<input type="%s" id="%s" name="%s" placeholder="%s"`,
HTMLEscapeString(e.Name), HTMLEscapeString(e.Placeholder), readonlyBadge,
HTMLEscapeString(e.Name), requiredBadge, HTMLEscapeString(e.Placeholder), readonlyBadge,
HTMLEscapeString(e.Type), HTMLEscapeString(e.Name),
HTMLEscapeString(e.Name), HTMLEscapeString(e.Placeholder))
if e.Value != "" {
Expand All @@ -631,6 +659,9 @@ func (r *FormRenderer) renderInput(w util.BufWriter, e FormInput, idx int, lastD
if e.Readonly {
fmt.Fprint(w, ` readonly`)
}
if e.Required {
fmt.Fprint(w, ` required`)
}
if isExec {
fmt.Fprintf(w, ` data-action-function-target="param-input" data-action="input->action-function#updateAllArgs" data-action-function-param-value="%s"`, HTMLEscapeString(e.Name))
}
Expand All @@ -651,15 +682,22 @@ func (r *FormRenderer) renderTextarea(w util.BufWriter, e FormTextarea, idx int,
if e.Readonly {
readonlyBadge = `<span class="gno-form_readonly-badge">(readonly)</span>`
}
requiredBadge := ""
if e.Required {
requiredBadge = `<span class="gno-form_required-badge">*</span>`
}

fmt.Fprintf(w, `<div class="gno-form_input"><label for="%s"> %s %s</label>
fmt.Fprintf(w, `<div class="gno-form_input"><label for="%s">%s %s %s</label>
<textarea id="%s" name="%s" placeholder="%s" rows="%d"`,
HTMLEscapeString(e.Name), HTMLEscapeString(e.Placeholder), readonlyBadge,
HTMLEscapeString(e.Name), requiredBadge, HTMLEscapeString(e.Placeholder), readonlyBadge,
HTMLEscapeString(e.Name), HTMLEscapeString(e.Name),
HTMLEscapeString(e.Placeholder), e.Rows)
if e.Readonly {
fmt.Fprint(w, ` readonly`)
}
if e.Required {
fmt.Fprint(w, ` required`)
}
if isExec {
fmt.Fprintf(w, ` data-action-function-target="param-input" data-action="input->action-function#updateAllArgs" data-action-function-param-value="%s"`, HTMLEscapeString(e.Name))
}
Expand All @@ -681,9 +719,13 @@ func (r *FormRenderer) renderSelect(w util.BufWriter, elements []FormElement, e
if e.Readonly {
readonlyBadge = `<span class="gno-form_readonly-badge">(readonly)</span>`
}
fmt.Fprintf(w, `<div class="gno-form_select"><label for="%s"> %s %s</label>
requiredBadge := ""
if e.Required {
requiredBadge = `<span class="gno-form_required-badge">*</span>`
}
fmt.Fprintf(w, `<div class="gno-form_select"><label for="%s">%s %s %s</label>
<select id="%s" name="%s"`,
HTMLEscapeString(e.Name), HTMLEscapeString(label), readonlyBadge,
HTMLEscapeString(e.Name), requiredBadge, HTMLEscapeString(label), readonlyBadge,
HTMLEscapeString(e.Name), HTMLEscapeString(e.Name))

if *lastDescID != "" {
Expand All @@ -692,6 +734,9 @@ func (r *FormRenderer) renderSelect(w util.BufWriter, elements []FormElement, e
if e.Readonly {
fmt.Fprint(w, ` disabled`)
}
if e.Required {
fmt.Fprint(w, ` required`)
}
if isExec {
fmt.Fprintf(w, ` data-action-function-target="param-input" data-action="change->action-function#updateAllArgs" data-action-function-param-value="%s"`, HTMLEscapeString(e.Name))
}
Expand Down
Loading