Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@peter-mw
peter-mw committed Oct 30, 2023
1 parent 7b4630a commit 23b64f0
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 21 deletions.
2 changes: 1 addition & 1 deletion ...berPackages/CustomField/resources/views/livewire/custom-field-values-edit-forms.blade.php
View file
Expand Up @@ -14,7 +14,7 @@

<div id="js-sortable-items-holder-{{$this->id}}">
@foreach($customField->fieldValue as $fieldValue)
<div class="d-flex gap-3 mt-3 js-sortable-item" sort-key="{{ $fieldValue->id }}">
<div class="d-flex gap-3 mt-3 js-sortable-item" sort-key="{{ $fieldValue->id }}" wire:key="custom-field-vals-{{ $this->id }}">
<div class="d-flex justify-content-center align-items-center">
<div class="js-sort-handle">
<svg class="mdi-cursor-move cursor-grab ui-sortable-handle"
Expand Down
22 changes: 13 additions & 9 deletions src/MicroweberPackages/LiveEdit/resources/views/module-items-editor-list-items.blade.php
View file
@@ -1,6 +1,9 @@
<div>

<?php
if (!isset($editorSettings['config'])) {
$editorSettings['config'] = [];
}
Expand Down Expand Up @@ -79,13 +82,13 @@
$additionalButtonsView = $editorSettings['config']['additionalButtonsView'];
}
}
$rand = md5($moduleId.rand().time())
?>


@if (isset($editorSettings['schema']) and isset($items) and is_array($items) and !empty($items))
<div x-data="{}" class="list-group list-group-flush list-group-hoverable"
id="js-sortable-items-holder-{{md5($moduleId)}}">
<div class="list-group list-group-flush list-group-hoverable"
id="js-sortable-items-holder-{{ $rand }}" wire:key="js-sortable-items-holder-{{ $rand }}">

@foreach ($items as $item)
@php
Expand All @@ -104,10 +107,11 @@
@endif

<div class="list-group-item js-sortable-item p-2" sort-key="{{ $itemId }}"
wire:key="item-list-edit-{{ $itemId }}"
wire:mouseover="$emit('mouseoverItemId', '{{ $itemId }}')"
wire:mouseout="$emit('mouseoutItemId', '{{ $itemId }}')"
id="item-list-id-{{ $itemId }}">
<div class="row align-items-center">
<div class="row align-items-center" id="item-list-row-{{ $itemId }}">
<div class="col-auto">
<div class="sortHandle">
<div>
Expand All @@ -123,8 +127,7 @@
</div>
@if (isset($editorSettings['config']) && isset($editorSettings['config']['listColumns']))
<div class="col text-truncate"
wire:click="$emit('editItemById', '{{ $itemId }}')"
>
wire:click="$emit('editItemById', '{{ $itemId }}')" >
<div class="d-flex align-items-center gap-2">
@foreach ($editorSettings['config']['listColumns'] as $columnKey => $columnLabel)
@if (isset($item[$columnKey]))
Expand All @@ -146,12 +149,13 @@

<div class="col-auto d-flex align-items-center">

<x-microweber-ui::button-action type="button" :tooltip="$deleteButtonText"
wire:click="$emit('showConfirmDeleteItemById', '{{ $itemId }}')">

<x-microweber-ui::button-action wire:key="item-list-delete-btn-{{ $itemId }}" type="button" :tooltip="$deleteButtonText"
wire:click="$emit('onShowConfirmDeleteItemById', '{{ $itemId }}')">
<?php print $deleteButtonIconSvg ?>
</x-microweber-ui::button-action>

<x-microweber-ui::button-action type="button" wire:click="$emit('editItemById', '{{ $itemId }}')">
<x-microweber-ui::button-action wire:key="item-list-edit-btn-{{ $itemId }}" type="button" wire:click="$emit('editItemById', '{{ $itemId }}')">
<?php print $editButtonIconSvg ?>
</x-microweber-ui::button-action>

Expand Down
17 changes: 12 additions & 5 deletions src/MicroweberPackages/LiveEdit/resources/views/module-items-editor-list.blade.php
View file
Expand Up @@ -100,6 +100,7 @@
window.livewire.on('showConfirmDeleteItemById' , (itemId) => {
Livewire.emit('onShowConfirmDeleteItemById', itemId);
var event = new Event('moduleSettings.showConfirmDeleteItemById', { detail: itemId });
})
}">
Expand All @@ -122,7 +123,10 @@
<?php print $addButtonText ?>
</x-microweber-ui::button-animation>
</div>

<div>
@include('microweber-live-edit::module-items-editor-list-items')
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -171,11 +175,14 @@

<div>

<livewire:microweber-live-edit::module-items-editor-edit-item :moduleId="$moduleId"
:moduleType="$moduleType"
wire:key="item-edit-{{ $itemId }}"
:itemId="$itemId"
:editorSettings="$editorSettings"/>

@livewire('microweber-live-edit::module-items-editor-edit-item', [
'moduleId' => $moduleId,
'moduleType' => $moduleType,
'editorSettings' => $editorSettings,
'itemId' => $itemId,
], key('module-settings-list-item-edit'.$moduleId.time().uniqid().$itemId))


</div>

Expand Down
4 changes: 2 additions & 2 deletions src/MicroweberPackages/LiveEdit/resources/views/module-settings.blade.php
View file
Expand Up @@ -69,13 +69,13 @@
'moduleId' => $moduleId,
'moduleType' => $moduleFolder,
'moduleParams' => $params,
])
], key('module-settings-'.$moduleId))
@elseif(livewire_component_exists($livewireComponentDashed))
@livewire($livewireComponentDashed, [
'moduleId' => $moduleId,
'moduleType' => $moduleFolder,
'moduleParams' => $params,
])
], key('module-settings-'.$moduleId))
@else


Expand Down
11 changes: 7 additions & 4 deletions src/MicroweberPackages/MicroweberUI/resources/views/components/file-picker.blade.php
View file
Expand Up @@ -3,7 +3,10 @@
<div class="form-control-live-edit-label-wrapper">

@php
$randId = rand(111,999).time();
$attrs = $attributes->merge([]);
$randId = 'mwfilepickeritem'.md5(rand(111,999).time().uniqid().json_encode($attrs));
@endphp
<div>

Expand Down Expand Up @@ -133,9 +136,9 @@ function generatePreview{{$randId}}(fullFilePath)
mediaPickerFileField.dispatchEvent(new Event('input'));
}
});
generatePreview{{$randId}}(mediaPickerFileField.value);
if(mediaPickerFileField && mediaPickerFileField.value) {
generatePreview{{$randId}}(mediaPickerFileField.value);
}
$('.js-remove-file-{{$randId}}').click(function() {
mediaPickerFileField.value = '';
Expand Down

0 comments on commit 23b64f0

Please sign in to comment.