Skip to content

Commit

Permalink
Unlocking Entangled Items (#1859)
Browse files Browse the repository at this point in the history
* Unlock properties locked in error

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
  • Loading branch information
lrljoe and lrljoe committed Aug 17, 2024
1 parent 30d65ac commit b3137d9
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to `laravel-livewire-tables` will be documented in this file

## [v3.4.7] - 2024-08-18
### Bug Fixes
- Correct a locked property that is entangled in js, and add comments around some key properties to prevent reoccurrence by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1859

## [v3.4.6] - 2024-08-15
### New Features
- Column Features - deselectedIf/selectedIf by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1846
Expand Down
4 changes: 4 additions & 0 deletions src/Traits/WithBulkActions.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ trait WithBulkActions

public bool $bulkActionsStatus = true;

// Entangled in JS
public bool $selectAll = false;

public array $bulkActions = [];

public array $bulkActionConfirms = [];

// Entangled in JS
public array $selected = [];

// Entangled in JS
public bool $hideBulkActionsWhenEmpty = false;

public ?string $bulkActionConfirmDefaultMessage;
Expand All @@ -46,6 +49,7 @@ trait WithBulkActions

protected array $bulkActionsMenuItemAttributes = ['default-colors' => true, 'default-styling' => true];

// Entangled in JS
public bool $delaySelectAll = false;

public function bulkActions(): array
Expand Down
4 changes: 3 additions & 1 deletion src/Traits/WithFilters.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ trait WithFilters
#[Locked]
public bool $filterPillsStatus = true;

#[Locked]
// Entangled in JS
public bool $filterSlideDownDefaultVisible = false;

#[Locked]
Expand All @@ -31,8 +31,10 @@ trait WithFilters
#[Locked]
public int $filterCount;

// Set in JS
public array $filterComponents = [];

// Set in Frontend
public array $appliedFilters = [];

public array $filterGenericData = [];
Expand Down
3 changes: 3 additions & 0 deletions src/Traits/WithPagination.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@ trait WithPagination
#[Locked]
public bool $perPageVisibilityStatus = true;

// Entangled in JS
public array $paginationCurrentItems = [];

// Entangled in JS
public int $paginationCurrentCount = 0;

// Entangled in JS
public ?int $paginationTotalItemCount = null;

public array $numberOfPaginatorsRendered = [];
Expand Down
5 changes: 5 additions & 0 deletions src/Traits/WithReordering.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@ trait WithReordering
use ReorderingConfiguration,
ReorderingHelpers;

// Entangled in JS
public bool $reorderStatus = false;

// Entangled in JS
public bool $currentlyReorderingStatus = false;

// Entangled in JS
public bool $hideReorderColumnUnlessReorderingStatus = false;

// Entangled in JS
public bool $reorderDisplayColumn = false;

// Retrieved in JS
public string $defaultReorderColumn = 'sort';

public array $orderedItems = [];
Expand Down

0 comments on commit b3137d9

Please sign in to comment.