Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/fix-php-code-style-issues.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Fix PHP Code Styling"

on:
push:
pull_request:
paths:
- '**.php'

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: PHPStan

on:
push:
branches: [main]
paths:
- '**.php'
- 'phpstan.neon.dist'
pull_request:
paths:
- '**.php'
- 'phpstan.neon.dist'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@ jobs:
- name: List Installed Dependencies
run: composer show -D

- name: Check code style
run: vendor/bin/pint --test

- name: Execute tests
run: vendor/bin/pest --ci --coverage --min=0
14 changes: 9 additions & 5 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:

permissions:
contents: write
pull-requests: write

jobs:
update:
Expand All @@ -23,9 +24,12 @@ jobs:
latest-version: ${{ github.event.release.name }}
release-notes: ${{ github.event.release.body }}

- name: Commit updated CHANGELOG
uses: stefanzweifel/git-auto-commit-action@v7
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
branch: main
commit_message: Update CHANGELOG
file_pattern: CHANGELOG.md
commit-message: Update CHANGELOG
title: Update CHANGELOG for ${{ github.event.release.name }}
body: |
Automated changelog update for release ${{ github.event.release.name }}.
branch: changelog/${{ github.event.release.tag_name }}
delete-branch: true
4 changes: 3 additions & 1 deletion config/flatpickr.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use Coolsam\Flatpickr\Enums\FlatpickrTheme;

return [
'theme' => \Coolsam\Flatpickr\Enums\FlatpickrTheme::DEFAULT, // Recommended: Use DEFAULT theme for better compatibility with Filament Styling and dark mode
'theme' => FlatpickrTheme::DEFAULT, // Recommended: Use DEFAULT theme for better compatibility with Filament Styling and dark mode
];
17 changes: 9 additions & 8 deletions src/Forms/Components/Flatpickr.php
Original file line number Diff line number Diff line change
Expand Up @@ -524,19 +524,19 @@ public function hydrateFlatpickr(Flatpickr $component, $state): void
}
}

public static function dehydrateFlatpickr(Flatpickr $component, $state): array|CarbonInterface|null
public static function dehydrateFlatpickr(Flatpickr $component, $state): array | CarbonInterface | null
{
if (blank($state)) {
return null;
}

$component->rule(
'date',
static fn(Flatpickr $component): bool => $component->isMultiplePicker() && !$component->isRangePicker() && $component->hasDate(),
static fn (Flatpickr $component): bool => $component->isMultiplePicker() && ! $component->isRangePicker() && $component->hasDate(),
);

// try to convert the state to a Carbon instance
if (!($component->isMultiplePicker() || $component->isRangePicker())) {
if (! ($component->isMultiplePicker() || $component->isRangePicker())) {
try {
$res = $component->parseToCarbon($state);
if ($res) {
Expand All @@ -547,7 +547,7 @@ public static function dehydrateFlatpickr(Flatpickr $component, $state): array|C
}
}

if (!$state instanceof CarbonInterface) {
if (! $state instanceof CarbonInterface) {
if (is_string($state)) {
if ($component->isRangePicker()) {
$range = self::splitRangeString($state, $component);
Expand All @@ -560,23 +560,23 @@ public static function dehydrateFlatpickr(Flatpickr $component, $state): array|C
return collect($range)->map(function ($date) use ($component) {
$parsed = $component->parseToCarbon($date);

if (!$parsed) {
if (! $parsed) {
return null;
}

$parsed = $parsed->setTimezone($component->getTimezone());

if (!$component->isNative()) {
if (! $component->isNative()) {
return $parsed->format($component->getFormat());
}

if (!$component->hasTime()) {
if (! $component->hasTime()) {
return $parsed->toDateString();
}

$precision = $component->hasSeconds() ? 'second' : 'minute';

if (!$component->hasDate()) {
if (! $component->hasDate()) {
return $parsed->toTimeString($precision);
}

Expand Down Expand Up @@ -625,6 +625,7 @@ protected static function extractDateMatches(string $state, Flatpickr $component

return [];
}

protected function setUp(): void
{
parent::setUp();
Expand Down
47 changes: 47 additions & 0 deletions tests/FlatpickrDehydrationTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

use Carbon\CarbonInterface;
use Coolsam\Flatpickr\Forms\Components\Flatpickr;

it('returns null when dehydrating blank state', function () {
$component = Flatpickr::make('date');

expect(Flatpickr::dehydrateFlatpickr($component, null))->toBeNull()
->and(Flatpickr::dehydrateFlatpickr($component, ''))->toBeNull();
});

it('dehydrates a single date string to a carbon instance', function () {
$component = Flatpickr::make('date')->format('Y-m-d');

$result = Flatpickr::dehydrateFlatpickr($component, '2024-06-15');

expect($result)->toBeInstanceOf(CarbonInterface::class)
->and($result->format('Y-m-d'))->toBe('2024-06-15');
});

it('dehydrates a range with dates separated by whitespace', function () {
$component = Flatpickr::make('range')->rangePicker()->format('Y-m-d');

$result = Flatpickr::dehydrateFlatpickr($component, '2024-06-01 to 2024-06-15');

expect($result)->toBe(['2024-06-01', '2024-06-15']);
});

it('dehydrates a range by dynamically splitting concatenated dates', function () {
$component = Flatpickr::make('range')->rangePicker()->format('Y-m-d');

$result = Flatpickr::dehydrateFlatpickr($component, '2024-06-012024-06-15');

expect($result)->toBe(['2024-06-01', '2024-06-15']);
});

it('dehydrates multiple dates separated by the configured conjunction', function () {
$component = Flatpickr::make('dates')
->multiplePicker()
->format('Y-m-d')
->conjunction(',');

$result = Flatpickr::dehydrateFlatpickr($component, '2024-06-01,2024-06-15,2024-06-30');

expect($result)->toBe(['2024-06-01', '2024-06-15', '2024-06-30']);
});
Loading