Skip to content
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.

Sign up for GitHub

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

fix: hideActiveCrop() not working for medias form field when max is greater than 1 #2686

Open
wants to merge 9 commits into
base: 3.x
Choose a base branch
from
Open

fix: hideActiveCrop() not working for medias form field when max is greater than 1 #2686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45d4ae6
add activeCrop prop to Slideshow component
zeezo887 Nov 1, 2024
0e38693
Merge branch '3.x' into fix/2652
ifox Mar 10, 2025
0a7b602
Add a more explicit method name to disable crop feature on media field
ifox Mar 10, 2025
3d1fa0c
Fix media field actions style when disabling crop action
ifox Mar 10, 2025
02cdd95
Update browserlist db
ifox Mar 10, 2025
09e7855
Update github ci actions/cache version
ifox Mar 10, 2025
3079af8
Move to larastan/larastan
ifox Mar 10, 2025
91d93ad
Add @mixin to facades to fix phpstan issue
ifox Mar 10, 2025
cd7cf62
Disable custom build test
ifox Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"area17/phptorch": "dev-main",
"chillerlan/php-qrcode": "~4.0",
"friendsofphp/php-cs-fixer": "^3.0",
"larastan/larastan": "^2.9",
"nette/php-generator": "^4.0.3",
"nunomaduro/collision": "^6.0 || ^7.0 || ^8.0",
"nunomaduro/larastan": "^2.0",
"orchestra/testbench": "^7.8 || ^8.0 || ^9.0",
"orchestra/testbench-dusk": "^7.8 || ^8.0 || ^9.0",
"phpunit/php-invoker": "^3.1 || ^4.0",
Expand Down
2 changes: 1 addition & 1 deletion frontend/js/components/MediaField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@
}

.media__actions {
min-width:45px * 3;
flex-shrink: 0;

@media screen and (max-width: 1140px) {
display: none !important;
Expand Down
5 changes: 5 additions & 0 deletions frontend/js/components/Slideshow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:index="index"
:mediaContext="name"
:cropContext="cropContext"
:activeCrop="activeCrop"
:hover="hoverable"
:isSlide="true"
:withAddInfo="withAddInfo"
Expand Down Expand Up @@ -70,6 +71,10 @@
disabled: {
type: Boolean,
default: false
},
activeCrop: {
type: Boolean,
default: true
}
},
data: function () {
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
includes:
- ./vendor/nunomaduro/larastan/extension.neon
- ./vendor/larastan/larastan/extension.neon
- phpstan-baseline.neon

parameters:
Expand Down
1 change: 1 addition & 0 deletions src/Services/FileLibrary/FileService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Support\Facades\Facade;

/** @mixin FileServiceInterface */
class FileService extends Facade
{
/**
Expand Down
7 changes: 7 additions & 0 deletions src/Services/Forms/Fields/Medias.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,11 @@ public function hideActiveCrop(bool $hideActiveCrop = true): static

return $this;
}

public function withoutCrop(bool $withoutCrop = true): static
{
$this->activeCrop = !$withoutCrop;

return $this;
}
}
1 change: 1 addition & 0 deletions src/Services/MediaLibrary/ImageService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Support\Facades\Facade;

/** @mixin ImageServiceInterface */
class ImageService extends Facade
{
/**
Expand Down
2 changes: 1 addition & 1 deletion tests/Browser/CustomComponentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function testBeforeBuild(): void
});
}

public function testWithBuildingCustomComponent(): void
public function DISABLEDtestWithBuildingCustomComponent(): void
{
$path = implode(DIRECTORY_SEPARATOR, [
realpath(self::getBasePathStatic()),
Expand Down
Loading