Skip to content

Commit 40d3b99

Browse files
athphaneathphane
committed
fix: add missing div for map-input component
1 parent 05de577 commit 40d3b99

File tree

5 files changed

+95
-3
lines changed

5 files changed

+95
-3
lines changed

‎lang/dv/strings.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
'image_hint' => 'ރަނގަޅުވާނީ :widthpx x :heightpx.',
2424
'text_list_separator' => '، ',
2525
'text_list_separator_last_glue' => ' އަދި ',
26+
'map_search_string' => 'ހޯދާ...'
2627
];

‎lang/en/strings.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
'image_hint' => 'Recommended :widthpx x :heightpx.',
2424
'text_list_separator' => ', ',
2525
'text_list_separator_last_glue' => ' and ',
26+
'map_search_string' => 'Search...'
2627
];

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

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<x-forms::form-group :wrap="$showLabel" :label="$label ?: $label()" :name="$attributes->get('id') ?: $id()" :framework="$framework" :inline="$inline" :required="$required" :floating="$floating">
2+
3+
<div
4+
{{ $attributes }}
5+
data-map-selector="true"
6+
data-lat="{{ $defaultMapCenterLat }}"
7+
data-lng="{{ $defaultMapCenterLng }}"
8+
data-enable-marker="{{ $enableCoordinates ? 'true' : 'false' }}"
9+
@if($disabled)
10+
data-disabled="true"
11+
@endif
12+
@if($enableRadius)
13+
data-enable-radius="true"
14+
@endif
15+
@if($enablePolygon)
16+
data-enable-polygon="true"
17+
@endif
18+
>
19+
@if($hideInputs)
20+
@if($enableCoordinates)
21+
<x-forms::hidden class="map-selector-lat" :value="$lat" :name="$latName" :required="$required" :disabled="$disabled" :framework="$framework" />
22+
<x-forms::hidden class="map-selector-lng" :value="$lng" :name="$lngName" :required="$required" :disabled="$disabled" :framework="$framework" />
23+
@endif
24+
25+
@if($enableRadius)
26+
<x-forms::hidden class="map-selector-radius" :value="$radius" :name="$radiusName" :required="$required" :disabled="$disabled" :framework="$framework" />
27+
@endif
28+
29+
@if($enablePolygon)
30+
<x-forms::hidden class="map-selector-polygon" :value="$polygon" :name="$polygonName" :required="$required" :disabled="$disabled" :framework="$framework" />
31+
@endif
32+
@else
33+
@if($enableCoordinates)
34+
<div class="row">
35+
<div class="col-lg-6">
36+
<x-forms::latitude class="map-selector-lat" :value="$lat" :name="$latName" :label="trans('forms::strings.latitude')" :required="$required" :disabled="$disabled" :framework="$framework" />
37+
</div>
38+
<div class="col-lg-6">
39+
<x-forms::longitude class="map-selector-lng" :value="$lng" :name="$lngName" :label="trans('forms::strings.longitude')" :required="$required" :disabled="$disabled" :framework="$framework" />
40+
</div>
41+
</div>
42+
@endif
43+
44+
@if($enableRadius)
45+
<x-forms::number
46+
:name="$radiusName"
47+
class="map-selector-radius"
48+
:label="trans('forms::strings.radius')"
49+
:required="$required"
50+
:disabled="$disabled"
51+
:value="$radius"
52+
:framework="$framework"
53+
min="0"
54+
:max="$maxRadius"
55+
:step="$getRadiusStep()"
56+
>
57+
<x-slot:append>{{ $radiusUnit == 'km' ? trans('forms::strings.km_abbr') : trans('forms::strings.meters_abbr') }}</x-slot:append>
58+
</x-forms::number>
59+
@endif
60+
61+
@if($enablePolygon)
62+
<x-forms::textarea class="map-selector-polygon" :value="$polygon" :name="$polygonName" :label="trans('forms::strings.boundary')" :required="$required" :disabled="$disabled" :framework="$framework" />
63+
@endif
64+
@endif
65+
66+
<div>
67+
<input class="map-selector-search" type="text" placeholder="{{ trans('forms::strings.map_search_string') }}" />
68+
<div class="map-selector-map"></div>
69+
</div>
70+
</div>
71+
72+
@if(! empty($help))
73+
<x-forms::input-help :framework="$framework">
74+
{!! $help !!}
75+
</x-forms::input-help>
76+
@endif
77+
78+
@if($hasErrorAndShow($name))
79+
<x-forms::errors :framework="$framework" :name="$name" />
80+
@endif
81+
</x-forms::form-group>
82+
83+
@pushonce(config('forms.scripts_stack'))
84+
@include('forms::partials.maps-script')
85+
@endpushonce

‎resources/views/material-admin-26/map-input.blade.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ class="map-selector-radius"
6262
<x-forms::textarea class="map-selector-polygon" :value="$polygon" :name="$polygonName" :label="trans('forms::strings.boundary')" :required="$required" :disabled="$disabled" :framework="$framework" />
6363
@endif
6464
@endif
65+
66+
<div>
67+
<input class="map-selector-search" type="text" placeholder="{{ trans('forms::strings.map_search_string') }}" />
68+
<div class="map-selector-map"></div>
69+
</div>
6570
</div>
6671

6772
@if(! empty($help))

‎tests/Feature/MapInputTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
namespace Javaabu\Forms\Tests\Feature;
44

5-
use Illuminate\Foundation\Testing\RefreshDatabaseState;
65
use Illuminate\Support\Facades\Route;
76
use Javaabu\Forms\Tests\TestCase;
7+
use Javaabu\Forms\Tests\TestSupport\Models\City;
88
use MatanYadaev\EloquentSpatial\Objects\Point;
99
use MatanYadaev\EloquentSpatial\Objects\Polygon;
10-
use Javaabu\Forms\Tests\TestSupport\Models\City;
1110

1211
class MapInputTest extends TestCase
1312
{
@@ -66,10 +65,11 @@ public function it_can_bind_map_inputs_from_attributes()
6665
})->middleware('web');
6766

6867
$this->visit('/map-input')
68+
->see('Search...')
6969
->seeElement('#basic-map-input')
7070
->within('#basic-map-input', function () use ($lat, $lng, $wkt, $radius) {
7171
$this->seeElement('input[name="lat"][type="number"][value="' . $lat . '"]')
72-
->seeElement('input[name="lng"][type="number"][value="' . $lng . '"]')
72+
->seeElement('input[name="lng"][type="number"][value="' . $lng . '"]')
7373
->seeElement('input[name="radius"][type="number"][value="' . $radius . '"]')
7474
->seeInElement('textarea[name="boundary"]', $wkt);
7575
});

0 commit comments

Comments
 (0)