Skip to content

Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 9 commits into from
Dec 8, 2022
Merged

Handle edits within frontend fields #7178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f30bb4
initial text and toggle tests
jasonvarga Dec 2, 2022
923dd58
extract
jasonvarga Dec 2, 2022
d07102f
tests for more fieldtypes
jasonvarga Dec 8, 2022
8efceab
implement
jasonvarga Dec 8, 2022
0986483
whoops
jasonvarga Dec 8, 2022
850def9
this changed
jasonvarga Dec 8, 2022
60fb891
avoid using old
jasonvarga Dec 8, 2022
e4e948b
avoid changing 'default'
jasonvarga Dec 8, 2022
c51c521
better var names
jasonvarga Dec 8, 2022
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
9 changes: 4 additions & 5 deletions resources/views/extend/forms/fields/checkboxes.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
<label>
<input
type="checkbox"
name="{{ handle }}[]"
value="{{ value }}"
value="{{ option }}"
{{ if js_driver }}{{ js_attributes }}{{ /if }}
{{ if (old | in_array:value) }}checked{{ /if }}
{{ if ! old && value === default }}checked{{ /if }}
{{ if value|in_array:option }}checked{{ /if }}
{{ if validate|contains:required }}required{{ /if }}
>
{{ label !== null ? label : value }}
{{ label !== null ? label : option }}
</label>
{{ unless inline }}
<br>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/extend/forms/fields/default.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
type="text"
type="{{ input_type ?? 'text' }}"
name="{{ handle }}"
value="{{ old ?? default}}"
value="{{ value }}"
{{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
{{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
{{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down
9 changes: 4 additions & 5 deletions resources/views/extend/forms/fields/radio.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
<label>
<input
type="radio"
name="{{ handle }}"
value="{{ value }}"
value="{{ option }}"
{{ if js_driver }}{{ js_attributes }}{{ /if }}
{{ if old === value }}checked{{ /if }}
{{ if ! old && value === default }}checked{{ /if }}
{{ if value == option }}checked{{ /if }}
{{ if validate|contains:required }}required{{ /if }}
>
{{ label !== null ? label : value }}
{{ label !== null ? label : option }}
</label>
{{ unless inline }}
<br>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/extend/forms/fields/select.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
{{ /if }}
</option>
{{ /unless }}
{{ foreach:options as="value|label" }}
<option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
{{ label !== null ? label : value }}
{{ foreach:options as="option|label" }}
<option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
{{ label !== null ? label : option }}
</option>
{{ /foreach:options }}
</select>
2 changes: 1 addition & 1 deletion resources/views/extend/forms/fields/text.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
type="{{ input_type ?? 'text' }}"
name="{{ handle }}"
value="{{ old ?? default }}"
value="{{ value }}"
{{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
{{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
{{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/extend/forms/fields/textarea.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
{{ if js_driver }}{{ js_attributes }}{{ /if }}
{{ if validate|contains:required }}required{{ /if }}
>
{{ old ?? default }}
{{ value }}
</textarea>
2 changes: 1 addition & 1 deletion resources/views/extend/forms/fields/toggle.antlers.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
name="{{ handle }}"
value="1"
{{ if js_driver }}{{ js_attributes }}{{ /if }}
{{ if ! old && default }}checked{{ /if }}
{{ if value && value !== '0' }}checked{{ /if }}
{{ if validate|contains:required }}required{{ /if }}
>
{{ if inline_label }}
Expand Down
6 changes: 6 additions & 0 deletions src/Tags/Concerns/RendersForms.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
{
$errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

$missing = str_random();
$old = old($field->handle(), $missing);
$default = $field->value() ?? $field->defaultValue();
$value = $old === $missing ? $default : $old;

Comment on lines +130 to +134

@jasonvargajasonvargaDec 8, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Context for future us, or any onlookers:

This weirdness with the random string old fallback is because of how Laravel's handling of old values works.

If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.

If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.

One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.

This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.

$data = array_merge($field->toArray(), [
'error' => $errors->first($field->handle()) ?: null,
'old' => old($field->handle()),
'value' => $value,
]);

if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Handle edits within frontend fields by jasonvarga · Pull Request #7178 · statamic/cms · GitHub
Skip to content
Handle edits within frontend fields#7178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 9 commits into

from

Dec 8, 2022
 Merged


Handle edits within frontend fields
#7178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9f30bb4

initial text and toggle tests


jasonvarga Dec 2, 2022
923dd58

extract


jasonvarga Dec 2, 2022
d07102f

tests for more fieldtypes


jasonvarga Dec 8, 2022
8efceab

implement


jasonvarga Dec 8, 2022
0986483

whoops


jasonvarga Dec 8, 2022
850def9

this changed


jasonvarga Dec 8, 2022
60fb891

avoid using old


jasonvarga Dec 8, 2022
e4e948b

avoid changing 'default'


jasonvarga Dec 8, 2022
c51c521

better var names


jasonvarga Dec 8, 2022

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


9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/checkboxes.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="checkbox"
 name="{{ handle }}[]"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if (old | in_array:value) }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value|in_array:option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

4 changes: 2 additions & 2 deletions
resources/views/extend/forms/fields/default.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="text"
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default}}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

9 changes: 4 additions & 5 deletions
resources/views/extend/forms/fields/radio.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
{{ foreach:options as="value|label" }}
{{ foreach:options as="option|label" }}
 <label>
 <input
 type="radio"
 name="{{ handle }}"
 value="{{ value }}"
 value="{{ option }}"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if old === value }}checked{{ /if }}
 {{ if ! old && value === default }}checked{{ /if }}
 {{ if value == option }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ label !== null ? label : value }}
 {{ label !== null ? label : option }}
 </label>
 {{ unless inline }}
 <br>
Expand Down

6 changes: 3 additions & 3 deletions
resources/views/extend/forms/fields/select.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,9 @@
 {{ /if }}
 </option>
 {{ /unless }}
 {{ foreach:options as="value|label" }}
 <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
 {{ label !== null ? label : value }}
 {{ foreach:options as="option|label" }}
 <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
 {{ label !== null ? label : option }}
 </option>
 {{ /foreach:options }}
</select>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/text.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<input
 type="{{ input_type ?? 'text' }}"
 name="{{ handle }}"
 value="{{ old ?? default }}"
 value="{{ value }}"
 {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
 {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
Expand Down

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/textarea.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,5 @@
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
>
 {{ old ?? default }}
 {{ value }}
</textarea>

2 changes: 1 addition & 1 deletion
resources/views/extend/forms/fields/toggle.antlers.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 name="{{ handle }}"
 value="1"
 {{ if js_driver }}{{ js_attributes }}{{ /if }}
 {{ if ! old && default }}checked{{ /if }}
 {{ if value && value !== '0' }}checked{{ /if }}
 {{ if validate|contains:required }}required{{ /if }}
 >
 {{ if inline_label }}
Expand Down

6 changes: 6 additions & 0 deletions
src/Tags/Concerns/RendersForms.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 {
 $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;

 $missing = str_random();
 $old = old($field->handle(), $missing);
 $default = $field->value() ?? $field->defaultValue();
 $value = $old === $missing ? $default : $old;


Comment on lines

+130
 to 
+134

@jasonvargajasonvargaDec 8, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Context for future us, or any onlookers:
This weirdness with the random string old fallback is because of how Laravel's handling of old values works.
If a field is submitted with an empty value, it gets converted to null, so old('fieldname', 'fallback') will give you null. If the field wasn't submitted at all, the fallback would be returned.
If you were to intentionally submit a text field with an empty value, there's no way to tell the difference between the old empty value, or a completely missing value. If we did old('field') ?? $default then we'd end up rendering the default value when a user empties out the field - that's not right.
One option would be to exclude that field from the ConvertEmptyStringsToNulls middleware, but that's overkill and we don't have control of that anyway.
This is the alternative - if the old() method gives us the fallback, we can be sure it's actually missing and not just emptied by the user. I'm using a random string just to prevent someone being able to submit the known string.
 $data = array_merge($field->toArray(), [
 'error' => $errors->first($field->handle()) ?: null,
 'old' => old($field->handle()),
 'value' => $value,
 ]);

 if ($manipulateDataCallback instanceof Closure) {
Expand Down
Loading