Merge remote-tracking branch 'origin/main'

Author: athphane

docs/basic-usage/conditional-link.md

@@ -0,0 +1,68 @@
+---
+title: Conditional Link
+sidebar_position: 11
+---
+
+You can use the `conditional-link` component to render `<a>` tags conditionally. This can be useful if you want to link to something only if a user has the permission to do so.
+
+## Basic usage
+
+```bladehtml
+<x-forms::conditional-link :url="route('admin.users.index', $organization)" :show-link="$your_condition_boolean" value="10" />
+```
+
+## Using `can`
+
+Instead of directly using the `show-link` prop, you can also check for a user permission by using the `can` and `arg` props.
+
+```bladehtml
+<x-forms::conditional-link :url="route('admin.users.index', $organization)" can="view" arg="users" value="10" />
+```
+
+You can also specify a specific `guard` when using `can`
+
+```bladehtml
+<x-forms::conditional-link :url="route('admin.users.index', $organization)" can="view" arg="users" guard="web" value="10" />
+```
+
+## Using slot
+
+You can also render your data manually instead of using the `value` prop.
+
+```bladehtml
+<x-forms::conditional-link :url="route('admin.users.index', $organization)" can="view" arg="users">
+    {{ $organization->users_count }}
+</x-forms::conditional-link>
+```
+
+## Using model value binding
+
+You can also bind to a model attribute value by using `name` prop when in a model context.
+
+```bladehtml
+@model($organization)
+<x-forms::conditional-link :url="route('admin.users.index', $organization)" can="view" arg="users" name="users_count" />
+@endmodel
+```
+
+## Passing additional HTML attributes
+
+HTML attributes will get rendered on the `a` tag. For example, to set the `target` to `_blank`, just use the `target` attribute. 
+Remember, if the `show-link` evaluates to `false`, then these extra attributes won't be rendered.
+
+```bladehtml
+<x-forms::conditional-link :url="route('admin.users.index', $organization)" can="view" arg="users" value="10" target="_blank" />
+```
+
+## Allowed props
+
+The `conditional-link` support the following props:
+- `'url'` - (Required) the url to link to.
+- `'show-link'` - (Bool) Whether to render as a link or not
+- `'value'` - (Optional) Value to render in the link
+- `'name'` - Name of the attribute, if using model value binding
+- `'can'` - Ability to check for, instead of using `show-link`
+- `'arg'` - Argument to pass to `can` method
+- `'guard'` - User guard to use when using `can`. By default uses the current guard.
+- `'multiline'` - (Bool) If the bound value should be rendered as multiline
+- `framework` - Which css framework to use.

docs/basic-usage/select2.md

@@ -43,7 +43,8 @@ This would add `data-minimum-results-for-search="Infinity"` to the select elemen
 
 # Enabling tags
 
-To enable the user to add their own options to the select, enable the `tags` feature of Select2 by using the `tags` attribute.
+To enable the user to add their own options to the select, enable the `tags` feature of Select2 by using the `tags` attribute. 
+When you use the `tags` option, any old values will automatically get added to the options if there's a validation error.
 
 ```html
 <x-forms::select2 name="categories" :options="$options" multiple tags />

resources/views/bootstrap-5/checkbox.blade.php

@@ -29,5 +29,9 @@ class="form-check-label"
     @if($hasErrorAndShow($name))
         <x-forms::errors :framework="$framework" :name="$name" />
     @endif
+
+    @if($showJsErrors)
+        <x-forms::js-errors :framework="$framework" :name="$name" />
+    @endif
 </x-forms::form-group>
 

resources/views/bootstrap-5/conditional-link.blade.php

@@ -0,0 +1,24 @@
+@if($showLink)
+<a {{ $attributes->merge([
+    'href' => $url
+]) }}>
+@endif
+    @if($slot->isNotEmpty())
+        {{ $slot }}
+    @elseif($isAdminModel())
+        {{ $value->admin_link_name }}
+    @else
+        @if($isStatusEnum())
+            <x-forms::status :framework="$framework" :color="$value->getColor()" :label="$getEnumLabel()" />
+        @elseif($multiline)
+            {!! nl2br(e($value ?: trans('forms::strings.blank'))) !!}
+        @elseif(is_array($value))
+            {{ implode(trans('forms::strings.table_array_separator'), $value) }}
+        @else
+            {{ $formatValue() }}
+        @endif
+    @endif
+@if($showLink)
+</a>
+@endif
+

resources/views/bootstrap-5/file.blade.php

@@ -70,4 +70,8 @@
     @if($hasErrorAndShow($name))
         <x-forms::errors :framework="$framework" :name="$name" />
     @endif
+
+    @if($showJsErrors)
+        <x-forms::js-errors :framework="$framework" :name="$name" />
+    @endif
 </x-forms::form-group>

resources/views/bootstrap-5/image.blade.php

@@ -87,4 +87,8 @@
     @if($hasErrorAndShow($name))
         <x-forms::errors :framework="$framework" :name="$name" />
     @endif
+
+    @if($showJsErrors)
+        <x-forms::js-errors :framework="$framework" :name="$name" />
+    @endif
 </x-forms::form-group>

resources/views/bootstrap-5/input.blade.php

@@ -60,4 +60,8 @@ class="{{ $clearBtnClass }}" title="{{ __('Clear') }}">
     @if($hasErrorAndShow($name))
         <x-forms::errors :framework="$framework" :name="$name"/>
     @endif
+
+    @if($showJsErrors)
+        <x-forms::js-errors :framework="$framework" :name="$name" />
+    @endif
 </x-forms::form-group>

resources/views/bootstrap-5/js-errors.blade.php

@@ -0,0 +1,3 @@
+<ul {!! $attributes->merge(['class' => 'invalid-feedback ' . $name . '-error']) !!}>
+    {{ $slot }}
+</ul>

resources/views/bootstrap-5/map-input.blade.php

@@ -78,6 +78,10 @@ class="map-selector-radius"
     @if($hasErrorAndShow($name))
         <x-forms::errors :framework="$framework" :name="$name" />
     @endif
+
+    @if($showJsErrors)
+        <x-forms::js-errors :framework="$framework" :name="$name" />
+    @endif
 </x-forms::form-group>
 
 @pushonce(config('forms.scripts_stack'))

resources/views/bootstrap-5/radio.blade.php

@@ -29,4 +29,8 @@ class="form-check-label"
     @if($hasErrorAndShow($name))
         <x-forms::errors :framework="$framework" :name="$name" />
     @endif
+
+    @if($showJsErrors)
+        <x-forms::js-errors :framework="$framework" :name="$name" />
+    @endif
 </x-forms::form-group>