-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Form row component experiment #17921
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.
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
Open
snipe
wants to merge
32
commits into
develop
Choose a base branch
from
form-row-component-experiment
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
8ce3001
First stab
snipe 9023eda
Changed class
snipe 514711d
Label blade component
snipe 7c0c3b2
Use shorthand for errors
snipe e138c93
Added maxlength default for text
snipe 5c716c3
Updated notes maxlength
snipe 671e79f
Sorry, this shouldn’t have been in there :(
snipe a59914e
Added placeholder back in
snipe 253026d
Updated locations edit
snipe c4923fa
Updated address
snipe d2e3a13
Added ability to mark fields as disabled
snipe c3efdd0
Updated company
snipe 433a3e1
Fixed field type
snipe 2554b50
Updated suppliers
snipe 33e7425
Account for tooltips
snipe a3bad98
Added date and tooltip components
snipe b766f6e
Made edit screen narrower on wide screens
snipe 3863e82
Handle text and date fields on license edit
snipe 682c1a8
Make required false
snipe f8362f4
handled text fields in status labels
snipe 02a4268
Switched more fields to blade compaonents
snipe 1c09657
Handle checkboxes
snipe cde2297
More checkbox changes
snipe 150c205
Added checkboxes to status labels page
snipe 3b4c51b
Use slot instead of label
snipe f056147
Update resources/views/blade/input/text.blade.php
snipe 235dcbc
Updated more views
snipe 5782484
Update resources/views/blade/form-row.blade.php
snipe eea1922
Added checkbox and radios
snipe dc6ee34
Revert custom field name text box for now
snipe 08630d9
Remove radio buttons - they don’t work correctly yet
snipe 750c376
Set item to null so it doesn’t get merged automatically
snipe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <!-- form-label blade component --> | ||
| @props([ | ||
| 'label', | ||
| ]) | ||
|
|
||
| <label {{ $attributes->merge(['class' => 'control-label']) }}> | ||
| {{ $label }} | ||
| </label> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <!-- form-row blade component --> | ||
| @props([ | ||
| 'errors', | ||
| 'label', | ||
| 'name' => null, | ||
| 'help_text' => null, | ||
| 'label_style' => null, | ||
| 'label_class' => 'col-md-3 col-sm-12 col-xs-12', | ||
| 'div_style' => null, | ||
| 'input_div_class' => 'col-md-8 col-sm-12', | ||
| 'input_style' => null, | ||
| 'item' => null, | ||
| 'type' => 'text', | ||
| 'placeholder' => null, | ||
| 'maxlength' => 191, | ||
| ]) | ||
|
|
||
| <div {{ $attributes->merge(['class' => 'form-group']) }}> | ||
|
|
||
| <x-form-label | ||
| :$label | ||
| :for="$name" | ||
| :style="$label_style ?? null" | ||
| class="{{ $label_class }}" | ||
| /> | ||
|
|
||
| <div {{ $attributes->merge(['class' => $input_div_class]) }} {{ ($div_style) ? $attributes->merge(['style' => $div_style]):'' }}> | ||
snipe marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| @php | ||
| $type = in_array($type, ['text', 'email', 'url', 'tel', 'number', 'password']) ? 'text' : $type; | ||
snipe marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| @endphp | ||
|
|
||
| <x-dynamic-component | ||
| :component="'input.'.$type" | ||
| :aria-label="$name" | ||
| :$name | ||
| :$placeholder | ||
| :$input_style | ||
| :$item | ||
| :id="$name" | ||
| :required="Helper::checkIfRequired($item, $name)" | ||
| :value="old($name, $item->{$name})" | ||
| :$type | ||
| :$maxlength | ||
|
|
||
| /> | ||
|
|
||
| @error($name) | ||
| <span class="alert-msg" role="alert-msg"> | ||
| <i class="fas fa-times" aria-hidden="true"></i> | ||
| {{ $message }} | ||
| </span> | ||
| @enderror | ||
|
|
||
| @if ($help_text) | ||
| <p class="help-block"> | ||
| {!! $help_text !!} | ||
| </p> | ||
| @endif | ||
| </div> | ||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| @props([ | ||
| 'item' => null, | ||
| 'field_name' => null, | ||
| 'input_style' => null, | ||
| 'required' => null, | ||
snipe marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ]) | ||
| <!-- input-text blade component --> | ||
| <input {{ $attributes->merge(['class' => 'form-control']) }} {{ ($input_style) ? $attributes->merge(['style' => $input_style]): '' }} {{ ($required ?? false) ? 'required' : '' }} /> | ||
snipe marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a stylistic thing, but you could use
$slothere - making your labels look something like:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did it this way to ensure that we have
control-labeland whatever other styles might be needed. Possible I'm misunderstanding though.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think he means removing
@propsand swapping{{ $label }}for{{ $slot }}. The attributes will still be merged (class="control-label"will still render) and the calling syntax would change fromto
It's not a big difference but it's worth noting the attributes are still merged using that syntax.
Personally, I like the "content" to be passed via
$slotbecause it feels more natural than passing it as an attribute but either way works for me.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That gives me
Undefined variable $labelThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I swap it for
{{ $slot }}, it works, but for such a simple blade, I'm not really sure how that helps us.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$slotfeels more natural to me in this scenario but either way works.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, but that screws up the flexibility I just built into the checkboxes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha. I hadn't gotten that far into my review 😅